Merge pull request #38 from thin-edge/fix-ui-container-group-guard

reubenmiller · web-flow · commit 20a08ce00341 · 2024-03-18T15:15:12.000Z
fix(ui): display container and container-groups tabs when either type is present
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git 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",
diff --git 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);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tedge-container-plugin-ui",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "UI for the tedge-container-plugin to monitor installed containers and container groups.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "c8ycli server -u $C8Y_URL --shell devicemanagement",`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export class ContainerGuard implements CanActivate {`
`12`	`12`	`return this.inventoryService`
`13`	`13`	`.childAdditionsList(`
`14`	`14`	`{ id },`
`15`		- { query: `serviceType eq container`, pageSize: 1 }
	`15`	+ { query: `serviceType eq 'container' or serviceType eq 'container-group'`, pageSize: 1 }
`16`	`16`	`)`
`17`	`17`	`.then(result => !!result?.data?.length);`
`18`	`18`	`}`