From 6f00fc4fee20db9a1f7f0f1b29fade5d2f7274f7 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:02:33 +0000 Subject: [PATCH 1/5] fixes --- .../manage-plugins-modal.component.html | 6 ++-- .../accessories/accessories.component.html | 2 +- .../plugin-card/plugin-card.component.html | 4 +-- .../plugin-card/plugin-card.component.ts | 32 +++++++++---------- .../app/shared/layout/layout.component.html | 8 ++--- 5 files changed, 25 insertions(+), 27 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 index 24da41e84..ccb22dfb4 100644 --- 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 @@ -51,9 +51,9 @@

-

Release Notes

-

Beta Information

-
{{ release.name }}
+

{{ release.name }}

+
Release Notes
+
Beta Information
diff --git a/ui/src/app/modules/accessories/accessories.component.html b/ui/src/app/modules/accessories/accessories.component.html index 43f679e51..d9ebcb7d8 100644 --- a/ui/src/app/modules/accessories/accessories.component.html +++ b/ui/src/app/modules/accessories/accessories.component.html @@ -35,7 +35,7 @@
-
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 index 625f826c4..74121cecc 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html @@ -56,7 +56,7 @@

placement="top" ngbTooltip="{{'plugins.status_update_available' | translate:plugin }}" container="body" [openDelay]="150"> - @@ -64,7 +64,7 @@

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 index 2cf538c39..3592469a1 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts @@ -45,23 +45,7 @@ export class PluginCardComponent implements OnInit { private $settings: SettingsService, ) {} - ngOnInit(): void { - if ( - !this.$settings.env.recommendChildBridges - || !this.$settings.env.serviceMode - || ['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) - ) { - this.recommendChildBridge = false; - return; - } - this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise() - .then((schema) => { - this.recommendChildBridge = schema.pluginType === 'platform'; - }) - .catch(() => { - this.recommendChildBridge = false; - }); - } + ngOnInit(): void {} @Input() set childBridges(childBridges: any[]) { this.hasChildBridges = childBridges.length > 0; @@ -80,6 +64,20 @@ export class PluginCardComponent implements OnInit { } this._childBridges = childBridges; + + if ( + this.$settings.env.recommendChildBridges + && this.$settings.env.serviceMode + && !['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) + ) { + this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise() + .then((schema) => { + this.recommendChildBridge = schema.pluginType === 'platform'; + }) + .catch(() => { + // ignore + }); + } } openFundingModal(plugin: any) { diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index 63eb65abe..b4b7b85fb 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -65,9 +65,6 @@ {{ 'menu.linux.label_logs' | translate }} - - {{ 'menu.restart.title' | translate }} -
{{ 'menu.label_settings_hb' | translate }} @@ -83,7 +80,10 @@ {{'menu.tooltip_user_accounts' | translate}} -
+
+ + {{ 'menu.restart.title' | translate }} + {{ 'menu.tooltip_logout' | translate }} - {{ $auth.user.username }} From 71cd358c76652e442c33a59ede026597f4a8f5c6 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:21:09 +0000 Subject: [PATCH 2/5] plugin card --- .../plugin-card/plugin-card.component.html | 2 +- .../plugin-card/plugin-card.component.ts | 34 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) 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 index 74121cecc..6375153a4 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html @@ -56,7 +56,7 @@

placement="top" ngbTooltip="{{'plugins.status_update_available' | translate:plugin }}" container="body" [openDelay]="150"> - 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 index 3592469a1..a5bda09eb 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.ts @@ -32,6 +32,7 @@ export class PluginCardComponent implements OnInit { public childBridgeStatus = 'pending'; public childBridgeRestartInProgress = false; public recommendChildBridge = false; + public childBridgesLoaded = false; constructor( public $plugin: ManagePluginsService, @@ -45,7 +46,23 @@ export class PluginCardComponent implements OnInit { private $settings: SettingsService, ) {} - ngOnInit(): void {} + ngOnInit(): void { + if ( + !this.$settings.env.recommendChildBridges + || !this.$settings.env.serviceMode + || ['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) + ) { + this.recommendChildBridge = false; + return; + } + this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise() + .then((schema) => { + this.recommendChildBridge = schema.pluginType === 'platform'; + }) + .catch(() => { + this.recommendChildBridge = false; + }); + } @Input() set childBridges(childBridges: any[]) { this.hasChildBridges = childBridges.length > 0; @@ -64,20 +81,7 @@ export class PluginCardComponent implements OnInit { } this._childBridges = childBridges; - - if ( - this.$settings.env.recommendChildBridges - && this.$settings.env.serviceMode - && !['homebridge', 'homebridge-config-ui-x'].includes(this.plugin.name) - ) { - this.$api.get(`/plugins/config-schema/${encodeURIComponent(this.plugin.name)}`, {}).toPromise() - .then((schema) => { - this.recommendChildBridge = schema.pluginType === 'platform'; - }) - .catch(() => { - // ignore - }); - } + this.childBridgesLoaded = true; } openFundingModal(plugin: any) { From 5d9e5ef053d435aa315074556353cd706f4b7b92 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:53:47 +0000 Subject: [PATCH 3/5] next --- .../manage-plugins-modal.component.html | 9 +++++---- .../plugin-log-modal/plugin-log-modal.component.ts | 5 +++-- .../plugins/plugin-card/plugin-card.component.html | 2 +- 3 files changed, 9 insertions(+), 7 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 index ccb22dfb4..505c6161c 100644 --- 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 @@ -51,10 +51,11 @@

-

{{ release.name }}

-
Release Notes
-
Beta Information
- +
{{ 'plugins.manage.label_release_notes' | translate }} ({{ release.name }})
+
{{ 'plugins.manage.label_release_notes_beta' | translate }} ({{ release.name }})
+
+ +

diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts index 638dec239..5a87e252e 100644 --- a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts +++ b/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) => { 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 index 6375153a4..bfa5ab2c5 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.html @@ -98,7 +98,7 @@

{{ 'plugins.manage.message_install_alternate_version' | translate }} -

-

{{ 'child_bridge.message_about' | translate }} + + {{ 'child_bridge.message_wiki_link' | translate }} + +

@@ -100,22 +103,14 @@
-

- - {{ 'child_bridge.message_wiki_link' | translate }} - - -

-
-
-
+
+
+ +