up

homebridge · Nov 13, 2023 · 0e57693 · 0e57693
1 parent b47a762
commit 0e57693
Show file tree

Hide file tree

Showing 30 changed files with 15 additions and 55 deletions.
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
@@ -58,12 +58,12 @@ <h5>{{ release.name }}</h5>
   </div>
   <div class="modal-footer justify-content-between" *ngIf="!onlineUpdateOk || actionComplete || showReleaseNotes || actionFailed">
     <div class="text-left">
-      <button *ngIf="!justUpdatedPlugin" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
+      <button *ngIf="!justUpdatedPlugin && !actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
     <div class="text-center">
-      <button *ngIf="justUpdatedPlugin" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
+      <button *ngIf="justUpdatedPlugin || actionFailed" type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
         {{ 'form.button_close' | translate }}
       </button>
     </div>

diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html
@@ -9,12 +9,9 @@
       <p class="mb-0 grey-text" *ngIf="!plugin.installedVersion">
         <i class="far fa-fw fa-circle"></i> {{ 'plugins.status_not_installed' | translate }}
       </p>
-      <p class="mb-0 primary-text" *ngIf="plugin.updateAvailable && !plugin.betaUpdateAvailable && !plugin.disabled">
+      <p class="mb-0 primary-text" *ngIf="plugin.updateAvailable || plugin.betaUpdateAvailable && !plugin.disabled">
         <i class="far fa-fw fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_available' | translate }}
       </p>
-      <p class="mb-0 primary-text" *ngIf="plugin.betaUpdateAvailable && !plugin.updateAvailable && !plugin.disabled">
-        <i class="far fa-fw fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_beta_available' | translate }}
-      </p>
       <p class="mb-0 red-text" *ngIf="plugin.installedVersion && plugin.disabled">
         <i class="far fa-fw fa-circle-pause"></i> {{ 'plugins.status_disabled' | translate }}
       </p>
@@ -54,18 +51,6 @@ <h4 class="card-title mb-0">
     </a>
 
     <div class="ml-auto">
-      <a href="javascript:void(0)" class="card-link text-decoration-none ml-3"
-        *ngIf="plugin.updateAvailable && !plugin.betaUpdateAvailable" (click)="$plugin.updatePlugin(plugin)"
-        placement="bottom" ngbTooltip="{{'plugins.tooltip_update_plugin_to' | translate:plugin }}" container="body"
-        [openDelay]="150" [closeDelay]="3000" [autoClose]="true" [translate]="'plugins.button_update'" triggers="hover:focus:touchstart:touchend:click">
-        <i class="fas fa-fw fa-arrow-alt-circle-up primary-text"></i>
-      </a>
-      <a href="javascript:void(0)" class="card-link text-decoration-none ml-3"
-        *ngIf="!plugin.updateAvailable && plugin.betaUpdateAvailable" (click)="$plugin.updatePlugin(plugin, 'beta')"
-        placement="bottom" ngbTooltip="{{'plugins.tooltip_update_plugin_to' | translate:plugin }}" container="body"
-        [openDelay]="150" [closeDelay]="3000" [autoClose]="true" [translate]="'plugins.button_update'" triggers="hover:focus:touchstart:touchend:click">
-        <i class="fas fa-fw fa-arrow-alt-circle-up 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"
@@ -91,11 +76,8 @@ <h4 class="card-title mb-0">
       </ng-container>
 
       <span ngbDropdown placement="bottom-right top-right" class="d-inline-block ml-3">
-        <a href="javascript:void(0)" class="card-link grey-text" aria-label="Plugin actions drop down menu"
-          ngbDropdownToggle>
-          <span class="card-link">
-            <i class="fas fa-fw fa-ellipsis-v"></i>
-          </span>
+        <a class="card-link" href="javascript:void(0)" aria-label="Plugin actions drop down menu" ngbDropdownToggle>
+            <i class="fas fa-fw fa-ellipsis-v" [ngClass]="{'grey-text': !plugin.updateAvailable && !plugin.betaUpdateAvailable, 'primary-text': plugin.updateAvailable || plugin.betaUpdateAvailable }"></i>
         </a>
         <div ngbDropdownMenu aria-labelledby="Plugin actions drop down menu">
           <ng-container *ngIf="hasChildBridges && !plugin.disabled">
@@ -107,6 +89,11 @@ <h4 class="card-title mb-0">
             </button>
             <div class="dropdown-divider"></div>
           </ng-container>
+          <button ngbDropdownItem *ngIf="plugin.updateAvailable || plugin.betaUpdateAvailable"
+            (click)="$plugin.updatePlugin(plugin, plugin.betaUpdateAvailable ? 'beta' : 'latest')">
+            <i class="fas fa-fw fa-arrow-alt-circle-up primary-text"></i>
+            {{ 'plugins.button_update' | translate }} (v{{ plugin.latestVersion }})
+          </button>
           <button ngbDropdownItem *ngIf="plugin.publicPackage" (click)="$plugin.installPreviousVersion(plugin)">
             <i class="fas fa-fw fa-fw fa-history"></i>
             {{ 'plugins.manage.message_install_alternate_version' | translate }}
@@ -124,11 +111,11 @@ <h4 class="card-title mb-0">
           </button>
           <button ngbDropdownItem (click)="disablePlugin(plugin)"
             *ngIf="plugin.installedVersion && plugin.name !== 'homebridge-config-ui-x' && !plugin.disabled">
-            <i class="far fa-fw fa-times-circle"></i> {{ 'plugins.manage.disable' | translate }}
+            <i class="far fa-fw fa-circle-pause"></i> {{ 'plugins.manage.disable' | translate }}
           </button>
           <button ngbDropdownItem (click)="enablePlugin(plugin)"
             *ngIf="plugin.installedVersion && plugin.name !== 'homebridge-config-ui-x' && plugin.disabled">
-            <i class="far fa-fw fa-check-circle"></i> {{ 'plugins.manage.enable' | translate }}
+            <i class="far fa-fw fa-circle-play"></i> {{ 'plugins.manage.enable' | translate }}
           </button>
           <button ngbDropdownItem *ngIf="plugin.installedVersion && plugin.name !== 'homebridge-config-ui-x'"
             (click)="$plugin.uninstallPlugin(plugin)">

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
@@ -83,7 +83,7 @@ export class PluginCardComponent implements OnInit {
     ref.componentInstance.title = `${this.$translate.instant('plugins.manage.disable')}: ${plugin.name}`;
     ref.componentInstance.message = this.$translate.instant('plugins.manage.message_confirm_disable', { pluginName: plugin.name });
     ref.componentInstance.confirmButtonLabel = this.$translate.instant('plugins.manage.disable');
-    ref.componentInstance.faIconClass = 'fa-circle-pause red-text';
+    ref.componentInstance.faIconClass = 'fa-circle-pause primary-text';
 
     ref.result.then(async () => {
       try {
@@ -113,7 +113,7 @@ export class PluginCardComponent implements OnInit {
     ref.componentInstance.title = `${this.$translate.instant('plugins.manage.enable')}: ${plugin.name}`;
     ref.componentInstance.message = this.$translate.instant('plugins.manage.message_confirm_enable', { pluginName: plugin.name });
     ref.componentInstance.confirmButtonLabel = this.$translate.instant('plugins.manage.enable');
-    ref.componentInstance.faIconClass = 'fa-circle-check green-text';
+    ref.componentInstance.faIconClass = 'fa-circle-play primary-text';
 
     ref.result.then(async () => {
       try {

diff --git a/ui/src/i18n/bg.json b/ui/src/i18n/bg.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Инсталиран",
     "plugins.status_not_installed": "Не е инсталиран",
     "plugins.status_update_available": "Налична е актуализация",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Неуспешно зареждане на добавките",
     "plugins.tooltip_update_plugin_to": "Актуализирай добавката до v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",

diff --git a/ui/src/i18n/ca.json b/ui/src/i18n/ca.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Instal·lat",
     "plugins.status_not_installed": "No instal·lat",
     "plugins.status_update_available": "Actualització disponible",
-    "plugins.status_update_beta_available": "Actualització Beta Disponible",
     "plugins.toast_failed_to_load_plugins": "Error al carregar els plugins",
     "plugins.tooltip_update_plugin_to": "Actualitzar el plugin a v{{ latestVersion }}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Després de realitzar aquesta acció, pot ser que sigui necessari configurar de nou alguns accessoris en HomeKit o tornar a afegir-los a les teves automatitzacions.",

diff --git a/ui/src/i18n/cs.json b/ui/src/i18n/cs.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Instalováno",
     "plugins.status_not_installed": "Není instalován",
     "plugins.status_update_available": "Aktualizace k dispozici",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Nepodařilo se načíst pluginy",
     "plugins.tooltip_update_plugin_to": "Aktualizovat plugin pro v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Po provedení této akce může být nutné některé příslušenství znovu nakonfigurovat v HomeKit nebo znovu přidat do vašich automatizací.",

diff --git a/ui/src/i18n/de.json b/ui/src/i18n/de.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Installiert",
     "plugins.status_not_installed": "Nicht installiert",
     "plugins.status_update_available": "Aktualisierung verfügbar",
-    "plugins.status_update_beta_available": "Beta Update verfügbar",
     "plugins.toast_failed_to_load_plugins": "Fehler beim Laden der Plugins",
     "plugins.tooltip_update_plugin_to": "Plugin auf v{{latestVersion}} aktualisieren",
     "reset.accessories_will_may_need_to_be_reconfigured": "Nachdem diese Aktion durchgeführt wurde, müssen eventuell einige HomeKit-Geräte neu eingerichtet oder neu zur Automation hinzugefühgt werden.",

diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json
@@ -182,7 +182,7 @@
     "plugins.button_api_documentation": "API Documentation",
     "plugins.button_homepage": "Plugin Homepage",
     "plugins.button_install": "Install",
-    "plugins.button_settings": "Settings",
+    "plugins.button_settings": "Config",
     "plugins.button_uninstall": "Uninstall",
     "plugins.button_update": "Update",
     "plugins.button_upgrade": "Upgrade",
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Installed",
     "plugins.status_not_installed": "Not Installed",
     "plugins.status_update_available": "Update Available",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Failed to load plugins",
     "plugins.tooltip_update_plugin_to": "Update plugin to v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",

diff --git a/ui/src/i18n/es.json b/ui/src/i18n/es.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Instalado",
     "plugins.status_not_installed": "No instalado",
     "plugins.status_update_available": "Actualización disponible",
-    "plugins.status_update_beta_available": "Actualización beta disponible",
     "plugins.toast_failed_to_load_plugins": "Error al cargar los plugins",
     "plugins.tooltip_update_plugin_to": "Actualizar plugin a la versión {{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Después de realizar esta acción, puede que sea necesario configurar de nuevo algunos accesorios en HomeKit o volver a añadirlos a sus automatizaciones.",

diff --git a/ui/src/i18n/fr.json b/ui/src/i18n/fr.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Installé",
     "plugins.status_not_installed": "Non installé",
     "plugins.status_update_available": "Mise à jour disponible",
-    "plugins.status_update_beta_available": "Mise à jour version Bêta disponible",
     "plugins.toast_failed_to_load_plugins": "Erreur de chargement des plugins",
     "plugins.tooltip_update_plugin_to": "Mettre à jour le plugin vers v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Après la réalisation de cette action, certains accessoires devront peut-être être reconfigurés dans HomeKit ou de nouveau ajoutés à vos Automatisations.",

diff --git a/ui/src/i18n/he.json b/ui/src/i18n/he.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "מותקן",
     "plugins.status_not_installed": "לא מותקן",
     "plugins.status_update_available": "עדכון זמין",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "כשל בהעלאת התוספים",
     "plugins.tooltip_update_plugin_to": "תוסף עודכן לגרסא v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",

diff --git a/ui/src/i18n/hu.json b/ui/src/i18n/hu.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Telepítve",
     "plugins.status_not_installed": "Nincs telepítve",
     "plugins.status_update_available": "Új frissítés érhető el",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Nem sikerült betölteni a plugineket",
     "plugins.tooltip_update_plugin_to": "Frissítés a v{{latestVersion}} verzióra",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",

diff --git a/ui/src/i18n/id.json b/ui/src/i18n/id.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Terpasang",
     "plugins.status_not_installed": "Tidak Terpasang",
     "plugins.status_update_available": "Pembaruan Tersedia",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Gagal memuat plugin",
     "plugins.tooltip_update_plugin_to": "Perbarui plugin ke v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Setelah melakukan tindakan ini, beberapa aksesoris mungkin perlu dikonfigurasi ulang di HomeKit atau ditambahkan kembali ke otomasi anda.",

diff --git a/ui/src/i18n/it.json b/ui/src/i18n/it.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Installato",
     "plugins.status_not_installed": "Non installato",
     "plugins.status_update_available": "Aggiornamento disponibile",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Impossibile caricare i plugin",
     "plugins.tooltip_update_plugin_to": "Aggiorna plugin alla versione v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Dopo l'esecuzione di questa operazione potrebbe essere necessario riconfigurare alcuni degli accessori in HomeKit o riaggiungerli alle automazioni.",

diff --git a/ui/src/i18n/ja.json b/ui/src/i18n/ja.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "インストール済",
     "plugins.status_not_installed": "未インストール",
     "plugins.status_update_available": "更新が利用可能です",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "プラグインの読み込みに失敗しました",
     "plugins.tooltip_update_plugin_to": "プラグインをv{{latestVersion}}に更新",
     "reset.accessories_will_may_need_to_be_reconfigured": "この操作を実行すると、一部のアクセサリをHomeKitで再設定するか、自動化機能に再追加する必要がある可能性があります。",

diff --git a/ui/src/i18n/ko.json b/ui/src/i18n/ko.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "설치됨",
     "plugins.status_not_installed": "설치 안됨",
     "plugins.status_update_available": "업데이트 가능",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "플러그인 로드 실패",
     "plugins.tooltip_update_plugin_to": "플러그인을 v{{latestVersion}}로 업데이트",
     "reset.accessories_will_may_need_to_be_reconfigured": "이 작업을 진행한 후에는 HomeKit에서 일부 액세서리를 재구성해야 할 수 있으며, 자동화 작업들을 다시 추가해야할 수 있습니다.",

diff --git a/ui/src/i18n/mk.json b/ui/src/i18n/mk.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Инсталиран",
     "plugins.status_not_installed": "Не е инсталиран",
     "plugins.status_update_available": "Ажурирање достапно",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Грешка при вчитување плагини.",
     "plugins.tooltip_update_plugin_to": "Ажурирај го плагинот на v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "По извршување на оваа акција, некои уреди можно е да треба да бидат повторно конфигурирано во HomeKit или да се додадат во вашите автоматизации.",

diff --git a/ui/src/i18n/nl.json b/ui/src/i18n/nl.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Geïnstalleerd",
     "plugins.status_not_installed": "Niet Geïnstalleerd",
     "plugins.status_update_available": "Update Beschikbaar",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Laden van plug-ins mislukt",
     "plugins.tooltip_update_plugin_to": "Update plugin naar v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Na het uitvoeren van deze actie kan het zijn dat voor sommmige accessoires de configuratie in HomeKit moet worden aangepast of opnieuw moet worden toegevoegd aan je automatiseringen.",

diff --git a/ui/src/i18n/no.json b/ui/src/i18n/no.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Installert",
     "plugins.status_not_installed": "Ikke installert",
     "plugins.status_update_available": "Oppdatering tilgjengelig",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Kunne ikke laste plugins",
     "plugins.tooltip_update_plugin_to": "Oppdater plugin til v {{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",

diff --git a/ui/src/i18n/pl.json b/ui/src/i18n/pl.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Zainstalowany",
     "plugins.status_not_installed": "Niezainstalowany",
     "plugins.status_update_available": "Dostępna aktualizacja",
-    "plugins.status_update_beta_available": "Dostępna aktualizacja beta",
     "plugins.toast_failed_to_load_plugins": "Nie udało się załadować wtyczek",
     "plugins.tooltip_update_plugin_to": "Zaktualizuj wtyczkę do wersji {{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Po wykonaniu tej czynności dla niektórych akcesoriów może być wymagana ponowna ich konfiguracja w HomeKit lub ponowne dodanie do automatyzacji.",

diff --git a/ui/src/i18n/pt-BR.json b/ui/src/i18n/pt-BR.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Instalado",
     "plugins.status_not_installed": "Não Instalado",
     "plugins.status_update_available": "Atualização Disponível",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Falha ao carregar os plugins",
     "plugins.tooltip_update_plugin_to": "Atualizar o plugin para a versão v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Após executar esta ação alguns acessórios poderão ter que ser reconfigurados no HomeKit ou readicionados nas automações.",

diff --git a/ui/src/i18n/pt.json b/ui/src/i18n/pt.json
@@ -245,7 +245,6 @@
     "plugins.status_installed": "Instalado",
     "plugins.status_not_installed": "Não Instalado",
     "plugins.status_update_available": "Atualização Disponível",
-    "plugins.status_update_beta_available": "Beta Update Available",
     "plugins.toast_failed_to_load_plugins": "Falha ao carregar os plugins",
     "plugins.tooltip_update_plugin_to": "Atualizar o plugin para a versão v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "Após executar a reposição alguns acessórios poderão ter que ser repostos no HomeKit ou readicionados nas automações.",