no need to restart if updating disabled plugin

homebridge · Dec 29, 2023 · 8c71d6b · 8c71d6b
1 parent 15e0bf0
commit 8c71d6b
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ All notable changes to homebridge-config-ui-x will be documented in this file.
 - add link to homebridge wiki in logs on plugin action error
 - allow fan/fanv2 rotation speed to be a different unit than percentage
 - improve plugin sorting, with actionable plugins at the top
+- fix footer paddings for mobile and desktop (#1956) (@mkz212)
+- no need to restart if updating disabled plugin
 
 ### Translation Changes
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html
@@ -7,7 +7,7 @@ <h5 class="modal-title">{{ presentTenseVerb }}: {{ pluginName }}</h5>
   </div>
   <div [hidden]="!onlineUpdateOk || actionComplete || showReleaseNotes" id="plugin-log-output" class="modal-body"></div>
   <div *ngIf="actionComplete" class="modal-body plugin-modal-body">
-    <div *ngIf="justUpdatedPlugin">
+    <div *ngIf="justUpdatedPlugin && !isDisabled">
       <h3 class="text-center primary-text" [translate]="'platform.version.title_service_restart_required'">
         Restart Required
       </h3>
@@ -57,20 +57,25 @@ <h5 *ngIf="updateToBeta">{{ 'plugins.manage.label_release_notes_beta' | translat
   <div class="modal-footer justify-content-between" *ngIf="!onlineUpdateOk || actionComplete || showReleaseNotes || actionFailed">
     <div class="text-left">
       <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')"
-        [attr.aria-label]="'form.button_close' | translate">
+        [attr.aria-label]="'form.button_close' | translate" *ngIf="!justUpdatedPlugin || (justUpdatedPlugin && (!isDisabled || actionFailed))">
+        {{ 'form.button_close' | translate }}
+      </button>
+    </div>
+    <div class="text-center">
+      <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')"
+        [attr.aria-label]="'form.button_close' | translate" *ngIf="justUpdatedPlugin && isDisabled && !actionFailed">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
-    <div class="text-center"></div>
     <div class="text-right">
       <button *ngIf="onlineUpdateOk && showReleaseNotes" type="button" class="btn btn-primary" (click)="update()">
         {{ 'plugins.button_update' | translate }}
       </button>
-      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && !['homebridge', 'homebridge-config-ui-x'].includes(pluginName) && childBridges.length > 0"
+      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && !isDisabled && !['homebridge', 'homebridge-config-ui-x'].includes(pluginName) && childBridges.length > 0"
         (click)="onRestartChildBridgeClick()">
         {{ (childBridges.length === 1 ? 'plugins.manage.child_bridge_button_restart_now_one' : 'plugins.manage.child_bridge_button_restart_now') | translate }}
       </button>
-      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && (['homebridge', 'homebridge-config-ui-x'].includes(pluginName) || childBridges.length === 0)"
+      <button type="button" class="btn btn-primary" *ngIf="justUpdatedPlugin && !isDisabled && (['homebridge', 'homebridge-config-ui-x'].includes(pluginName) || childBridges.length === 0)"
         (click)="onRestartHomebridgeClick()">
         {{ 'plugins.manage.button_restart_now' | translate }}
       </button>

diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts
@@ -28,6 +28,7 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy {
   @Input() targetVersion = 'latest';
   @Input() latestVersion: string;
   @Input() installedVersion: string;
+  @Input() isDisabled: boolean;
   @Input() action: string;
 
   public actionComplete = false;

diff --git a/ui/src/app/core/manage-plugins/manage-plugins.service.ts b/ui/src/app/core/manage-plugins/manage-plugins.service.ts
@@ -61,6 +61,7 @@ export class ManagePluginsService {
     ref.componentInstance.targetVersion = targetVersion;
     ref.componentInstance.latestVersion = plugin.latestVersion;
     ref.componentInstance.installedVersion = plugin.installedVersion;
+    ref.componentInstance.isDisabled = plugin.disabled;
   }
 
   async upgradeHomebridge(homebridgePkg: any, targetVersion = 'latest') {

diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts
@@ -132,9 +132,10 @@ export class PluginCardComponent implements OnInit {
     ref.result.then(async () => {
       try {
         await this.$api.put(`/config-editor/plugin/${encodeURIComponent(plugin.name)}/disable`, {}).toPromise();
-        // mark as disabled
+        // Mark as disabled
         plugin.disabled = true;
-        // stop all child bridges
+
+        // Stop all child bridges
         if (this.hasChildBridges) {
           this.doChildBridgeAction('stop');
         }