diff --git a/.github/workflows/Attach Artifacts.yml b/.github/workflows/Attach Artifacts.yml index 7f0203286..f8e48a5dd 100644 --- a/.github/workflows/Attach Artifacts.yml +++ b/.github/workflows/Attach Artifacts.yml @@ -2,6 +2,8 @@ name: Manually Attach Artifacts ( If the automation fails ) run-name: Manually Attach Artifacts against ${{ github.event.inputs.tag }} on: + repository_dispatch: + types: [attach-artifacts] workflow_dispatch: inputs: tag: @@ -18,6 +20,10 @@ jobs: uses: actions/setup-node@v1 with: node-version: 20.x + + - name: Get previous tag + id: previoustag + uses: "WyriHaximus/github-action-get-previous-tag@v1" # Sanity check to ensure that release tags don't start with a 'v' version prefix but adhere to the X.Y.Z format - name: Check for Tag name Format @@ -30,7 +36,7 @@ jobs: - name: Install package run: | export npm_config_prefix=$(pwd)/package - npm install -g homebridge-config-ui-x@${{ github.event.inputs.tag }} + npm install -g homebridge-config-ui-x@$${{ needs.analyze-tags.outputs.previous-tag }} - name: Remove invalid node-pty node-gyp run run: | @@ -39,11 +45,11 @@ jobs: - name: Create Bundle run: | tar -C $(pwd)/package --owner=0 --group=0 --format=posix -czvf homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz . - shasum -a 256 homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz > SHASUMS256.txt + shasum -a 256 homebridge-config-ui-x-${{ needs.analyze-tags.outputs.previous-tag }}.tar.gz > SHASUMS256.txt - name: Attach Bundle uses: AButler/upload-release-assets@v2.0 with: - files: 'homebridge-config-ui-x-${{ github.event.inputs.tag }}.tar.gz;SHASUMS256.txt' + files: 'homebridge-config-ui-x-${{ needs.analyze-tags.outputs.previous-tag }}.tar.gz;SHASUMS256.txt' repo-token: ${{ secrets.GITHUB_TOKEN }} release-tag: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/alpha-release.yml b/.github/workflows/alpha-release.yml index 3f3f0fc87..fc1774a9d 100644 --- a/.github/workflows/alpha-release.yml +++ b/.github/workflows/alpha-release.yml @@ -6,23 +6,7 @@ on: workflow_dispatch: jobs: - build_and_test: - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest - with: - enable_coverage: true - install_cmd: npm ci && cd ui && npm ci - secrets: - token: ${{ secrets.GITHUB_TOKEN }} - - lint: - needs: build_and_test - uses: homebridge/.github/.github/workflows/eslint.yml@latest - with: - install_cmd: npm ci && cd ui && npm ci - publish: - needs: lint - if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }} uses: homebridge/.github/.github/workflows/npm-publish.yml@latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5691ac3cb..3f524197c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,9 +61,7 @@ jobs: tar -C $(pwd)/package --owner=0 --group=0 --format=posix -czvf homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz . shasum -a 256 homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz > SHASUMS256.txt - - name: Attach Bundle - uses: AButler/upload-release-assets@v2.0 + - name: Repository Dispatch + uses: peter-evans/repository-dispatch@v2 with: - files: 'homebridge-config-ui-x-${{ github.event.release.tag_name }}.tar.gz;SHASUMS256.txt' - repo-token: ${{ secrets.GITHUB_TOKEN }} - release-tag: ${{ github.event.release.tag_name }} + event-type: attach-artifacts diff --git a/src/modules/status/status.service.ts b/src/modules/status/status.service.ts index 4f5b79c14..6550fc926 100644 --- a/src/modules/status/status.service.ts +++ b/src/modules/status/status.service.ts @@ -466,7 +466,7 @@ export class StatusService { try { const versionList = (await this.httpService.get('https://nodejs.org/dist/index.json').toPromise()).data; - const currentLts = versionList.filter(x => x.lts)[0]; + const currentLts = versionList.filter((x: any) => x.lts)[0]; // See why this is set to 2.29 at https://homebridge.io/w/JJSun const glibcVersion = this.getGlibcVersion(); diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index f37287512..7b1a258a8 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -70,11 +70,13 @@ export class AppComponent { } // ensure the menu closes when we navigate - router.events.subscribe((event) => { + router.events.subscribe((event: any) => { if (event instanceof NavigationEnd) { const dropdownMenu = window.document.querySelector('#navbarSupportedContent'); + const hamburgerMenuButton = window.document.querySelector('.navbar-toggler'); if (dropdownMenu) { dropdownMenu.classList.remove('show'); + hamburgerMenuButton.classList.add('collapsed'); } } }); diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 3d9a240aa..789b8d564 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -17,11 +17,13 @@ import { AuthModule } from '@/app/core/auth/auth.module'; import { CoreModule } from '@/app/core/core.module'; import { supportedLocales } from '@/app/core/locales'; import { onMonacoLoad } from '@/app/core/monaco-editor.service'; +import { RestartOptionsModalComponent } from '@/app/shared/layout/restart-options-modal/restart-options-modal.component'; @NgModule({ declarations: [ AppComponent, LayoutComponent, + RestartOptionsModalComponent, ], imports: [ BrowserModule, diff --git a/ui/src/app/core/accessories/accessories.service.ts b/ui/src/app/core/accessories/accessories.service.ts index 375b072da..f7794e77b 100644 --- a/ui/src/app/core/accessories/accessories.service.ts +++ b/ui/src/app/core/accessories/accessories.service.ts @@ -171,14 +171,14 @@ export class AccessoriesService { /** * Parse the incoming accessory data and refresh existing accessory statuses */ - private parseServices(services) { + private parseServices(services: any) { if (!this.accessories.services.length) { this.accessories.services = services; return; } // update the existing objects to avoid re-painting the dom element each refresh - services.forEach((service) => { + services.forEach((service: any) => { const existing = this.accessories.services.find(x => x.uniqueId === service.uniqueId); if (existing) { diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html index 9f8735667..37553f096 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html @@ -1,4 +1,4 @@ -
@@ -8,4 +8,4 @@
{{ service.values.Brightness }}%
- \ No newline at end of file + diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts index 25453340a..ffa91f662 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.component.ts @@ -29,7 +29,7 @@ export class LightbulbComponent implements OnInit { onLongClick() { if ('Brightness' in this.service.values) { const ref = this.modalService.open(LightbulbManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html index 999cd0836..c3d391da6 100644 --- a/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html +++ b/ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html @@ -6,7 +6,7 @@
-
+
diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html index 46fdc3a50..4ec709a91 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html @@ -1,4 +1,4 @@ -
-
\ No newline at end of file +
diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss index 9f06a9bdd..d090a4563 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss @@ -3,4 +3,4 @@ font-size: 1.4rem; text-transform: initial; } -} \ No newline at end of file +} diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts index bdd2fc107..db0271dbc 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.component.ts @@ -27,7 +27,7 @@ export class WindowcoveringComponent implements OnInit { onLongClick() { const ref = this.modalService.open(WindowcoveringManageComponent, { - size: 'sm', + size: 'md', }); ref.componentInstance.service = this.service; } diff --git a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html index 6efd3dcde..e0adf6bd7 100644 --- a/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html +++ b/ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html @@ -6,7 +6,7 @@
-
+
diff --git a/ui/src/app/core/components/confirm/confirm.component.html b/ui/src/app/core/components/confirm/confirm.component.html index 29d7bda30..21e5a8b9f 100644 --- a/ui/src/app/core/components/confirm/confirm.component.html +++ b/ui/src/app/core/components/confirm/confirm.component.html @@ -1,8 +1,7 @@
{{ title }}
-
diff --git a/ui/src/app/core/components/information/information.component.html b/ui/src/app/core/components/information/information.component.html index 40dc87cf3..dbf40e7f1 100644 --- a/ui/src/app/core/components/information/information.component.html +++ b/ui/src/app/core/components/information/information.component.html @@ -1,8 +1,7 @@
{{ title }}
-
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html new file mode 100644 index 000000000..d1a31b112 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html @@ -0,0 +1,25 @@ +
+
+
{{ 'platform.version.title_service_restart_required' | translate }}
+ +
+
+ +

{{ 'plugins.manage.message_thanks_for_updating_restart' | translate }}

+
+
+
+ +
+
+
+ +
+
+
diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts new file mode 100644 index 000000000..fccf84336 --- /dev/null +++ b/ui/src/app/core/components/restart-homebridge/restart-homebridge.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'app-confirm', + templateUrl: './restart-homebridge.component.html', + styleUrls: ['./restart-homebridge.component.scss'], +}) +export class RestartHomebridgeComponent implements OnInit { + constructor( + public activeModal: NgbActiveModal, + private $router: Router, + ) { } + + ngOnInit() {} + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } +} diff --git a/ui/src/app/core/core.module.ts b/ui/src/app/core/core.module.ts index 3680f3f15..e8e782e39 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -16,6 +16,7 @@ import { ConvertTempPipe } from './pipes/convert-temp.pipe'; import { ExternalLinkIconPipe } from './pipes/external-link-icon.pipe'; import { ReplacePipe } from './pipes/replace.pipe'; import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; @NgModule({ declarations: [ @@ -32,6 +33,7 @@ import { InformationComponent } from '@/app/core/components/information/informat ScheduledBackupsComponent, ConfirmComponent, InformationComponent, + RestartHomebridgeComponent, QrcodeComponent, ], imports: [ diff --git a/ui/src/app/core/log.service.ts b/ui/src/app/core/log.service.ts index 2c1aca4ff..1dc252f85 100644 --- a/ui/src/app/core/log.service.ts +++ b/ui/src/app/core/log.service.ts @@ -17,6 +17,7 @@ export class LogService { private webLinksAddon: WebLinksAddon; private resize: Subject; private elementResize: Subject | undefined; + private pluginName: string; constructor( private $ws: WsService, @@ -25,7 +26,10 @@ export class LogService { startTerminal( targetElement: ElementRef, termOpts: ITerminalOptions = {}, - elementResize?: Subject) { + elementResize?: Subject, + pluginName?: string, + ) { + this.pluginName = pluginName; // handle element resize events this.elementResize = elementResize; @@ -74,8 +78,29 @@ export class LogService { }); // subscribe to incoming data events from server to client - this.io.socket.on('stdout', data => { - this.term.write(data); + this.io.socket.on('stdout', (data: string) => { + if (this.pluginName) { + const lines = data.split('\n'); + let includeNextLine = false; + + lines.forEach((line) => { + if (includeNextLine) { + if (line.match(/36m\[.*?]/)) { + includeNextLine = false; + } else { + this.term.write(line + '\r\n'); + return; + } + } + + if (line.includes(`36m[${this.pluginName}]`)) { + this.term.write(line + '\r\n'); + includeNextLine = true; + } + }); + } else { + this.term.write(data); + } }); // handle resize events from the client diff --git a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html index 5bb5ef0b4..3f506b461 100644 --- a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.html @@ -10,18 +10,19 @@
-

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

-
-

- - {{ 'child_bridge.message_select_platforms_accessories' | translate }}: - +

+ {{ 'child_bridge.message_child_bridges_must_be_paired_separately' | translate }}

- +

{{ 'child_bridge.message_select_platforms_accessories' | translate }}:

  • @@ -56,13 +57,12 @@
    - -

    + +

    {{ 'child_bridge.label_bridge_paired' | translate }}

    -
- -

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

- {{ 'child_bridge.message_must_configure_plugin_first' | translate }} -
{{ 'plugins.settings.message_manual_config_required' | translate }} {{ 'plugins.settings.message_consult_documentation' | translate }} -
- -

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

-
diff --git a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts index fd0189ba4..dc3e4d500 100644 --- a/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/bridge-plugins-modal/bridge-plugins-modal.component.ts @@ -1,11 +1,11 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; /* eslint-disable no-underscore-dangle */ @@ -31,8 +31,8 @@ export class BridgePluginsModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, public $settings: SettingsService, - private $notification: NotificationService, private $api: ApiService, + private $modal: NgbModal, private $plugins: ManagePluginsService, private $router: Router, private $toastr: ToastrService, @@ -101,8 +101,8 @@ export class BridgePluginsModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.configBlocks).toPromise(); - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error( this.$translate.instant('config.toast_failed_to_save_config') + ': ' + err.error?.message, diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html index 49f871320..57b994aae 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html @@ -4,13 +4,24 @@
{{ 'plugins.settings.title_settings' | translate }}: {{ plugin.displayName || plugin.name }}
-
-
+
+ +

+ Please restart Homebridge for the changes to apply. +

+

+ Please restart the plugin's child bridges for the changes to apply. +

+
+ +
@@ -48,32 +59,46 @@
-
-
- +
+
+
- -
+
- -
- +
+
- - +
+
+ +
+
+
+ + +
+
diff --git a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts index c6d938cea..1e54fcceb 100644 --- a/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts +++ b/ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts @@ -6,6 +6,7 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; @@ -31,6 +32,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { public pluginType: 'platform' | 'accessory'; public loading = true; public saveInProgress = false; + public justSavedAndExited = false; public pluginSpinner = false; public uiLoaded = false; public showSchemaForm = false; @@ -43,6 +45,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { public formValid = true; public formUpdatedSubject = new Subject(); public formActionSubject = new Subject(); + public childBridges: any[] = []; private io = this.$ws.connectToNamespace('plugins/settings-ui'); private basePath: string; @@ -56,14 +59,11 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { private $translate: TranslateService, private $toastr: ToastrService, private $api: ApiService, + private $router: Router, private $ws: WsService, private $notification: NotificationService, ) {} - get arrayKey() { - return this.pluginType === 'accessory' ? 'accessories' : 'platforms'; - } - ngOnInit(): void { this.pluginAlias = this.schema.pluginAlias; this.pluginType = this.schema.pluginType; @@ -427,16 +427,17 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { return this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.pluginConfig) .toPromise() .then(data => { - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('plugins.settings.toast_plugin_config_saved'), - ); + // this.$toastr.success( + // this.$translate.instant('plugins.settings.toast_restart_required'), + // this.$translate.instant('plugins.settings.toast_plugin_config_saved'), + // ); this.saveInProgress = false; - this.$notification.configUpdated.next(undefined); + // this.$notification.configUpdated.next(undefined); if (exit) { - this.activeModal.close(); + this.getChildBridges(); + this.justSavedAndExited = true; } }) .catch(err => { @@ -445,6 +446,47 @@ export class CustomPluginsComponent implements OnInit, OnDestroy { }); } + getChildBridges(): any[] { + try { + this.$api.get('/status/homebridge/child-bridges').subscribe((data: any[]) => { + data.forEach((bridge) => { + if (this.plugin.name === bridge.plugin) { + this.childBridges.push(bridge); + } + }); + }); + return this.childBridges; + } catch (err) { + this.$toastr.error(err.message, this.$translate.instant('toast.title_error')); + return []; + } + } + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + public async onRestartChildBridgeClick() { + try { + for (const bridge of this.childBridges) { + await this.$api.put(`/server/restart/${bridge.username}`, {}).toPromise(); + } + this.$toastr.success( + this.$translate.instant('plugins.manage.child_bridge_restart_success'), + this.$translate.instant('toast.title_success'), + ); + } catch (err) { + this.$notification.configUpdated.next(undefined); // highlight the restart icon in the navbar + this.$toastr.error( + this.$translate.instant('plugins.manage.child_bridge_restart_failed'), + this.$translate.instant('toast.title_error'), + ); + } finally { + this.activeModal.close(); + } + } + deletePluginConfig() { this.updateConfigBlocks([]); this.savePluginConfig(true); 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 27955a545..5ea907129 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 @@ -18,18 +18,10 @@

Please restart the plugin's child bridges for the changes to apply.

-
- - -
-

- +
+ +

@@ -48,18 +40,37 @@

-

Release Notes

-

Beta Information

-
{{ release.name }}
- +
{{ '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/manage-plugins-modal/manage-plugins-modal.component.scss b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.scss index abbb27334..9357d26a3 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.scss +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.scss @@ -1,6 +1,7 @@ .plugin-modal-body { max-height: 60vh; - overflow: auto; + overflow-y: auto; + overflow-x: hidden; } @@ -39,4 +40,4 @@ background-color: #f6f8fa; border-radius: 3px; } -} \ No newline at end of file +} 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 index 1a1b1e7ba..d74f48fc9 100644 --- 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 @@ -5,12 +5,13 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; @@ -50,6 +51,7 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { private $translate: TranslateService, public $settings: SettingsService, private $api: ApiService, + private $modal: NgbModal, private $ws: WsService, private $notification: NotificationService, private $router: Router, @@ -137,9 +139,8 @@ export class ManagePluginsModalComponent implements OnInit, OnDestroy { termRows: this.term.rows, }).subscribe( () => { - this.activeModal.close(); this.$router.navigate(['/plugins']); - this.$toastr.success(`${this.pastTenseVerb} ${this.pluginName}`, this.toastSuccess); + this.$modal.open(RestartHomebridgeComponent); }, (err) => { this.actionFailed = true; diff --git a/ui/src/app/core/manage-plugins/manage-plugins.module.ts b/ui/src/app/core/manage-plugins/manage-plugins.module.ts index 6650c9dcc..938093319 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins.module.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins.module.ts @@ -16,6 +16,7 @@ import { SelectPreviousVersionComponent } from './select-previous-version/select import { SettingsPluginsModalComponent } from './settings-plugins-modal/settings-plugins-modal.component'; import { UninstallPluginsModalComponent } from './uninstall-plugins-modal/uninstall-plugins-modal.component'; import { CoreModule } from '@/app/core/core.module'; +import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; @NgModule({ declarations: [ @@ -27,6 +28,7 @@ import { CoreModule } from '@/app/core/core.module'; ManualPluginConfigModalComponent, SelectPreviousVersionComponent, BridgePluginsModalComponent, + PluginLogModalComponent, ], imports: [ CommonModule, diff --git a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts index ad596281e..b043d92a2 100644 --- a/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manual-plugin-config-modal/manual-plugin-config-modal.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { parse } from 'json5'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -39,8 +39,8 @@ export class ManualPluginConfigModalComponent implements OnInit { constructor( public activeModal: NgbActiveModal, private $api: ApiService, + private $modal: NgbModal, private $settings: SettingsService, - private $notification: NotificationService, private $toastr: ToastrService, private translate: TranslateService, private $router: Router, @@ -214,12 +214,8 @@ export class ManualPluginConfigModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, this.pluginConfig) .toPromise(); - this.$toastr.success( - this.translate.instant('plugins.settings.toast_restart_required'), - this.translate.instant('plugins.settings.toast_plugin_config_saved')); - - this.$notification.configUpdated.next(undefined); this.activeModal.close(); + this.$modal.open(RestartHomebridgeComponent); } catch { this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); this.saveInProgress = false; diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html new file mode 100644 index 000000000..0970989bf --- /dev/null +++ b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html @@ -0,0 +1,12 @@ +
+
+
Logs: {{ plugin.displayName || plugin.name }}
+ +
+
+
+
+
diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.scss b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.scss new file mode 100644 index 000000000..e69de29bb 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 new file mode 100644 index 000000000..bc05173f9 --- /dev/null +++ b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts @@ -0,0 +1,62 @@ +import { + Component, + ElementRef, + HostListener, + Input, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { ToastrService } from 'ngx-toastr'; +import { Subject } from 'rxjs'; +import { ApiService } from '@/app/core/api.service'; +import { LogService } from '@/app/core/log.service'; + +@Component({ + selector: 'app-plugin-log-modal', + templateUrl: './plugin-log-modal.component.html', + styleUrls: ['./plugin-log-modal.component.scss'], +}) +export class PluginLogModalComponent implements OnInit, OnDestroy { + @Input() plugin: any; + @ViewChild('pluginlogoutput', { static: true }) termTarget: ElementRef; + private resizeEvent = new Subject(); + + constructor( + public activeModal: NgbActiveModal, + private $api: ApiService, + private $log: LogService, + private $toastr: ToastrService, + private $translate: TranslateService, + ) { } + + @HostListener('window:resize', ['$event']) + onWindowResize() { + this.resizeEvent.next(undefined); + } + + ngOnInit(): void { + this.getPluginLog(); + } + + 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 || this.plugin.name); + this.$log.startTerminal(this.termTarget, {}, this.resizeEvent, logAlias); + }, + (err) => { + this.$toastr.error(`${err.error.message || err.message}`, this.$translate.instant('toast.title_error')); + this.activeModal.dismiss(); + }, + ); + } + + ngOnDestroy() { + this.$log.destroyTerminal(); + } +} diff --git a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html index 0a117fdc2..375ac03dd 100644 --- a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html +++ b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.html @@ -9,7 +9,7 @@
-
+
@@ -55,13 +55,23 @@
{{ block.name }}
*ngIf="schema.footerDisplay">
-
-
- +
+ +

+ Please restart Homebridge for the changes to apply. +

+

+ Please restart the plugin's child bridges for the changes to apply. +

+
+
+
+
- -
+
{{ block.name }}
- -
+
+
+
+ +
+
+
+ + +
+
diff --git a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts index 511ecf7d7..cb0ce62ed 100644 --- a/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/settings-plugins-modal/settings-plugins-modal.component.ts @@ -1,4 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; @@ -28,12 +29,16 @@ export class SettingsPluginsModalComponent implements OnInit { public form: any = {}; public show = ''; public saveInProgress: boolean; + public justSavedAndExited = false; + + public childBridges: any[] = []; constructor( public activeModal: NgbActiveModal, private $api: ApiService, private $settings: SettingsService, private $notification: NotificationService, + private $router: Router, private $toastr: ToastrService, private translate: TranslateService, ) {} @@ -83,17 +88,20 @@ export class SettingsPluginsModalComponent implements OnInit { try { await this.$api.post(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`, configBlocks) .toPromise(); - this.$toastr.success( - this.translate.instant('plugins.settings.toast_restart_required'), - this.translate.instant('plugins.settings.toast_plugin_config_saved')); - - this.activeModal.close(configBlocks.length ? this.schema : null); - this.$notification.configUpdated.next(undefined); + // this.$toastr.success( + // this.translate.instant('plugins.settings.toast_restart_required'), + // this.translate.instant('plugins.settings.toast_plugin_config_saved')); + // + // this.activeModal.close(configBlocks.length ? this.schema : null); + // this.$notification.configUpdated.next(undefined); // reload app settings if the config was changed for Homebridge UI if (this.plugin.name === 'homebridge-config-ui-x') { this.$settings.getAppSettings().catch(); } + + this.getChildBridges(); + this.justSavedAndExited = true; } catch (err) { this.$toastr.error( this.translate.instant('config.toast_failed_to_save_config') + ': ' + err.error?.message, @@ -130,6 +138,47 @@ export class SettingsPluginsModalComponent implements OnInit { this.pluginConfig.splice(pluginConfigIndex, 1); } + getChildBridges(): any[] { + try { + this.$api.get('/status/homebridge/child-bridges').subscribe((data: any[]) => { + data.forEach((bridge) => { + if (this.plugin.name === bridge.plugin) { + this.childBridges.push(bridge); + } + }); + }); + return this.childBridges; + } catch (err) { + this.$toastr.error(err.message, this.translate.instant('toast.title_error')); + return []; + } + } + + public onRestartHomebridgeClick() { + this.$router.navigate(['/restart']); + this.activeModal.close(); + } + + public async onRestartChildBridgeClick() { + try { + for (const bridge of this.childBridges) { + await this.$api.put(`/server/restart/${bridge.username}`, {}).toPromise(); + } + this.$toastr.success( + this.translate.instant('plugins.manage.child_bridge_restart_success'), + this.translate.instant('toast.title_success'), + ); + } catch (err) { + this.$notification.configUpdated.next(undefined); // highlight the restart icon in the navbar + this.$toastr.error( + this.translate.instant('plugins.manage.child_bridge_restart_failed'), + this.translate.instant('toast.title_error'), + ); + } finally { + this.activeModal.close(); + } + } + /** * Homebridge Hue - ensure users object is preserved */ diff --git a/ui/src/app/core/settings.service.ts b/ui/src/app/core/settings.service.ts index 6a9501f3d..06f150549 100644 --- a/ui/src/app/core/settings.service.ts +++ b/ui/src/app/core/settings.service.ts @@ -34,13 +34,6 @@ interface EnvInterface { recommendChildBridges: boolean; } -interface AppSettingsInterface { - env: EnvInterface; - formAuth: boolean; - theme: string; - serverTimestamp: string; -} - @Injectable({ providedIn: 'root', }) @@ -70,19 +63,17 @@ export class SettingsService { this.getAppSettings(); } - getAppSettings() { - return this.$api.get('/auth/settings').toPromise() - .then((data: AppSettingsInterface) => { - this.formAuth = data.formAuth; - this.env = data.env; - this.setTheme(data.theme || 'auto'); - this.setTitle(this.env.homebridgeInstanceName); - this.checkServerTime(data.serverTimestamp); - this.setUiVersion(data.env.packageVersion); - this.setLang(this.env.lang); - this.settingsLoaded = true; - this.settingsLoadedSubject.next(undefined); - }); + async getAppSettings() { + const data = await this.$api.get('/auth/settings').toPromise(); + this.formAuth = data.formAuth; + this.env = data.env; + this.setTheme(data.theme || 'auto'); + this.setTitle(this.env.homebridgeInstanceName); + this.checkServerTime(data.serverTimestamp); + this.setUiVersion(data.env.packageVersion); + this.setLang(this.env.lang); + this.settingsLoaded = true; + this.settingsLoadedSubject.next(undefined); } setTheme(theme: string) { diff --git a/ui/src/app/core/ws.service.ts b/ui/src/app/core/ws.service.ts index 50017cf3e..04cd35161 100644 --- a/ui/src/app/core/ws.service.ts +++ b/ui/src/app/core/ws.service.ts @@ -92,8 +92,8 @@ export class WsService { }, }); - const request = (resource, payload): Observable => new Observable((observer) => { - socket.emit(resource, payload, (resp) => { + const request = (resource: string, payload: any): Observable => new Observable((observer) => { + socket.emit(resource, payload, (resp: any) => { if (typeof resp === 'object' && resp.error) { observer.error(resp); } else { diff --git a/ui/src/app/modules/accessories/accessories.component.html b/ui/src/app/modules/accessories/accessories.component.html index 43f679e51..b7437e839 100644 --- a/ui/src/app/modules/accessories/accessories.component.html +++ b/ui/src/app/modules/accessories/accessories.component.html @@ -35,13 +35,28 @@
-
+ + + + + + + + + + + + + + +
diff --git a/ui/src/app/modules/accessories/accessories.component.scss b/ui/src/app/modules/accessories/accessories.component.scss index 864fb047c..5ea4dd349 100644 --- a/ui/src/app/modules/accessories/accessories.component.scss +++ b/ui/src/app/modules/accessories/accessories.component.scss @@ -1,5 +1,3 @@ - - .room-title { margin-left: 10px; @media (max-width: 575px) { @@ -24,3 +22,6 @@ } } +a:hover { + text-decoration: none !important; +} diff --git a/ui/src/app/modules/config-editor/config-editor.component.ts b/ui/src/app/modules/config-editor/config-editor.component.ts index f3f249ccc..589832c98 100644 --- a/ui/src/app/modules/config-editor/config-editor.component.ts +++ b/ui/src/app/modules/config-editor/config-editor.component.ts @@ -7,9 +7,9 @@ import { NgxEditorModel } from 'ngx-monaco-editor'; import { ToastrService } from 'ngx-toastr'; import { ConfigRestoreBackupComponent } from './config-restore-backup/config.restore-backup.component'; import { ApiService } from '@/app/core/api.service'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; import { MonacoEditorService } from '@/app/core/monaco-editor.service'; -import { NotificationService } from '@/app/core/notification.service'; import { SettingsService } from '@/app/core/settings.service'; @Component({ @@ -21,7 +21,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { public originalConfig: string; public saveInProgress: boolean; public isMobile: any = false; - public monacoEditor; + public monacoEditor: any; public editorOptions = { language: 'json', theme: this.$settings.theme.startsWith('dark-mode') ? 'vs-dark' : 'vs-light', @@ -38,8 +38,8 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { private $settings: SettingsService, private $api: ApiService, private $md: MobileDetectService, + private $modal: NgbModal, private $monacoEditor: MonacoEditorService, - private $notification: NotificationService, public $toastr: ToastrService, private $route: ActivatedRoute, private translate: TranslateService, @@ -85,7 +85,7 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { /** * Called when the monaco editor is ready */ - onEditorInit(editor) { + onEditorInit(editor: any) { this.monacoEditor = editor; this.monacoEditor.getModel().setValue(this.homebridgeConfig); window['editor'] = editor; // eslint-disable-line @typescript-eslint/dot-notation @@ -202,17 +202,15 @@ export class ConfigEditorComponent implements OnInit, OnDestroy { } } - saveConfig(config) { - return this.$api.post('/config-editor', config) - .toPromise() - .then(data => { - this.$notification.configUpdated.next(undefined); - this.$toastr.success(this.translate.instant('config.toast_config_saved'), this.translate.instant('toast.title_success')); - this.homebridgeConfig = JSON.stringify(data, null, 4); - }) - .catch(err => { - this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); - }); + async saveConfig(config: any) { + try { + const data = await this.$api.post('/config-editor', config) + .toPromise(); + this.homebridgeConfig = JSON.stringify(data, null, 4); + this.$modal.open(RestartHomebridgeComponent); + } catch { + this.$toastr.error(this.translate.instant('config.toast_failed_to_save_config'), this.translate.instant('toast.title_error')); + } } onRestore() { diff --git a/ui/src/app/modules/config-editor/config-editor.resolver.ts b/ui/src/app/modules/config-editor/config-editor.resolver.ts index 1e99e45c9..bb8bc9248 100644 --- a/ui/src/app/modules/config-editor/config-editor.resolver.ts +++ b/ui/src/app/modules/config-editor/config-editor.resolver.ts @@ -1,10 +1,5 @@ import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - Resolve, - Router, - RouterStateSnapshot, -} from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; @@ -16,15 +11,13 @@ export class ConfigEditorResolver implements Resolve { private $router: Router, ) {} - resolve( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot, - ) { - return this.$api.get('/config-editor').toPromise() - .then((json) => JSON.stringify(json, null, 4)) - .catch((err) => { - this.$toastr.error(err.message, 'Failed to Load Config'); - this.$router.navigate(['/']); - }); + async resolve() { + try { + const json = await this.$api.get('/config-editor').toPromise(); + return JSON.stringify(json, null, 4); + } catch (err) { + this.$toastr.error(err.message, 'Failed to Load Config'); + this.$router.navigate(['/']); + } } } diff --git a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts index 125ec9d35..a441fd6e9 100644 --- a/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts +++ b/ui/src/app/modules/config-editor/config-restore-backup/config.restore-backup.component.ts @@ -36,13 +36,13 @@ export class ConfigRestoreBackupComponent implements OnInit { ); } - restore(backupId) { + restore(backupId: any) { return this.activeModal.close(backupId); } deleteAllBackups() { return this.$api.delete('/config-editor/backups').subscribe( - (data) => { + () => { this.activeModal.dismiss(); this.$toastr.success(this.translate.instant('config.restore.toast_backups_deleted'), this.translate.instant('toast.title_success')); }, diff --git a/ui/src/app/modules/login/login.component.ts b/ui/src/app/modules/login/login.component.ts index c963a3387..19630471d 100644 --- a/ui/src/app/modules/login/login.component.ts +++ b/ui/src/app/modules/login/login.component.ts @@ -12,9 +12,9 @@ import { environment } from '@/environments/environment'; styleUrls: ['./login.component.scss'], }) export class LoginComponent implements OnInit { - @ViewChild('password') private passwordInput; - @ViewChild('username') private usernameInput; - @ViewChild('otp') private otpInput; + @ViewChild('password') private passwordInput: any; + @ViewChild('username') private usernameInput: any; + @ViewChild('otp') private otpInput: any; public form: FormGroup<{ username: FormControl; @@ -91,7 +91,7 @@ export class LoginComponent implements OnInit { } await this.$auth.login(this.form.getRawValue()) - .then((user) => { + .then(() => { this.$router.navigateByUrl(this.targetRoute); window.sessionStorage.removeItem('target_route'); }) diff --git a/ui/src/app/modules/logs/logs.component.scss b/ui/src/app/modules/logs/logs.component.scss index ed89a9cde..ba2edbedd 100644 --- a/ui/src/app/modules/logs/logs.component.scss +++ b/ui/src/app/modules/logs/logs.component.scss @@ -1,9 +1,11 @@ .log-buttons { position: fixed; - top: 80px; + top: 0px; right: 10px; z-index: 1000; - + background-color: #000000; + padding: 10px 0 10px 10px; + button { opacity: 0.4; -webkit-transition: opacity 200ms ease-in; @@ -20,3 +22,9 @@ } } } + +@media (max-width: 991px) { + .log-buttons { + top: 67px !important; + } +} diff --git a/ui/src/app/modules/logs/logs.component.ts b/ui/src/app/modules/logs/logs.component.ts index 9ec3371b3..acaae2e09 100644 --- a/ui/src/app/modules/logs/logs.component.ts +++ b/ui/src/app/modules/logs/logs.component.ts @@ -36,7 +36,7 @@ export class LogsComponent implements OnInit, OnDestroy { ) {} @HostListener('window:resize', ['$event']) - onWindowResize(event) { + onWindowResize() { this.resizeEvent.next(undefined); } @@ -94,7 +94,7 @@ export class LogsComponent implements OnInit, OnDestroy { ref.result.then(() => { this.$api.put('/platform-tools/hb-service/log/truncate', {}) .subscribe( - (res) => { + () => { this.$toastr.success( this.$translate.instant('logs.message_log_file_truncated'), this.$translate.instant('toast.title_success'), 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 cf6a48d1b..b8ab90e84 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 @@ -1,151 +1,170 @@ -
+
-
-

- {{ 'plugins.status_installed' | translate }} -

-

- {{ 'plugins.status_not_installed' | translate }} -

-

- {{ 'plugins.status_update_available' | translate }} -

-

- {{ 'plugins.status_update_beta_available' | translate }} -

-

- {{ 'plugins.status_disabled' | translate }} -

+
+
- -
-

- {{ plugin.displayName || ((plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name) | - replace:'-':' ' | titlecase) }} -

-

{{ plugin.name }} v{{ plugin.installedVersion || plugin.latestVersion }} - ({{ plugin.lastUpdated | date:'yyyy-MM-dd' }}) -

-
- - {{ 'plugins.button_settings' | translate | uppercase }} - - - {{ 'plugins.button_install' | translate | uppercase }} - - -
- - - - - - - - - - - - - - - - - - - - - - - +
+
+
+

+ {{ 'plugins.status_installed' | translate }} +

+

+ {{ 'plugins.status_not_installed' | translate }} +

+

+ {{ 'plugins.status_update_available' | translate }} +

+

+ {{ 'plugins.status_disabled' | translate }} +

+
+ +
+
+

+ {{ plugin.displayName || ((plugin.name.charAt(0) === '@' ? plugin.name.split('/')[1] : plugin.name) | + replace:'-':' ' | titlecase) }} +

+ {{ plugin.name }} +
+
+

+ + v{{ plugin.installedVersion || plugin.latestVersion }} + + + ({{ plugin.lastUpdated | date:'yyyy-MM-dd' }}) + + + @{{ plugin.author }} + +

+ + + +
+ + + + + + + +
+ + + +
+ + + + + + + + +
+ + + + + + +
+ + {{ 'plugins.button_api_documentation' | translate }} + + + + + {{ 'plugins.button_homepage' | translate }} + +
- -
- - - -
- - - - - - - -
- - {{ 'plugins.button_api_documentation' | translate }} - - - - - {{ 'plugins.button_homepage' | translate }} -
- +
diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss index b22776a98..908588149 100644 --- a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss +++ b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss @@ -6,3 +6,22 @@ .dropup .dropdown-toggle:after { display: none; } + +.card-title { + -webkit-line-clamp: 2 !important; + -webkit-box-orient: vertical !important; + display: -webkit-box !important; + overflow: hidden !important; + height: 4rem !important; + line-height: 2rem !important; + max-height: 4rem !important; +} + +.dropdown.show .fa-caret-down { + transform: rotate(-180deg); + transition: 0.5s; +} + +.dropdown .fa-caret-down { + transition: 0.5s; +} 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 643db9023..b54400a1b 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 @@ -5,9 +5,11 @@ import { ToastrService } from 'ngx-toastr'; import { ApiService } from '@/app/core/api.service'; import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component'; import { InformationComponent } from '@/app/core/components/information/information.component'; +import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; +import { PluginLogModalComponent } from '@/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component'; import { MobileDetectService } from '@/app/core/mobile-detect.service'; -import { NotificationService } from '@/app/core/notification.service'; +import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; import { DonateModalComponent } from '@/app/modules/plugins/donate-modal/donate-modal.component'; @@ -24,6 +26,7 @@ export class PluginCardComponent implements OnInit { public allChildBridgesStopped = false; public childBridgeStatus = 'pending'; public childBridgeRestartInProgress = false; + public recommendChildBridge = false; public isMobile = this.$md.detect.mobile(); private io = this.$ws.getExistingNamespace('child-bridges'); @@ -33,25 +36,25 @@ export class PluginCardComponent implements OnInit { public $plugin: ManagePluginsService, private $api: ApiService, private $ws: WsService, - private $notification: NotificationService, private $translate: TranslateService, private $modal: NgbModal, private $toastr: ToastrService, private $md: MobileDetectService, + private $settings: SettingsService, ) {} @Input() set childBridges(childBridges: any[]) { this.hasChildBridges = childBridges.length > 0; - this.hasUnpairedChildBridges = childBridges.filter(x => x.paired === false).length > 0; - this.allChildBridgesStopped = childBridges.filter(x => x.manuallyStopped === true).length === childBridges.length; + this.hasUnpairedChildBridges = childBridges.filter((x: any) => x.paired === false).length > 0; + this.allChildBridgesStopped = childBridges.filter((x: any) => x.manuallyStopped === true).length === childBridges.length; if (this.hasChildBridges) { // get the "worse" status of all child bridges and use that for colour icon - if (childBridges.some(x => x.status === 'down')) { + if (childBridges.some((x: any) => x.status === 'down')) { this.childBridgeStatus = 'down'; - } else if (childBridges.some(x => x.status === 'pending')) { + } else if (childBridges.some((x: any) => x.status === 'pending')) { this.childBridgeStatus = 'pending'; - } else if (childBridges.some(x => x.status === 'ok')) { + } else if (childBridges.some((x: any) => x.status === 'ok')) { this.childBridgeStatus = 'ok'; } } @@ -59,7 +62,23 @@ export class PluginCardComponent implements OnInit { this.setChildBridges = childBridges; } - 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; + }); + } openFundingModal(plugin: any) { const ref = this.$modal.open(DonateModalComponent); @@ -81,7 +100,6 @@ 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.cancelButtonLabel = this.$translate.instant('form.button_cancel'); ref.componentInstance.faIconClass = 'fa-circle-pause primary-text'; ref.result.then(async () => { @@ -93,11 +111,7 @@ export class PluginCardComponent implements OnInit { if (this.hasChildBridges) { this.doChildBridgeAction('stop'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to disable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } @@ -112,7 +126,6 @@ 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.cancelButtonLabel = this.$translate.instant('form.button_cancel'); ref.componentInstance.faIconClass = 'fa-circle-play primary-text'; ref.result.then(async () => { @@ -124,11 +137,7 @@ export class PluginCardComponent implements OnInit { if (this.hasChildBridges) { await this.doChildBridgeAction('start'); } - this.$toastr.success( - this.$translate.instant('plugins.settings.toast_restart_required'), - this.$translate.instant('toast.title_success'), - ); - this.$notification.configUpdated.next(undefined); + this.$modal.open(RestartHomebridgeComponent); } catch (err) { this.$toastr.error(`Failed to enable plugin: ${err.message}`, this.$translate.instant('toast.title_error')); } @@ -137,6 +146,15 @@ export class PluginCardComponent implements OnInit { }); } + viewPluginLog(plugin: any) { + const ref = this.$modal.open(PluginLogModalComponent, { + size: 'xl', + backdrop: 'static', + }); + + ref.componentInstance.plugin = plugin; + } + async doChildBridgeAction(action: 'stop' | 'start' | 'restart') { this.childBridgeRestartInProgress = true; try { diff --git a/ui/src/app/modules/plugins/plugins.component.scss b/ui/src/app/modules/plugins/plugins.component.scss index b7b3808dd..b5b638e28 100644 --- a/ui/src/app/modules/plugins/plugins.component.scss +++ b/ui/src/app/modules/plugins/plugins.component.scss @@ -34,6 +34,6 @@ width: calc(1 / 2 * 100% - (1 - 1 / 3) * 10px); @media only screen and (max-width: 991px) { - width: calc(100% - (1 - 1 / 3) * 10px); + width: 100%; } } diff --git a/ui/src/app/modules/plugins/plugins.component.ts b/ui/src/app/modules/plugins/plugins.component.ts index 3fa3b0361..8170f3461 100644 --- a/ui/src/app/modules/plugins/plugins.component.ts +++ b/ui/src/app/modules/plugins/plugins.component.ts @@ -1,13 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ToastrService } from 'ngx-toastr'; import { Subscription } from 'rxjs'; -import { take } from 'rxjs/operators'; import { ApiService } from '@/app/core/api.service'; -import { ManagePluginsService } from '@/app/core/manage-plugins/manage-plugins.service'; -import { SettingsService } from '@/app/core/settings.service'; import { WsService } from '@/app/core/ws.service'; @Component({ @@ -27,12 +24,9 @@ export class PluginsComponent implements OnInit, OnDestroy { private navigationSubscription: Subscription; constructor( - private $settings: SettingsService, private $api: ApiService, private $ws: WsService, - private $plugin: ManagePluginsService, private $router: Router, - private $route: ActivatedRoute, private $toastr: ToastrService, private $translate: TranslateService, ) {} @@ -43,7 +37,7 @@ export class PluginsComponent implements OnInit, OnDestroy { this.io.socket.emit('monitor-child-bridge-status'); }); - this.io.socket.on('child-bridge-status-update', (data) => { + this.io.socket.on('child-bridge-status-update', (data: any) => { const existingBridge = this.childBridges.find(x => x.username === data.username); if (existingBridge) { Object.assign(existingBridge, data); @@ -78,21 +72,6 @@ export class PluginsComponent implements OnInit, OnDestroy { this.$translate.instant('toast.title_error'), ); } - - this.$route.queryParams.pipe(take(1)).subscribe(async (params) => { - if (params.installed && this.installedPlugins.find(x => x.name === params.installed)) { - const plugin = this.installedPlugins.find(x => x.name === params.installed); - this.$plugin.settings(plugin) - .then((schema?) => { - this.recommendChildBridge(plugin, schema); - }) - .finally(() => { - this.$router.navigate([], { - queryParams: {}, - }); - }); - } - }); } search() { @@ -117,7 +96,7 @@ export class PluginsComponent implements OnInit, OnDestroy { this.loadInstalledPlugins(); } - onSubmit({ value, valid }) { + onSubmit({ value }) { if (!value.query.length) { this.loadInstalledPlugins(); } else { @@ -125,24 +104,13 @@ export class PluginsComponent implements OnInit, OnDestroy { } } - recommendChildBridge(plugin, schema) { - if ( - this.$settings.env.recommendChildBridges && - this.$settings.env.serviceMode && - schema && - schema.pluginType === 'platform' - ) { - this.$plugin.bridgeSettings(plugin); - } - } - getChildBridgeMetadata() { this.io.request('get-homebridge-child-bridge-status').subscribe((data) => { this.childBridges = data; }); } - getPluginChildBridges(plugin) { + getPluginChildBridges(plugin: any) { return this.childBridges.filter(x => x.plugin === plugin.name); } diff --git a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts index 187bf87aa..2abaa0c3d 100644 --- a/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts +++ b/ui/src/app/modules/settings/remove-all-cached-accessories-modal/remove-all-cached-accessories-modal.component.ts @@ -22,14 +22,14 @@ export class RemoveAllCachedAccessoriesModalComponent { onResetCachedAccessoriesClick() { this.clicked = true; return this.$api.put('/server/reset-cached-accessories', {}).subscribe( - data => { + () => { this.toastr.success( this.translate.instant('reset.toast_clear_cached_accessories_success'), this.translate.instant('toast.title_success'), ); this.activeModal.close(); }, - err => { + () => { this.toastr.error(this.translate.instant('reset.toast_failed_to_reset'), this.translate.instant('toast.title_error')); }, ); diff --git a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts index bf0e64e36..07a04fdd1 100644 --- a/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts +++ b/ui/src/app/modules/settings/remove-single-cached-accessory-modal/remove-single-cached-accessory-modal.component.ts @@ -36,7 +36,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { } } - removeAccessory(item) { + removeAccessory(item: any) { this.deleting = item.UUID; this.toastr.info(this.translate.instant('reset.toast_removing_cached_accessory_please_wait')); @@ -46,7 +46,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { cacheFile: item.$cacheFile, }, }).subscribe( - async data => { + async () => { await this.loadCachedAccessories(); this.deleting = null; @@ -57,7 +57,7 @@ export class RemoveSingleCachedAccessoryModalComponent implements OnInit { this.toastr.success(this.translate.instant('reset.toast_cached_accessory_removed'), this.translate.instant('toast.title_success')); }, - err => { + () => { this.deleting = null; this.toastr.error(this.translate.instant( 'reset.toast_failed_to_delete_cached_accessory'), diff --git a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts index ae66d19fe..ae62354dc 100644 --- a/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts +++ b/ui/src/app/modules/settings/reset-homebridge-modal/reset-homebridge-modal.component.ts @@ -22,12 +22,12 @@ export class ResetHomebridgeModalComponent { onResetHomebridgeAccessoryClick() { this.clicked = true; return this.$api.put('/server/reset-homebridge-accessory', {}).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('reset.toast_accessory_reset'), this.translate.instant('toast.title_success')); this.activeModal.close(); this.$route.navigate(['/restart']); }, - async err => { + async () => { this.toastr.error(this.translate.instant('reset.toast_failed_to_reset'), this.translate.instant('toast.title_error')); }, ); diff --git a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts index 10737b567..39d7c97a1 100644 --- a/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts +++ b/ui/src/app/modules/settings/select-network-interfaces/select-network-interfaces.component.ts @@ -18,7 +18,7 @@ export class SelectNetworkInterfacesComponent implements OnInit { submit() { this.activeModal.close( - this.availableNetworkAdapters.filter(x => x.selected).map(x => x.iface), + this.availableNetworkAdapters.filter((x: any) => x.selected).map((x: any) => x.iface), ); } } diff --git a/ui/src/app/modules/settings/settings.component.ts b/ui/src/app/modules/settings/settings.component.ts index 4e398e865..64fe4a86a 100644 --- a/ui/src/app/modules/settings/settings.component.ts +++ b/ui/src/app/modules/settings/settings.component.ts @@ -169,7 +169,7 @@ export class SettingsComponent implements OnInit { } this.bridgeNetworkAdapters = adapters.map((interfaceName) => { - const i = this.availableNetworkAdapters.find((x => x.iface === interfaceName)); + const i = this.availableNetworkAdapters.find(((x: any) => x.iface === interfaceName)); if (i) { i.selected = true; i.missing = false; diff --git a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts index f74a4f4f0..ec790ba09 100644 --- a/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts +++ b/ui/src/app/modules/settings/unpair-accessory-modal/unpair-accessory-modal.component.ts @@ -39,7 +39,7 @@ export class UnpairAccessoryModalComponent implements OnInit { this.deleting = id; this.$api.delete(`/server/pairings/${id}`).subscribe( - async data => { + async () => { await this.loadPairings(); if (!this.pairings.length) { @@ -53,7 +53,7 @@ export class UnpairAccessoryModalComponent implements OnInit { this.translate.instant('toast.title_success'), ); }, - err => { + () => { this.deleting = null; this.toastr.error('Failed to un-pair accessory.', this.translate.instant('toast.title_error')); }, diff --git a/ui/src/app/modules/status/default-dashboard-layout.json b/ui/src/app/modules/status/default-dashboard-layout.json index 8d4887852..494ef343b 100644 --- a/ui/src/app/modules/status/default-dashboard-layout.json +++ b/ui/src/app/modules/status/default-dashboard-layout.json @@ -1,7 +1,7 @@ [ { "x": 0, - "y": 8, + "y": 9, "component": "HomebridgeStatusWidgetComponent", "cols": 5, "rows": 6, @@ -11,7 +11,7 @@ }, { "x": 15, - "y": 8, + "y": 9, "component": "ChildBridgeWidgetComponent", "cols": 5, "rows": 6, @@ -20,7 +20,7 @@ }, { "x": 5, - "y": 8, + "y": 9, "component": "CpuWidgetComponent", "cols": 5, "rows": 3, @@ -29,7 +29,7 @@ }, { "x": 5, - "y": 11, + "y": 12, "component": "MemoryWidgetComponent", "cols": 5, "rows": 3, @@ -38,7 +38,7 @@ }, { "x": 10, - "y": 11, + "y": 12, "component": "NetworkWidgetComponent", "cols": 5, "rows": 3, @@ -47,7 +47,7 @@ }, { "x": 10, - "y": 8, + "y": 9, "component": "UptimeWidgetComponent", "cols": 5, "rows": 3, @@ -59,7 +59,7 @@ "y": 0, "component": "SystemInfoWidgetComponent", "cols": 5, - "rows": 8, + "rows": 9, "mobileOrder": 70, "hideOnMobile": false }, @@ -68,7 +68,7 @@ "y": 0, "component": "HapQrcodeWidgetComponent", "cols": 5, - "rows": 8, + "rows": 9, "mobileOrder": 100, "hideOnMobile": false }, @@ -77,8 +77,8 @@ "y": 0, "component": "HomebridgeLogsWidgetComponent", "cols": 10, - "rows": 8, + "rows": 9, "mobileOrder": 1000, "hideOnMobile": true } -] \ No newline at end of file +] diff --git a/ui/src/app/modules/status/status.component.ts b/ui/src/app/modules/status/status.component.ts index 7be731e9d..5a8b13389 100644 --- a/ui/src/app/modules/status/status.component.ts +++ b/ui/src/app/modules/status/status.component.ts @@ -86,7 +86,7 @@ export class StatusComponent implements OnInit, OnDestroy { this.consoleStatus = 'down'; }); - this.io.socket.on('homebridge-status', (data) => { + this.io.socket.on('homebridge-status', (data: any) => { // check if client is up-to-date if (data.packageVersion && data.packageVersion !== this.$settings.uiVersion) { window.location.reload(); @@ -169,7 +169,7 @@ export class StatusComponent implements OnInit, OnDestroy { this.options.api.optionsChanged(); } - gridResizeEvent(item: any, itemComponent: any) { + gridResizeEvent(_item: any, itemComponent: any) { itemComponent.item.$resizeEvent.next('resize'); this.page.mobile = (window.innerWidth < 1024); } @@ -245,7 +245,7 @@ export class StatusComponent implements OnInit, OnDestroy { }); } - manageWidget(item) { + manageWidget(item: any) { const ref = this.$modal.open(WidgetControlComponent); ref.componentInstance.widget = item; diff --git a/ui/src/app/modules/status/widget-add/widget-add.component.html b/ui/src/app/modules/status/widget-add/widget-add.component.html index 4848583cb..40703ca42 100644 --- a/ui/src/app/modules/status/widget-add/widget-add.component.html +++ b/ui/src/app/modules/status/widget-add/widget-add.component.html @@ -18,6 +18,7 @@

{{ 'status.widget.label_no_additional_widgets' | translate }}

+
diff --git a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts index f6e2c7d95..2283904b1 100644 --- a/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts +++ b/ui/src/app/modules/users/users-disable2fa/users-disable2fa.component.ts @@ -32,11 +32,11 @@ export class UsersDisable2faComponent implements OnInit { disable2fa() { this.invalidCredentials = false; this.$api.post('/users/otp/deactivate', this.formGroup.value).subscribe( - data => { + () => { this.activeModal.close(); this.toastr.success(this.translate.instant('users.setup_2fa_disable_success'), this.translate.instant('toast.title_success')); }, - err => { + () => { this.formGroup.setValue({ password: '' }); this.invalidCredentials = true; }, diff --git a/ui/src/app/modules/users/users-edit/users-edit.component.ts b/ui/src/app/modules/users/users-edit/users-edit.component.ts index 3b2494736..1938c1846 100644 --- a/ui/src/app/modules/users/users-edit/users-edit.component.ts +++ b/ui/src/app/modules/users/users-edit/users-edit.component.ts @@ -12,7 +12,7 @@ import { AuthService } from '@/app/core/auth/auth.service'; templateUrl: './users-edit.component.html', }) export class UsersEditComponent implements OnInit { - @Input() user; + @Input() user: any; public form = new FormGroup({ username: new FormControl('', [Validators.required]), @@ -53,9 +53,9 @@ export class UsersEditComponent implements OnInit { } } - onSubmit({ value, valid }) { + onSubmit({ value }) { this.$api.patch(`/users/${this.user.id}`, value).subscribe( - data => { + () => { this.activeModal.close(); this.toastr.success(this.translate.instant('users.toast_updated_user'), this.translate.instant('toast.title_success')); diff --git a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts index cb162aee7..3f0c49fe2 100644 --- a/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts +++ b/ui/src/app/modules/users/users-setup2fa/users-setup2fa.component.ts @@ -18,7 +18,7 @@ import { ApiService } from '@/app/core/api.service'; styleUrls: ['./users-setup2fa.component.scss'], }) export class UsersSetup2faComponent implements OnInit { - @Input() public user; + @Input() public user: any; @ViewChild('qrcode', { static: true }) qrcodeElement: ElementRef; @@ -65,7 +65,7 @@ export class UsersSetup2faComponent implements OnInit { enable2fa() { this.$api.post('/users/otp/activate', this.formGroup.value).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('users.setup_2fa_enabled_success'), this.translate.instant('toast.title_success')); this.activeModal.close(); }, diff --git a/ui/src/app/modules/users/users.component.ts b/ui/src/app/modules/users/users.component.ts index 619addf79..22a78aa7e 100644 --- a/ui/src/app/modules/users/users.component.ts +++ b/ui/src/app/modules/users/users.component.ts @@ -51,7 +51,7 @@ export class UsersComponent implements OnInit { }); } - openEditUser(user) { + openEditUser(user: any) { const ref = this.modalService.open(UsersEditComponent, { size: 'lg', }); @@ -64,7 +64,7 @@ export class UsersComponent implements OnInit { deleteUser(id: string) { this.$api.delete(`/users/${id}`).subscribe( - data => { + () => { this.toastr.success(this.translate.instant('users.toast_user_deleted'), this.translate.instant('toast.title_success')); this.reloadUsers(); }, @@ -77,7 +77,7 @@ export class UsersComponent implements OnInit { ); } - setup2fa(user) { + setup2fa(user: any) { const ref = this.modalService.open(UsersSetup2faComponent, { size: 'lg', backdrop: 'static', @@ -89,7 +89,7 @@ export class UsersComponent implements OnInit { }); } - disable2fa(user) { + disable2fa(user: any) { const ref = this.modalService.open(UsersDisable2faComponent, { backdrop: 'static', }); diff --git a/ui/src/app/modules/users/users.resolver.ts b/ui/src/app/modules/users/users.resolver.ts index 39018fb9d..14d22d51c 100644 --- a/ui/src/app/modules/users/users.resolver.ts +++ b/ui/src/app/modules/users/users.resolver.ts @@ -11,11 +11,12 @@ export class UsersResolver implements Resolve { private $router: Router, ) {} - resolve() { - return this.$api.get('/users').toPromise() - .catch((err) => { - this.$toastr.error(err.message, 'Failed to Load Users'); - this.$router.navigate(['/']); - }); + async resolve() { + try { + return await this.$api.get('/users').toPromise(); + } catch (err) { + this.$toastr.error(err.message, 'Failed to Load Users'); + this.$router.navigate(['/']); + } } } diff --git a/ui/src/app/shared/layout/layout.component.html b/ui/src/app/shared/layout/layout.component.html index 646b13080..16da63d5b 100644 --- a/ui/src/app/shared/layout/layout.component.html +++ b/ui/src/app/shared/layout/layout.component.html @@ -1,120 +1,197 @@
- -
+ -