@bindu-dashing/dam-solution-v2 5.8.13 → 5.8.15

package/build/MyDrive/FolderTree.js

@@ -105,6 +105,7 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             });
             const response = yield api.get(`${FETCH_FOLDER_URL.replace(":folderId", fid)}?isPagination=false&includeFiles=false&includeSubFoldersCount=true&fetchMainFolders=true&globalSearch=${fid == rootFolderId ? globalSearch : ""}`);
             const newFolders = get(response, "data.folders", []);
+            console.log('## newFolders', newFolders);
             if (fid === rootFolderId) {
                 setFolders(sortFoldersRecursively(newFolders, "name", sortOrder));
             }
@@ -159,6 +160,7 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
     const toggleEditModal = (folder = {}) => setState((prev) => (Object.assign(Object.assign({}, prev), { selectedFolder: folder, showEditModal: !prev.showEditModal })));
     const toggleDeleteModal = (folder = {}) => setState((prev) => (Object.assign(Object.assign({}, prev), { selectedFolder: folder, showConfirmationModal: !prev.showConfirmationModal })));
     const getFoldersTree = (folders = []) => {
+        console.log('## folders', folders);
         const transform = (tree = []) => map(tree, (folder) => {
             const key = get(folder, "_id", "");
             const name = get(folder, "name", "");
@@ -319,6 +321,7 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             return Object.assign(Object.assign({}, prevState), { tempFolders: cloneDeep(customSorted), sortMode: "custom", enableDrag: false });
         });
     };
+    console.log('## folders in FolderTree', tempFolders, folders);
     return (_jsxs(_Fragment, { children: [!screens.md && collapse && (_jsxs("div", { className: `md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-p-1 md-lib-rounded md-lib-absolute md-lib-top-16 md-lib-left-1`, children: [" ", _jsx(FaAngleRightbtn, { size: 24, className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", onClick: toggleMenu })] })), _jsxs("div", { className: `md-lib-border-r md-lib-inline-table md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-px-2 md-lib-pt-1 md-lib-max-h-[calc(100%-76px)] md-lib-overflow-x-auto ${!screens.md &&
                     "md-lib-absolute md-lib-left-0 md-lib-z-30 md-lib-h-full"} ${!screens.md && collapse && "!-md-lib-left-full"}`, children: [!screens.md && !collapse && (_jsxs("div", { className: `md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-p-1 md-lib-rounded md-lib-absolute md-lib-top-1 md-lib-right-1 md-lib-z-50`, children: [" ", _jsx(FaAngleLeftbtn, { size: 24, className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", onClick: toggleMenu })] })), _jsx("div", { className: "md-lib-mb-2", children: _jsx(Input, { placeholder: "Search files (min. 2 characters required)", onChange: (e) => setState((prevState) => {
                                 return Object.assign(Object.assign({}, prevState), { globalSearchValue: e.target.value });

package/build/MyDrive/MyDriveMainContainer.js

@@ -7,23 +7,19 @@ import DriveContainer from "./DriveContainer";
 import useAppParams from "../utilities/useAppParams";
 import { FoldersProvider } from "../utilities/FoldersContext";
 export default function MyDriveMainContainer({ folders, setFolders }) {
-    console.log('## MyDriveMainContainer props', folders, setFolders);
     const damConfig = useDamConfig();
     const { rootFolderId, brand, isAdmin } = damConfig;
     const params = useAppParams();
-    console.log('## all props', params, rootFolderId);
+    console.log('## all params from useAppParams', params);
     const [selectedKeys, setSelectedKeys] = useState([]);
     const [expandedKeys, setExpandedKeys] = useState([]);
     const [globalSearch, setGlobalSearch] = useState("");
     useEffect(() => {
+        // Priority: URL params > Props from ParamsProvider > rootFolderId from config
         if (params === null || params === void 0 ? void 0 : params.folderId) {
             setSelectedKeys(params.folderId);
         }
-        else if (rootFolderId && !(params === null || params === void 0 ? void 0 : params.folderId)) {
-            // If no URL param but rootFolderId is set (from props), use it
-            setSelectedKeys(rootFolderId);
-        }
-    }, [params === null || params === void 0 ? void 0 : params.folderId, rootFolderId]);
+    }, [params === null || params === void 0 ? void 0 : params.folderId, params === null || params === void 0 ? void 0 : params.id, params === null || params === void 0 ? void 0 : params.parentId, rootFolderId]);
     const currentRootId = isArray(selectedKeys)
         ? selectedKeys.length
             ? selectedKeys[selectedKeys.length - 1]

package/build/MyDrive/index.js

@@ -9,6 +9,7 @@ import { useMemo, useState } from "react";
 import process from "process";
 import { ParamsProvider } from "../utilities/useAppParams";
 function App(props) {
+    var _a;
     console.log('## receiver props', props);
     const config = useMemo(() => ({
         damAccessKey: props === null || props === void 0 ? void 0 : props.accessKey,
@@ -17,7 +18,11 @@ function App(props) {
         teamIds: props === null || props === void 0 ? void 0 : props.teamIds,
         styles: props === null || props === void 0 ? void 0 : props.styles,
         appType: props === null || props === void 0 ? void 0 : props.appType,
-        initialRootFolderId: (props === null || props === void 0 ? void 0 : props.folderId) || (props === null || props === void 0 ? void 0 : props.id) || (props === null || props === void 0 ? void 0 : props.parentId),
+        folderId: props === null || props === void 0 ? void 0 : props.folderId,
+        id: props === null || props === void 0 ? void 0 : props.id,
+        parentId: props === null || props === void 0 ? void 0 : props.parentId,
+        showSubfolders: props === null || props === void 0 ? void 0 : props.showSubfolders,
+        routerVersion: props === null || props === void 0 ? void 0 : props.routerVersion,
     }), [
         props === null || props === void 0 ? void 0 : props.accessKey,
         props === null || props === void 0 ? void 0 : props.secretKey,
@@ -29,11 +34,18 @@ function App(props) {
         props === null || props === void 0 ? void 0 : props.folderId,
         props === null || props === void 0 ? void 0 : props.id,
         props === null || props === void 0 ? void 0 : props.parentId,
+        props === null || props === void 0 ? void 0 : props.showSubfolders,
+        props === null || props === void 0 ? void 0 : props.routerVersion,
     ]);
     const [folders, setFolders] = useState([]);
     if (typeof window !== "undefined" && !window.process) {
         window.process = process;
     }
-    return (_jsx(AppProvider, { children: _jsx(DamConfigProvider, { config: config, children: _jsxs(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: [_jsxs("div", { className: "md-lib-grid md:md-lib-grid-cols-[auto,1fr] md-lib-h-[inherit]", children: [" ", _jsx(ParamsProvider, { children: _jsx(AppRoutes, { setFolders: setFolders, folders: folders, routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) })] }), _jsx(ToastProvider, {})] }) }) }));
+    return (_jsx(AppProvider, { children: _jsx(DamConfigProvider, { config: config, children: _jsxs(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: [_jsxs("div", { className: "md-lib-grid md:md-lib-grid-cols-[auto,1fr] md-lib-h-[inherit]", children: [" ", _jsx(ParamsProvider, { initialParams: {
+                                    folderId: props === null || props === void 0 ? void 0 : props.folderId,
+                                    id: props === null || props === void 0 ? void 0 : props.id,
+                                    parentId: props === null || props === void 0 ? void 0 : props.parentId,
+                                    showSubfolders: (_a = props === null || props === void 0 ? void 0 : props.showSubfolders) === null || _a === void 0 ? void 0 : _a.toString(),
+                                }, children: _jsx(AppRoutes, { setFolders: setFolders, folders: folders, routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) })] }), _jsx(ToastProvider, {})] }) }) }));
 }
 export default App;

package/build/hocs/DamConfigContext.js

@@ -19,7 +19,7 @@ import { SUBSCRIPTION_EXPIRED_ERROR_MESSAGE } from "./appConstants";
 const DamConfigContext = createContext(null);
 export const DamConfigProvider = ({ children, config }) => {
     // console.log(config);
-    const { damAccessKey, secretKey, subdomain, teamIds, appType, initialRootFolderId } = config;
+    const { damAccessKey, secretKey, subdomain, teamIds, appType, initialRootFolderId, folderId, id, parentId, showSubfolders, routerVersion } = config;
     const [accessToken, setAccessToken] = useState(null);
     const [user, setDamUser] = useState(null);
     const [brand, setBrand] = useState(null);

package/build/utilities/useAppParams.d.ts

@@ -1,6 +1,8 @@
 import * as React from "react";
-export declare let ParamsProvider: React.FC<{
+type ParamsProviderProps = {
     children: React.ReactNode;
-}>;
+    initialParams?: Record<string, string | undefined>;
+};
+export declare let ParamsProvider: React.FC<ParamsProviderProps>;
 declare let useAppParams: () => Record<string, string>;
 export default useAppParams;

package/build/utilities/useAppParams.js

@@ -1,22 +1,67 @@
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 // src/utils/useAppParams.tsx
 import * as React from "react";
-// Declare this always so TS doesn’t complain
+// Declare this always so TS doesn't complain
 const ParamsContext = React.createContext({});
-export let ParamsProvider = ({ children, }) => _jsx(_Fragment, { children: children });
+// Helper to filter out undefined values
+const filterUndefined = (params) => {
+    const filtered = {};
+    Object.keys(params).forEach((key) => {
+        if (params[key] !== undefined) {
+            filtered[key] = params[key];
+        }
+    });
+    return filtered;
+};
+// Wrapper component for v6/v5.1+ that merges URL params with initial params
+const ParamsMerger = ({ children, initialParams }) => {
+    try {
+        const rrd = require("react-router-dom");
+        if (rrd.useParams) {
+            const urlParams = rrd.useParams();
+            const mergedParams = React.useMemo(() => (Object.assign(Object.assign({}, filterUndefined(initialParams)), urlParams)), [urlParams, initialParams]);
+            return (_jsx(ParamsContext.Provider, { value: mergedParams, children: children }));
+        }
+    }
+    catch (_a) {
+        // Fallback if useParams not available
+    }
+    // Fallback: just use initial params (filtered)
+    return (_jsx(ParamsContext.Provider, { value: filterUndefined(initialParams), children: children }));
+};
+export let ParamsProvider = ({ children, initialParams = {}, }) => {
+    // For v6/v5.1+, use the merger component
+    try {
+        const rrd = require("react-router-dom");
+        if (rrd.useParams) {
+            // ✅ v6 or v5.1+ - Use merger component
+            return _jsx(ParamsMerger, { initialParams: initialParams, children: children });
+        }
+        else {
+            // ✅ v4 fallback
+            const { Route } = rrd;
+            return (_jsx(Route, { path: "*", render: ({ match }) => {
+                    const urlParams = match ? match.params : {};
+                    const mergedParams = Object.assign(Object.assign({}, filterUndefined(initialParams)), urlParams);
+                    return (_jsx(ParamsContext.Provider, { value: mergedParams, children: children }));
+                } }));
+        }
+    }
+    catch (_a) {
+        // if require fails for some reason, just use initial params (filtered)
+        return (_jsx(ParamsContext.Provider, { value: filterUndefined(initialParams), children: children }));
+    }
+};
 let useAppParams;
 // Dynamically detect router version
 try {
     const rrd = require("react-router-dom");
     if (rrd.useParams) {
-        // ✅ v6 or v5.1+
-        const { useParams } = rrd;
-        useAppParams = () => useParams();
+        // ✅ v6 or v5.1+ - Use context which now has merged params
+        useAppParams = () => React.useContext(ParamsContext);
     }
     else {
-        // ✅ v4 fallback
-        const { Route } = rrd;
-        ParamsProvider = ({ children }) => (_jsx(Route, { path: "*", render: ({ match }) => (_jsx(ParamsContext.Provider, { value: match ? match.params : {}, children: children })) }));
+        // ✅ v4 fallback - Use context
         useAppParams = () => React.useContext(ParamsContext);
     }
 }

package/package.json

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