@equinor/fusion-framework-dev-portal 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @equinor/fusion-framework-dev-portal
 
+## 1.1.4
+
+### Patch Changes
+
+- [#3471](https://github.com/equinor/fusion-framework/pull/3471) [`1db21e2`](https://github.com/equinor/fusion-framework/commit/1db21e21410f37bd9a8c1d31ab4f68452578a51e) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - Re-add support for custom context path extraction and generation
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/main.js

@@ -13223,7 +13223,7 @@ Check the render method of \`` + a + "`." : "";
         };
       }
     }
-    function qLe(a) {
+    function GLe(a) {
       return a;
     }
     function DX(a) {
@@ -15454,10 +15454,10 @@ Incoming: %s`, Fe, "[" + c.join(", ") + "]", "[" + a.join(", ") + "]");
       }
       return [A, S];
     }
-    function GLe(a, c, h) {
-    }
     function KLe(a, c, h) {
     }
+    function WLe(a, c, h) {
+    }
     function q7(a, c, h) {
       var m = zn, y = Ed(), S, T = Na();
       if (T) {
@@ -48181,7 +48181,7 @@ const HL = nt().datetime({ offset: !0 }).transform((t) => new Date(t)), gT = {
     name: nt(),
     mail: nt().optional(),
     phoneNumber: nt().optional(),
-    jobTitle: nt().optional(),
+    jobTitle: nt().nullish(),
     accountType: nl(["Employee", "Consultant", "External", "Application", "Local"]).optional(),
     accountClassification: nl(["Unclassified", "Internal", "External"]).nullish()
   })
@@ -85768,7 +85768,20 @@ const LLe = {
       ]
     }
   );
-}, ZLe = () => {
+}, ZLe = (t, e, r, n) => {
+  if (n) {
+    const o = r?.generatePathFromContext?.(e, t) ?? t.replace(n, e.id);
+    return console.debug(
+      "🌍 Portal: context changed, navigating to app's context url:",
+      `found context id [${n}] in url, replacing with [${o}]`
+    ), o;
+  }
+  const i = r?.generatePathFromContext?.(e, t) ?? `/${e?.id}`;
+  return console.debug(
+    "🌍 Portal: context changed, navigating to app's context url:",
+    `could not find context id in url, navigating to path [${i}]`
+  ), i;
+}, zLe = () => {
   const t = NI("navigation"), { modules: e } = NQ(), { context: r, navigation: n } = e ?? {};
   iY(
     // if the context is not available, use an empty observable
@@ -85792,27 +85805,20 @@ const LLe = {
           console.debug("🌍 Portal:", "current context was cleared, navigating to root"), n ? n.replace("/") : t.replace("/");
           return;
         }
-        const s = oK(o), u = s ? i ? (
-          // context id exists in the url, replace it with the new context id
-          o.replace(s, i.id)
-        ) : (
-          // context was cleared, set the path to the root
-          "/"
-        ) : (
-          // could not find context id in the url, set the path to the new context id
-          `/${i?.id}`
+        const s = ZLe(
+          o,
+          i,
+          r,
+          r?.extractContextIdFromPath?.(o) ?? oK(o)
         );
-        console.debug(
-          "🌍 Portal:",
-          "context changed, navigating to app's context url:",
-          s ? `found context id [${s}] in url, ${i ? `replacing with [${i.id}]` : "context was cleared, navigating to root"}` : `could not find context id in url, navigating to context id [${i ? i.id : "root"}]`
-        ), n ? n.replace({ ...n.path, pathname: u }) : t.replace({ ...t.path, pathname: u });
+        n ? n.replace({ ...n.path, pathname: s }) : t.replace({ ...t.path, pathname: s });
       },
       [
         // framework navigation instance, should not change
         t,
         // application navigation instance, may change when the application changes
-        n
+        n,
+        r
       ]
     )
   );
@@ -85835,33 +85841,33 @@ const LLe = {
         max-width: 100%;
         display: grid;
     `
-}, zLe = () => (GTe({ resolveAppPath: (t) => `/apps/${t}` }), /* @__PURE__ */ D.jsxs(zk.ContentContainer, { children: [
+}, ULe = () => (GTe({ resolveAppPath: (t) => `/apps/${t}` }), /* @__PURE__ */ D.jsxs(zk.ContentContainer, { children: [
   /* @__PURE__ */ D.jsx(zk.Head, { children: /* @__PURE__ */ D.jsx(HLe, {}) }),
   /* @__PURE__ */ D.jsx(zk.Main, { children: /* @__PURE__ */ D.jsx(yRe, {}) })
-] })), ULe = () => {
+] })), VLe = () => {
   const { appKey: t } = nRe();
   return t ? /* @__PURE__ */ D.jsx(hNe, { appKey: t }) : null;
-}, VLe = [
+}, jLe = [
   {
     path: "/",
-    element: /* @__PURE__ */ D.jsx(zLe, {}),
+    element: /* @__PURE__ */ D.jsx(ULe, {}),
     children: [
       {
         path: "apps/:appKey/*",
-        element: /* @__PURE__ */ D.jsx(ULe, {})
+        element: /* @__PURE__ */ D.jsx(VLe, {})
       }
     ]
   }
-], jLe = () => {
-  const { navigation: t } = zp().modules, [e] = P.useState(() => t.createRouter(VLe));
-  return ZLe(), /* @__PURE__ */ D.jsx(
+], FLe = () => {
+  const { navigation: t } = zp().modules, [e] = P.useState(() => t.createRouter(jLe));
+  return zLe(), /* @__PURE__ */ D.jsx(
     NRe,
     {
       router: e,
       fallbackElement: /* @__PURE__ */ D.jsx("p", { children: "wooot" })
     }
   );
-}, FLe = '<svg height="24px" width="24px" fill="#999" viewBox="0 0 24 24" title="person" role="img" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="#eee" /><path d="M12 4C9.79 4 8 5.79 8 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4Zm2 4c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2Zm4 10c-.2-.71-3.3-2-6-2-2.69 0-5.77 1.28-6 2h12ZM4 18c0-2.66 5.33-4 8-4s8 1.34 8 4v2H4v-2Z" fill-rule="evenodd" clip-rule="evenodd" class="sc-dmqHEX eydzYY"></path></svg>', BLe = new Blob([FLe], { type: "image/svg+xml" }), eZe = (t, e) => {
+}, BLe = '<svg height="24px" width="24px" fill="#999" viewBox="0 0 24 24" title="person" role="img" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="#eee" /><path d="M12 4C9.79 4 8 5.79 8 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4Zm2 4c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2Zm4 10c-.2-.71-3.3-2-6-2-2.69 0-5.77 1.28-6 2h12ZM4 18c0-2.66 5.33-4 8-4s8 1.34 8 4v2H4v-2Z" fill-rule="evenodd" clip-rule="evenodd" class="sc-dmqHEX eydzYY"></path></svg>', qLe = new Blob([BLe], { type: "image/svg+xml" }), tZe = (t, e) => {
   Fne.createRoot(t).render(
     /* @__PURE__ */ D.jsx(yge, { theme: re, children: /* @__PURE__ */ D.jsx(
       p1e,
@@ -85869,12 +85875,12 @@ const LLe = {
         configure: BTe,
         parent: e.ref,
         fallback: /* @__PURE__ */ D.jsx(rY, { text: "Loading framework" }),
-        children: /* @__PURE__ */ D.jsx(cEe, { options: { fallbackImage: BLe }, children: /* @__PURE__ */ D.jsx(jLe, {}) })
+        children: /* @__PURE__ */ D.jsx(cEe, { options: { fallbackImage: qLe }, children: /* @__PURE__ */ D.jsx(FLe, {}) })
       }
     ) })
   );
 };
 export {
-  eZe as default,
-  eZe as render
+  tZe as default,
+  tZe as render
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-dev-portal",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "",
   "type": "module",
   "module": "./dist/main.js",
@@ -40,19 +40,19 @@
     "tsx": "^4.19.3",
     "typescript": "^5.8.2",
     "vite": "^7.1.5",
+    "@equinor/fusion-framework": "^7.3.20",
     "@equinor/fusion-framework-app": "^10.0.0",
-    "@equinor/fusion-framework-dev-server": "^1.1.2",
     "@equinor/fusion-framework-module-app": "^7.0.1",
-    "@equinor/fusion-framework": "^7.3.19",
+    "@equinor/fusion-framework-dev-server": "^1.1.3",
     "@equinor/fusion-framework-module-bookmark": "^3.0.1",
-    "@equinor/fusion-framework-module-context": "^7.0.0",
     "@equinor/fusion-framework-module-feature-flag": "^1.1.24",
+    "@equinor/fusion-framework-module-context": "^7.0.0",
+    "@equinor/fusion-framework-module-services": "^7.1.2",
     "@equinor/fusion-framework-module-navigation": "^6.0.0",
-    "@equinor/fusion-framework-module-services": "^7.1.1",
     "@equinor/fusion-framework-react": "^7.4.18",
-    "@equinor/fusion-framework-react-components-bookmark": "^1.1.0",
-    "@equinor/fusion-framework-react-module-bookmark": "^5.0.1",
     "@equinor/fusion-framework-react-components-people-provider": "^1.5.23",
+    "@equinor/fusion-framework-react-module-bookmark": "^5.0.1",
+    "@equinor/fusion-framework-react-components-bookmark": "^1.1.0",
     "@equinor/fusion-query": "^5.2.14",
     "@equinor/fusion-observable": "^8.5.4"
   },

package/src/useAppContextNavigation.ts

@@ -2,7 +2,11 @@ import { useCallback } from 'react';
 
 import { useCurrentAppModules } from '@equinor/fusion-framework-react/app';
 
-import type { ContextItem, ContextModule } from '@equinor/fusion-framework-module-context';
+import type {
+  ContextItem,
+  ContextModule,
+  IContextProvider,
+} from '@equinor/fusion-framework-module-context';
 import { extractContextIdFromPath } from '@equinor/fusion-framework-module-context/utils';
 
 import type { NavigationModule } from '@equinor/fusion-framework-module-navigation';
@@ -13,6 +17,48 @@ import { useFrameworkModule } from '@equinor/fusion-framework-react';
 
 type CurrentAppModules = [ContextModule, NavigationModule];
 
+/**
+ * Generates a pathname for navigation based on the current pathname,
+ * context item, and optional context provider. If a `pathContextId` is provided,
+ * it replaces the existing context ID in the pathname. Otherwise, it constructs
+ * a new pathname using the context item's ID.
+ *
+ * @param currentPathname - The current URL pathname.
+ * @param item - The context item containing the ID to be used in the pathname.
+ * @param context - An optional context provider with a method to generate a pathname from the context item.
+ * @param pathContextId - An optional context ID present in the current URL to be replaced.
+ * @returns The generated pathname for navigation.
+ */
+const generatePathname = (
+  currentPathname: string,
+  item: ContextItem,
+  context?: IContextProvider,
+  pathContextId?: string,
+) => {
+  if (pathContextId) {
+    // context id exists in the url, replace it with the new context id
+    const pathname =
+      context?.generatePathFromContext?.(item, currentPathname) ??
+      currentPathname.replace(pathContextId, item.id);
+
+    console.debug(
+      `🌍 Portal: context changed, navigating to app's context url:`,
+      `found context id [${pathContextId}] in url, replacing with [${pathname}]`,
+    );
+
+    return pathname;
+  }
+  // could not find context id in the url, set the path to the new context id
+  const pathname = context?.generatePathFromContext?.(item, currentPathname) ?? `/${item?.id}`;
+
+  console.debug(
+    `🌍 Portal: context changed, navigating to app's context url:`,
+    `could not find context id in url, navigating to path [${pathname}]`,
+  );
+
+  return pathname;
+};
+
 /**
  * when current application changes, this hook will observe the application module instances.
  * If the module has Context and Navigation, this hook will navigate when the context changes
@@ -63,25 +109,12 @@ export const useAppContextNavigation = () => {
           return;
         }
 
-        // extract the context id from the current path
-        const pathContextId = extractContextIdFromPath(currentPathname);
-
-        // generate path to the selected context
-        const pathname = pathContextId
-          ? item
-            ? // context id exists in the url, replace it with the new context id
-              currentPathname.replace(pathContextId, item.id)
-            : // context was cleared, set the path to the root
-              '/'
-          : // could not find context id in the url, set the path to the new context id
-            `/${item?.id}`;
-
-        console.debug(
-          '🌍 Portal:',
-          "context changed, navigating to app's context url:",
-          pathContextId
-            ? `found context id [${pathContextId}] in url, ${item ? `replacing with [${item.id}]` : 'context was cleared, navigating to root'}`
-            : `could not find context id in url, navigating to context id [${item ? item.id : 'root'}]`,
+        const pathname = generatePathname(
+          currentPathname,
+          item,
+          context,
+          context?.extractContextIdFromPath?.(currentPathname) ??
+            extractContextIdFromPath(currentPathname),
         );
 
         // if app has its own navigation, use it to navigate
@@ -98,6 +131,7 @@ export const useAppContextNavigation = () => {
         navigation,
         // application navigation instance, may change when the application changes
         appNavigation,
+        context,
       ],
     ),
   );

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '1.1.3';
+export const version = '1.1.4';