@equinor/fusion-framework-dev-portal 5.1.0 → 5.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-dev-portal",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "description": "",
   "type": "module",
   "module": "./dist/main.js",
@@ -32,50 +32,50 @@
     "dotenv": "^17.3.1",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
-    "react-router-dom": "^7.9.5",
     "rxjs": "^7.8.1",
     "styled-components": "^6.3.11",
     "tsx": "^4.19.3",
     "typescript": "^5.9.3",
     "vite": "^8.0.0",
-    "@equinor/fusion-framework-app": "11.0.0",
-    "@equinor/fusion-framework": "8.0.0",
-    "@equinor/fusion-framework-dev-server": "2.0.0",
-    "@equinor/fusion-framework-module-ag-grid": "36.0.0",
+    "@equinor/fusion-framework": "8.0.1",
+    "@equinor/fusion-framework-app": "11.0.1",
+    "@equinor/fusion-framework-dev-server": "2.0.1",
     "@equinor/fusion-framework-module-app": "8.0.0",
     "@equinor/fusion-framework-module-bookmark": "4.0.0",
+    "@equinor/fusion-framework-module-analytics": "2.0.1",
+    "@equinor/fusion-framework-module-ag-grid": "36.0.0",
     "@equinor/fusion-framework-module-feature-flag": "2.0.0",
-    "@equinor/fusion-framework-module-analytics": "2.0.0",
-    "@equinor/fusion-framework-module-services": "8.0.0",
     "@equinor/fusion-framework-module-navigation": "7.0.0",
-    "@equinor/fusion-framework-module-context": "8.0.0",
+    "@equinor/fusion-framework-module-services": "8.0.0",
     "@equinor/fusion-framework-module-telemetry": "5.0.0",
+    "@equinor/fusion-framework-module-context": "8.0.0",
     "@equinor/fusion-framework-react-components-bookmark": "2.0.0",
+    "@equinor/fusion-framework-react-module-bookmark": "6.0.0",
     "@equinor/fusion-framework-react": "8.0.0",
-    "@equinor/fusion-framework-react-components-people-provider": "2.0.1",
+    "@equinor/fusion-observable": "9.0.0",
     "@equinor/fusion-query": "7.0.0",
-    "@equinor/fusion-framework-react-module-bookmark": "6.0.0",
-    "@equinor/fusion-observable": "9.0.0"
+    "@equinor/fusion-framework-react-components-people-provider": "2.0.1",
+    "@equinor/fusion-framework-react-router": "1.2.1"
   },
   "peerDependencies": {
-    "@equinor/fusion-framework": "8.0.0",
+    "@equinor/fusion-framework": "8.0.1",
+    "@equinor/fusion-framework-dev-server": "2.0.1",
     "@equinor/fusion-framework-module-ag-grid": "36.0.0",
-    "@equinor/fusion-framework-module-analytics": "2.0.0",
-    "@equinor/fusion-framework-app": "11.0.0",
+    "@equinor/fusion-framework-module-analytics": "2.0.1",
     "@equinor/fusion-framework-module-app": "8.0.0",
     "@equinor/fusion-framework-module-bookmark": "4.0.0",
+    "@equinor/fusion-framework-app": "11.0.1",
     "@equinor/fusion-framework-module-context": "8.0.0",
-    "@equinor/fusion-framework-module-feature-flag": "2.0.0",
-    "@equinor/fusion-framework-dev-server": "2.0.0",
     "@equinor/fusion-framework-module-navigation": "7.0.0",
     "@equinor/fusion-framework-module-telemetry": "5.0.0",
     "@equinor/fusion-framework-module-services": "8.0.0",
-    "@equinor/fusion-framework-react": "8.0.0",
     "@equinor/fusion-framework-react-components-bookmark": "2.0.0",
+    "@equinor/fusion-framework-react": "8.0.0",
+    "@equinor/fusion-framework-react-components-people-provider": "2.0.1",
     "@equinor/fusion-framework-react-module-bookmark": "6.0.0",
     "@equinor/fusion-observable": "9.0.0",
-    "@equinor/fusion-query": "7.0.0",
-    "@equinor/fusion-framework-react-components-people-provider": "2.0.1"
+    "@equinor/fusion-framework-module-feature-flag": "2.0.0",
+    "@equinor/fusion-query": "7.0.0"
   },
   "peerDependenciesMeta": {
     "@equinor/fusion-framework": {

package/src/PersonSideSheet/sheets/FeatureSheetContent.tsx

@@ -32,7 +32,7 @@ export const FeatureSheetContent = ({ navigate }: SheetContentProps) => {
       </div>
       <Divider />
       <div>
-        <Tabs activeTab={tab} onChange={(index) => setTab(index)}>
+        <Tabs activeTab={tab} onChange={(index) => setTab(Number(index))}>
           <Tabs.List>
             <Tabs.Tab>App features</Tabs.Tab>
             <Tabs.Tab>Portal features</Tabs.Tab>

package/src/Router.tsx

@@ -1,6 +1,11 @@
 import { useBookmarkNavigate } from '@equinor/fusion-framework-react-module-bookmark/portal';
 
-import { Outlet, RouterProvider, type RouterProviderProps, useParams } from 'react-router-dom';
+import {
+  Outlet,
+  RouterProvider,
+  type RouterProviderProps,
+  useParams,
+} from '@equinor/fusion-framework-react-router';
 import AppLoader from './AppLoader';
 import { Header } from './Header';
 
@@ -87,10 +92,5 @@ export const Router = () => {
   const [router] = useState(() => navigation.createRouter(routes));
   // observe the context changes and navigate when the context changes
   useAppContextNavigation();
-  return (
-    <RouterProvider
-      router={router as unknown as RouterProviderProps['router']}
-      fallbackElement={<p>wooot</p>}
-    />
-  );
+  return <RouterProvider router={router as unknown as RouterProviderProps['router']} />;
 };

package/src/globals.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Ambient JSX type declarations for Lit/WCEV web components used by dev-portal.
+ *
+ * `@types/react@19` removed the global `JSX` namespace — augmentations must
+ * target the `react` module's `JSX` namespace instead.
+ *
+ * The `@equinor/fusion-wc-person` package still uses the old `global JSX` pattern
+ * with computed-property keys so its declarations are not picked up by the compiler.
+ * This file re-declares the elements with string-literal keys in the correct location.
+ */
+export {};
+
+declare module 'react' {
+  namespace JSX {
+    interface IntrinsicElements {
+      'fwc-person-avatar': React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLElement> & {
+          azureId?: string;
+          size?: string;
+          clickable?: boolean;
+        },
+        HTMLElement
+      >;
+      'fwc-person-list-item': React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLElement> & {
+          azureId?: string;
+        },
+        HTMLElement
+      >;
+    }
+  }
+}

package/src/useAppContextNavigation.ts

@@ -126,13 +126,17 @@ export const useAppContextNavigation = () => {
             extractContextIdFromPath(currentPathname),
         );
 
-        // if app has its own navigation, use it to navigate
+        // always navigate via the portal navigation to trigger the synthetic pop() workaround,
+        // ensuring app routers that listen only for POP actions detect the URL change
         if (appNavigation) {
-          // update the path of the app navigation, preserving search and hash
-          appNavigation.replace({ ...appNavigation.path, pathname });
+          // resolve the full URL via the app navigation (includes app basename),
+          // then hand it to the portal navigation which will not double-prefix when basename is empty
+          const newUrl = appNavigation.createURL({ pathname });
+          navigation.navigate(newUrl, { replace: true });
         } else {
-          // update the path of the portal navigation, preserving search and hash
-          navigation.replace({ ...navigation.path, pathname });
+          // pass the pathname directly so navigation.navigate does not re-run createURL
+          // (which would duplicate the basename if one is configured)
+          navigation.navigate({ pathname }, { replace: true });
         }
       },
       [

package/src/version.ts

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