@genesislcap/blank-app-seed 3.41.1 → 3.41.2

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.41.1",
+  "version": "3.41.2",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [3.41.2](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.41.1...v3.41.2) (2025-03-20)
+
+
+### Bug Fixes
+
+* correct path for login redirect 4b06ecb
+* fix angular router e92e502
+* react and angular router fix (#439) 6c7a4da
+* react router fixes 1fd1742
+
 ## [3.41.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.41.0...v3.41.1) (2025-03-18)
 
 

package/client-tmp/angular/src/app/share/foundation-login.ts

@@ -28,12 +28,10 @@ export const configureFoundationLogin = ({
   router: Router;
 }) => {
   configure(DI.getOrCreateDOMContainer(), {
-    // autoConnect: true, // < Guard in place to ensure connection. Keeping the connect form in place for now.
-    autoAuth: true, // < Allow users to skip login
-    showConnectionIndicator: true,
+    autoConnect: true,
     hostPath: AUTH_PATH,
     redirectHandler: () => {
-      router.navigate([getUser().lastPath() ?? '{{kebabCase routes.[0].name}}'])
+      router.navigate(['{{kebabCase routes.[0].name}}'])
     },
     ...ssoSettings,
     logo: css `

package/client-tmp/react/package.json

@@ -58,7 +58,7 @@
     "history": "^5.3.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router-dom": "7.0.2",
+    "react-router": "^7.1.3",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {

package/client-tmp/react/src/App.tsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
-import { unstable_HistoryRouter as HistoryRouter, Routes, Route, useLocation } from 'react-router-dom';
+import {Routes, Route, useLocation, BrowserRouter} from 'react-router';
 import {
-  history,
   setApiHost,
   getLayoutNameByRoute,
   {{#if FDC3.channels.length~}}
@@ -17,7 +16,6 @@ import { AuthProvider } from './store/AuthContext';
 import { RoutesProvider, useRoutesContext } from './store/RoutesContext';
 import AuthPage from './pages/AuthPage/AuthPage';
 import { registerComponents as genesisRegisterComponents } from './share/genesis-components';
-import { configureFoundationLogin } from './share/foundation-login';
 import ProtectedGuard from './guards/ProtectedGuard';
 import { storeService } from '@/services/store.service';
 
@@ -33,10 +31,8 @@ const DynamicLayout = () => {
 
   useEffect(() => {
     handleRouteChange(location);
-    const unlisten = history.listen(handleRouteChange);
 
     return () => {
-      unlisten();
     }
   }, [location]);
 
@@ -82,7 +78,6 @@ const App: React.FC<AppProps> = ({ rootElement }) => {
 
   setApiHost();
   genesisRegisterComponents();
-  configureFoundationLogin({ router: history });
 
   useEffect(() => {
     registerStylesTarget(document.body, 'main');
@@ -107,11 +102,11 @@ const App: React.FC<AppProps> = ({ rootElement }) => {
   return (
     <AuthProvider>
       <RoutesProvider>
-        <HistoryRouter history={history as any}>
+        <BrowserRouter>
           <Routes>
             <Route path="*" element={<DynamicLayout />} />
           </Routes>
-        </HistoryRouter>
+        </BrowserRouter>
       </RoutesProvider>
     </AuthProvider>
   );

package/client-tmp/react/src/config.ts

@@ -2,11 +2,11 @@ import { RouteLayouts } from './types/RouteLayouts';
 import { environment } from '@environment';
 
 export const routeLayouts: RouteLayouts = {
-  '/auth': 'blank',
+  '/login': 'blank',
   '/': 'blank',
 };
 
-export const AUTH_PATH = 'auth';
+export const AUTH_PATH = 'login';
 export const NOT_PERMITTED_PATH = 'not-permitted';
 
 export const API_DATA = {

package/client-tmp/react/src/guards/ProtectedGuard.tsx

@@ -1,6 +1,5 @@
 import { useState, useEffect, ReactNode } from 'react';
-import { RouteObject } from 'react-router';
-import { useNavigate } from 'react-router-dom';
+import {RouteObject, useNavigate} from 'react-router';
 import isConnectedHelper from '@/helpers/isConnectedHelper';
 import isAuthenticatedHelper from '@/helpers/isAuthenticatedHelper';
 import hasPermissionHelper from '@/helpers/hasPermissionHelper';
@@ -56,7 +55,11 @@ const ProtectedGuard: React.FC<{ children: ReactNode }> = ({ children }: { child
     }
 
     if (permissionState) {
-      navigate(`/${redirectUrlByPermissionState[permissionState]}`);
+      const baseElement = document.querySelector('base');
+      const basePath = baseElement?.getAttribute('href') || '';
+
+      const redirect = `${basePath}${redirectUrlByPermissionState[permissionState]}`;
+      navigate(`/${redirect}`);
     }
   }, [routes, isConnected, isAuthenticated, hasPermission]);
 

package/client-tmp/react/src/layouts/default/DefaultLayout.tsx

@@ -1,7 +1,6 @@
 import React, { ReactNode, useEffect, useRef } from 'react';
-import { RouteObject } from 'react-router';
+import { RouteObject, useNavigate } from 'react-router';
 import { configureDesignSystem, getNavItems } from '@genesislcap/foundation-ui';
-import { useNavigate } from 'react-router-dom';
 import {
   baseLayerLuminance,
   StandardLuminance,
@@ -10,6 +9,7 @@ import styles from './DefaultLayout.module.css';
 import PBCElementsRenderer from '@/pbc/elementsRenderer';
 import * as designTokens from '@/styles/design-tokens.json';
 import { useRoutesContext } from '@/store/RoutesContext';
+import { AUTH_PATH } from '@/config';
 
 interface DefaultLayoutProps {
   children: ReactNode;
@@ -25,7 +25,6 @@ type ExtendedRouteObject = RouteObject & {
 const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
   const navigate = useNavigate();
   const designSystemProviderRef = useRef<HTMLElement>(null);
-  const foundationHeaderRef = useRef<HTMLElement>(null);
   const routes = useRoutesContext() as ExtendedRouteObject[];
   const navItems = getNavItems(routes.flatMap((route) => ({
     path: route.path || '',
@@ -43,25 +42,13 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
       );
     }
   };
-  
+
   useEffect(() => {
     if (designSystemProviderRef.current) {
       configureDesignSystem(designSystemProviderRef.current, designTokens);
     }
 
-    const handleLuminanceIconClicked = () => {
-      onLuminanceToggle();
-    };
-
-    const foundationHeader = foundationHeaderRef.current;
-    if (foundationHeader) {
-      foundationHeader.addEventListener('luminance-icon-clicked', handleLuminanceIconClicked);
-    }
-
     return () => {
-      if (foundationHeader) {
-        foundationHeader.removeEventListener('luminance-icon-clicked', handleLuminanceIconClicked);
-      }
     };
   }, []);
 
@@ -71,7 +58,8 @@ const DefaultLayout: React.FC<DefaultLayoutProps> = ({ children }) => {
     <rapid-design-system-provider ref={designSystemProviderRef} class={className}>
       <PBCElementsRenderer target={['layout-start']} />
       <foundation-header
-        ref={foundationHeaderRef}
+        onluminance-icon-clicked={onLuminanceToggle}
+        onlogout-clicked={() => navigate(`/${AUTH_PATH}`)}
         show-luminance-toggle-button
         show-misc-toggle-button
         routeNavItems={navItems}

package/client-tmp/react/src/pages/AuthPage/AuthPage.tsx

@@ -1,12 +1,20 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import './AuthPage.css';
+import { configureFoundationLogin } from "@/share/foundation-login.ts";
+import { useNavigate } from 'react-router';
 
 const AuthPage: React.FC = () => {
-  return (
-    <section className="auth-page">
-      <client-app-login></client-app-login>
-    </section>
-  );
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        configureFoundationLogin({ navigate });
+    }, []);
+
+    return (
+        <section className="auth-page">
+            <client-app-login></client-app-login>
+        </section>
+    );
 };
 
 export default AuthPage;

package/client-tmp/react/src/pbc/container.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, RouteObject } from 'react';
 import { deriveElementTag } from './utils';
 import { useRoutesContext } from '@/store/RoutesContext';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 
 type ExtendedRouteObject = RouteObject & {
   data?: {

package/client-tmp/react/src/share/foundation-login.ts

@@ -1,24 +1,19 @@
 import {configure, define} from '@genesislcap/foundation-login';
-import { getUser } from '@genesislcap/foundation-user';
 import { DI } from '@genesislcap/web-core';
 import { AUTH_PATH } from '@/config';
-import type { Router } from '@/utils/history';
 
 /**
  * Configure the micro frontend
  */
-export const configureFoundationLogin = ({ router }:{ router: Router }) => {
+export const configureFoundationLogin = ({ navigate }:{ navigate: any }) => {
   configure(DI.getOrCreateDOMContainer(), {
     autoConnect: true,
     autoAuth: true, // < Allow users to skip login
     showConnectionIndicator: true,
     hostPath: AUTH_PATH,
     redirectHandler: () => {
-      // workaround for redirect from foundation-login
-      setTimeout(() => {
-        const lastPath = getUser().lastPath() ?? '/{{kebabCase routes.[0].name}}';
-        router.push(lastPath);
-      }, 0);
+      const lastPath = '/{{kebabCase routes.[0].name}}';
+      navigate(lastPath);
     },
   });
 

package/client-tmp/react/src/store/RoutesContext.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, ReactNode } from 'react';
-import { RouteObject, Navigate } from 'react-router-dom';
+import { RouteObject, Navigate } from 'react-router';
 import { getApp } from '@genesislcap/foundation-shell/app';
 import AuthPage from '@/pages/AuthPage/AuthPage';
 import NotFoundPage from '@/pages/NotFoundPage/NotFoundPage';

package/client-tmp/react/src/utils/index.ts

@@ -1,4 +1,3 @@
-export * from './history';
 export * from './fdc3';
 export * from './layout';
 export * from './permissions';

package/client-tmp/web-components/src/routes/config.ts

@@ -59,7 +59,7 @@ export class MainRouterConfig extends FoundationRouterConfiguration<LoginSetting
           configure(this.container, {
             hostPath: 'login',
             autoConnect: true,
-            defaultRedirectUrl: publicPath + '{{kebabCase routes.[0].name}}',
+            defaultRedirectUrl: publicPath + '/{{kebabCase routes.[0].name}}',
             ...ssoSettings,
           });
           return define({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "3.41.1",
+  "version": "3.41.2",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"

package/client-tmp/react/src/utils/history.ts

@@ -1,5 +0,0 @@
-import { createBrowserHistory, History } from 'history';
-
-export type Router = History;
-
-export const history = createBrowserHistory() as History;