Merge branch 'beta-4.52.4' into patch-3

package.json

@@ -56,7 +56,7 @@
     "@fastify/multipart": "8.0.0",
     "@fastify/static": "6.12.0",
     "@fastify/swagger": "8.12.0",
-    "@homebridge/node-pty-prebuilt-multiarch": "0.11.10",
+    "@homebridge/node-pty-prebuilt-multiarch": "0.11.11",
     "@nestjs/axios": "3.0.1",
     "@nestjs/common": "10.2.8",
     "@nestjs/core": "10.2.8",
@@ -72,7 +72,7 @@
     "class-validator": "0.14.0",
     "commander": "11.1.0",
     "dayjs": "1.11.10",
-    "emoji-js": "3.7.0",
+    "emoji-js": "3.8.0",
     "fastify": "4.24.3",
     "fs-extra": "11.1.1",
     "node-cache": "5.1.2",

ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html

@@ -9,9 +9,12 @@ <h5 class="modal-title">
     </button>
   </div>
   <div class="modal-body">
-
     <p>
       {{ 'child_bridge.message_about' | translate }}
+      <a href="https://github.com/homebridge/homebridge/wiki/Child-Bridges" target="_blank" rel="noopener noreferrer" class="primary-text">
+        {{ 'child_bridge.message_wiki_link' | translate }}
+        <i class='fas fa-fw fa-external-link-alt'></i>
+      </a>
     </p>
 
     <div *ngIf="configBlocks.length">
@@ -100,29 +103,26 @@ <h5 class="primary-text">
       </div>
     </div>
 
-    <p>
-      <a href="https://github.com/homebridge/homebridge/wiki/Child-Bridges" target="_blank" rel="noopener noreferrer"
-        class="primary-text">
-        {{ 'child_bridge.message_wiki_link' | translate }}
-        <i class='fas fa-fw fa-external-link-alt'></i>
-      </a>
-    </p>
-
   </div>
   <div class="modal-footer justify-content-between">
     <div class="text-left">
-      <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.close('Dismiss')">
+      <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.close('Dismiss')" *ngIf="configBlocks.length">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
-    <div class="d-none d-lg-block text-center">
+    <div class="d-none d-lg-block text-center" *ngIf="configBlocks.length">
       <a *ngIf="plugin.links.npm" [href]="plugin.links.npm" target="_blank" rel="noopener noreferrer"
          class="pr-3 manage-plugin-config-external-icons dark-mode-highlight"><i class="fab fa-fw fa-npm"></i></a>
       <a *ngIf="plugin.links.homepage" [href]="plugin.links.homepage" target="_blank" rel="noopener noreferrer"
          class="manage-plugin-config-external-icons dark-mode-highlight">
         <i [ngClass]="plugin.links.homepage | externalLinkIcon"></i>
       </a>
     </div>
+    <div class="text-center" *ngIf="!configBlocks.length">
+      <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.close('Dismiss')">
+        {{ 'form.button_close' | translate }}
+      </button>
+    </div>
     <div class="text-right">
       <button type="button" class="btn btn-primary" (click)="save()" [disabled]="saveInProgress" *ngIf="configBlocks.length">
         {{ 'form.button_save' | translate }} <i *ngIf="saveInProgress" class="fas fa-fw fa-spinner fa-pulse"></i>

ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html

@@ -51,10 +51,11 @@ <h4 class="primary-text text-center" [translate]="'plugins.manage.label_manual_u
     <hr>
   </div>
   <div *ngIf="showReleaseNotes && !actionComplete" class="modal-body plugin-modal-body">
-    <h3 *ngIf="!updateToBeta" [translate]="'plugins.manage.label_release_notes'">Release Notes</h3>
-    <h3 *ngIf="updateToBeta" [translate]="'plugins.manage.label_release_notes_beta'">Beta Information</h3>
-    <h5>{{ release.name }}</h5>
-    <markdown class="plugin-md" [data]="release.changelog"></markdown>
+    <h5 *ngIf="!updateToBeta">{{ 'plugins.manage.label_release_notes' | translate }} ({{ release.name }})</h5>
+    <h5 *ngIf="updateToBeta">{{ 'plugins.manage.label_release_notes_beta' | translate }} ({{ release.name }})</h5>
+    <div class="alert show alert-info pt-3 px-3 pb-0 mb-0">
+      <markdown class="plugin-md" [data]="release.changelog"></markdown>
+    </div>
   </div>
   <div class="modal-footer justify-content-between" *ngIf="!onlineUpdateOk || actionComplete || showReleaseNotes || actionFailed">
     <div class="text-left">

ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts

@@ -37,15 +37,16 @@ export class PluginLogModalComponent implements OnInit, OnDestroy {
   }
 
   @HostListener('window:resize', ['$event'])
-  onWindowResize(event) {
+  onWindowResize() {
     this.resizeEvent.next(undefined);
   }
 
   getPluginLog() {
     // Get the plugin name as configured in the config file
+    console.log(this.plugin);
     this.$api.get(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`).subscribe(
       (result) => {
-        const logAlias = this.plugin.name === 'homebridge-config-ui-x' ? 'Homebridge UI' : result[0].name;
+        const logAlias = this.plugin.name === 'homebridge-config-ui-x' ? 'Homebridge UI' : (result[0]?.name || this.plugin.name);
         this.$log.startTerminal(this.termTarget, {}, this.resizeEvent, logAlias);
       },
       (err) => {

ui/src/app/modules/accessories/accessories.component.html

@@ -35,7 +35,7 @@ <h5 class="primary-text drag-handle room-title" [ngClass]="{'cursor-move': !isMo
         </div>
       </div>
       <div class="row mb-4">
-        <div class="col-md-12 d-flex flex-wrap noselect services-bag" *ngIf="room.services.length"
+        <div class="col-md-12 d-flex flex-wrap justify-content-between noselect services-bag" *ngIf="room.services.length"
           [dragula]='"services-bag"' [(dragulaModel)]='room.services'>
           <div *ngFor="let service of room.services" [ngSwitch]="service.type" class="accessory-item accessory-tab">
             <ng-container *ngIf="!hideHidden || !service.hidden">

ui/src/app/modules/plugins/plugin-card/plugin-card.component.html

@@ -2,7 +2,7 @@
 <div class="card card-body mb-3">
   <div class="d-flex flex-row justify-content-between">
     <div class="">
-      <p class="mb-0 primary-text"
+      <p class="mb-0 info-text"
         *ngIf="plugin.installedVersion && !plugin.updateAvailable && !plugin.betaUpdateAvailable && !plugin.disabled">
         <i class="far fa-fw fa-circle-check"></i> {{ 'plugins.status_installed' | translate }}
       </p>
@@ -56,15 +56,15 @@ <h4 class="card-title mb-0">
          placement="top" ngbTooltip="{{'plugins.status_update_available' | translate:plugin }}" container="body" [openDelay]="150">
         <i class="fas fa-fw fa-arrow-alt-circle-up primary-text"></i>
       </a>
-      <a href="javascript:void(0);" class="card-link ml-3" *ngIf="!hasChildBridges && recommendChildBridge"
+      <a href="javascript:void(0);" class="card-link ml-3" *ngIf="!hasChildBridges && !plugin.disabled && recommendChildBridge"
          ngbTooltip="{{'child_bridge.label_bridge_setup_child_bridges' | translate}}" placement="top" container="body"
          [openDelay]="150" (click)="$plugin.bridgeSettings(plugin)">
         <i class="fa-fw icon-button fas fa-fw fa-circle-exclamation primary-text"></i>
       </a>
       <ng-container *ngIf="hasChildBridges">
         <a href="javascript:void(0);" class="card-link grey-text ml-3" rel="noopener noreferrer"
           aria-label="Connect to HomeKit"
-          *ngIf="!childBridgeRestartInProgress && hasUnpairedChildBridges && childBridgeStatus === 'ok'"
+          *ngIf="!childBridgeRestartInProgress && hasUnpairedChildBridges && childBridgeStatus === 'ok' && !plugin.disabled"
           ngbTooltip="{{'child_bridge.label_bridge_connect_to_homekit' | translate}}" placement="top" container="body"
           openDelay="150" (click)="$plugin.bridgeSettings(plugin)">
           <i class="fa-fw icon-button fas fa-fw fa-circle-exclamation primary-text"></i>
@@ -108,7 +108,7 @@ <h4 class="card-title mb-0">
             <i class="fas fa-fw fa-fw fa-history"></i>
             {{ 'plugins.manage.message_install_alternate_version' | translate }}
           </button>
-          <button ngbDropdownItem (click)="viewPluginLog(plugin)">
+          <button ngbDropdownItem (click)="viewPluginLog(plugin)" *ngIf="plugin.installedVersion">
             <i class="fas fa-fw fa-fw fa-wave-square"></i> {{ 'plugins.manage.plugin_logs' | translate }}
           </button>
           <button ngbDropdownItem (click)="$plugin.bridgeSettings(plugin)"

ui/src/app/shared/layout/layout.component.html

@@ -65,9 +65,6 @@
             <a class="dropdown-item waves-effect waves-light" routerLink="/logs">
               {{ 'menu.linux.label_logs' | translate }}
             </a>
-            <a href="javascript:void(0)" class="dropdown-item waves-effect waves-light" (click)="openRestartOptionsModal()" *ngIf="$auth.user.admin">
-              {{ 'menu.restart.title' | translate }}
-            </a>
             <div class="dropdown-divider" *ngIf="$auth.user.admin"></div>
             <a class="dropdown-item waves-effect waves-light" routerLink="/settings" *ngIf="$auth.user.admin">
               {{ 'menu.label_settings_hb' | translate }}
@@ -83,7 +80,10 @@
             <a class="dropdown-item waves-effect waves-light" routerLink="/users" *ngIf=" $auth.user.admin">
               {{'menu.tooltip_user_accounts' | translate}}
             </a>
-            <div class="dropdown-divider" *ngIf="$settings.formAuth"></div>
+            <div class="dropdown-divider" *ngIf="$auth.user.admin || $settings.formAuth"></div>
+            <a href="javascript:void(0)" class="dropdown-item waves-effect waves-light" (click)="openRestartOptionsModal()" *ngIf="$auth.user.admin">
+              {{ 'menu.restart.title' | translate }}
+            </a>
             <a href="javascript:void(0)" class="dropdown-item waves-effect waves-light" (click)="$auth.logout()" *ngIf="$settings.formAuth">
               {{ 'menu.tooltip_logout' | translate }} - {{ $auth.user.username }}
             </a>