@bindu-dashing/dam-solution-v2 5.8.193 → 5.8.195

package/build/AssetType/AddFieldProperties.js

@@ -314,11 +314,6 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                     return false;
                 return d.hour() !== 0 || d.minute() !== 0 || d.second() !== 0;
             };
-            const hasOnlyDateNoTime = (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`);
@@ -330,10 +325,8 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                             typeof value.hour === "function" &&
                             typeof value.minute === "function" &&
                             typeof value.second === "function";
-                        // When time is allowed: reject if user selected date-only (must re-select with time)
-                        if (allowTime && hasTimeMethods && hasOnlyDateNoTime(value)) {
-                            return Promise.reject("Please select a date with time (hour/minute/second).");
-                        }
+                        // 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).");
                         }
@@ -353,12 +346,8 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                             typeof end.hour === "function" &&
                             typeof end.minute === "function" &&
                             typeof end.second === "function";
-                        // When time is allowed: reject if either date is date-only (must re-select with time)
-                        if (allowTime && (startHasTimeMethods || endHasTimeMethods)) {
-                            if (hasOnlyDateNoTime(start) || hasOnlyDateNoTime(end)) {
-                                return Promise.reject("Please select both start and end dates with time.");
-                            }
-                        }
+                        // 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.");
                         }

package/build/CreateClient/CreateClientForm.js

@@ -19,7 +19,7 @@ import { getBaseUrl } from "../hocs/helpers";
 import { CREATE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { showNotification } from "../common/notifications";
-import { get } from "lodash";
+import { get, isEqual } from "lodash";
 const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess, clientSubdomain, existingClientData, }) => {
     const damConfig = useDamConfig();
     const { appType } = damConfig;
@@ -34,6 +34,51 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [form] = Form.useForm();
     const isEditMode = !!existingClientData;
+    // Watch form values to enable/disable Submit button
+    const formValues = Form.useWatch([], form);
+    const isFormValid = useMemo(() => {
+        var _a;
+        if (!formValues)
+            return false;
+        // In edit mode, disabled fields (subdomain, damLocationDetails) may be excluded from form values - use clientData as fallback
+        const damLocationDetails = formValues.damLocationDetails || get(clientData, "damLocationDetails", {}) || {};
+        const name = formValues.name;
+        const accessTypes = formValues.accessTypes;
+        const adminTeams = formValues.adminTeams;
+        const subdomain = (_a = formValues.subdomain) !== null && _a !== void 0 ? _a : (isEditMode ? (get(clientData, "subdomain") || (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain)) : undefined);
+        const type = damLocationDetails.type;
+        const rootPath = damLocationDetails.rootPath;
+        if (!(name === null || name === void 0 ? void 0 : name.trim()))
+            return false;
+        if (!(accessTypes === null || accessTypes === void 0 ? void 0 : accessTypes.length))
+            return false;
+        if (!(adminTeams === null || adminTeams === void 0 ? void 0 : adminTeams.length))
+            return false;
+        if (!(subdomain === null || subdomain === void 0 ? void 0 : subdomain.trim()))
+            return false;
+        if (!type)
+            return false;
+        if (!(rootPath === null || rootPath === void 0 ? void 0 : rootPath.trim()))
+            return false;
+        if (damLocationType === "external") {
+            const bucket = damLocationDetails.bucket;
+            const accessKeyId = damLocationDetails.accessKeyId;
+            const secretAccessKey = damLocationDetails.secretAccessKey;
+            const url = damLocationDetails.url;
+            const region = damLocationDetails.region;
+            if (!(bucket === null || bucket === void 0 ? void 0 : bucket.trim()))
+                return false;
+            if (!(accessKeyId === null || accessKeyId === void 0 ? void 0 : accessKeyId.trim()))
+                return false;
+            if (!(secretAccessKey === null || secretAccessKey === void 0 ? void 0 : secretAccessKey.trim()))
+                return false;
+            if (!(url === null || url === void 0 ? void 0 : url.trim()))
+                return false;
+            if (!(region === null || region === void 0 ? void 0 : region.trim()))
+                return false;
+        }
+        return true;
+    }, [formValues, damLocationType, isEditMode, clientData, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain]);
     const onChangeDamLocationType = (e) => {
         setDamLocationType(e);
         form.setFieldValue("dam_location_details", { type: e });
@@ -152,7 +197,7 @@ 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;
         try {
             // Use teamsApiDetails from clientData if available (from API response), otherwise use props
             const teamsApiDetailsFromData = get(clientData, "teamsApiDetails", {});
@@ -163,54 +208,85 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
             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 (partial update)
+                const originalAdminTeams = get(clientData, "adminTeams", []);
+                const originalAdminTeamsStr = Array.isArray(originalAdminTeams)
+                    ? originalAdminTeams.map((t) => String(t)).sort()
+                    : [];
+                const newAdminTeamsStr = [...adminTeamsAsStrings].sort();
+                const payload = {};
+                if (data.name !== undefined && data.name !== get(clientData, "name")) {
+                    payload.name = data.name;
+                }
+                if (!isEqual(newAdminTeamsStr, originalAdminTeamsStr)) {
+                    payload.adminTeams = adminTeamsAsStrings;
+                }
+                if (!isEqual(data.accessTypes || [], get(clientData, "accessTypes", []))) {
+                    payload.accessTypes = data.accessTypes;
+                }
+                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, */*'
                     }
                 });
-                // Extract data from axios response (API returns { data: {...} } or { data: { data: {...} } })
                 response = get(putResponse, "data.data", get(putResponse, "data", putResponse));
             }
             else {
+                // Create mode: send full payload
+                const damLocationDetailsFromForm = data === null || data === void 0 ? void 0 : data.damLocationDetails;
+                const subdomainValue = data.subdomain;
+                const values = Object.assign(Object.assign({}, data), { subdomain: subdomainValue, 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: damLocationType === "external"
+                        ? {
+                            bucket: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.bucket,
+                            locationType: "EXTERNAL",
+                            rootPath: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.rootPath,
+                            accessKeyId: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.accessKeyId,
+                            secretAccessKey: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.secretAccessKey,
+                            url: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.url,
+                            region: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.region,
+                        }
+                        : {
+                            locationType: "INTERNAL",
+                            rootPath: damLocationDetailsFromForm === null || damLocationDetailsFromForm === void 0 ? void 0 : damLocationDetailsFromForm.rootPath,
+                        } });
                 // Create new client: POST to /brands/sub-brand
                 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);
+            showNotification((_d = response === null || response === void 0 ? void 0 : response.message) !== null && _d !== void 0 ? _d : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
             toggleShow();
             if (onSuccess) {
-                onSuccess(response === null || response === void 0 ? void 0 : response.data);
+                // Pass full brand object: API may return { data: {...} } or {...} directly
+                // For PATCH (edit), response may be partial - merge with clientData and existingClientData
+                // so parent gets accessKey, secretKey, subdomain (credentials may not be in API response)
+                const apiBrand = get(response, "data", response);
+                const brandData = isEditMode
+                    ? Object.assign(Object.assign(Object.assign({}, (clientData || {})), (existingClientData || {})), apiBrand) : apiBrand;
+                onSuccess(brandData);
             }
         }
         catch (error) {
@@ -307,41 +383,41 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                                 },
                             ], children: _jsx(Select, { options: DAM_LOCATION_TYPES, onChange: (e) => {
                                     onChangeDamLocationType(e);
-                                }, placeholder: "Type" }) }), _jsx(Form.Item, { label: "Root Path", name: ["damLocationDetails", "rootPath"], rules: [
+                                }, placeholder: "Type", disabled: isEditMode }) }), _jsx(Form.Item, { label: "Root Path", name: ["damLocationDetails", "rootPath"], rules: [
                                 {
                                     required: true,
                                     message: "Root path is required",
                                 },
-                            ], children: _jsx(Input, { placeholder: "Root path" }) }), shouldShowExternalFields && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Bucket", name: ["damLocationDetails", "bucket"], rules: [
+                            ], children: _jsx(Input, { placeholder: "Root path", disabled: isEditMode }) }), shouldShowExternalFields && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Bucket", name: ["damLocationDetails", "bucket"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Bucket is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Bucket", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Access Key", name: ["damLocationDetails", "accessKeyId"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Bucket", disabled: damLocationType === "internal" || isEditMode }) }), _jsx(Form.Item, { label: "Access Key", name: ["damLocationDetails", "accessKeyId"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Access key is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Access Key", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Secret Access Key", name: ["damLocationDetails", "secretAccessKey"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Access Key", disabled: damLocationType === "internal" || isEditMode }) }), _jsx(Form.Item, { label: "Secret Access Key", name: ["damLocationDetails", "secretAccessKey"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Secret Access Key is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Secret Key", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Url", name: ["damLocationDetails", "url"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Secret Key", disabled: damLocationType === "internal" || isEditMode }) }), _jsx(Form.Item, { label: "Url", name: ["damLocationDetails", "url"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Url is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Url", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Region", name: ["damLocationDetails", "region"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Url", disabled: damLocationType === "internal" || isEditMode }) }), _jsx(Form.Item, { label: "Region", name: ["damLocationDetails", "region"], rules: [
                                         {
                                             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" || isEditMode }) })] }))] }), _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, { children: _jsx(Button, { htmlType: "submit", type: "primary", block: true, loading: loading, disabled: !isFormValid || loading, children: "Submit" }) })] })) }));
 };
 export default CreateClientForm;

package/build/MyDrive/FolderTree.js

@@ -233,7 +233,13 @@ 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);
                 }
@@ -248,7 +254,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/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

package/package.json

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