@bindu-dashing/dam-solution-v2 5.8.63 → 5.8.65

package/build/AssetType/CreateOrEditAssetTemplate.js

@@ -18,6 +18,17 @@ import { useTheme } from "../hocs/ThemeContext";
 import { InputTypes } from "../utilities/constants/interface";
 import Loader from "../common/loader/loader";
 import useAppParams from "../utilities/useAppParams";
+// Fallback to useParams if useAppParams doesn't work
+let useParamsFallback = () => ({});
+try {
+    const rrd = require("react-router-dom");
+    if (rrd.useParams) {
+        useParamsFallback = rrd.useParams;
+    }
+}
+catch (_a) {
+    // Fallback if react-router-dom not available
+}
 export default function CreateOrEditAssetTemplate() {
     const [state, setState] = useState({
         inputTypesLoading: false,
@@ -30,12 +41,15 @@ export default function CreateOrEditAssetTemplate() {
     const { variables } = useTheme();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const params = useAppParams();
+    const routeParams = useParamsFallback();
+    // Merge params from both sources, routeParams take precedence
+    const mergedParams = useMemo(() => (Object.assign(Object.assign({}, params), routeParams)), [params, routeParams]);
     useEffect(() => {
         getInputTypesData();
     }, []);
     useEffect(() => {
         getTemplateData();
-    }, [params]);
+    }, [mergedParams]);
     const getInputTypesData = () => __awaiter(this, void 0, void 0, function* () {
         setState((prevState) => {
             return Object.assign(Object.assign({}, prevState), { inputTypesLoading: true });
@@ -59,7 +73,13 @@ export default function CreateOrEditAssetTemplate() {
             return Object.assign(Object.assign({}, prevState), { templateData: true });
         });
         try {
-            const response = yield api.get(FETCH_ASSET_URL.replace(":assetId", get(params, "id") || ""));
+            const assetId = get(mergedParams, "id") || "";
+            if (!assetId) {
+                console.error("Asset ID is missing from route parameters");
+                setState((prevState) => (Object.assign(Object.assign({}, prevState), { templatesDataLoading: false })));
+                return;
+            }
+            const response = yield api.get(FETCH_ASSET_URL.replace(":assetId", assetId));
             setState((prevState) => {
                 return Object.assign(Object.assign({}, prevState), { templateData: get(response, "data", []), templatesDataLoading: false });
             });

package/build/AssetType/EditAssetTemplate.js

@@ -26,12 +26,27 @@ import { useDamConfig } from "../hocs/DamConfigContext";
 import { createApiClient } from "../hocs/configureAxios";
 import useAppNavigate from "../utilities/useAppNavigate";
 import useAppParams from "../utilities/useAppParams";
+// Fallback to useParams if useAppParams doesn't work
+let useParamsFallback = () => ({});
+try {
+    const rrd = require("react-router-dom");
+    if (rrd.useParams) {
+        useParamsFallback = rrd.useParams;
+    }
+}
+catch (_a) {
+    // Fallback if react-router-dom not available
+}
 const { Paragraph } = Typography;
 const IoMdCloseIcon = IoMdClose;
 const FiEdit2Icon = FiEdit2;
 const FiSaveIcon = FiSave;
 export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
-    const { id } = useAppParams();
+    const params = useAppParams();
+    const routeParams = useParamsFallback();
+    // Merge params from both sources, routeParams take precedence
+    const mergedParams = useMemo(() => (Object.assign(Object.assign({}, params), routeParams)), [params, routeParams]);
+    const id = mergedParams.id || params.id;
     const navigate = useAppNavigate();
     const damConfig = useDamConfig();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
@@ -105,6 +120,11 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
     const handleSaveTemplate = () => __awaiter(this, void 0, void 0, function* () {
         const imagePickerOutputFormatHasErrors = validateImagePickerOutputFormat();
         if (!imagePickerOutputFormatHasErrors) {
+            if (!id) {
+                console.error("Asset ID is missing from route parameters");
+                showNotification("Asset ID is missing. Please navigate from the assets list.", NotificationStatus.ERROR);
+                return;
+            }
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { loading: true })));
             try {
                 const response = yield api.put(FETCH_ASSET_URL.replace(":assetId", id), {

package/build/AssetType/index.js

@@ -6,6 +6,7 @@ import { ThemeProvider } from "../hocs/ThemeContext";
 import { ThemeModes } from "../utilities/constants/interface";
 import AppRoutes from "./routes";
 import ToastProvider from "../hocs/ToastProvider";
+import { ParamsProvider } from "../utilities/useAppParams";
 import process from "process";
 function App(props) {
     const config = {
@@ -19,6 +20,6 @@ function App(props) {
     if (typeof window !== "undefined" && !window.process) {
         window.process = process;
     }
-    return (_jsx(DamConfigProvider, { config: config, children: _jsxs(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: [_jsx(MemoryRouter, { initialEntries: ["/"], children: _jsx(AppRoutes, { routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) }), _jsx(ToastProvider, {})] }) }));
+    return (_jsx(DamConfigProvider, { config: config, children: _jsxs(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: [_jsx(MemoryRouter, { initialEntries: ["/"], children: _jsx(ParamsProvider, { children: _jsx(AppRoutes, { routerVersion: (props === null || props === void 0 ? void 0 : props.routerVersion) || 6 }) }) }), _jsx(ToastProvider, {})] }) }));
 }
 export default App;

package/build/MyDrive/AddDrive.js

@@ -44,9 +44,7 @@ const AddDrive = ({ parentFolderId }) => {
     const { brand, rootFolderId } = damConfig;
     const brandId = get(brand, "_id");
     const { folderId } = useAppParams();
-    // Use parentFolderId (current folder from selection) > folderId (from URL) > rootFolderId
     const currentFolderId = parentFolderId || folderId || rootFolderId;
-    console.log('## currentFolderId', currentFolderId, 'parentFolderId', parentFolderId, 'folderId', folderId, 'rootFolderId', rootFolderId);
     const fileInputRef = useRef(null);
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({
@@ -168,6 +166,6 @@ const AddDrive = ({ parentFolderId }) => {
         },
     ];
     const toggleGenerateThumbnails = () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGenerateThumbnails: !prevState.showGenerateThumbnails })));
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal, parentFolderId: currentFolderId })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: toggleOpenMapFile, filesList: filesList, fromUpload: true })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: currentFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: currentFolderId }))] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "md-lib-flex md-lib-gap-3", children: [_jsx(CustomButton, { label: "Generate Thumbnails", icon: _jsx(RiGalleryLineIcon, {}), size: "large", onClick: toggleGenerateThumbnails }), _jsx(Dropdown, { menu: { items }, trigger: ["click"], placement: "bottomRight", children: _jsxs(Button, { icon: _jsx(GoPlusIcon, { size: 16 }), type: "primary", size: "large", children: ["Add ", _jsx(MdKeyboardArrowDownIconIcon, {})] }) })] }), _jsx("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: handleNativeFileUpload }), openFolderModal && (_jsx(AddFolder, { open: openFolderModal, handleCancel: toggleFolderModal, parentFolderId: currentFolderId })), openMapFile && (_jsx(MapFile, { open: openMapFile, handleCancel: toggleOpenMapFile, filesList: filesList, fromUpload: true, parentFolderId: currentFolderId })), showUploadStatus && (_jsx(UploadStatusModal, { open: showUploadStatus, statusList: uploadStatusList, onClose: () => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showUploadStatus: false }))) })), openBlukUploadModal && (_jsx(BulkUploadModal, { toggleUpload: toggleFolderBulkModal, folderId: currentFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: currentFolderId }))] }));
 };
 export default AddDrive;

package/build/MyDrive/AddFolder.js

@@ -29,7 +29,6 @@ function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileMod
     const { folderId, type } = useAppParams();
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
-    // Use parentFolderId (current folder from selection) > folderId (from URL) > rootFolderId
     const currentFolderId = parentFolderId || folderId || rootFolderId;
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({ loading: false });

package/build/MyDrive/FolderGridView.js

@@ -41,36 +41,28 @@ const FolderGridView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
             }
         }
         else {
-            // Check if this is a double click (same item clicked within timer window)
             const isDoubleClick = clickTimer.current !== null && lastClickedId.current === id;
             if (isDoubleClick) {
-                // Double click detected - clear timer and handle double click action
                 if (clickTimer.current) {
                     clearTimeout(clickTimer.current);
                 }
                 clickTimer.current = null;
                 lastClickedId.current = null;
                 if (fileType === EntityType.FOLDER) {
-                    // Double click on folder: update tree selection (similar to FolderTree's handleSelect)
-                    // This will automatically update the DriveContainer to show the folder's contents
                     if (setSelectedKeys) {
                         setSelectedKeys(id);
                     }
                 }
                 else if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {
-                    // Double click on file: show preview
                     setState((prevState) => (Object.assign(Object.assign({}, prevState), { selectedFile: folder, showPreviewModal: true })));
                 }
                 return;
             }
-            // Single click - set timer for selection
             if (clickTimer.current) {
-                // Different item clicked, clear previous timer
                 clearTimeout(clickTimer.current);
             }
             lastClickedId.current = id;
             clickTimer.current = setTimeout(() => {
-                // Single click action: toggle selection
                 if (fileType === EntityType.FILE) {
                     const alreadySelected = includes(selectedFileIds, id);
                     setSelectedItems({

package/build/MyDrive/FolderListView.js

@@ -79,10 +79,8 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
             }
         }
         else {
-            // Check if this is a double click (same item clicked within timer window)
             const isDoubleClick = clickTimer.current !== null && lastClickedId.current === id;
             if (isDoubleClick) {
-                // Double click detected - clear timer and handle double click action
                 if (clickTimer.current) {
                     clearTimeout(clickTimer.current);
                 }
@@ -90,26 +88,20 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                 lastClickedId.current = null;
                 console.log('## isDoubleClick', isDoubleClick, id, fileType);
                 if (fileType === EntityType.FOLDER) {
-                    // Double click on folder: update tree selection (similar to FolderTree's handleSelect)
-                    // This will automatically update the DriveContainer to show the folder's contents
                     if (setSelectedKeys) {
                         setSelectedKeys(id);
                     }
                 }
                 else if (fileType === EntityType.FILE && type !== DriveModes.TRASH) {
-                    // Double click on file: show preview
                     setState((prevState) => (Object.assign(Object.assign({}, prevState), { selectedFile: folder, showPreviewModal: true })));
                 }
                 return;
             }
-            // Single click - set timer for selection
             if (clickTimer.current) {
-                // Different item clicked, clear previous timer
                 clearTimeout(clickTimer.current);
             }
             lastClickedId.current = id;
             clickTimer.current = setTimeout(() => {
-                // Single click action: toggle selection
                 if (fileType === EntityType.FILE) {
                     const alreadySelected = includes(selectedFileIds, id);
                     setSelectedItems({

package/build/MyDrive/FolderTree.js

@@ -179,7 +179,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
         }
         return false;
     };
-    // Helper to find the path (all parent IDs) to a folder in the tree
     const findPathToFolder = (folderId, tree, path = []) => {
         for (const folder of tree) {
             const currentPath = [...path, folder._id];
@@ -221,10 +220,8 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                 if (!existingFolder || !isArray(existingFolder.children) || existingFolder.children.length === 0) {
                     fetchFolderChildren(currentRootId);
                 }
-                // Expand the tree to show the path to the selected folder
                 const pathToFolder = findPathToFolder(currentRootId, folders);
                 if (pathToFolder && pathToFolder.length > 0) {
-                    // Remove the folder itself from the path (we only need to expand parents)
                     const parentPath = pathToFolder.slice(0, -1);
                     if (parentPath.length > 0) {
                         const currentExpanded = isArray(expandedKeys) ? expandedKeys : [expandedKeys].filter(Boolean);
@@ -233,25 +230,16 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                         console.log('## Expanding path to folder:', parentPath);
                     }
                 }
-                // Update ref to prevent re-triggering
                 prevCurrentRootIdRef.current = currentRootId;
             }
             else {
-                // Folder not in tree - only replace tree if it's the root folder or folders is empty
-                // For subfolders clicked from list view, keep existing tree structure to avoid replacing it
                 if (currentRootId === rootFolderId || folders.length === 0) {
-                    // Root folder or empty tree - fetch as new root
                     prevCurrentRootIdRef.current = currentRootId;
                     fetchFolders(currentRootId);
                 }
                 else {
-                    // Subfolder not in tree but tree has content - keep existing tree structure
-                    // The DriveContainer will handle showing the folder contents based on parentFolderId
-                    // This prevents replacing the entire tree when clicking folders from list view
                     console.log('## Folder not in tree but tree has content - keeping existing tree structure');
                     prevCurrentRootIdRef.current = currentRootId;
-                    // Don't call fetchFolders here to avoid replacing the tree
-                    // The folder contents will be shown by DriveContainer based on parentFolderId
                 }
             }
         }

package/build/MyDrive/files/MapFile.d.ts

@@ -1,8 +1,9 @@
 import { FileEntity, ResponseFile } from "../../utilities/constants/interface";
-declare function MapFile({ open, handleCancel, filesList, fromUpload, }: {
+declare function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, }: {
     open?: boolean;
     handleCancel?: () => void;
     filesList: ResponseFile[] | FileEntity[];
     fromUpload?: boolean;
+    parentFolderId?: string;
 }): JSX.Element;
 export default MapFile;

package/build/MyDrive/files/MapFile.js

@@ -27,12 +27,13 @@ import { DATE_FORMAT, DATE_WITH_TIME_FORMAT } from "../../hocs/appConstants";
 import dayjs from "dayjs";
 import useAppNavigate from "../../utilities/useAppNavigate";
 import { addQueryParams } from "../../hocs/helpers";
-function MapFile({ open, handleCancel, filesList, fromUpload, }) {
+function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, }) {
     const { folderId, type } = useAppParams();
     const damConfig = useDamConfig();
     const externalTeams = (damConfig === null || damConfig === void 0 ? void 0 : damConfig.teams) || [];
     const { rootFolderId, brand } = damConfig;
     const brandId = get(brand, "_id");
+    const currentFolderId = parentFolderId || folderId || rootFolderId;
     const queryClient = useQueryClient();
     const [form] = Form.useForm();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
@@ -92,7 +93,7 @@ function MapFile({ open, handleCancel, filesList, fromUpload, }) {
         mutationFn: updateFile,
         onSuccess: (response) => {
             invalidateData(queryClient, QueryKeys.FILE, get(file, "_id"));
-            invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);
+            invalidateData(queryClient, generateFoldersQueryKey(type), currentFolderId);
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { editTemplate: false, editForm: false })));
             showNotification(get(response, "data.message", UPDATE_SUCCESS), NotificationStatus.SUCCESS);
         },
@@ -115,7 +116,7 @@ function MapFile({ open, handleCancel, filesList, fromUpload, }) {
                 const formattedValues = getFormattedMetadata(values);
                 const expiryDate = values.expiryDate || null;
                 delete values.expiryDate;
-                const response = yield api.post(CREATE_FILE_URL, Object.assign(Object.assign({}, values), { folderId: folderId || rootFolderId, files: map(filesList, (file) => {
+                const response = yield api.post(CREATE_FILE_URL, Object.assign(Object.assign({}, values), { folderId: currentFolderId, files: map(filesList, (file) => {
                         const fileData = {
                             name: get(file, "name"),
                             path: get(file, "filePath"),
@@ -136,8 +137,8 @@ function MapFile({ open, handleCancel, filesList, fromUpload, }) {
                 showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
             }
             finally {
-                invalidateData(queryClient, QueryKeys.FILE, folderId || rootFolderId);
-                invalidateData(queryClient, QueryKeys.FOLDERS, folderId || rootFolderId);
+                invalidateData(queryClient, QueryKeys.FILE, currentFolderId);
+                invalidateData(queryClient, QueryKeys.FOLDERS, currentFolderId);
                 setState((prevState) => (Object.assign(Object.assign({}, prevState), { loading: false })));
             }
         }));

package/package.json

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