@bindu-dashing/dam-solution-v2 5.9.257 → 5.9.260

package/build/MyDrive/ImageEditor/EditImage.js

@@ -20,7 +20,7 @@ import CustomButton from "../../common/Button";
 import { showNotification } from "../../common/notifications";
 import { FILE_UPLOAD_ERROR, SOMETHING_WENT_WRONG, UPDATE_SUCCESS, } from "../../utilities/constants/messages";
 import { CREATE_FILE_URL, FILE_UPLOAD_URL, SAVE_EDITED_FILE_THUMBNAIL_URL, SAVE_EDITED_FILE_URL, } from "../../utilities/constants/apiUrls";
-import { generateFoldersQueryKey, invalidateData, QueryKeys, } from "../../utilities/constants/queryKeys";
+import { QueryKeys } from "../../utilities/constants/queryKeys";
 import { useQueryClient } from "react-query";
 import { useDamConfig } from "../../hocs/DamConfigContext";
 import { createApiClient } from "../../hocs/configureAxios";
@@ -39,8 +39,12 @@ const ImageEditorComponent = ({ file, handleClose, }) => {
     const { rootFolderId, brand } = damConfig;
     const brandId = get(brand, "_id");
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
-    const { type, folderId } = useAppParams();
-    const currentFolderId = folderId || rootFolderId;
+    const { folderId } = useAppParams();
+    // file.folderId is the folder the file actually lives in. Prefer it because
+    // `useAppParams().folderId` is undefined when the picker is opened as a
+    // modal (no URL change) — that was causing uploads to land in the root
+    // folder and invalidations to miss the picker's active query.
+    const currentFolderId = get(file, "folderId") || folderId || rootFolderId;
     const [state, setState] = useState({
         loading: false,
         confirmOpen: false,
@@ -48,8 +52,13 @@ const ImageEditorComponent = ({ file, handleClose, }) => {
     const { loading, confirmOpen } = state;
     const editorRef = useRef(null);
     const invalidateAfterChange = () => {
-        invalidateData(queryClient, generateFoldersQueryKey(type), currentFolderId);
-        invalidateData(queryClient, QueryKeys.FILE, get(file, "_id"));
+        // Prefix-only invalidation so we hit every relevant query regardless of
+        // its second key segment (folderId, picker id, mode, etc.). Going by
+        // exact key was missing the picker's active query because its folderId
+        // doesn't match useAppParams().folderId when the picker is a modal.
+        queryClient.invalidateQueries({ queryKey: [QueryKeys.FOLDERS] });
+        queryClient.invalidateQueries({ queryKey: [QueryKeys.IMAGE_PICKERS] });
+        queryClient.invalidateQueries({ queryKey: [QueryKeys.FILE] });
     };
     const handleOverwrite = () => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
@@ -131,8 +140,15 @@ const ImageEditorComponent = ({ file, handleClose, }) => {
                 setState((prev) => (Object.assign(Object.assign({}, prev), { loading: false })));
                 return;
             }
-            // 3) register the file in the DB so it shows up in the folder grid
+            // 3) register the file in the DB so it shows up in the folder grid.
+            // Inherit assetId / metadata / teamIds from the original file so the new
+            // one belongs to the same asset template and keeps the same field values.
+            const inheritedMetadata = get(file, "metadata") || {};
+            const inheritedTeamIds = get(file, "teamIds") || [];
             yield api.post(CREATE_FILE_URL, {
+                assetId: get(file, "assetId"),
+                teamIds: inheritedTeamIds,
+                metadata: inheritedMetadata,
                 folderId: currentFolderId,
                 files: [
                     {
@@ -140,8 +156,8 @@ const ImageEditorComponent = ({ file, handleClose, }) => {
                         path: filePath,
                         size: editedFile.size,
                         mimetype,
-                        metadata: {},
-                        teamIds: get(file, "teamIds") || [],
+                        metadata: inheritedMetadata,
+                        teamIds: inheritedTeamIds,
                     },
                 ],
             });

package/package.json

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