feat: admin app use new app manifest model (#841)

Co-authored-by: Noggling <[email protected]>
equinor · Oct 29, 2024 · 45d3433 · 45d3433
1 parent 159f911
commit 45d3433
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 1,872 deletions.
diff --git a/.changeset/pr-841-2151009734.md b/.changeset/pr-841-2151009734.md
@@ -0,0 +1,6 @@
+
+---
+"fusion-project-portal": patch
+--- 
+- Admin app use new app manifest model
+- Update all fusion packages in admin app
diff --git a/client/apps/portal-administration/app.config.ts b/client/apps/portal-administration/app.config.ts
@@ -1,13 +1,9 @@
-import { mergeAppConfigs, defineAppConfig } from '@equinor/fusion-framework-cli';
-export default defineAppConfig((_env, { base }) =>
-	mergeAppConfigs(base, {
-		environment: {
-			endpoints: {
-				client: {
-					baseUri: 'https://backend-fusion-project-portal-test.radix.equinor.com',
-					defaultScopes: ['api://02f3484c-cad0-4d1d-853d-3a9e604b38f3/access_as_user'],
-				},
-			},
+import { defineAppConfig } from '@equinor/fusion-framework-cli';
+export default defineAppConfig((_env) => ({
+	environment: {
+		client: {
+			baseUri: 'https://backend-fusion-project-portal-test.radix.equinor.com',
+			defaultScopes: ['api://02f3484c-cad0-4d1d-853d-3a9e604b38f3/access_as_user'],
 		},
-	})
-);
+	},
+}));
diff --git a/client/apps/portal-administration/package.json b/client/apps/portal-administration/package.json
@@ -14,7 +14,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@equinor/fusion-framework-cli": "^9.12.14",
+    "@equinor/fusion-framework-cli": "^10.0.1",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.1.3",
@@ -23,8 +23,8 @@
   "dependencies": {
     "react-router-dom": "^6.26.0",
     "@equinor/fusion-react-side-sheet": "^1.3.3",
-    "@equinor/fusion-framework-module-navigation": "^4.0.6",
-    "@equinor/fusion-framework-react-app": "^5.2.7",
+    "@equinor/fusion-framework-module-navigation": "^4.0.7",
+    "@equinor/fusion-framework-react-app": "^5.2.10",
     "@ag-grid-community/core": "^32.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -43,4 +43,4 @@
     "uuidv7": "^1.0.1",
     "zod": "^3.23.8"
   }
-}
+}
diff --git a/client/apps/portal-administration/src/components/PortalApps/PortalAppTable.tsx b/client/apps/portal-administration/src/components/PortalApps/PortalAppTable.tsx
@@ -95,24 +95,32 @@ export const PortalAppTable = ({ portalApps }: { portalApps: PortalApplication[]
 								);
 							},
 						},
-
 						{
-							field: 'appManifest.name',
+							field: 'appManifest.displayName',
 							headerName: 'Name',
 							filterParams: {
 								filterOptions: ['contains', 'startsWith', 'endsWith'],
 								defaultOption: 'startsWith',
 							},
 						},
 						{
-							field: 'key',
+							field: 'appManifest.appKey',
 							maxWidth: 350,
 							headerName: 'Application key',
 							filterParams: {
 								filterOptions: ['contains', 'startsWith', 'endsWith'],
 								defaultOption: 'startsWith',
 							},
 						},
+						{
+							field: 'appManifest.category.displayName',
+							maxWidth: 350,
+							headerName: 'Category',
+							filterParams: {
+								filterOptions: ['contains', 'startsWith', 'endsWith'],
+								defaultOption: 'startsWith',
+							},
+						},
 
 						{
 							field: 'appManifest.description',

diff --git a/client/apps/portal-administration/src/config.ts b/client/apps/portal-administration/src/config.ts
@@ -12,7 +12,6 @@ export const configure: AppModuleInitiator = (configurator, { env }) => {
 	enableNavigation(configurator, basename);
 
 	const environment = config?.environment as { client: Client };
-
 	configurator.configureHttpClient('portal-client', environment.client);
 };
-Original file line number
+Diff line change
@@ Expand Up @@
     	enableNavigation(configurator, basename);
     	const environment = config?.environment as { client: Client };
     	configurator.configureHttpClient('portal-client', environment.client);
     };
@@ Expand Down @@