@bindu-dashing/dam-solution-v2 5.8.61 → 5.8.64

package/build/MyDrive/AddDrive.d.ts

@@ -1,3 +1,5 @@
 import React from "react";
-declare const AddDrive: React.FC;
+declare const AddDrive: React.FC<{
+    parentFolderId?: string;
+}>;
 export default AddDrive;

package/build/MyDrive/AddDrive.js

@@ -39,11 +39,13 @@ const BsUploadIcon = BsUpload;
 const PiFolderPlusLightIcon = PiFolderPlusLight;
 const GoPlusIcon = GoPlus;
 const MdKeyboardArrowDownIconIcon = MdKeyboardArrowDown;
-const AddDrive = () => {
+const AddDrive = ({ parentFolderId }) => {
     const damConfig = useDamConfig();
     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;
     const fileInputRef = useRef(null);
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({
@@ -102,7 +104,7 @@ const AddDrive = () => {
         try {
             const response = yield api.post(FILE_UPLOAD_URL, {
                 brandId,
-                folderId: folderId || rootFolderId,
+                folderId: currentFolderId,
                 files: map(files, (file) => ({
                     name: get(file, "name"),
                     size: get(file, "size"),
@@ -165,6 +167,6 @@ const AddDrive = () => {
         },
     ];
     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 })), 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: folderId !== null && folderId !== void 0 ? folderId : rootFolderId })), showGenerateThumbnails && (_jsx(BulkUploadModal, { toggleUpload: toggleGenerateThumbnails, thumbnailsOnly: true, folderId: folderId !== null && folderId !== void 0 ? folderId : rootFolderId }))] }));
+    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.d.ts

@@ -1,10 +1,11 @@
 import { FileEntity, FolderEntity } from "../utilities/constants/interface";
-declare function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, }: {
+declare function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, parentFolderId, }: {
     open: boolean;
     handleCancel: () => void;
     folder?: FolderEntity;
     file?: FileEntity;
     onCloseSelection?: () => void;
     fileModal?: boolean;
+    parentFolderId?: string;
 }): JSX.Element;
 export default AddFolder;

package/build/MyDrive/AddFolder.js

@@ -24,11 +24,13 @@ import { createApiClient } from "../hocs/configureAxios";
 import useAppParams from "../utilities/useAppParams";
 import { RenderModalTitle } from "../common/CustomElements";
 import { useFoldersContext } from "../utilities/FoldersContext";
-function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, }) {
+function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileModal, parentFolderId, }) {
     const { setFolders, globalSearch } = useFoldersContext();
     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 });
     const { loading } = state;
@@ -42,7 +44,7 @@ function AddFolder({ open, handleCancel, folder, file, onCloseSelection, fileMod
                     ? yield api.put(FETCH_FOLDER_URL.replace(":folderId", get(folder, "_id")), values)
                     : get(file, "_id")
                         ? yield api.put(FETCH_FILE_URL.replace(":fileId", get(file, "_id")), values)
-                        : yield api.post(FETCH_FOLDERS_URL, Object.assign(Object.assign({}, values), { teamIds: [], parentId: folderId ? folderId : rootFolderId }));
+                        : yield api.post(FETCH_FOLDERS_URL, Object.assign(Object.assign({}, values), { teamIds: [], parentId: currentFolderId }));
                 if (folder || file) {
                     // ✅ update case
                     const updatedFolder = folder

package/build/MyDrive/DriveContainer.js

@@ -235,7 +235,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         setState((prevState) => (Object.assign(Object.assign({}, prevState), filters)));
     };
     // console.log("search", searchKey, searchValue, metadataKey, metadataValue);
-    return (_jsxs("div", { className: "md-lib-h-[inherit]", children: [type !== DriveModes.FILE && (_jsx(_Fragment, { children: _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-px-4 md-lib-h-20 md-lib-justify-between md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-mb-4", children: [imagePicker ? (_jsx(ImagePickerBreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId })) : (_jsx(_Fragment, { children: _jsx(BreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId, globalSearch: globalSearch, setSelectedKeys: setSelectedKeys }) })), isAdmin && _jsx(AddDrive, {}), get(imagePicker, "allowNewFiles") && (_jsx(Upload, { beforeUpload: (file) => {
+    return (_jsxs("div", { className: "md-lib-h-[inherit]", children: [type !== DriveModes.FILE && (_jsx(_Fragment, { children: _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-px-4 md-lib-h-20 md-lib-justify-between md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-mb-4", children: [imagePicker ? (_jsx(ImagePickerBreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId })) : (_jsx(_Fragment, { children: _jsx(BreadCrumbList, { folder: parentFolder, parentFolderId: parentFolderId, setParentFolderId: setParentFolderId, pickerFolderId: pickerFolderId, globalSearch: globalSearch, setSelectedKeys: setSelectedKeys }) })), isAdmin && _jsx(AddDrive, { parentFolderId: parentFolderId }), get(imagePicker, "allowNewFiles") && (_jsx(Upload, { beforeUpload: (file) => {
                                 onSelectNewFile(file);
                             }, showUploadList: false, accept: "image/*", children: _jsx(CustomButton, { loading: loadingType === "NEW_FILE_UPLOAD", label: "Select File", icon: _jsx(BsUploadIcon, {}) }) }))] }) })), _jsxs("div", { className: `md-lib-px-4 md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex ${!includes([DriveModes.FOLDERS, DriveModes.FILE], type)
                     ? "md-lib-justify-between"

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,14 @@ 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");
+    // Use parentFolderId (current folder from selection) > folderId (from URL) > rootFolderId
+    const currentFolderId = parentFolderId || folderId || rootFolderId;
     const queryClient = useQueryClient();
     const [form] = Form.useForm();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
@@ -92,7 +94,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 +117,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 +138,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.61",
+  "version": "5.8.64",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",