@bindu-dashing/dam-solution-v2 5.9.259 → 5.9.261

package/build/AssetType/CreateOrEditAssetTemplate.js

@@ -95,6 +95,6 @@ export default function CreateOrEditAssetTemplate() {
         }
     });
     return (_jsx("div", { className: "md-lib-h-auto", style: {
-            backgroundColor: (styles === null || styles === void 0 ? void 0 : styles.secondaryColor) || (variables === null || variables === void 0 ? void 0 : variables.secondaryColor),
+            backgroundColor: (styles === null || styles === void 0 ? void 0 : styles.colorSecondary) || (variables === null || variables === void 0 ? void 0 : variables.secondaryColor),
         }, children: (state === null || state === void 0 ? void 0 : state.inputTypesLoading) || (state === null || state === void 0 ? void 0 : state.templatesDataLoading) ? (_jsx(Loader, {})) : (_jsx(EditAssetTemplate, { assetTemplate: get(state, "templateData", {}), inputTypes: get(state, "inputTypesData", []) })) }));
 }

package/build/AssetType/fieldProperties/OptionsField.js

@@ -45,11 +45,12 @@ export default function OptionsField({ field, supportedTypes, currentInputType,
                                 message: "At least one option is required",
                             },
                         ], children: _jsx(Form.List, { name: "options", children: (fields, { add, remove }) => (_jsxs(_Fragment, { children: [fields.map((_a) => {
+                                        var _b;
                                         var { key, name } = _a, restField = __rest(_a, ["key", "name"]);
                                         return (_jsxs(Row, { gutter: 8, className: "md-lib-items-center", children: [_jsx(Col, { span: 10, children: _jsx(Form.Item, Object.assign({}, restField, { name: [name, "label"], label: "Label", rules: [
                                                             { required: true, message: "Label is required" },
                                                         ], children: _jsx(Input, { placeholder: "Enter Label", className: "md-lib-h-12" }) })) }), _jsx(Col, { span: 10, children: _jsx(Form.Item, Object.assign({}, restField, { name: [name, "value"], label: "Value", rules: [
                                                             { required: true, message: "Value is required" },
-                                                        ], children: _jsx(Input, { placeholder: "Enter Value", className: "md-lib-h-12" }) })) }), _jsx(Col, { span: 4, className: "md-lib-flex md-lib-items-end", children: _jsx(TiDeleteOutlineIcon, { size: ICON_SIZE, className: "md-lib-cursor-pointer", color: theme === null || theme === void 0 ? void 0 : theme.primaryColor, onClick: () => remove(name) }) })] }, key));
+                                                        ], children: _jsx(Input, { placeholder: "Enter Value", className: "md-lib-h-12" }) })) }), _jsx(Col, { span: 4, className: "md-lib-flex md-lib-items-end", children: _jsx(TiDeleteOutlineIcon, { size: ICON_SIZE, className: "md-lib-cursor-pointer", color: (_b = theme === null || theme === void 0 ? void 0 : theme.variables) === null || _b === void 0 ? void 0 : _b.primaryColor, onClick: () => remove(name) }) })] }, key));
                                     }), _jsx(Form.Item, { children: _jsx(Button, { icon: _jsx(FaPlusIcon, {}), onClick: () => add(), children: "Add Option" }) })] })) }) })] }))] }));
 }

package/build/MyDrive/BulkUploadModal.js

@@ -316,7 +316,7 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
                         },
                     ], children: _jsx(Input, { placeholder: "Email", disabled: !assetTypeId }) })), !thumbnailsOnly && (_jsx(Form.Item, { name: "reject_invalid_meta_file", valuePropName: "checked", children: _jsxs(Checkbox, { name: "reject_invalid_meta_file", children: ["Reject invalid meta file", _jsx(Popover, { content: _jsxs("span", { style: { color: "grey", padding: "5px" }, children: ["When this option is selected the uploaded metadata", _jsx("br", {}), " file will be rejected if it contains invalid values"] }), children: _jsx(QuestionCircleOutlined, { style: { marginLeft: "5px", color: "silver" } }) })] }) })), _jsx(Form.Item, { children: _jsx(Button, { block: true, type: "primary", htmlType: "submit", style: {
                             marginBottom: "10px",
-                            backgroundColor: styles === null || styles === void 0 ? void 0 : styles.primaryColor,
+                            backgroundColor: styles === null || styles === void 0 ? void 0 : styles.colorPrimary,
                         }, loading: loading, disabled: isSubmitDisabled, children: "Submit" }) })] }) }));
 };
 export default BulkUploadModal;

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,12 +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"));
-        // Image picker uses ["image-pickers", id] as its own query key,
-        // so the above invalidations don't refresh the picker grid. Hit it
-        // by prefix so we don't need to know the specific picker id here.
+        // 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;

package/build/common/RefreshableImage.d.ts

@@ -1,14 +1,4 @@
 import React from "react";
-/**
- * <img> wrapper that bypasses the browser HTTP cache when `version` changes.
- *
- * Why: S3 presigned URLs don't change after a file is overwritten in place
- * (same key → same signed URL). The browser's HTTP cache then serves the
- * old binary even when react-query refetches the file list. Appending
- * query params would break the S3 signature, so instead we re-fetch the URL
- * with `cache: 'reload'` and display the result via an object URL — the
- * blob URL is unique so the browser must paint the fresh bytes.
- */
 type Props = Omit<React.ImgHTMLAttributes<HTMLImageElement>, "src"> & {
     src: string;
     version?: string | number | null;

package/package.json

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