diff --git a/package-lock.json b/package-lock.json index 7de3239c0..9454d6f2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@fastify/multipart": "8.0.0", "@fastify/static": "6.12.0", "@fastify/swagger": "8.12.0", - "@homebridge/node-pty-prebuilt-multiarch": "0.11.10", + "@homebridge/node-pty-prebuilt-multiarch": "0.11.11", "@nestjs/axios": "3.0.1", "@nestjs/common": "10.2.8", "@nestjs/core": "10.2.8", @@ -39,7 +39,7 @@ "class-validator": "0.14.0", "commander": "11.1.0", "dayjs": "1.11.10", - "emoji-js": "3.7.0", + "emoji-js": "3.8.0", "fastify": "4.24.3", "fs-extra": "11.1.1", "node-cache": "5.1.2", @@ -942,9 +942,9 @@ } }, "node_modules/@homebridge/node-pty-prebuilt-multiarch": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@homebridge/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.11.10.tgz", - "integrity": "sha512-ttOE8QQRq/aRXDoKD2rfYEF50AiDLM9LPTohqCog1Z78g8k3Zqk15R/EHfTl/8cfw4l0fxt3y0dWL56wq79p2A==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@homebridge/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.11.11.tgz", + "integrity": "sha512-g7XB2DxGXUuJV4ZS5+8BbztaeqKyihK1zowPL2EeLRp4wfew1qZ3Xw1FWYncpiuRbRvjXrEzXDkcTiYe/XC/ZA==", "hasInstallScript": true, "dependencies": { "nan": "^2.18.0", @@ -3954,9 +3954,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", - "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", + "version": "1.0.30001562", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", + "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==", "dev": true, "funding": [ { @@ -4983,16 +4983,16 @@ } }, "node_modules/emoji-datasource": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/emoji-datasource/-/emoji-datasource-7.0.2.tgz", - "integrity": "sha512-F5TTUSktTIfbjHIlaz8tjsQ8EAD0UpJtj1i5O13jQARWTddtFgam3nE1W5WgSQoqU/cuTnF1H9tK/wlCOyzfiA==" + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/emoji-datasource/-/emoji-datasource-15.0.1.tgz", + "integrity": "sha512-aF5Q6LCKXzJzpG4K0ETiItuzz0xLYxNexR9qWw45/shuuEDWZkOIbeGHA23uopOSYA/LmeZIXIFsySCx+YKg2g==" }, "node_modules/emoji-js": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/emoji-js/-/emoji-js-3.7.0.tgz", - "integrity": "sha512-YNJCF8DOYI1AZnkSIcJbmIN6rtXtSv5DObqzvHuGAP8VLQc15MMN+DG9rQVSfHPXGFkFub9pGvbiO4FNz5+sjg==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/emoji-js/-/emoji-js-3.8.0.tgz", + "integrity": "sha512-A5FNHKlRPRo6RJWrrdGWnoolIBMkVXHy4qkO0V5ahekQPjfVECxvOOWADeAF/SbzRVA9Sxdj24FCoRYGt06skA==", "dependencies": { - "emoji-datasource": "7.0.2" + "emoji-datasource": "15.0.1" } }, "node_modules/emoji-regex": { diff --git a/package.json b/package.json index 7142c64ce..92619586e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@fastify/multipart": "8.0.0", "@fastify/static": "6.12.0", "@fastify/swagger": "8.12.0", - "@homebridge/node-pty-prebuilt-multiarch": "0.11.10", + "@homebridge/node-pty-prebuilt-multiarch": "0.11.11", "@nestjs/axios": "3.0.1", "@nestjs/common": "10.2.8", "@nestjs/core": "10.2.8", @@ -72,7 +72,7 @@ "class-validator": "0.14.0", "commander": "11.1.0", "dayjs": "1.11.10", - "emoji-js": "3.7.0", + "emoji-js": "3.8.0", "fastify": "4.24.3", "fs-extra": "11.1.1", "node-cache": "5.1.2", 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 b22f531e1..c9ff265ef 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 @@ -9,9 +9,12 @@
-

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

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

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

-
-
-
+
+
+ +
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/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 b87a721fe..25b01cb19 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 @@ -2,7 +2,7 @@