From ca05c4ea76e52901b5daf9d1cb273dd1259734bd Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Mon, 18 Mar 2024 16:08:35 +0100 Subject: [PATCH 1/2] fix(ui): display container and container-groups tabs when either type is present --- ui/src/shared/container.guard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/shared/container.guard.ts b/ui/src/shared/container.guard.ts index 29b20df..5cdbb8e 100644 --- a/ui/src/shared/container.guard.ts +++ b/ui/src/shared/container.guard.ts @@ -12,7 +12,7 @@ export class ContainerGuard implements CanActivate { return this.inventoryService .childAdditionsList( { id }, - { query: `serviceType eq container`, pageSize: 1 } + { query: `serviceType eq 'container' or serviceType eq 'container-group'`, pageSize: 1 } ) .then(result => !!result?.data?.length); } From b028dd1b67ad4d3a5e11223ac7d93c8eea0ae8c7 Mon Sep 17 00:00:00 2001 From: Reuben Miller Date: Mon, 18 Mar 2024 16:11:11 +0100 Subject: [PATCH 2/2] bump ui version to 1.0.2 --- ui/package-lock.json | 4 ++-- ui/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 209ba4f..109eaa9 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "tedge-container-plugin-ui", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tedge-container-plugin-ui", - "version": "1.0.1", + "version": "1.0.2", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { diff --git a/ui/package.json b/ui/package.json index 3b1bf9a..dcab485 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "tedge-container-plugin-ui", - "version": "1.0.1", + "version": "1.0.2", "description": "UI for the tedge-container-plugin to monitor installed containers and container groups.", "scripts": { "start": "c8ycli server -u $C8Y_URL --shell devicemanagement",