@legalplace/wizardx-core 4.42.10-nightly.20251126120203 → 4.42.10-nightly.20251126141528

package/dist/App.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from "react";
-import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
+import { Router, Route, Switch, Redirect } from "react-router-dom";
 import { Provider } from "react-redux";
 import { getStore, createAppStore } from "./redux/store";
+import { getHistory } from "./redux/routerHistory";
 import Globals, { setGlobals } from "./Globals";
 import { getConfig, updateConfig } from "./config";
 import { fetchModelPrerequisitesAction } from "./redux/actions/sagas/model";
@@ -33,7 +34,7 @@ class WizardXCore extends React.Component {
         var _a;
         super(props);
         clearPlugins();
-        const historyType = "memory";
+        const historyType = typeof props.historyType === "string" ? props.historyType : "browser";
         const params = Object.assign(Object.assign({}, Globals), { loadTheme: props.loadTheme, loadPlugin: props.loadPlugin });
         if (props.model) {
             params.model = props.model;
@@ -76,7 +77,7 @@ class WizardXCore extends React.Component {
         getStore().dispatch(resetStateAction());
     }
     render() {
-        return (_jsx(Provider, { store: getStore(), children: _jsxs(BrowserRouter, { children: [_jsx(RouteWatcher, {}), _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }), !window.location.href.includes("smartscript") && (_jsx(Route, { component: RedirectHandler }))] })] }) }));
+        return (_jsx(Provider, { store: getStore(), children: _jsxs(Router, { history: getHistory(), children: [_jsx(RouteWatcher, {}), _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }), !window.location.href.includes("smartscript") && (_jsx(Route, { component: RedirectHandler }))] })] }) }));
     }
 }
 export default WizardXCore;

package/dist/components/RouteWatcher.js

@@ -1,23 +1,34 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useLocation } from "react-router-dom";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 const RouteWatcher = () => {
     const location = useLocation();
     const dispatch = useDispatch();
+    const isFirstRender = useRef(true);
+    const routerLocation = useSelector((state) => { var _a; return (_a = state.router) === null || _a === void 0 ? void 0 : _a.location; });
     useEffect(() => {
-        dispatch({
-            type: "@@router/LOCATION_CHANGE",
-            payload: {
-                location: {
-                    pathname: location.pathname,
-                    search: location.search,
-                    hash: location.hash,
+        const hasChanged = !routerLocation ||
+            routerLocation.pathname !== location.pathname ||
+            routerLocation.search !== location.search ||
+            routerLocation.hash !== location.hash;
+        if (hasChanged) {
+            dispatch({
+                type: "@@router/LOCATION_CHANGE",
+                payload: {
+                    location: {
+                        pathname: location.pathname,
+                        search: location.search,
+                        hash: location.hash,
+                    },
+                    action: isFirstRender.current ? "POP" : "PUSH",
+                    isFirstRendering: isFirstRender.current,
                 },
-                action: "PUSH",
-                isFirstRendering: false,
-            },
-        });
-    }, [location.pathname, location.search, location.hash, dispatch]);
+            });
+        }
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+        }
+    }, [location.pathname, location.search, location.hash, dispatch, routerLocation]);
     return null;
 };
 export default RouteWatcher;

package/dist/libs/PathReader.js

@@ -1,4 +1,3 @@
-import { createMatchSelector } from "connected-react-router";
 import queryString from "query-string";
 import { matchPath, generatePath } from "react-router";
 import { getConfig } from "../config";
@@ -19,12 +18,16 @@ export class PathReader {
         }
     }
     matchWithoutUniqId(state) {
-        var _a;
-        const matchSelector = createMatchSelector(getConfig().router.wizardPath);
-        const matchResult = matchSelector(state);
-        if (matchResult) {
+        var _a, _b, _c;
+        const pathname = ((_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname) || window.location.pathname;
+        const matchResult = matchPath(pathname, {
+            path: getConfig().router.wizardPath,
+            exact: false,
+            strict: false,
+        });
+        if (matchResult && matchResult.params) {
             const { permalink, page, view, prefix } = matchResult.params;
-            const modelVersion = (_a = getQueryStringValues()) === null || _a === void 0 ? void 0 : _a.version;
+            const modelVersion = (_c = getQueryStringValues()) === null || _c === void 0 ? void 0 : _c.version;
             this.currentPrefix = prefix || "";
             this.currentPermalink = Globals.permalink || permalink;
             this.currentPage = this.getPageNumber(page);
@@ -36,12 +39,16 @@ export class PathReader {
         }
     }
     matchWithUniqId(state) {
-        var _a;
-        const matchSelector = createMatchSelector(getConfig().router.wizardInstancePath);
-        const matchResult = matchSelector(state);
-        if (matchResult) {
+        var _a, _b, _c;
+        const pathname = ((_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname) || window.location.pathname;
+        const matchResult = matchPath(pathname, {
+            path: getConfig().router.wizardInstancePath,
+            exact: false,
+            strict: false,
+        });
+        if (matchResult && matchResult.params) {
             const { permalink, page, uniqid, view, prefix } = matchResult.params;
-            const modelVersion = (_a = getQueryStringValues()) === null || _a === void 0 ? void 0 : _a.version;
+            const modelVersion = (_c = getQueryStringValues()) === null || _c === void 0 ? void 0 : _c.version;
             this.currentPermalink = Globals.permalink || permalink;
             this.currentPrefix = prefix || "";
             this.currentPage = this.getPageNumber(page);

package/dist/redux/middlewares/paginationWatcherMiddleware.d.ts

@@ -1,5 +1,17 @@
-import type { LocationChangeAction } from "connected-react-router";
 import type { MiddlewareAPI, Dispatch } from "redux";
+declare const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";
+interface LocationChangeAction {
+    type: typeof LOCATION_CHANGE;
+    payload: {
+        location: {
+            pathname: string;
+            search: string;
+            hash: string;
+        };
+        action: string;
+        isFirstRendering: boolean;
+    };
+}
 import type { ActionsType } from "../../types/Actions.type";
 export type WatcherActions = ActionsType.Conditions.updateSectionCondition | LocationChangeAction;
 declare const paginationWatcherMiddleware: (mpi: MiddlewareAPI) => (next: Dispatch) => (action: WatcherActions) => any;

package/dist/redux/middlewares/paginationWatcherMiddleware.js

@@ -1,4 +1,4 @@
-import { LOCATION_CHANGE } from "connected-react-router";
+const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";
 import { goPageAction, updateAvailableSectionsAction, initMetaAction, initInstanceAction, } from "../actions/app";
 import { UPDATE_SECTION_CONDITION } from "../constants/conditions";
 import { selectAllSectionsReferences, selectUserEmailSectionVariableIds, } from "../selectors/references";

package/dist/redux/reducers/router.d.ts

@@ -0,0 +1,11 @@
+export interface RouterLocation {
+    pathname: string;
+    search: string;
+    hash: string;
+}
+export interface RouterState {
+    location: RouterLocation;
+    action: string;
+}
+declare const routerReducer: (state: RouterState | undefined, action: any) => RouterState;
+export default routerReducer;

package/dist/redux/reducers/router.js

@@ -0,0 +1,15 @@
+const initialState = {
+    location: {
+        pathname: typeof window !== "undefined" ? window.location.pathname : "/",
+        search: typeof window !== "undefined" ? window.location.search : "",
+        hash: typeof window !== "undefined" ? window.location.hash : "",
+    },
+    action: "POP",
+};
+const routerReducer = (state = initialState, action) => {
+    if (action.type === "@@router/LOCATION_CHANGE") {
+        return Object.assign(Object.assign({}, state), { location: action.payload.location, action: action.payload.action || "PUSH" });
+    }
+    return state;
+};
+export default routerReducer;

package/dist/redux/sagas/fetchModel.js

@@ -237,7 +237,7 @@ function* createInstance(enableShadowInstance, modelInformation, uniqid, permali
     yield put(initInstanceAction(instance));
 }
 function* fetchModelPrerequisites(action) {
-    const { permalink, prefix } = action;
+    let { permalink, prefix } = action;
     if (!permalink && window.location.href.includes("smartscript"))
         return;
     const uniqid = selectInstanceUniqid() || getConfig().uniqid;
@@ -245,6 +245,12 @@ function* fetchModelPrerequisites(action) {
     const urlParams = new URLSearchParams(window.location.search);
     const state = yield select((s) => s);
     const pathReader = new PathReader(state);
+    if (!permalink || permalink.trim() === "") {
+        permalink = pathReader.currentPermalink || "";
+    }
+    if (!prefix || prefix.trim() === "") {
+        prefix = pathReader.currentPrefix || "";
+    }
     const queryParams = new URLSearchParams(window.location.search);
     if (pathReader.modelVersion)
         queryParams.set("version", pathReader.modelVersion);

package/dist/redux/store.js

@@ -1,5 +1,4 @@
 import { combineReducers, legacy_createStore as createStore, applyMiddleware } from "redux";
-import { connectRouter, routerMiddleware } from "connected-react-router";
 import { composeWithDevTools } from "redux-devtools-extension";
 import { appReducer } from "./reducers/app";
 import { userReducer } from "./reducers/user";
@@ -24,6 +23,7 @@ import smartscriptMiddleware from "./middlewares/smartscriptMiddleware";
 import thirdPartyScriptsMiddleware from "./middlewares/thirdpartyScriptsMiddleware";
 import { pluginsStoreReducer } from "./reducers/pluginsStore";
 import { getSagaMiddleware } from "./sagas/middleware";
+import routerReducer from "./reducers/router";
 let store;
 export const createAppStore = (historyType = "browser") => {
     if (store !== undefined) {
@@ -32,7 +32,7 @@ export const createAppStore = (historyType = "browser") => {
     }
     const history = createHistory(historyType);
     const wizardxReducers = combineReducers({
-        router: connectRouter(history),
+        router: routerReducer,
         app: appReducer,
         user: userReducer,
         references: referencesReducer,
@@ -43,7 +43,7 @@ export const createAppStore = (historyType = "browser") => {
         pluginsStore: pluginsStoreReducer,
     });
     const sagaMiddleware = getSagaMiddleware();
-    const appliedMiddlewares = applyMiddleware(pluginsHookMiddleware, routerMiddleware(history), sagaMiddleware, paginationWatcherMiddleware, selectorsMiddleware, conditionsWatcherMiddleware, prefillerWatcherMiddleware, evaluationsWatcherMiddleware, multiplesActionsMiddleware, mandatoriesWatcherMiddleware, smartscriptMiddleware, thirdPartyScriptsMiddleware);
+    const appliedMiddlewares = applyMiddleware(pluginsHookMiddleware, sagaMiddleware, paginationWatcherMiddleware, selectorsMiddleware, conditionsWatcherMiddleware, prefillerWatcherMiddleware, evaluationsWatcherMiddleware, multiplesActionsMiddleware, mandatoriesWatcherMiddleware, smartscriptMiddleware, thirdPartyScriptsMiddleware);
     const middlewares = Globals.appEnv !== "production"
         ? composeWithDevTools(appliedMiddlewares)
         : appliedMiddlewares;
@@ -51,6 +51,20 @@ export const createAppStore = (historyType = "browser") => {
     sagasRunner(sagaMiddleware);
     subscribeListeners(store);
     store.dispatch({ type: "@@WIZARDX/INIT" });
+    if (typeof window !== "undefined") {
+        store.dispatch({
+            type: "@@router/LOCATION_CHANGE",
+            payload: {
+                location: {
+                    pathname: window.location.pathname,
+                    search: window.location.search,
+                    hash: window.location.hash,
+                },
+                action: "POP",
+                isFirstRendering: true,
+            },
+        });
+    }
 };
 export const getStore = (throwIfDoesNotExist = true) => {
     if (store === undefined && throwIfDoesNotExist)

package/dist/types/State.type.d.ts

@@ -14,8 +14,18 @@ export type MAPPED_CONDITIONS = {
     };
     conditions: ConditionV3;
 };
+export interface RouterStateType {
+    location: {
+        pathname: string;
+        search: string;
+        hash: string;
+        key?: string;
+        state?: any;
+    };
+    action: string;
+}
 export interface StateType {
-    router: any;
+    router: RouterStateType;
     app: AppType;
     user?: UserType;
     inputs: InputsType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.42.10-nightly.20251126120203",
+  "version": "4.42.10-nightly.20251126141528",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [