@anji-dashing/dam-solution-v2 5.8.175 → 5.8.177

package/build/AssetType/AddFieldProperties.js

@@ -214,13 +214,42 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 setDisabledReason(null);
         }, 100);
     }, [field, form]);
+    // Strip time from dayjs (set to midnight) - used when "Allow time" is toggled OFF
+    const stripTimeFromDayjs = (d) => {
+        if (!d || typeof d.hour !== "function")
+            return d;
+        return d.hour(0).minute(0).second(0).millisecond(0);
+    };
     // Update defaultValueInput whenever form values change
-    const handleFormValuesChange = () => {
+    const handleFormValuesChange = (changedValues, allValues) => {
         var _a;
-        const formValues = form.getFieldsValue(true);
+        const formValues = allValues !== null && allValues !== void 0 ? allValues : form.getFieldsValue(true);
         const defaultName = currentInputType === null || currentInputType === void 0 ? void 0 : currentInputType.defaultName;
+        // When "Allow time" is toggled OFF for DATE/DATE_RANGE, strip time from defaultValue
+        const settings = get(formValues, "inputTypeSettings", {});
+        const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
+        const allowTimeChanged = changedValues && get(changedValues, "inputTypeSettings");
+        if (allowTimeChanged &&
+            !allowTime &&
+            (defaultName === InputTypes.DATE || defaultName === InputTypes.DATE_RANGE)) {
+            const currentDefault = get(formValues, "defaultValue");
+            if (currentDefault) {
+                let normalized = null;
+                if (defaultName === InputTypes.DATE_RANGE && isArray(currentDefault)) {
+                    normalized = [
+                        stripTimeFromDayjs(first(currentDefault)),
+                        stripTimeFromDayjs(nth(currentDefault, 1)),
+                    ];
+                }
+                else if (defaultName === InputTypes.DATE) {
+                    normalized = stripTimeFromDayjs(currentDefault);
+                }
+                if (normalized !== null) {
+                    form.setFieldValue("defaultValue", normalized);
+                }
+            }
+        }
         const options = ((_a = formValues.options) === null || _a === void 0 ? void 0 : _a.filter((opt) => (opt === null || opt === void 0 ? void 0 : opt.label) && (opt === null || opt === void 0 ? void 0 : opt.value))) || [];
-        const settings = formValues.inputTypeSettings || {};
         const isOptionsBasedField = includes([InputTypes.SELECT, InputTypes.CHECKBOX, InputTypes.RADIO], defaultName);
         if (isOptionsBasedField && options.length === 0) {
             // Don't show Default Value field if no options exist
@@ -280,6 +309,11 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         if ((defaultName === InputTypes.DATE ||
             defaultName === InputTypes.DATE_RANGE) &&
             settings[InputSupportedTypes.ALLOW_TIME] !== undefined) {
+            const hasNonZeroTime = (d) => {
+                if (!d || typeof d.hour !== "function")
+                    return false;
+                return d.hour() !== 0 || d.minute() !== 0 || d.second() !== 0;
+            };
             rules.push({
                 validator: (_, value) => {
                     const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
@@ -291,10 +325,13 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                             typeof value.hour === "function" &&
                             typeof value.minute === "function" &&
                             typeof value.second === "function";
+                        // When time is allowed: accept any moment with time methods (including 00:00:00 - midnight is valid)
+                        // Only reject if value lacks time methods (e.g. date-only format)
                         if (allowTime && !hasTimeMethods) {
                             return Promise.reject("Please select a date with time (hour/minute/second).");
                         }
-                        if (!allowTime && hasTimeMethods) {
+                        // When time is not allowed: strip time (handled in onValuesChange) - reject only if still has non-zero time
+                        if (!allowTime && hasNonZeroTime(value)) {
                             return Promise.reject("Time is not allowed. Please select only a date.");
                         }
                     }
@@ -309,10 +346,13 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                             typeof end.hour === "function" &&
                             typeof end.minute === "function" &&
                             typeof end.second === "function";
+                        // When time is allowed: accept any moment with time methods (including 00:00:00 - midnight is valid)
+                        // Only reject if start or end lacks time methods
                         if (allowTime && (!startHasTimeMethods || !endHasTimeMethods)) {
                             return Promise.reject("Please select both start and end dates with time.");
                         }
-                        if (!allowTime && (startHasTimeMethods || endHasTimeMethods)) {
+                        // When time is not allowed: strip time (handled in onValuesChange) - reject only if still has non-zero time
+                        if (!allowTime && (hasNonZeroTime(start) || hasNonZeroTime(end))) {
                             return Promise.reject("Time is not allowed. Please select only dates.");
                         }
                     }
@@ -348,12 +388,12 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                                             InputTypes.TEAM,
                                             InputTypes.CHECKBOX,
                                             InputTypes.RADIO,
-                                        ], get(currentInputType, "defaultName")) && (_jsx(OptionsField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []), currentInputType: currentInputType }))] })] }), _jsxs(Form.Item, { className: "md-lib-flex md-lib-flex-col md-lib-items-end md-lib-absolute md-lib-bottom-0 md-lib-right-0 md-lib-pr-4 md-lib-pb-4", children: [disabledReason && (_jsxs("p", { className: "md-lib-text-sm md-lib-mb-2 md-lib-mr-2", style: { color: styles === null || styles === void 0 ? void 0 : styles.secondaryTextColor }, children: ["Update disabled: ", disabledReason] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center", children: [_jsx(Button, { color: "primary", variant: "text", onClick: () => {
-                                                if (onCancel && index !== null) {
-                                                    onCancel(index);
-                                                }
-                                                else {
-                                                    setCurrentFieldIndex(null);
-                                                }
-                                            }, size: "large", children: "Cancel" }), _jsx(Button, { color: "primary", htmlType: "submit", className: "md-lib-ml-2 md-lib-border-primaryColor md-lib-text-primaryColor", size: "large", loading: loading, disabled: !isFormValid || loading, title: disabledReason || undefined, children: "Update" })] })] })] }) })] }));
+                                        ], get(currentInputType, "defaultName")) && (_jsx(OptionsField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []), currentInputType: currentInputType }))] })] }), _jsx(Form.Item, { className: "md-lib-flex md-lib-flex-col md-lib-items-end md-lib-absolute md-lib-bottom-0 md-lib-right-0 md-lib-pr-4 md-lib-pb-4", children: _jsxs("div", { className: "md-lib-flex md-lib-items-center", children: [_jsx(Button, { color: "primary", variant: "text", onClick: () => {
+                                            if (onCancel && index !== null) {
+                                                onCancel(index);
+                                            }
+                                            else {
+                                                setCurrentFieldIndex(null);
+                                            }
+                                        }, size: "large", children: "Cancel" }), _jsx(Button, { color: "primary", htmlType: "submit", className: "md-lib-ml-2 md-lib-border-primaryColor md-lib-text-primaryColor", size: "large", loading: loading, disabled: !isFormValid || loading, title: disabledReason || undefined, children: "Update" })] }) })] }) })] }));
 }

package/build/AssetType/EditAssetTemplate.js

@@ -218,13 +218,13 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
         {
             key: "1",
             label: "Fields",
-            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: false })),
+            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: false, assetId: id || get(assetTemplate, "_id") })),
         },
         {
             key: "2",
             label: "Image picker output format",
             disabled: fields.length === 0,
-            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: true })),
+            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: true, assetId: id || get(assetTemplate, "_id") })),
         },
     ];
     // console.log("edit asset template", fields, imagePickerOutputFormat);

package/build/AssetType/FieldsSection.d.ts

@@ -1,7 +1,7 @@
 import { SetStateAction } from "react";
 import { InputTypeEntity } from "../utilities/constants/interface";
 export declare const getWidgetIcon: (defaultName: string | undefined | null) => import("react-icons").IconType | null;
-export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, }: {
+export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, assetId: assetIdProp, }: {
     name: string;
     inputTypes: InputTypeEntity[];
     transformInputTypePayload: (values: any, field: InputTypeEntity, mapId: string) => void;
@@ -11,4 +11,5 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
     setState: React.Dispatch<SetStateAction<any>>;
     showOutputFormat: boolean;
     imagePickerOutputFormat: InputTypeEntity[];
+    assetId?: string;
 }): JSX.Element;

package/build/AssetType/FieldsSection.js

@@ -25,7 +25,7 @@ import { IoIosRadioButtonOff } from "react-icons/io";
 import { IoCheckboxOutline } from "react-icons/io5";
 import { FaRegUser } from "react-icons/fa";
 import { showNotification } from "../common/notifications";
-import { DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, INPUT_SETTINGS_VALIDATION_ERROR, INPUT_SETTINGS_VALIDATION_ERROR_AT_SWITCH_INPUT, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
+import { DELETE_CONFIRMATION_MESSAGE, DELETE_OK_TEXT, DELETE_SUCCESS, INPUT_SETTINGS_VALIDATION_ERROR, INPUT_SETTINGS_VALIDATION_ERROR_AT_SWITCH_INPUT, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { getInputTypeValidationErrors } from "../utilities/helpers/validators";
 import { DELETE_ASSET_FIELD_URL } from "../utilities/constants/apiUrls";
 import { DeleteConfirmationModal } from "../common/CustomElements";
@@ -76,8 +76,9 @@ export const getWidgetIcon = (defaultName) => {
         return null;
     }
 };
-export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, }) {
-    const { id } = useAppParams();
+export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, assetId: assetIdProp, }) {
+    const { id: idFromParams } = useAppParams();
+    const assetId = assetIdProp !== null && assetIdProp !== void 0 ? assetIdProp : idFromParams;
     const [fieldState, setFieldState] = useState({
         showConfirmModal: false,
         selectedField: null,
@@ -166,9 +167,13 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
         }
     };
     const onDeleteExistedField = () => __awaiter(this, void 0, void 0, function* () {
+        if (!assetId) {
+            showNotification("Asset ID is missing. Unable to delete field.", NotificationStatus.ERROR);
+            return;
+        }
         setFieldState((prevState) => (Object.assign(Object.assign({}, prevState), { loading: true })));
         try {
-            const response = yield api.delete(DELETE_ASSET_FIELD_URL.replace(":assetId", id).replace(":id", get(selectedField, "_id")));
+            const response = yield api.delete(DELETE_ASSET_FIELD_URL.replace(":assetId", assetId).replace(":id", get(selectedField, "_id")));
             const updatedFields = filter(fields, (field, index) => get(field, "_id") !== get(selectedField, "_id"));
             const updatedImagePickerOutputFormat = filter(imagePickerOutputFormat, (field, index) => get(field, "mapId") !== get(selectedField, "mapId"));
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { fields: updatedFields, currentFieldIndex: null, imagePickerOutputFormat: updatedImagePickerOutputFormat })));
@@ -264,5 +269,5 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
                                     else {
                                         setCurrentFieldIndex(null);
                                     }
-                                } }) }))] }) }), showConfirmModal && (_jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmModal, okText: DELETE_OK_TEXT, onOk: onDeleteExistedField, loading: loading, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", "Delete").replace(":entity", `${get(selectedField, "name", "this field")}`), subHeading: DELETE_MESSAGE_DESCRIPTION }))] }));
+                                } }) }))] }) }), showConfirmModal && (_jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmModal, okText: DELETE_OK_TEXT, onOk: onDeleteExistedField, loading: loading, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", "Delete").replace(":entity", `${get(selectedField, "name", "this field")}`) }))] }));
 }

package/build/CreateClient/CreateClientBtn.d.ts

@@ -1,5 +1,6 @@
-declare const CreateClient: ({ onSuccess, clientSubdomain, teamsApi, username, password, existingClientData, }: {
+declare const CreateClient: ({ onSuccess, onRefreshSuccess, clientSubdomain, teamsApi, username, password, existingClientData, }: {
     onSuccess: (data: any) => void;
+    onRefreshSuccess?: (data: any) => void;
     clientSubdomain: string;
     teamsApi: string;
     username: string;

package/build/CreateClient/CreateClientBtn.js

@@ -18,7 +18,7 @@ import { showNotification } from "../common/notifications";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { SOMETHING_WENT_WRONG } from "../utilities/constants/messages";
 import { get } from "lodash";
-const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password, existingClientData, }) => {
+const CreateClient = ({ onSuccess, onRefreshSuccess, clientSubdomain, teamsApi, username, password, existingClientData, }) => {
     const [showForm, setShowForm] = useState(false);
     const [refreshingKey, setRefreshingKey] = useState(false);
     const isEditMode = !!existingClientData;
@@ -32,6 +32,10 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
             showNotification("Access key and secret key are required to refresh", NotificationStatus.ERROR);
             return;
         }
+        if (!(damConfig === null || damConfig === void 0 ? void 0 : damConfig.accessToken)) {
+            showNotification("Authentication token is not available. Please wait for the page to load or try again.", NotificationStatus.ERROR);
+            return;
+        }
         setRefreshingKey(true);
         try {
             const response = yield api.put(REFRESH_KEY_URL, {
@@ -40,7 +44,10 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
             });
             setRefreshingKey(false);
             showNotification(get(response, "data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
-            if (onSuccess) {
+            if (onRefreshSuccess) {
+                onRefreshSuccess(response === null || response === void 0 ? void 0 : response.data);
+            }
+            else if (onSuccess) {
                 onSuccess(response === null || response === void 0 ? void 0 : response.data);
             }
         }

package/build/CreateClient/CreateClientForm.js

@@ -152,66 +152,105 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
         fetchClientData();
     }, [isEditMode, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.brandId, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain, api, form]);
     const onFinish = (data) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         try {
-            // Use teamsApiDetails from clientData if available (from API response), otherwise use props
-            const teamsApiDetailsFromData = get(clientData, "teamsApiDetails", {});
-            const finalTeamsApi = teamsApiDetailsFromData.teamsApi || teamsApi;
-            const finalUsername = teamsApiDetailsFromData.username || username;
-            const finalPassword = teamsApiDetailsFromData.password || password;
-            // Convert adminTeams to strings for API (API expects strings like ["547"] not numbers like [547])
-            const adminTeamsAsStrings = Array.isArray(data.adminTeams)
-                ? data.adminTeams.map((team) => String(team))
-                : [];
-            const values = Object.assign(Object.assign({}, data), { adminTeams: adminTeamsAsStrings, showFilePreview: (_a = data.showFilePreview) !== null && _a !== void 0 ? _a : false, accessKey: appType == "reactJs"
-                    ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_ACCESS_KEY
-                    : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_ACCESS_KEY, secretKey: appType == "reactJs"
-                    ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_SECRET_KEY
-                    : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_SECRET_KEY, parentSubdomain: appType == "reactJs"
-                    ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_SUBDOMAIN
-                    : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_SUBDOMAIN, teamsApiDetails: {
-                    teamsApi: finalTeamsApi,
-                    username: finalUsername,
-                    password: finalPassword,
-                }, damLocationDetails: damLocationType === "external"
-                    ? {
-                        bucket: (_b = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _b === void 0 ? void 0 : _b.bucket,
-                        locationType: "EXTERNAL",
-                        rootPath: (_c = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _c === void 0 ? void 0 : _c.rootPath,
-                        accessKeyId: (_d = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _d === void 0 ? void 0 : _d.accessKeyId,
-                        secretAccessKey: (_e = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _e === void 0 ? void 0 : _e.secretAccessKey,
-                        url: (_f = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _f === void 0 ? void 0 : _f.url,
-                        region: (_g = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _g === void 0 ? void 0 : _g.region,
-                    }
-                    : {
-                        locationType: "INTERNAL",
-                        rootPath: (_h = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _h === void 0 ? void 0 : _h.rootPath,
-                    } });
             setLoading(true);
             let response;
             const baseUrl = getBaseUrl(appType);
             if (isEditMode && brandIdForUpdate && authToken) {
-                // Update existing client: PUT to /brands/{brandId}
-                const putResponse = yield axios.put(`${baseUrl}/brands/${brandIdForUpdate}`, values, {
+                // Edit mode: send only changed fields via PUT
+                const adminTeamsAsStrings = Array.isArray(data.adminTeams)
+                    ? data.adminTeams.map((team) => String(team))
+                    : [];
+                const existingAdminTeams = (get(clientData, "adminTeams", []) || []).map((t) => String(t));
+                const arraysEqual = (a, b) => {
+                    const sa = [...a].sort();
+                    const sb = [...b].sort();
+                    return sa.length === sb.length && sa.every((v, i) => v === sb[i]);
+                };
+                const accessTypesChanged = JSON.stringify([...(data.accessTypes || [])].sort()) !==
+                    JSON.stringify([...(get(clientData, "accessTypes", []) || [])].sort());
+                const payload = {};
+                if (data.name !== get(clientData, "name"))
+                    payload.name = data.name;
+                if (accessTypesChanged)
+                    payload.accessTypes = data.accessTypes || [];
+                if (!arraysEqual(adminTeamsAsStrings, existingAdminTeams))
+                    payload.adminTeams = adminTeamsAsStrings;
+                if (((_a = data.showFilePreview) !== null && _a !== void 0 ? _a : false) !== get(clientData, "showFilePreview", false))
+                    payload.showFilePreview = (_b = data.showFilePreview) !== null && _b !== void 0 ? _b : false;
+                if (Object.keys(payload).length === 0) {
+                    setLoading(false);
+                    showNotification("No changes to save", NotificationStatus.INFO);
+                    return;
+                }
+                const putResponse = yield axios.put(`${baseUrl}/brands/${brandIdForUpdate}`, payload, {
                     headers: {
-                        'Authorization': `Bearer ${authToken}`,
-                        'Content-Type': 'application/json',
-                        'accept': 'application/json, text/plain, */*'
-                    }
+                        Authorization: `Bearer ${authToken}`,
+                        "Content-Type": "application/json",
+                        accept: "application/json, text/plain, */*",
+                    },
                 });
                 // Extract data from axios response (API returns { data: {...} } or { data: { data: {...} } })
                 response = get(putResponse, "data.data", get(putResponse, "data", putResponse));
             }
             else {
-                // Create new client: POST to /brands/sub-brand
+                // Create new client: POST to /brands/sub-brand (full payload required)
+                const teamsApiDetailsFromData = clientData ? get(clientData, "teamsApiDetails", {}) : {};
+                const finalTeamsApi = teamsApiDetailsFromData.teamsApi || teamsApi;
+                const finalUsername = teamsApiDetailsFromData.username || username;
+                const finalPassword = teamsApiDetailsFromData.password || password;
+                const adminTeamsAsStrings = Array.isArray(data.adminTeams)
+                    ? data.adminTeams.map((team) => String(team))
+                    : [];
+                const formDamLocation = data === null || data === void 0 ? void 0 : data.damLocationDetails;
+                const damLocationDetails = damLocationType === "external"
+                    ? {
+                        bucket: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.bucket,
+                        locationType: "EXTERNAL",
+                        rootPath: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.rootPath,
+                        accessKeyId: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.accessKeyId,
+                        secretAccessKey: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.secretAccessKey,
+                        url: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.url,
+                        region: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.region,
+                    }
+                    : {
+                        locationType: "INTERNAL",
+                        rootPath: formDamLocation === null || formDamLocation === void 0 ? void 0 : formDamLocation.rootPath,
+                    };
+                const values = Object.assign(Object.assign({}, data), { adminTeams: adminTeamsAsStrings, showFilePreview: (_c = data.showFilePreview) !== null && _c !== void 0 ? _c : false, accessKey: appType == "reactJs"
+                        ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_ACCESS_KEY
+                        : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_ACCESS_KEY, secretKey: appType == "reactJs"
+                        ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_SECRET_KEY
+                        : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_SECRET_KEY, parentSubdomain: appType == "reactJs"
+                        ? process.env.REACT_APP_MIXDRIVE_CLIENT_PARENT_SUBDOMAIN
+                        : process.env.NEXT_PUBLIC_MIXDRIVE_CLIENT_PARENT_SUBDOMAIN, teamsApiDetails: {
+                        teamsApi: finalTeamsApi,
+                        username: finalUsername,
+                        password: finalPassword,
+                    }, damLocationDetails });
                 response = yield api.post(CREATE_SUB_BRAND, values);
             }
             setLoading(false);
-            showNotification((_j = response === null || response === void 0 ? void 0 : response.message) !== null && _j !== void 0 ? _j : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
-            toggleShow();
+            showNotification((_d = response === null || response === void 0 ? void 0 : response.message) !== null && _d !== void 0 ? _d : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
+            // Call onSuccess before closing drawer so parent can show its toast (e.g. d1-admin, ThemePage)
+            // Parent expects accessKey, secretKey, subdomain - always provide when in edit mode
             if (onSuccess) {
-                onSuccess(response === null || response === void 0 ? void 0 : response.data);
+                const successData = isEditMode
+                    ? Object.assign(Object.assign(Object.assign({}, response === null || response === void 0 ? void 0 : response.data), response), { accessKey: (_f = (_e = existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.accessKey) !== null && _e !== void 0 ? _e : get(response, "accessKey")) !== null && _f !== void 0 ? _f : get(clientData, "accessKey"), secretKey: (_h = (_g = existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.secretKey) !== null && _g !== void 0 ? _g : get(response, "secretKey")) !== null && _h !== void 0 ? _h : get(clientData, "secretKey"), subdomain: (_l = (_k = (_j = data === null || data === void 0 ? void 0 : data.subdomain) !== null && _j !== void 0 ? _j : existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain) !== null && _k !== void 0 ? _k : get(response, "subdomain")) !== null && _l !== void 0 ? _l : get(clientData, "subdomain") }) : (_m = response === null || response === void 0 ? void 0 : response.data) !== null && _m !== void 0 ? _m : response;
+                // Guard: parent (e.g. ThemePage.onCreateDamClient) accesses data.accessKey - never pass undefined
+                const safeData = successData && typeof successData === "object"
+                    ? successData
+                    : isEditMode && existingClientData
+                        ? {
+                            accessKey: existingClientData.accessKey,
+                            secretKey: existingClientData.secretKey,
+                            subdomain: existingClientData.subdomain,
+                        }
+                        : {};
+                onSuccess(safeData);
             }
+            toggleShow();
         }
         catch (error) {
             setLoading(false);
@@ -300,7 +339,7 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                             required: true,
                             message: "Team Ids is required",
                         },
-                    ], children: _jsx(Select, { showSearch: true, mode: "multiple", placeholder: "Team Ids", options: filteredTeams, optionFilterProp: "key" }) }), _jsxs(Form.Item, { label: "DAM Location Details", name: "damLocationDetails", children: [_jsx(Form.Item, { label: "Type", name: ["damLocationDetails", "type"], rules: [
+                    ], children: _jsx(Select, { showSearch: true, mode: "multiple", placeholder: "Team Ids", options: filteredTeams, optionFilterProp: "key" }) }), !isEditMode && (_jsxs(Form.Item, { label: "DAM Location Details", name: "damLocationDetails", children: [_jsx(Form.Item, { label: "Type", name: ["damLocationDetails", "type"], rules: [
                                 {
                                     required: true,
                                     message: "Type is required",
@@ -337,11 +376,33 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                                             required: damLocationType === "external",
                                             message: "Region is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Region", disabled: damLocationType === "internal" }) })] }))] }), _jsx(Form.Item, { label: "Subdomain", name: "subdomain", rules: [
+                                    ], children: _jsx(Input, { placeholder: "Region", disabled: damLocationType === "internal" }) })] }))] })), _jsx(Form.Item, { label: "Subdomain", name: "subdomain", rules: [
                         {
                             required: true,
                             message: "Subdomain is required",
                         },
-                    ], children: _jsx(Input, { placeholder: "Subdomain" }) }), _jsx(Form.Item, { name: "showFilePreview", valuePropName: "checked", initialValue: false, children: _jsx(Checkbox, { children: "Show File Preview Editor" }) }), _jsx(Form.Item, { children: _jsx(Button, { htmlType: "submit", type: "primary", block: true, loading: loading, children: "Submit" }) })] })) }));
+                    ], children: _jsx(Input, { placeholder: "Subdomain", disabled: isEditMode }) }), _jsx(Form.Item, { name: "showFilePreview", valuePropName: "checked", initialValue: false, children: _jsx(Checkbox, { children: "Show File Preview Editor" }) }), _jsx(Form.Item, { shouldUpdate: true, style: { marginBottom: 0 }, children: () => {
+                        var _a, _b, _c, _d, _e, _f, _g, _h;
+                        const values = form.getFieldsValue(true);
+                        const hasName = !!((_a = values === null || values === void 0 ? void 0 : values.name) === null || _a === void 0 ? void 0 : _a.trim());
+                        const hasAccessTypes = Array.isArray(values === null || values === void 0 ? void 0 : values.accessTypes) && values.accessTypes.length > 0;
+                        const hasAdminTeams = Array.isArray(values === null || values === void 0 ? void 0 : values.adminTeams) && values.adminTeams.length > 0;
+                        const hasSubdomain = !!((_b = values === null || values === void 0 ? void 0 : values.subdomain) === null || _b === void 0 ? void 0 : _b.trim());
+                        const baseValid = hasName && hasAccessTypes && hasAdminTeams && hasSubdomain;
+                        let damLocationValid = true;
+                        if (!isEditMode) {
+                            const dl = (values === null || values === void 0 ? void 0 : values.damLocationDetails) || {};
+                            damLocationValid = !!((dl === null || dl === void 0 ? void 0 : dl.type) && ((_c = dl === null || dl === void 0 ? void 0 : dl.rootPath) === null || _c === void 0 ? void 0 : _c.trim()));
+                            if (damLocationValid && damLocationType === "external") {
+                                damLocationValid = !!(((_d = dl === null || dl === void 0 ? void 0 : dl.bucket) === null || _d === void 0 ? void 0 : _d.trim()) &&
+                                    ((_e = dl === null || dl === void 0 ? void 0 : dl.accessKeyId) === null || _e === void 0 ? void 0 : _e.trim()) &&
+                                    ((_f = dl === null || dl === void 0 ? void 0 : dl.secretAccessKey) === null || _f === void 0 ? void 0 : _f.trim()) &&
+                                    ((_g = dl === null || dl === void 0 ? void 0 : dl.url) === null || _g === void 0 ? void 0 : _g.trim()) &&
+                                    ((_h = dl === null || dl === void 0 ? void 0 : dl.region) === null || _h === void 0 ? void 0 : _h.trim()));
+                            }
+                        }
+                        const isFormValid = baseValid && damLocationValid;
+                        return (_jsx(Button, { htmlType: "submit", type: "primary", block: true, loading: loading, disabled: !isFormValid, children: "Submit" }));
+                    } })] })) }));
 };
 export default CreateClientForm;

package/build/CreateClient/index.d.ts

@@ -7,6 +7,7 @@ declare function App(props: {
     username: string;
     password: string;
     onSuccess: (data: any) => void;
+    onRefreshSuccess?: (data: any) => void;
     teamIds: string[] | number[];
     styles: Record<string, any>;
     appType: string;

package/build/CreateClient/index.js

@@ -5,14 +5,16 @@ import { ThemeModes } from "../utilities/constants/interface";
 import CreateClient from "./CreateClientBtn";
 import ToastProvider from "../hocs/ToastProvider";
 function App(props) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    // Use existingClientData as fallback so login API gets token for keys/refresh APIs
     const config = {
-        damAccessKey: props === null || props === void 0 ? void 0 : props.accessKey,
-        secretKey: props === null || props === void 0 ? void 0 : props.secretKey,
-        subdomain: props === null || props === void 0 ? void 0 : props.subdomain,
-        teamIds: props === null || props === void 0 ? void 0 : props.teamIds,
+        damAccessKey: (_a = props === null || props === void 0 ? void 0 : props.accessKey) !== null && _a !== void 0 ? _a : (_b = props === null || props === void 0 ? void 0 : props.existingClientData) === null || _b === void 0 ? void 0 : _b.accessKey,
+        secretKey: (_c = props === null || props === void 0 ? void 0 : props.secretKey) !== null && _c !== void 0 ? _c : (_d = props === null || props === void 0 ? void 0 : props.existingClientData) === null || _d === void 0 ? void 0 : _d.secretKey,
+        subdomain: (_g = (_e = props === null || props === void 0 ? void 0 : props.subdomain) !== null && _e !== void 0 ? _e : (_f = props === null || props === void 0 ? void 0 : props.existingClientData) === null || _f === void 0 ? void 0 : _f.subdomain) !== null && _g !== void 0 ? _g : props === null || props === void 0 ? void 0 : props.clientSubdomain,
+        teamIds: (_h = props === null || props === void 0 ? void 0 : props.teamIds) !== null && _h !== void 0 ? _h : (((_j = props === null || props === void 0 ? void 0 : props.existingClientData) === null || _j === void 0 ? void 0 : _j.brandId) ? [props.existingClientData.brandId] : []),
         styles: props === null || props === void 0 ? void 0 : props.styles,
         appType: props === null || props === void 0 ? void 0 : props.appType,
     };
-    return (_jsx(DamConfigProvider, { config: config, children: _jsxs(ThemeProvider, { styles: props === null || props === void 0 ? void 0 : props.styles, sessionTheme: ThemeModes.LIGHT, children: [_jsx(CreateClient, { teamsApi: props === null || props === void 0 ? void 0 : props.teamsApi, username: props === null || props === void 0 ? void 0 : props.username, password: props === null || props === void 0 ? void 0 : props.password, clientSubdomain: props === null || props === void 0 ? void 0 : props.clientSubdomain, onSuccess: props === null || props === void 0 ? void 0 : props.onSuccess, existingClientData: props === null || props === void 0 ? void 0 : props.existingClientData }), _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(CreateClient, { teamsApi: props === null || props === void 0 ? void 0 : props.teamsApi, username: props === null || props === void 0 ? void 0 : props.username, password: props === null || props === void 0 ? void 0 : props.password, clientSubdomain: props === null || props === void 0 ? void 0 : props.clientSubdomain, onSuccess: props === null || props === void 0 ? void 0 : props.onSuccess, onRefreshSuccess: props === null || props === void 0 ? void 0 : props.onRefreshSuccess, existingClientData: props === null || props === void 0 ? void 0 : props.existingClientData }), _jsx(ToastProvider, {})] }) }));
 }
 export default App;

package/build/MyDrive/ActionBar.js

@@ -11,7 +11,7 @@ import { DeleteConfirmationModal } from "../common/CustomElements";
 import { DeleteOutlined, RedoOutlined } from "@ant-design/icons";
 import { generateFoldersQueryKey, invalidateData, } from "../utilities/constants/queryKeys";
 import { DriveModes, NotificationStatus, } from "../utilities/constants/interface";
-import { ARCHIVE_OK_TEXT, DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, INVALID_URL, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
+import { ARCHIVE_OK_TEXT, DELETE_CONFIRMATION_MESSAGE, DELETE_OK_TEXT, DELETE_SUCCESS, INVALID_URL, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { showNotification } from "../common/notifications";
 import FileMenuOptions from "./FileMenuOptions";
 import { getFolderData } from "../react-query/hooks/folder-hooks";
@@ -185,6 +185,8 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
     return (_jsxs("div", { className: "md-lib-fixed md-lib-bottom-6 md-lib-left-1/2 md-lib-transform -md-lib-translate-x-1/2 md-lib-w-80 md:md-lib-w-[720px] md-lib-max-w-3xl md-lib-bg-textColorActive md-lib-border dark:md-lib-bg-darkPrimary dark:md-lib-border-darkBorderColor md-lib-border-secondaryHoverColor md-lib-rounded-xl md-lib-shadow-md md-lib-flex md-lib-items-center md-lib-justify-between md-lib-px-4 md-lib-py-2 md-lib-z-50", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5 md-lib-pl-2", children: [_jsx(Button, { type: "text", size: "large", icon: _jsx(FiDownloadIcon, { size: 24, className: "" }), disabled: isTrashPage, onClick: onDownloadFiles, loading: downloadFileMutation.isLoading }), _jsx(Tooltip, { title: "Move", children: _jsx(Button, { type: "text", size: "large", icon: _jsx(FiFolderPlusIcon, { size: 24, className: "" }), disabled: isTrashPage, onClick: toggleShowMoveFolder }) }), isTrashPage ? (_jsx(Tooltip, { title: "Restore", children: _jsx(Button, { type: "text", size: "large", icon: _jsx(RedoOutlined, { className: "" }), onClick: () => onRestoreFiles(), disabled: !isTrashPage }) })) : (_jsx(_Fragment, { children: isAdmin && (_jsx(Tooltip, { title: "Delete", children: _jsx(Button, { type: "text", size: "large", icon: _jsx(FiTrash2Icon, { size: 24, className: "" }), onClick: () => toggleConfirmPopup("delete"), disabled: isTrashPage }) })) })), _jsx(FileMenuOptions, { file: selectedFile || null, fileIds: fileIds, folderIds: folderIds, folder: selectedFolder || null, onCloseSelection: onCloseSelection, readOnly: isTrashPage })] }), _jsx("div", { className: "md-lib-flex md-lib-items-center", children: _jsxs(Tag, { className: "md-lib-bg-[#DEE4ED] dark:md-lib-bg-darkPrimaryHoverColor  !md-lib-rounded-lg !md-lib-px-4 h-[38px] md-lib-text-sm md-lib-items-center md-lib-font-medium md-lib-flex md-lib-gap-2 md-lib-text-textColor dark:md-lib-text-darkTextColor", closable: true, closeIcon: _jsx(FiXIcon, { onClick: onCloseSelection, className: "md-lib-cursor-pointer" }), children: [get(fileIds, "length", 0) + get(folderIds, "length", 0), " Selected"] }) }), showMoveFolder && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: () => {
                     toggleShowMoveFolder();
                     onCloseSelection();
-                }, folderIds: folderIds, fileIds: fileIds, entity: null })), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(" :entity", ""), subHeading: actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION, onOk: actionType === "archive" ? () => { } : onDeleteFile, loading: deleteFileMutation.isLoading })] }));
+                }, folderIds: folderIds, fileIds: fileIds, entity: null })), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(" :entity", ""), 
+                // subHeading={actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION}
+                onOk: actionType === "archive" ? () => { } : onDeleteFile, loading: deleteFileMutation.isLoading })] }));
 };
 export default ActionsBar;

package/build/MyDrive/BulkUploadModal.js

@@ -43,7 +43,6 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
     const [form] = Form.useForm();
     const emailValue = Form.useWatch("email", form);
     const zipFileUrlValue = Form.useWatch("zip_file_url", form);
-    const emailsValue = Form.useWatch("emails", form);
     const isSubmitDisabled = useMemo(() => {
         if (loading)
             return true;
@@ -51,9 +50,9 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
             const hasAssetFile = assetsSourceType === "zip"
                 ? assetFile && !assetFileError
                 : !!(zipFileUrlValue === null || zipFileUrlValue === void 0 ? void 0 : zipFileUrlValue.trim());
-            const hasEmails = Array.isArray(emailsValue) &&
-                emailsValue.length > 0 &&
-                emailsValue.every((e) => get(validateEmail(e), "valid"));
+            const hasEmails = Array.isArray(emailValue) &&
+                emailValue.length > 0 &&
+                emailValue.every((e) => get(validateEmail(e), "valid"));
             return !hasAssetFile || !hasEmails;
         }
         const hasAssetType = !!assetTypeId;
@@ -74,7 +73,6 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
         assetsSourceType,
         emailValue,
         zipFileUrlValue,
-        emailsValue,
     ]);
     useEffect(() => {
         onFetchAssetTemplates();

package/build/MyDrive/DriveContainer.js

@@ -316,7 +316,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         if (setGlobalSearch)
             setGlobalSearch("");
     };
-    return (_jsx(RefetchFoldersProvider, { value: refetch, children: _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) => {
+    return (_jsx(RefetchFoldersProvider, { value: refetch, children: _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, imagePickerModal: true })) : (_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/FileMenuOptions.js

@@ -22,7 +22,7 @@ import { DownloadOutlined, } from "@ant-design/icons";
 import AddFolder from "./AddFolder";
 import { useMutation, useQueryClient } from "react-query";
 import { archiveFiles, deleteFiles, downloadFiles, duplicateFiles, restoreFiles, unarchiveFiles, useFile, } from "../react-query/services/file-services";
-import { ADDED_TO_FAV_MSG, ARCHIVE_OK_TEXT, ARCHIVE_SUCCESS, CREATE_SUCCESS, DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, INVALID_URL, REMOVED_FROM_FAV_MSG, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
+import { ADDED_TO_FAV_MSG, ARCHIVE_OK_TEXT, ARCHIVE_SUCCESS, CREATE_SUCCESS, DELETE_CONFIRMATION_MESSAGE, DELETE_OK_TEXT, DELETE_SUCCESS, INVALID_URL, REMOVED_FROM_FAV_MSG, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { getSelectedFiles, } from "../react-query/hooks/folder-hooks";
 import { generateFoldersQueryKey, invalidateData, QueryKeys, } from "../utilities/constants/queryKeys";
 import { useRefetchFolders } from "../utilities/FoldersContext";
@@ -445,6 +445,8 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
                         ? "md-lib-cursor-not-allowed md-lib-text-disabledBtnColor dark:md-lib-text-darkBorderColor"
                         : "md-lib-cursor-pointer", onClick: (e) => e.stopPropagation() }) }), displayUpdateName && (!!file || !!folder) && (_jsx(AddFolder, { file: file, open: displayUpdateName, handleCancel: toggleDisplayUpdateName, folder: folder, onCloseSelection: onCloseSelection, fileModal: fileModal })), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: isMultiSelection
                     ? DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(" :entity", "")
-                    : DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(file, "name", "this file")), onOk: actionType === "archive" ? onArchiveFile : onDeleteFile, subHeading: actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION, loading: deleteFileMutation.isLoading || archiveFileMutation.isLoading }), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: toggleShowPreviewModal, file: file || undefined, files: getSelectedFiles(queryClient, folderId ? folderId : rootFolderId, generateFoldersQueryKey(type), file ? [get(file, "_id")] : fileIds), fileIds: file ? [get(file, "_id")] : fileIds, onCloseSelection: onCloseSelection })), showMoveFolder && (effectiveFile || file) && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, fileIds: effectiveFile ? [get(effectiveFile, "_id")] : [get(file, "_id")], folderIds: [], entity: effectiveFile || file, onCloseSelection: onCloseSelection })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: file ? [get(file, "_id")] : fileIds, folderIds: folderIds, inviteType: DriveModes.FILE, file: file })), showFileAccess && (file || folder) && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: file ? file : folder })), showLogsModal && (_jsx(FileDownloadHistory, { file: file ? file : folder, open: showLogsModal, onClose: toggleLogsModal }))] }));
+                    : DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(file, "name", "this file")), onOk: actionType === "archive" ? onArchiveFile : onDeleteFile, 
+                // subHeading={actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION}
+                loading: deleteFileMutation.isLoading || archiveFileMutation.isLoading }), showPreviewModal && (_jsx(FileDetails, { open: showPreviewModal, handleClose: toggleShowPreviewModal, file: file || undefined, files: getSelectedFiles(queryClient, folderId ? folderId : rootFolderId, generateFoldersQueryKey(type), file ? [get(file, "_id")] : fileIds), fileIds: file ? [get(file, "_id")] : fileIds, onCloseSelection: onCloseSelection })), showMoveFolder && (effectiveFile || file) && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, fileIds: effectiveFile ? [get(effectiveFile, "_id")] : [get(file, "_id")], folderIds: [], entity: effectiveFile || file, onCloseSelection: onCloseSelection })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: file ? [get(file, "_id")] : fileIds, folderIds: folderIds, inviteType: DriveModes.FILE, file: file })), showFileAccess && (file || folder) && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: file ? file : folder })), showLogsModal && (_jsx(FileDownloadHistory, { file: file ? file : folder, open: showLogsModal, onClose: toggleLogsModal }))] }));
 }
 export default FileMenuOptions;

package/build/MyDrive/FilesGridView.js

@@ -19,7 +19,9 @@ const FilesGridView = ({ files, handleClick, selectedFileIds, isImagePicker, sel
                                 type !== DriveModes.FOLDERS &&
                                 get(file, "fileUploadStatus") !== ThumbnailStatus.PENDING && (_jsx(FileMenuOptions, { file: file }))] }), _jsx("div", { className: "md-lib-mt-2 md-lib-h-28 md-lib-mx-2.5 md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-rounded-md md-lib-flex md-lib-justify-center", children: get(file, "fileUploadStatus") === ThumbnailStatus.PENDING ? (
                         // <IconInprogress className="mt-10 text-[40px] text-imagesColor" />
-                        _jsx(Image, { src: UPLOAD_FILE_IN_PROGRESS_WHITE_IMAGE, width: 100, height: 100 })) : (_jsx("img", { src: get(file, "thumbnailUrl", ""), width: 100, height: 100, alt: get(file, "name", "N/A") })) }), _jsx("div", { children: _jsx("p", { className: "md-lib-text-xs md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-px-5 md-lib-pt-2.5 md-lib-truncate md-lib-max-w-40", title: get(file, "name", "N/A"), children: get(file, "assetName", "N/A") }) })] }, get(file, "_id")));
+                        _jsx(Image, { src: UPLOAD_FILE_IN_PROGRESS_WHITE_IMAGE, width: 100, height: 100 })) : (_jsx("img", { src: get(file, "thumbnailUrl", ""), 
+                            // width={100}
+                            height: 100, alt: get(file, "name", "N/A"), className: "mb-lib-w-auto" })) }), _jsx("div", { children: _jsx("p", { className: "md-lib-text-xs md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-px-5 md-lib-pt-2.5 md-lib-truncate md-lib-max-w-40", title: get(file, "name", "N/A"), children: get(file, "assetName", "N/A") }) })] }, get(file, "_id")));
         }) }));
 };
 export default FilesGridView;

package/build/MyDrive/FolderListView.js

@@ -152,7 +152,7 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
         }
         return groupBy(sortedFolders, (folder) => formatGroupDate(get(folder, "updatedAt")));
     }, [sortedFolders, sortByKey]);
-    return (_jsxs("div", { className: "md-lib-space-y-6 md-lib-relative ", children: [_jsxs("div", { className: "md-lib-flex md-lib-justify-between md-lib-items-center md-lib-px-2 md-lib-min-w-fit md-lib-gap-2 mb-lib-sticky md-lib-top-0 md-lib-bg-white dark:md-lib-bg-darkPrimary", children: [!isImagePicker && type !== DriveModes.FOLDERS && (_jsx("div", { className: "md-lib-w-6", children: ((searchKey && searchValue) || (metadataKey && metadataValue)) && (_jsx("div", { className: "md-lib-p-1 md-lib-border md-lib-rounded md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-cursor-pointer", children: _jsx(Tooltip, { title: "Clear filter", children: _jsx(ClearFilterIcon, { fill: get(theme, "variables.primaryColor"), onClick: () => {
+    return (_jsxs("div", { className: "md-lib-space-y-6 md-lib-relative ", children: [_jsxs("div", { className: "md-lib-flex md-lib-justify-between md-lib-items-center md-lib-px-2 md-lib-min-w-fit md-lib-gap-2 mb-lib-sticky md-lib-top-0 md-lib-bg-white dark:md-lib-bg-darkPrimary", style: { position: "sticky", top: '0' }, children: [!isImagePicker && type !== DriveModes.FOLDERS && (_jsx("div", { className: "md-lib-w-6", children: ((searchKey && searchValue) || (metadataKey && metadataValue)) && (_jsx("div", { className: "md-lib-p-1 md-lib-border md-lib-rounded md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-cursor-pointer", children: _jsx(Tooltip, { title: "Clear filter", children: _jsx(ClearFilterIcon, { fill: get(theme, "variables.primaryColor"), onClick: () => {
                                         onSearch({
                                             searchKey: "",
                                             searchValue: "",

package/build/MyDrive/FolderMenuOptions.js

@@ -6,7 +6,7 @@ import { IoArchiveOutline, IoDuplicateOutline } from "react-icons/io5";
 import { useMemo, useState } from "react";
 import { DriveModes, NotificationStatus, } from "../utilities/constants/interface";
 import { DeleteConfirmationModal } from "../common/CustomElements";
-import { ADDED_TO_FAV_MSG, ARCHIVE_OK_TEXT, ARCHIVE_SUCCESS, DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, DUPLICATE_SUCCESS, INVALID_URL, REMOVED_FROM_FAV_MSG, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
+import { ADDED_TO_FAV_MSG, ARCHIVE_OK_TEXT, ARCHIVE_SUCCESS, DELETE_CONFIRMATION_MESSAGE, DELETE_OK_TEXT, DELETE_SUCCESS, DUPLICATE_SUCCESS, INVALID_URL, REMOVED_FROM_FAV_MSG, RESTORE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { filter, get, includes } from "lodash";
 import { useMutation, useQueryClient } from "react-query";
 import { addToFavFolders, archiveFolders, deleteFolders, duplicateFolder, removeFromFavFolders, restoreFolders, unarchiveFolders, } from "../react-query/services/folder-services";
@@ -345,6 +345,8 @@ function FolderMenuOptions({ folder }) {
     const currentMenuItems = useMemo(() => {
         return filterActions(items, get(AllowedFolderActions, type));
     }, [type, items]);
-    return (_jsxs(_Fragment, { children: [_jsx(Dropdown, { menu: { items: currentMenuItems }, trigger: ["click"], children: _jsx(BsThreeDotsVerticalIcon, { size: 20, className: "md-lib-cursor-pointer", onClick: (e) => e.stopPropagation() }) }), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(folder, "name", "this folder")), subHeading: actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION, onOk: actionType === "archive" ? onArchiveFolder : onDeleteFolder, loading: deleteFolderMutation.isLoading || archiveFolderMutation.isLoading }), _jsx(AddFolder, { open: showUpdateModal, handleCancel: toggleUpdateModal, folder: folder }), showMoveFolder && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, folderIds: [get(folder, "_id")], entity: folder })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: [], folderIds: [get(folder, "_id")], inviteType: DriveModes.FOLDERS, file: folder })), showFileAccess && folder && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: folder })), showLogs && (_jsx(FileDownloadHistory, { file: folder, open: showLogs, onClose: toggleLogsModal }))] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Dropdown, { menu: { items: currentMenuItems }, trigger: ["click"], children: _jsx(BsThreeDotsVerticalIcon, { size: 20, className: "md-lib-cursor-pointer", onClick: (e) => e.stopPropagation() }) }), _jsx(DeleteConfirmationModal, { showDeleteModal: showConfirmModal, toggleDeleteModal: toggleConfirmPopup, icon: actionType === "archive" ? (_jsx(IoArchiveOutlineIcon, {})) : (_jsx(DeleteOutlined, {})), okText: actionType === "archive" ? ARCHIVE_OK_TEXT : DELETE_OK_TEXT, description: DELETE_CONFIRMATION_MESSAGE.replace(":action", actionType).replace(":entity", get(folder, "name", "this folder")), 
+                // subHeading={actionType === "archive" ? "" : DELETE_MESSAGE_DESCRIPTION}
+                onOk: actionType === "archive" ? onArchiveFolder : onDeleteFolder, loading: deleteFolderMutation.isLoading || archiveFolderMutation.isLoading }), _jsx(AddFolder, { open: showUpdateModal, handleCancel: toggleUpdateModal, folder: folder }), showMoveFolder && (_jsx(MoveToAnotherFolder, { open: showMoveFolder, handleCancel: toggleShowMoveFolder, folderIds: [get(folder, "_id")], entity: folder })), showShareModal && (_jsx(InviteTeamModal, { open: showShareModal, onClose: toggleShareModal, onFetchInvitations: () => { }, shareModal: true, fileIds: [], folderIds: [get(folder, "_id")], inviteType: DriveModes.FOLDERS, file: folder })), showFileAccess && folder && (_jsx(ManageFile, { open: showFileAccess, onClose: toggleFileAccess, file: folder })), showLogs && (_jsx(FileDownloadHistory, { file: folder, open: showLogs, onClose: toggleLogsModal }))] }));
 }
 export default FolderMenuOptions;

package/build/MyDrive/FolderTree.js

@@ -232,13 +232,34 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                 prevCurrentRootIdRef.current = currentRootId;
             }
             else {
-                if (currentRootId === rootFolderId || folders.length === 0) {
+                // When folders is empty and we have a subfolder ID (e.g. from URL refresh),
+                // fetch root first so the full tree is visible, then expand to the selected folder
+                if (folders.length === 0 && currentRootId !== rootFolderId) {
+                    // Don't set prevCurrentRootIdRef yet - we need to re-run when folders is populated
+                    fetchFolders(rootFolderId);
+                }
+                else if (currentRootId === rootFolderId || folders.length === 0) {
                     prevCurrentRootIdRef.current = currentRootId;
                     fetchFolders(currentRootId);
                 }
                 else {
-                    console.log('## Folder not in tree but tree has content - keeping existing tree structure');
-                    prevCurrentRootIdRef.current = currentRootId;
+                    // Folder not in tree - it may be a nested subfolder (e.g. "Books Sub folder" under "Book")
+                    // Fetch children for top-level folders until the target appears in the tree
+                    console.log('## Folder not in tree - fetching children to find nested subfolder:', currentRootId);
+                    (() => __awaiter(this, void 0, void 0, function* () {
+                        setState((s) => (Object.assign(Object.assign({}, s), { loading: true })));
+                        for (const folder of folders) {
+                            const fid = get(folder, "_id");
+                            if (!fid)
+                                continue;
+                            const hasChildrenLoaded = isArray(folder.children) && folder.children.length > 0;
+                            if (!hasChildrenLoaded) {
+                                yield fetchFolderChildren(fid);
+                                // Effect will re-run when folders update; if target is now in tree, we'll expand
+                            }
+                        }
+                        setState((s) => (Object.assign(Object.assign({}, s), { loading: false })));
+                    }))();
                 }
             }
         }
@@ -247,7 +268,7 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             console.log('## FolderTree useEffect - globalSearch changed, refetching root folder');
             fetchFolders(currentRootId);
         }
-    }, [currentRootId, globalSearch]);
+    }, [currentRootId, globalSearch, folders]);
     // ✅ Handle sort dropdown
     const handleSortChange = (value) => {
         setState((prevState) => {

package/build/MyDrive/ImagePickerBreadCrumbList.d.ts

@@ -1,8 +1,9 @@
 import { FolderEntity } from "../utilities/constants/interface";
-declare function ImagePickerBreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, }: {
+declare function ImagePickerBreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, imagePickerModal }: {
     folder: FolderEntity;
     parentFolderId?: string;
     setParentFolderId?: (id: string) => void;
     pickerFolderId?: string;
+    imagePickerModal?: boolean;
 }): JSX.Element;
 export default ImagePickerBreadCrumbList;

package/build/MyDrive/ImagePickerBreadCrumbList.js

@@ -5,7 +5,7 @@ import { useMemo } from "react";
 import { FaChevronRight } from "react-icons/fa";
 import { useDamConfig } from "../hocs/DamConfigContext";
 const FaChevronRightIcon = FaChevronRight;
-function ImagePickerBreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, }) {
+function ImagePickerBreadCrumbList({ folder, parentFolderId, setParentFolderId, pickerFolderId, imagePickerModal }) {
     const damConfig = useDamConfig();
     const { rootFolderId } = damConfig;
     const tree = useMemo(() => {
@@ -29,7 +29,7 @@ function ImagePickerBreadCrumbList({ folder, parentFolderId, setParentFolderId,
                     setParentFolderId(treeId);
                 }
             };
-            return (_jsx(Breadcrumb.Item, { onClick: handleClick, className: "md-lib-h-auto md-lib-cursor-pointer", children: _jsx(Tooltip, { title: name, children: _jsx("p", { className: "md-lib-max-w-28 md-lib-truncate md-lib-font-semibold md-lib-text-[22px]", children: name }) }) }, treeId));
+            return (_jsx(Breadcrumb.Item, { onClick: handleClick, className: "md-lib-h-auto md-lib-cursor-pointer", children: _jsx(Tooltip, { title: name, children: _jsx("p", { className: `${!imagePickerModal && "md-lib-max-w-28"}  md-lib-truncate md-lib-font-semibold md-lib-text-[22px]`, children: name }) }) }, treeId));
         }) }));
 }
 export default ImagePickerBreadCrumbList;

package/build/MyDrive/MyDriveMainContainer.d.ts

@@ -2,5 +2,5 @@ import { type FolderTypes } from "../utilities/FoldersContext";
 export default function MyDriveMainContainer({ folders, setFolders, onFolderChange, }: {
     folders: FolderTypes[];
     setFolders: React.Dispatch<React.SetStateAction<FolderTypes[]>>;
-    onFolderChange?: (folderId: string) => void;
+    onFolderChange?: (folderId: string | undefined) => void;
 }): JSX.Element;

package/build/MyDrive/MyDriveMainContainer.js

@@ -20,13 +20,13 @@ export default function MyDriveMainContainer({ folders, setFolders, onFolderChan
         // Priority: URL params > Props from ParamsProvider > rootFolderId from config
         if (params === null || params === void 0 ? void 0 : params.folderId) {
             console.log('## Setting selectedKeys from params.folderId:', params.folderId);
-            setSelectedKeys(params.folderId);
+            setSelectedKeys(Array.isArray(params.folderId) ? params.folderId : [params.folderId]);
             initializedFromParamsRef.current = true;
         }
-        else if (!(params === null || params === void 0 ? void 0 : params.folderId) && rootFolderId && !selectedKeys && !initializedFromParamsRef.current) {
+        else if (!(params === null || params === void 0 ? void 0 : params.folderId) && rootFolderId && !(selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys.length) && !initializedFromParamsRef.current) {
             // Only set to rootFolderId if no params AND selectedKeys is empty AND we haven't initialized from params
             console.log('## No params.folderId and no selectedKeys, using rootFolderId:', rootFolderId);
-            setSelectedKeys(rootFolderId);
+            setSelectedKeys([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]);
     // Priority: selectedKeys > params > rootFolderId
@@ -51,13 +51,16 @@ export default function MyDriveMainContainer({ folders, setFolders, onFolderChan
         setExpandedKeys(map(keys, (k) => k.toString()));
     };
     // Wrapper function to handle both string and string[] for setSelectedKeys
+    // Also updates URL via onFolderChange so folder persists on refresh
     const handleSetSelectedKeys = (keys) => {
         const next = typeof keys === "string" ? [keys] : keys;
         setSelectedKeys(next);
         const singleFolderId = Array.isArray(next) && next.length === 1 ? next[0] : null;
-        if (singleFolderId && onFolderChange) {
-            onFolderChange(singleFolderId);
+        if (onFolderChange) {
+            // Update URL: subfolder id for subfolders, undefined for root/My Drive (so URL stays /digital-asset-management)
+            const urlFolderId = singleFolderId && singleFolderId !== rootFolderId ? singleFolderId : undefined;
+            onFolderChange(urlFolderId);
         }
     };
-    return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: setSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { parentFolderId: selectedFolderId, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch, setSelectedKeys: handleSetSelectedKeys }) })] }));
+    return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: handleSetSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { parentFolderId: selectedFolderId, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch, setSelectedKeys: handleSetSelectedKeys }) })] }));
 }

package/build/MyDrive/fileDetails/CommentEntity.js

@@ -17,7 +17,7 @@ import CustomButton from "../../common/Button";
 import { MoreOutlined } from "@ant-design/icons";
 import { useMemo, useState } from "react";
 import { DeleteConfirmationModal } from "../../common/CustomElements";
-import { DELETE_CONFIRMATION_MESSAGE, DELETE_MESSAGE_DESCRIPTION, DELETE_OK_TEXT, DELETE_SUCCESS, SOMETHING_WENT_WRONG, UPDATE_SUCCESS, } from "../../utilities/constants/messages";
+import { DELETE_CONFIRMATION_MESSAGE, DELETE_OK_TEXT, DELETE_SUCCESS, SOMETHING_WENT_WRONG, UPDATE_SUCCESS, } from "../../utilities/constants/messages";
 import { FETCH_COMMENT_URL } from "../../utilities/constants/apiUrls";
 import { showNotification } from "../../common/notifications";
 import Editor from "./Editor";
@@ -97,6 +97,6 @@ function CommentEntity({ comment, refreshData, parentId, file, }) {
                                     likes: includes(likesArray, userId)
                                         ? filter(likesArray, (id) => id !== userId)
                                         : [...likesArray, userId],
-                                }, "like") })] })] }, get(commentData, "_id"))), showConfimation && (_jsx(DeleteConfirmationModal, { showDeleteModal: showConfimation, toggleDeleteModal: toggleConfirmation, okText: DELETE_OK_TEXT, onOk: onDeleteComment, loading: loadingType === "delete", description: DELETE_CONFIRMATION_MESSAGE.replace(":action", "Delete").replace(" :entity", ""), subHeading: DELETE_MESSAGE_DESCRIPTION })), showReplies && (_jsxs("div", { className: "md-lib-mt-3 md-lib-ml-12 md-lib-flex md-lib-flex-col md-lib-gap-3 md-lib-animate-fade-in md-lib-transition-all md-lib-duration-300 md-lib-ease-in-out", children: [_jsx("p", { className: "md-lib-text-sm md-lib-text-secondaryTextColor dark:md-lib-text-darkSecondaryTextColor md-lib-font-semibold", children: "Replies" }), _jsx(Comments, { parentId: get(comment, "_id"), file: file })] }))] }));
+                                }, "like") })] })] }, get(commentData, "_id"))), showConfimation && (_jsx(DeleteConfirmationModal, { showDeleteModal: showConfimation, toggleDeleteModal: toggleConfirmation, okText: DELETE_OK_TEXT, onOk: onDeleteComment, loading: loadingType === "delete", description: DELETE_CONFIRMATION_MESSAGE.replace(":action", "Delete").replace(" :entity", "") })), showReplies && (_jsxs("div", { className: "md-lib-mt-3 md-lib-ml-12 md-lib-flex md-lib-flex-col md-lib-gap-3 md-lib-animate-fade-in md-lib-transition-all md-lib-duration-300 md-lib-ease-in-out", children: [_jsx("p", { className: "md-lib-text-sm md-lib-text-secondaryTextColor dark:md-lib-text-darkSecondaryTextColor md-lib-font-semibold", children: "Replies" }), _jsx(Comments, { parentId: get(comment, "_id"), file: file })] }))] }));
 }
 export default CommentEntity;

package/build/MyDrive/fileDetails/FileDetails.js

@@ -31,6 +31,7 @@ const FileDetails = ({ open, handleClose, file, files, fileIds, onCloseSelection
     console.log("## FileDetails - files:", files, "file:", file, "initialFile:", initialFile, "fileIds:", fileIds, "initialFileId:", initialFileId);
     const { id } = useAppParams();
     const damConfig = useDamConfig();
+    const headerHeight = get(damConfig, "headerHeight", 0) || 0;
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [state, setState] = useState({
         visible: false,
@@ -108,18 +109,37 @@ const FileDetails = ({ open, handleClose, file, files, fileIds, onCloseSelection
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { visible: false })));
         }
     }, [open]);
+    // Lock body scroll when preview modal is open so drive page files don't scroll behind it
+    // Add body class so host app can lower header z-index and let preview modal appear above it
+    useEffect(() => {
+        if (open && visible) {
+            const prevBodyOverflow = document.body.style.overflow;
+            const prevHtmlOverflow = document.documentElement.style.overflow;
+            document.body.style.overflow = "hidden";
+            document.documentElement.style.overflow = "hidden";
+            document.body.classList.add("dam-preview-open");
+            return () => {
+                document.body.style.overflow = prevBodyOverflow;
+                document.documentElement.style.overflow = prevHtmlOverflow;
+                document.body.classList.remove("dam-preview-open");
+            };
+        }
+    }, [open, visible]);
     if (!open && !visible)
         return null;
-    const modalContent = (_jsxs("div", { className: `md-lib-fixed md-lib-inset-0 md-lib-z-[1000] md-lib-w-screen md-lib-h-screen md-lib-bg-white dark:md-lib-bg-darkPrimary md-lib-text-black dark:md-lib-text-white md-lib-overflow-auto md-lib-transform md-lib-transition-all md-lib-duration-300 md-lib-ease-in-out ${open && visible
+    const modalStyle = headerHeight > 0
+        ? { top: headerHeight, left: 0, right: 0, bottom: 0, height: `calc(100vh - ${headerHeight}px)` }
+        : undefined;
+    const modalContent = (_jsxs("div", { className: `md-lib-fixed md-lib-z-[1000] md-lib-w-screen md-lib-bg-white dark:md-lib-bg-darkPrimary md-lib-text-black dark:md-lib-text-white md-lib-flex md-lib-flex-col md-lib-transform md-lib-transition-all md-lib-duration-300 md-lib-ease-in-out ${headerHeight === 0 ? "md-lib-inset-0 md-lib-h-screen" : ""} ${open && visible
             ? "md-lib-opacity-100 md-lib-translate-y-0"
-            : "md-lib-opacity-0 md-lib-translate-y-4"}`, onTransitionEnd: () => {
+            : "md-lib-opacity-0 md-lib-translate-y-4"}`, style: modalStyle, onTransitionEnd: () => {
             if (!open)
                 setState((prevState) => (Object.assign(Object.assign({}, prevState), { visible: false })));
-        }, children: [_jsx(FileDetailsHeader, { handleClose: handleClose, file: currentFile, onCloseSelection: onCloseSelection }), isFetching ? (_jsx(Loader, {})) : (_jsx(FileViewer, { file: currentFile, hasPrev: (!!files && currentIndex > 0) ||
-                    (!!fileIds && fileIds.length > 1 && currentIndex > 0) ||
-                    !!get(currentFile, "prevFileId"), hasNext: (!!files && currentIndex < get(files, "length", 0) - 1) ||
-                    (!!fileIds && fileIds.length > 1 && currentIndex < fileIds.length - 1) ||
-                    !!get(currentFile, "nextFileId"), onPrev: handlePrevious, onNext: handleNext, handleClose: handleClose }))] }));
+        }, children: [_jsx("div", { className: "md-lib-shrink-0", children: _jsx(FileDetailsHeader, { handleClose: handleClose, file: currentFile, onCloseSelection: onCloseSelection }) }), _jsx("div", { className: "md-lib-flex-1 md-lib-min-h-0 md-lib-overflow-auto", children: isFetching ? (_jsx(Loader, {})) : (_jsx(FileViewer, { file: currentFile, hasPrev: (!!files && currentIndex > 0) ||
+                        (!!fileIds && fileIds.length > 1 && currentIndex > 0) ||
+                        !!get(currentFile, "prevFileId"), hasNext: (!!files && currentIndex < get(files, "length", 0) - 1) ||
+                        (!!fileIds && fileIds.length > 1 && currentIndex < fileIds.length - 1) ||
+                        !!get(currentFile, "nextFileId"), onPrev: handlePrevious, onNext: handleNext, handleClose: handleClose })) })] }));
     return ReactDOM.createPortal(modalContent, document.body);
 };
 export default FileDetails;

package/build/MyDrive/fileDetails/FileHeader.js

@@ -2,20 +2,18 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button } from "antd";
 import { IoIosClose } from "react-icons/io";
 import { BsDownload } from "react-icons/bs";
-import { DriveModes, NotificationStatus, } from "../../utilities/constants/interface";
+import { NotificationStatus, } from "../../utilities/constants/interface";
 import { get } from "lodash";
 import { showNotification } from "../../common/notifications";
 import { INVALID_URL } from "../../utilities/constants/messages";
 import FileMenuOptions from "../FileMenuOptions";
 import { useDamConfig } from "../../hocs/DamConfigContext";
-import useAppParams from "../../utilities/useAppParams";
 const IoIosCloseIcon = IoIosClose;
 const BsDownloadIcon = BsDownload;
 const FileDetailsHeader = ({ handleClose, file, onCloseSelection, }) => {
     const damConfig = useDamConfig();
     const { isAdmin } = damConfig;
-    const { id, type } = useAppParams();
-    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [!id && type !== DriveModes.FILE && (_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: handleClose })), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, fileIds: get(file, "_id") ? [get(file, "_id")] : [], onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: () => {
+    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: () => handleClose === null || handleClose === void 0 ? void 0 : handleClose(), "aria-label": "Close" }), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, fileIds: get(file, "_id") ? [get(file, "_id")] : [], onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: () => {
                             const url = get(file, "downloadUrl") || get(file, "s3Url") || get(file, "thumbnailUrl");
                             if (!url) {
                                 showNotification(INVALID_URL, NotificationStatus.ERROR);

package/build/MyDrive/fileDetails/FileViewer.js

@@ -11,7 +11,7 @@ const FileViewer = ({ file, onNext, onPrev, hasNext, hasPrev, handleClose, }) =>
     const damConfig = useDamConfig();
     const brand = damConfig === null || damConfig === void 0 ? void 0 : damConfig.brand;
     const showFilePreview = get(brand, "showFilePreview", false);
-    const [metadataOpen, setMetadataOpen] = useState(showFilePreview);
-    return (_jsx(Layout, { className: "md-lib-h-full", children: _jsxs(Content, { className: "md-lib-flex md-lib-h-full md-lib-w-full", children: [_jsx("div", { className: `md-lib-flex md-lib-items-center md-lib-justify-center md-lib-relative md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-min-h-full ${metadataOpen ? "md-lib-flex-1" : "md-lib-flex-1 md-lib-w-full"}`, children: _jsx(PreviewDetails, { file: file, hasNext: hasNext, hasPrev: hasPrev, onNext: onNext, onPrev: onPrev, showFilePreview: showFilePreview }) }), showFilePreview && (_jsxs(_Fragment, { children: [_jsx(Button, { type: "text", className: "md-lib-shrink-0 md-lib-flex md-lib-items-center md-lib-justify-center md-lib-w-10 md-lib-h-10 md-lib-rounded-none md-lib-bg-black/50 hover:md-lib-bg-black/70 dark:md-lib-bg-white/20 dark:hover:md-lib-bg-white/30 md-lib-text-white md-lib-border-0 md-lib-self-start md-lib-mt-4", onClick: () => setMetadataOpen((prev) => !prev), "aria-label": metadataOpen ? "Hide Metadata" : "Show Metadata", children: metadataOpen ? (_jsx(RightOutlined, { className: "md-lib-text-lg" })) : (_jsx(LeftOutlined, { className: "md-lib-text-lg" })) }), metadataOpen && (_jsx("div", { className: "md-lib-w-[400px] md-lib-min-w-[320px] md-lib-shrink-0 md-lib-border-l md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-bg-backgroundColor dark:md-lib-bg-darkPrimary md-lib-overflow-y-auto", children: _jsx(MapFile, { fromUpload: false, filesList: file ? [file] : [], handleCancel: handleClose ? () => handleClose() : undefined }) }))] }))] }) }));
+    const [metadataOpen, setMetadataOpen] = useState(true);
+    return (_jsx(Layout, { className: "md-lib-h-full", children: _jsxs(Content, { className: "md-lib-flex md-lib-h-full md-lib-w-full", children: [_jsx("div", { className: `md-lib-flex md-lib-items-center md-lib-justify-center md-lib-relative md-lib-bg-textColorActive dark:md-lib-bg-darkSecondaryColor md-lib-min-h-full ${metadataOpen ? "md-lib-flex-1" : "md-lib-flex-1 md-lib-w-full"}`, children: _jsx(PreviewDetails, { file: file, hasNext: hasNext, hasPrev: hasPrev, onNext: onNext, onPrev: onPrev, showFilePreview: showFilePreview }) }), _jsxs(_Fragment, { children: [_jsx(Button, { type: "text", className: "md-lib-shrink-0 md-lib-flex md-lib-items-center md-lib-justify-center md-lib-w-10 md-lib-h-10 md-lib-rounded-none md-lib-bg-black/50 hover:md-lib-bg-black/70 dark:md-lib-bg-white/20 dark:hover:md-lib-bg-white/30 md-lib-text-white md-lib-border-0 md-lib-self-start md-lib-mt-4", onClick: () => setMetadataOpen((prev) => !prev), "aria-label": metadataOpen ? "Hide Metadata" : "Show Metadata", children: metadataOpen ? (_jsx(RightOutlined, { className: "md-lib-text-lg" })) : (_jsx(LeftOutlined, { className: "md-lib-text-lg" })) }), metadataOpen && (_jsx("div", { className: "md-lib-w-[400px] md-lib-min-w-[320px] md-lib-shrink-0 md-lib-border-l md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-bg-backgroundColor dark:md-lib-bg-darkPrimary md-lib-overflow-y-auto", children: _jsx(MapFile, { fromUpload: false, filesList: file ? [file] : [], handleCancel: handleClose ? () => handleClose() : undefined, canEdit: showFilePreview }) }))] })] }) }));
 };
 export default FileViewer;

package/build/MyDrive/fileDetails/MetaForm.d.ts

@@ -1,9 +1,14 @@
+import React from "react";
 import type { FormInstance } from "antd";
 import { BrandUserEntity, MetaDataFieldEntity } from "../../utilities/constants/interface";
 export declare const buildInitialValues: (formData: Record<string, any>, metaFields: MetaDataFieldEntity[], isEditMode: boolean) => {
     [x: string]: any;
 };
-export declare const getFormItem: (item: MetaDataFieldEntity, fromDefaultValue: boolean, userOptions?: BrandUserEntity[]) => JSX.Element | null;
+export declare const getFormItem: (item: MetaDataFieldEntity, fromDefaultValue: boolean, userOptions?: BrandUserEntity[], teamOptions?: {
+    label: React.ReactNode;
+    value: string;
+    key?: string;
+}[]) => JSX.Element | null;
 declare const MetaForm: ({ metaFields, metaData, form, isEditMode, }: {
     metaFields: MetaDataFieldEntity[];
     metaData: {

package/build/MyDrive/fileDetails/MetaForm.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo } from "react";
-import { Form, Input, InputNumber, DatePicker, Select, Checkbox, Radio, } from "antd";
+import { Form, Input, InputNumber, DatePicker, Select, Checkbox, Radio, Typography, } from "antd";
 import { find, first, get, includes, isArray, isNumber, map, mapValues, nth, } from "lodash";
 import dayjs from "dayjs";
 import { InputSupportedTypes, InputTypes, } from "../../utilities/constants/interface";
@@ -42,7 +42,7 @@ export const buildInitialValues = (formData, metaFields, isEditMode) => {
         }
     });
 };
-export const getFormItem = (item, fromDefaultValue, userOptions) => {
+export const getFormItem = (item, fromDefaultValue, userOptions, teamOptions) => {
     const name = get(item, "_id");
     const label = get(item, "name");
     const placeholder = get(item, "placeholder", "");
@@ -112,10 +112,12 @@ export const getFormItem = (item, fromDefaultValue, userOptions) => {
     // VALUE_RANGE
     if (defaultName === InputTypes.NUMBERS &&
         get(settings, "VALUE_RANGE.allow")) {
-        const min = get(settings, "VALUE_RANGE.minValue");
-        const max = get(settings, "VALUE_RANGE.maxValue");
-        const hasMin = isNumber(min);
-        const hasMax = isNumber(max);
+        const minRaw = get(settings, "VALUE_RANGE.minValue");
+        const maxRaw = get(settings, "VALUE_RANGE.maxValue");
+        const min = minRaw != null && minRaw !== "" ? Number(minRaw) : undefined;
+        const max = maxRaw != null && maxRaw !== "" ? Number(maxRaw) : undefined;
+        const hasMin = isNumber(min) && !Number.isNaN(min);
+        const hasMax = isNumber(max) && !Number.isNaN(max);
         let message = "";
         if (hasMin && hasMax) {
             message = `Must be between ${min} and ${max}.`;
@@ -126,7 +128,24 @@ export const getFormItem = (item, fromDefaultValue, userOptions) => {
         else if (!hasMin && hasMax) {
             message = `Maximum value is ${max}.`;
         }
-        rules.push(Object.assign(Object.assign(Object.assign({ type: "number" }, (hasMin ? { min } : {})), (hasMax ? { max } : {})), { message }));
+        rules.push({
+            validator: (_, value) => {
+                if (value === undefined || value === null || value === "") {
+                    return Promise.resolve();
+                }
+                const num = Number(value);
+                if (Number.isNaN(num)) {
+                    return Promise.reject(new Error("Must be a valid number."));
+                }
+                if (hasMin && num < min) {
+                    return Promise.reject(new Error(message || `Minimum value is ${min}.`));
+                }
+                if (hasMax && num > max) {
+                    return Promise.reject(new Error(message || `Maximum value is ${max}.`));
+                }
+                return Promise.resolve();
+            },
+        });
     }
     switch (defaultName) {
         case InputTypes.TEXT:
@@ -163,6 +182,11 @@ export const getFormItem = (item, fromDefaultValue, userOptions) => {
                         return false;
                     }, placeholder: placeholder, options: userOptions, optionFilterProp: "children" }) }, name));
         case InputTypes.TEAM:
+            return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(Select, { mode: get(settings, InputSupportedTypes.ALLOW_MULTIPLE)
+                        ? "multiple"
+                        : undefined, allowClear: !!get(settings, InputSupportedTypes.ALLOW_CLEAR), showSearch: !!get(settings, InputSupportedTypes.SEARCHABLE), filterOption: (input, option) => ((option === null || option === void 0 ? void 0 : option.key) || String((option === null || option === void 0 ? void 0 : option.value) || ""))
+                        .toLowerCase()
+                        .indexOf(input.toLowerCase()) >= 0, placeholder: placeholder, options: teamOptions || [], optionFilterProp: "key" }) }, name));
         case InputTypes.SELECT:
             return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(Select, { mode: get(settings, InputSupportedTypes.ALLOW_MULTIPLE)
                         ? "multiple"
@@ -185,6 +209,19 @@ const MetaForm = ({ metaFields, metaData, form, isEditMode, }) => {
     const brandId = get(brand, "_id");
     const queryClient = useQueryClient();
     const brandUsers = getCurrentBrandUsers(queryClient, brandId);
+    const teamOptions = useMemo(() => {
+        const externalTeams = (teams || []).filter((team) => get(team, "id") != null || get(team, "_id") != null);
+        return map(externalTeams, (team) => {
+            const teamId = get(team, "id") || get(team, "_id");
+            const teamName = get(team, "name", "");
+            const teamType = get(team, "type", "");
+            return {
+                label: (_jsxs(Typography.Text, { style: { display: "flex" }, children: [teamId, " ", teamName, " ", _jsx("span", { style: { marginLeft: "auto" }, children: teamType })] })),
+                value: teamId,
+                key: `${teamId} - ${teamName} - ${teamType}`,
+            };
+        });
+    }, [teams]);
     useEffect(() => {
         const formData = {
             metadata: buildInitialValues(metaData, metaFields, isEditMode),
@@ -194,6 +231,6 @@ const MetaForm = ({ metaFields, metaData, form, isEditMode, }) => {
     const userOptions = useMemo(() => {
         return map(brandUsers, (user) => getUserAvatar(user));
     }, [brandUsers, brandId]);
-    return (_jsx(_Fragment, { children: metaFields.map((item) => getFormItem(item, false, userOptions)) }));
+    return (_jsx(_Fragment, { children: metaFields.map((item) => getFormItem(item, false, userOptions, teamOptions)) }));
 };
 export default MetaForm;

package/build/MyDrive/fileDetails/Previewdetails.js

@@ -5,12 +5,10 @@ import { get, startsWith } from "lodash";
 import ImageViewer from "./ImageViewer";
 import { useMemo } from "react";
 import VideoPlayer from "./VideoPlayer";
-import useAppParams from "../../utilities/useAppParams";
 // const PDFViewer = lazy(() => import("./PdfViewer"));
 const GoArrowLeftIcon = GoArrowLeft;
 const GoArrowRightIcon = GoArrowRight;
 const PreviewDetails = ({ file, hasPrev, hasNext, onPrev, onNext, showFilePreview, }) => {
-    const { id } = useAppParams();
     const mimetype = get(file, "mimetype", "");
     const fileComponent = useMemo(() => {
         if (startsWith(mimetype, "image/")) {
@@ -48,6 +46,6 @@ const PreviewDetails = ({ file, hasPrev, hasNext, onPrev, onNext, showFilePrevie
             );
         }
     }, [mimetype, file]);
-    return (_jsxs(_Fragment, { children: [fileComponent, !id && (_jsxs(_Fragment, { children: [_jsx(Button, { icon: _jsx(GoArrowLeftIcon, { size: 24 }), className: "md-lib-h-11 md-lib-bg-white !md-lib-w-12 md-lib-rounded-lg md-lib-text-textColor dark:md-lib-text-darkTextColor dark:md-lib-bg-darkPrimary md-lib-absolute md-lib-left-6 md-lib-top-1/2 -md-lib-translate-y-1/2", onClick: onPrev, disabled: !hasPrev }), _jsx(Button, { icon: _jsx(GoArrowRightIcon, { size: 24 }), className: "md-lib-h-11 md-lib-bg-white !md-lib-w-12 md-lib-rounded-lg md-lib-text-textColor dark:md-lib-text-darkTextColor dark:md-lib-bg-darkPrimary md-lib-absolute md-lib-right-6 md-lib-top-1/2 -md-lib-translate-y-1/2", onClick: onNext, disabled: !hasNext })] }))] }));
+    return (_jsxs(_Fragment, { children: [fileComponent, _jsx(Button, { icon: _jsx(GoArrowLeftIcon, { size: 24 }), className: "md-lib-h-11 md-lib-bg-white !md-lib-w-12 md-lib-rounded-lg md-lib-text-textColor dark:md-lib-text-darkTextColor dark:md-lib-bg-darkPrimary md-lib-absolute md-lib-left-6 md-lib-top-1/2 -md-lib-translate-y-1/2", onClick: onPrev, disabled: !hasPrev }), _jsx(Button, { icon: _jsx(GoArrowRightIcon, { size: 24 }), className: "md-lib-h-11 md-lib-bg-white !md-lib-w-12 md-lib-rounded-lg md-lib-text-textColor dark:md-lib-text-darkTextColor dark:md-lib-bg-darkPrimary md-lib-absolute md-lib-right-6 md-lib-top-1/2 -md-lib-translate-y-1/2", onClick: onNext, disabled: !hasNext })] }));
 };
 export default PreviewDetails;

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

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

package/build/MyDrive/files/MapFile.js

@@ -27,7 +27,7 @@ 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, parentFolderId, }) {
+function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, canEdit = true, }) {
     const { folderId, type } = useAppParams();
     const damConfig = useDamConfig();
     const externalTeams = (damConfig === null || damConfig === void 0 ? void 0 : damConfig.teams) || [];
@@ -231,9 +231,15 @@ function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, })
             },
         });
     };
-    const getMetadataForm = (_jsxs(Form, { layout: "vertical", form: form, scrollToFirstError: true, onFinish: fromUpload ? handleSubmit : handleUpdate, className: "md-lib-m-2", children: [_jsx(AssetSelectionFormItem, { handleAssetTemplateChange: handleAssetTemplateChange, assetOptions: assetOptions, assetsLoading: assetsLoading }), selectedAssetTemplate && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { name: "teamIds", label: "Teams", children: _jsx(Select, { options: teamOptions, placeholder: "Select teams", mode: "multiple", onChange: (val) => onChangeTeams(val), style: { width: "100%" }, showSearch: true, optionFilterProp: "key" }) }), _jsx(Form.Item, { name: "expiryDate", label: "Expiry Date", children: _jsx(DatePicker, { placeholder: "Expiry Date", style: { width: "100%" } }) }), _jsx(Metadata, { asset: selectedAssetTemplate, form: form, file: (filesList === null || filesList === void 0 ? void 0 : filesList[0]) || null })] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-justify-end md-lib-gap-3", children: [_jsx(Button, { onClick: handleCancelWithConfirmation, children: "Cancel" }), _jsx(Button, { disabled: !selectedAssetTemplate, type: "primary", 
-                        // onClick={handleSubmit}
-                        loading: loading || updateFileMutation.isLoading, htmlType: "submit", children: "Save" })] })] }));
+    const preventEnterSubmit = (e) => {
+        if (e.key === "Enter" && e.target instanceof HTMLElement) {
+            const tagName = e.target.tagName.toLowerCase();
+            if (tagName !== "textarea") {
+                e.preventDefault();
+            }
+        }
+    };
+    const getMetadataForm = (_jsxs(Form, { layout: "vertical", form: form, scrollToFirstError: true, onFinish: fromUpload ? handleSubmit : handleUpdate, onKeyDown: preventEnterSubmit, className: "md-lib-m-2", disabled: !canEdit, children: [_jsx(AssetSelectionFormItem, { handleAssetTemplateChange: handleAssetTemplateChange, assetOptions: assetOptions, assetsLoading: assetsLoading }), selectedAssetTemplate && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { name: "teamIds", label: "Teams", children: _jsx(Select, { options: teamOptions, placeholder: "Select teams", mode: "multiple", onChange: (val) => onChangeTeams(val), style: { width: "100%" }, showSearch: true, optionFilterProp: "key" }) }), _jsx(Form.Item, { name: "expiryDate", label: "Expiry Date", children: _jsx(DatePicker, { placeholder: "Expiry Date", style: { width: "100%" } }) }), _jsx(Metadata, { asset: selectedAssetTemplate, form: form, file: (filesList === null || filesList === void 0 ? void 0 : filesList[0]) || null })] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-justify-end md-lib-gap-3", children: [_jsx(Button, { onClick: handleCancelWithConfirmation, children: canEdit ? "Cancel" : "Close" }), canEdit && (_jsx(Button, { disabled: !selectedAssetTemplate, type: "primary", loading: loading || updateFileMutation.isLoading, htmlType: "submit", children: "Save" }))] })] }));
     return (_jsx(_Fragment, { children: fromUpload ? (_jsx(Drawer, { title: "Metadata", open: open, onClose: handleCancelWithConfirmation, maskClosable: false, children: getMetadataForm })) : (_jsxs("div", { className: "md-lib-p-2 md-lib-overflow-y-scroll md-lib-max-h-[calc(100vh-65px)]", children: [_jsx("p", { className: "md-lib-text-lg md-lib-font-semibold", children: "Metadata" }), getMetadataForm] })) }));
 }
 export default MapFile;

package/build/MyDrive/index.d.ts

@@ -11,6 +11,8 @@ declare function App(props: {
     parentId?: string;
     showSubfolders?: boolean;
     userEmail?: string;
-    onFolderChange?: (folderId: string) => void;
+    onFolderChange?: (folderId: string | undefined) => void;
+    /** Height of host app header (e.g. navbar) in px. When set, preview modal positions below it instead of covering. */
+    headerHeight?: number;
 }): JSX.Element;
 export default App;

package/build/MyDrive/index.js

@@ -23,6 +23,7 @@ function App(props) {
         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,
+        headerHeight: props === null || props === void 0 ? void 0 : props.headerHeight,
     }), [
         props === null || props === void 0 ? void 0 : props.accessKey,
         props === null || props === void 0 ? void 0 : props.secretKey,
@@ -35,6 +36,7 @@ function App(props) {
         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.headerHeight,
     ]);
     const [folders, setFolders] = useState([]);
     if (typeof window !== "undefined" && !window.process) {

package/build/MyDrive/routes.d.ts

@@ -4,7 +4,7 @@ type AppRoutesProps = {
     folders: FolderTypes[];
     setFolders: React.Dispatch<React.SetStateAction<FolderTypes[]>>;
     routerVersion: 4 | 5 | 6;
-    onFolderChange?: (folderId: string) => void;
+    onFolderChange?: (folderId: string | undefined) => void;
 };
 export default function AppRoutes({ folders, setFolders, routerVersion, onFolderChange, }: AppRoutesProps): JSX.Element;
 export {};

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, headerHeight } = config;
     const [accessToken, setAccessToken] = useState(null);
     const [user, setDamUser] = useState(null);
     const [brand, setBrand] = useState(null);
@@ -148,6 +148,7 @@ export const DamConfigProvider = ({ children, config }) => {
             rootFolderId,
             teams,
             isAdmin,
+            headerHeight: headerHeight !== null && headerHeight !== void 0 ? headerHeight : 0,
         }, children: loading ? (_jsx(Loader, {})) : (_jsx(_Fragment, { children: showPaymentErr ? (_jsx("div", { className: "flex items-center justify-center h-[calc(100vh-200px)]", children: _jsx("p", { className: "text-sm font-medium text-textColor dark:text-darkTextColor", children: SUBSCRIPTION_EXPIRED_ERROR_MESSAGE }) })) : (children) })) }));
 };
 export const useDamConfig = () => useContext(DamConfigContext);

package/package.json

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