[do not merge] comparison: alpha -> beta

.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/[email protected]
         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 }}

.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

.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

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();

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');
         }
       }
     });

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,

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) {

ui/src/app/core/accessories/types/lightbulb/lightbulb.component.html

@@ -1,4 +1,4 @@
-<div class="accessory-box" [ngClass]="{'switch-on': service.values.On}" appLongclick (longclick)="onLongClick()"
+<div class="accessory-box" [ngClass]="{'light-on': service.values.On}" appLongclick (longclick)="onLongClick()"
   (shortclick)="onClick()" tabindex="0">
   <div class="d-flex flex-column h-100">
     <div [inlineSVG]="'/assets/hap-icons/lightbulb.svg'" aria-label="Light Bulb" class="accessory-svg"></div>
@@ -8,4 +8,4 @@
     </div>
     <div class="accessory-label grey-text" *ngIf="service.values.Brightness">{{ service.values.Brightness }}%</div>
   </div>
-</div>
+</div>

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;
     }

ui/src/app/core/accessories/types/lightbulb/lightbulb.manage.component.html

@@ -6,7 +6,7 @@ <h5 class="modal-title" [innerText]="service.customName || service.serviceName">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body text-center">
+  <div class="modal-body text-center p-5">
 
     <h5>
       <strong>

ui/src/app/core/accessories/types/windowcovering/windowcovering.component.html

@@ -1,4 +1,4 @@
-<div class="accessory-box" [ngClass]="{'switch-on': service.values.TargetPosition}" appLongclick
+<div class="accessory-box" [ngClass]="{'window-on': service.values.TargetPosition}" appLongclick
   (longclick)="onLongClick()" (shortclick)="onClick()" tabindex="0">
   <div class="d-flex flex-column h-100">
     <div *ngIf="!service.values.TargetPosition" [inlineSVG]="'/assets/hap-icons/windowcovering-closed.svg'"
@@ -20,4 +20,4 @@
       {{ 'accessories.control.label_closing' | translate }}...
     </div>
   </div>
-</div>
+</div>

ui/src/app/core/accessories/types/windowcovering/windowcovering.component.scss

@@ -3,4 +3,4 @@
     font-size: 1.4rem;
     text-transform: initial;
   }
-}
+}

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;
   }

ui/src/app/core/accessories/types/windowcovering/windowcovering.manage.component.html

@@ -6,7 +6,7 @@ <h5 class="modal-title" [innerText]="service.customName || service.serviceName">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body text-center">
+  <div class="modal-body text-center p-5">
 
     <h5>
       <strong>

ui/src/app/core/components/confirm/confirm.component.html

@@ -1,8 +1,7 @@
 <div class="modal-content">
   <div class="modal-header">
     <h5 class="modal-title">{{ title }}</h5>
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"
-      (click)="activeModal.dismiss('Dismiss')">
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="activeModal.dismiss('Dismiss')">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

ui/src/app/core/components/information/information.component.html

@@ -1,8 +1,7 @@
 <div class="modal-content">
   <div class="modal-header">
     <h5 class="modal-title">{{ title }}</h5>
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"
-      (click)="activeModal.dismiss('Dismiss')">
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="activeModal.dismiss('Dismiss')">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

ui/src/app/core/components/restart-homebridge/restart-homebridge.component.html

@@ -0,0 +1,25 @@
+<div class="modal-content">
+  <div class="modal-header">
+    <h5 class="modal-title">{{ 'platform.version.title_service_restart_required' | translate }}</h5>
+    <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="activeModal.dismiss('Dismiss')">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body w-100 text-center">
+    <i class="fas fa-fw fa-power-off primary-text mb-4" style="font-size: 75px;"></i>
+    <p class="w-100">{{ 'plugins.manage.message_thanks_for_updating_restart'  | translate }}</p>
+  </div>
+  <div class="modal-footer justify-content-between">
+    <div class="text-left">
+      <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
+        {{ 'form.button_close' | translate }}
+      </button>
+    </div>
+    <div class="text-center"></div>
+    <div class="text-right">
+      <button type="button" class="btn btn-primary" (click)="onRestartHomebridgeClick()">
+        {{ 'plugins.manage.button_restart_now' | translate }}
+      </button>
+    </div>
+  </div>
+</div>

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();
+  }
+}

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: [

ui/src/app/core/log.service.ts

@@ -17,6 +17,7 @@ export class LogService {
   private webLinksAddon: WebLinksAddon;
   private resize: Subject<any>;
   private elementResize: Subject<any> | undefined;
+  private pluginName: string;
 
   constructor(
     private $ws: WsService,
@@ -25,7 +26,10 @@ export class LogService {
   startTerminal(
     targetElement: ElementRef,
     termOpts: ITerminalOptions = {},
-    elementResize?: Subject<any>) {
+    elementResize?: Subject<any>,
+    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