@bindu-dashing/dam-solution-v2 5.8.37 → 5.8.39

package/build/AssetType/AssetTemplatesTable.js

@@ -131,7 +131,11 @@ function AssetTemplatesTable({ assetTemplates, totalPages, totalCount, filters =
             title: "Actions",
             dataIndex: "",
             key: "actions",
-            render: (record) => (_jsxs(Space, { children: [_jsx(Tooltip, { title: "Edit Asset template", className: "md-lib-hidden md:md-lib-block", children: _jsx(CustomButton, { icon: _jsx(EditOutlined, { size: 24, className: "md-lib-text-primaryColor" }), size: "large", label: "", className: "md-lib-border-none", onClick: () => navigate(ASSET_TEMPLATE_SCREEN.replace(":id", get(record, "_id"))) }) }), _jsx(Tooltip, { title: "Delete Asset template", placement: "topLeft", children: _jsx(CustomButton, { icon: _jsx(DeleteOutlined, { className: "md-lib-text-dangerColor", size: 24 }), label: "", type: "default", onClick: () => toggleDeletConfirm(record), className: "md-lib-border-none", size: "large" }) })] })),
+            render: (record) => (_jsxs(Space, { children: [_jsx(Tooltip, { title: "Edit Asset template", className: "md-lib-hidden md:md-lib-block", children: _jsx(CustomButton, { icon: _jsx(EditOutlined, { size: 24, className: "md-lib-text-primaryColor" }), size: "large", label: "", className: "md-lib-border-none", onClick: () => {
+                                if (navigate) {
+                                    navigate(ASSET_TEMPLATE_SCREEN.replace(":id", get(record, "_id")));
+                                }
+                            } }) }), _jsx(Tooltip, { title: "Delete Asset template", placement: "topLeft", children: _jsx(CustomButton, { icon: _jsx(DeleteOutlined, { className: "md-lib-text-dangerColor", size: 24 }), label: "", type: "default", onClick: () => toggleDeletConfirm(record), className: "md-lib-border-none", size: "large" }) })] })),
         },
     ];
     const handleTableChange = (pagination, tableFilters, sorter) => {

package/build/AssetType/CreateAssetTemplate.js

@@ -41,7 +41,9 @@ export default function CreateAssetTemplate({ label }) {
                 // console.log("response", response);
                 showNotification(get(response, "data.message", CREATE_SUCCESS), NotificationStatus.SUCCESS);
                 toggleModal();
-                navigate(ASSET_TEMPLATE_SCREEN.replace(":id", get(response, "data._id")));
+                if (navigate) {
+                    navigate(ASSET_TEMPLATE_SCREEN.replace(":id", get(response, "data._id")));
+                }
             }
             catch (error) {
                 setState((prevState) => (Object.assign(Object.assign({}, prevState), { loading: false })));

package/build/AssetType/EditAssetTemplate.js

@@ -129,7 +129,9 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
                         return finalField;
                     }),
                 });
-                navigate(ASSETS_SCREEN);
+                if (navigate) {
+                    navigate(ASSETS_SCREEN);
+                }
                 showNotification(get(response, "data.message", UPDATE_SUCCESS), NotificationStatus.SUCCESS);
             }
             catch (error) {
@@ -168,11 +170,19 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
                 alignItems: "center",
                 marginBottom: 0,
             }, centered: true, tabBarExtraContent: {
-                left: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-border-b md-lib-p-3 md-lib-border-borderColor dark:md-lib-border-darkBorderColor dark:md-lib-bg-darkPrimary md-lib-bg-white", children: [_jsx(IoMdCloseIcon, { size: ICON_SIZE, onClick: () => navigate(ASSETS_SCREEN), className: "md-lib-cursor-pointer" }), _jsx(Paragraph, { className: "md-lib-text-xl md-lib-border-l md-lib-pl-4 md-lib-ml-4 md-lib-asset-template-title", style: { marginBottom: "0px !important" }, editable: {
+                left: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-border-b md-lib-p-3 md-lib-border-borderColor dark:md-lib-border-darkBorderColor dark:md-lib-bg-darkPrimary md-lib-bg-white", children: [_jsx(IoMdCloseIcon, { size: ICON_SIZE, onClick: () => {
+                                if (navigate) {
+                                    navigate(ASSETS_SCREEN);
+                                }
+                            }, className: "md-lib-cursor-pointer" }), _jsx(Paragraph, { className: "md-lib-text-xl md-lib-border-l md-lib-pl-4 md-lib-ml-4 md-lib-asset-template-title", style: { marginBottom: "0px !important" }, editable: {
                                 onChange: (val) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { name: val }))),
                                 icon: _jsx(FiEdit2Icon, { size: 15, className: "md-lib-ml-2" }),
                             }, children: name })] })),
-                right: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2 md-lib-ml-auto", children: [imagePickerOutputFormatError && (_jsx("p", { className: "md-lib-text-sm md-lib-text-red-500", children: "Please fix the errors in the Image Picker Output format" })), _jsx(CustomButton, { label: "Cancel", onClick: () => navigate(ASSETS_SCREEN) }), _jsx(CustomButton, { label: "Save", type: currentFieldIndex !== null ? "default" : "primary", icon: _jsx(FiSaveIcon, {}), disabled: currentFieldIndex !== null, onClick: handleSaveTemplate, loading: loading })] })),
+                right: (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2 md-lib-ml-auto", children: [imagePickerOutputFormatError && (_jsx("p", { className: "md-lib-text-sm md-lib-text-red-500", children: "Please fix the errors in the Image Picker Output format" })), _jsx(CustomButton, { label: "Cancel", onClick: () => {
+                                if (navigate) {
+                                    navigate(ASSETS_SCREEN);
+                                }
+                            } }), _jsx(CustomButton, { label: "Save", type: currentFieldIndex !== null ? "default" : "primary", icon: _jsx(FiSaveIcon, {}), disabled: currentFieldIndex !== null, onClick: handleSaveTemplate, loading: loading })] })),
             }, onChange: (key) => setState((prevState) => {
                 return Object.assign(Object.assign({}, prevState), { activeTab: key, currentFieldIndex: key === "2" ? null : prevState.currentFieldIndex });
             }) }) }));

package/build/MyDrive/BreadCrumbList.js

@@ -1,19 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DriveModes } from "../utilities/constants/interface";
-import { DRIVE_MODES_SCREEN, MY_DRIVE_SCREEN, } from "../utilities/constants/routes";
+import { DRIVE_MODES_SCREEN, } from "../utilities/constants/routes";
 import { Breadcrumb, Tooltip } from "antd";
 import { findIndex, get, isEmpty, last, map, slice } from "lodash";
 import { useMemo } from "react";
 import { FaChevronRight } from "react-icons/fa";
 import { useDamConfig } from "../hocs/DamConfigContext";
 import useAppParams from "../utilities/useAppParams";
-import useAppNavigate from "../utilities/useAppNavigate";
 const FaChevronRightIcon = FaChevronRight;
 function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, globalSearch, setSelectedKeys, }) {
     const { type, id } = useAppParams();
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
-    const navigate = !pickerFolderId ? useAppNavigate() : null;
     const tree = useMemo(() => {
         const fullTree = get(folder, "tree", []);
         if (pickerFolderId) {
@@ -63,17 +61,10 @@ function BreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolde
                     if (pickerFolderId && setParentFolderId && !isLast) {
                         setParentFolderId(treeId);
                     }
-                    if (!pickerFolderId && !isLast) {
-                        if (treeId === rootFolderId) {
-                            // Navigate to MY_DRIVE_SCREEN only for root folder
-                            if (navigate) {
-                                navigate(MY_DRIVE_SCREEN);
-                            }
-                        }
-                        else if (setSelectedKeys) {
-                            // Use state-based navigation for other folders
-                            setSelectedKeys(treeId);
-                        }
+                    if (!pickerFolderId && !isLast && setSelectedKeys) {
+                        // Use state-based navigation for all folders including root
+                        // This works regardless of whether Router context is available
+                        setSelectedKeys(treeId);
                     }
                 };
                 const currentItemRender = (_jsx(Breadcrumb.Item, { onClick: handleClick, className: "md-lib-h-auto md-lib-cursor-pointer", children: _jsx(Tooltip, { title: name, children: _jsx("p", { className: "md-lib-max-w-28 md-lib-truncate md-lib-font-semibold md-lib-text-[22px]", children: name }) }) }, treeId));

package/build/MyDrive/FolderGridView.js

@@ -35,13 +35,15 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
             }
         }
         else if (type === DriveModes.FOLDERS) {
-            navigate(FETCH_ENTITY_SCREEN.replace(":id", id).replace(":type", fileType));
+            if (navigate) {
+                navigate(FETCH_ENTITY_SCREEN.replace(":id", id).replace(":type", fileType));
+            }
         }
         else {
             if (clickTimer.current) {
                 clearTimeout(clickTimer.current);
                 clickTimer.current = null;
-                if (fileType === EntityType.FOLDER) {
+                if (fileType === EntityType.FOLDER && navigate) {
                     navigate(SUBFOLDERS_SCREEN.replace(":folderId", id));
                 }
                 if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {

package/build/MyDrive/FolderListView.js

@@ -72,13 +72,15 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
             }
         }
         else if (type === DriveModes.FOLDERS) {
-            navigate(FETCH_ENTITY_SCREEN.replace(":id", id).replace(":type", fileType));
+            if (navigate) {
+                navigate(FETCH_ENTITY_SCREEN.replace(":id", id).replace(":type", fileType));
+            }
         }
         else {
             if (clickTimer.current) {
                 clearTimeout(clickTimer.current);
                 clickTimer.current = null;
-                if (fileType === EntityType.FOLDER) {
+                if (fileType === EntityType.FOLDER && navigate) {
                     navigate(SUBFOLDERS_SCREEN.replace(":folderId", id));
                 }
                 if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {

package/build/MyDrive/routes.js

@@ -1,17 +1,18 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { FETCH_ENTITY_SCREEN, MY_DRIVE_SCREEN, SUBFOLDERS_SCREEN, } from "../utilities/constants/routes";
+import { jsx as _jsx } from "react/jsx-runtime";
 import ImagePickerDrive from "./ImagePickerDrive";
 import MyDriveMainContainer from "./MyDriveMainContainer";
-import { NavigatorProvider } from "../utilities/NavigatorProvider";
+import useAppParams from "../utilities/useAppParams";
 export default function AppRoutes({ folders, setFolders, routerVersion, }) {
-    if (routerVersion === 6) {
-        // ✅ React Router v6
-        const { Routes, Route } = require("react-router-dom");
-        return (_jsxs(Routes, { children: [_jsx(Route, { path: MY_DRIVE_SCREEN, element: _jsx(MyDriveMainContainer, { folders: folders, setFolders: setFolders }) }, MY_DRIVE_SCREEN), _jsx(Route, { path: SUBFOLDERS_SCREEN, element: _jsx(MyDriveMainContainer, { folders: folders, setFolders: setFolders }) }, SUBFOLDERS_SCREEN), _jsx(Route, { path: FETCH_ENTITY_SCREEN, element: _jsx(ImagePickerDrive, {}) }, FETCH_ENTITY_SCREEN)] }));
+    const params = useAppParams();
+    const { type, id } = params;
+    // Determine which component to render based on params
+    // If type and id are present, it's likely an image picker or entity view
+    if (type && id) {
+        // This matches FETCH_ENTITY_SCREEN pattern
+        return _jsx(ImagePickerDrive, {});
     }
-    // ✅ React Router v4/v5
-    const { Switch, Route, withRouter } = require("react-router-dom");
-    const Wrapper = ({ history }) => (_jsx(NavigatorProvider, { history: history, children: _jsxs(Switch, { children: [_jsx(Route, { path: MY_DRIVE_SCREEN, render: (props) => (_jsx(MyDriveMainContainer, Object.assign({ folders: folders, setFolders: setFolders }, props))) }, MY_DRIVE_SCREEN), _jsx(Route, { path: SUBFOLDERS_SCREEN, render: (props) => (_jsx(MyDriveMainContainer, Object.assign({ folders: folders, setFolders: setFolders }, props))) }, SUBFOLDERS_SCREEN), _jsx(Route, { path: FETCH_ENTITY_SCREEN, render: (props) => _jsx(ImagePickerDrive, Object.assign({}, props)) }, FETCH_ENTITY_SCREEN)] }) }));
-    const WithRouterWrapper = withRouter(Wrapper);
-    return _jsx(WithRouterWrapper, {});
+    // Otherwise, render the main drive container
+    // This handles both MY_DRIVE_SCREEN and SUBFOLDERS_SCREEN
+    // The folderId param will be handled by MyDriveMainContainer
+    return (_jsx(MyDriveMainContainer, { folders: folders, setFolders: setFolders }));
 }

package/build/utilities/useAppNavigate.d.ts

@@ -1,2 +1,2 @@
-declare let useAppNavigate: () => (to: string) => void;
+declare let useAppNavigate: () => ((to: string) => void) | null;
 export default useAppNavigate;

package/build/utilities/useAppNavigate.js

@@ -1,19 +1,42 @@
+import * as React from "react";
 let useAppNavigate;
 const rrd = require("react-router-dom");
 if (rrd.useNavigate) {
     // ✅ v6+
     const { useNavigate } = rrd;
     useAppNavigate = () => {
-        const navigate = useNavigate();
-        return (to) => navigate(to);
+        // We need to call useNavigate unconditionally (hook rules)
+        // But we'll wrap it in an error boundary pattern
+        // If Router context is not available, this will throw
+        // The component using this should handle the error gracefully
+        let navigateFn = null;
+        // Use a ref to track if we've successfully initialized
+        const hasRouterContext = React.useRef(false);
+        try {
+            const navigate = useNavigate();
+            hasRouterContext.current = true;
+            navigateFn = (to) => navigate(to);
+        }
+        catch (e) {
+            // Router context not available - this will throw synchronously
+            // Return null so caller can use fallback
+            hasRouterContext.current = false;
+            navigateFn = null;
+        }
+        return navigateFn;
     };
 }
 else {
     // ✅ v4/v5 fallback → use our NavigatorProvider
     const { useLegacyNavigate } = require("./NavigatorProvider");
     useAppNavigate = () => {
-        const navigate = useLegacyNavigate();
-        return (to) => navigate(to);
+        try {
+            const navigate = useLegacyNavigate();
+            return (to) => navigate(to);
+        }
+        catch (e) {
+            return null;
+        }
     };
 }
 export default useAppNavigate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.37",
+  "version": "5.8.39",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",