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

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
@@ -285,6 +314,11 @@ 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`);
@@ -296,10 +330,14 @@ 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).");
+                        }
                         if (allowTime && !hasTimeMethods) {
                             return Promise.reject("Please select a date with time (hour/minute/second).");
                         }
-                        // When time is not allowed: reject only if user selected a non-zero time
+                        // 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.");
                         }
@@ -315,10 +353,16 @@ 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.");
+                            }
+                        }
                         if (allowTime && (!startHasTimeMethods || !endHasTimeMethods)) {
                             return Promise.reject("Please select both start and end dates with time.");
                         }
-                        // When time is not allowed: reject only if user selected a non-zero time
+                        // 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.");
                         }

package/build/CreateClient/CreateClientBtn.js

@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Button, Space } from "antd";
-import { useState, useMemo } from "react";
+import { useState } from "react";
+import axios from "axios";
 import CreateClientForm from "./CreateClientForm";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { createApiClient } from "../hocs/configureAxios";
-import { REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
+import { getBaseUrl } from "../hocs/helpers";
+import { REFRESH_KEY_URL, USER_LOGIN } from "../utilities/constants/apiUrls";
 import { showNotification } from "../common/notifications";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { SOMETHING_WENT_WRONG } from "../utilities/constants/messages";
@@ -23,7 +24,7 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
     const [refreshingKey, setRefreshingKey] = useState(false);
     const isEditMode = !!existingClientData;
     const damConfig = useDamConfig();
-    const api = useMemo(() => createApiClient(damConfig), [damConfig]);
+    const { appType, teamIds } = damConfig;
     const toggleShow = () => {
         setShowForm(!showForm);
     };
@@ -32,11 +33,32 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
             showNotification("Access key and secret key are required to refresh", NotificationStatus.ERROR);
             return;
         }
+        const accessKey = existingClientData.accessKey;
+        const secretKey = existingClientData.secretKey;
+        const subdomain = existingClientData.subdomain || clientSubdomain || (damConfig === null || damConfig === void 0 ? void 0 : damConfig.subdomain) || "";
+        if (!subdomain) {
+            showNotification("Subdomain is required to refresh key", NotificationStatus.ERROR);
+            return;
+        }
         setRefreshingKey(true);
         try {
-            const response = yield api.put(REFRESH_KEY_URL, {
-                accessKey: existingClientData.accessKey,
-                secretKey: existingClientData.secretKey,
+            // Step 1: Login with keys to get DAM token (same as Edit Client flow)
+            const loginResponse = yield axios.post(getBaseUrl(appType) + USER_LOGIN, {
+                accessKey,
+                secretKey,
+                subdomain,
+                teams: teamIds && teamIds.length > 0 ? teamIds : [""],
+            });
+            const token = get(loginResponse, "data.data.access_token");
+            if (!token) {
+                throw new Error("Failed to get token from login");
+            }
+            // Step 2: Call refresh API with the DAM token (include subdomain header)
+            const response = yield axios.put(getBaseUrl(appType) + REFRESH_KEY_URL, { accessKey, secretKey }, {
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    subdomain: subdomain,
+                },
             });
             setRefreshingKey(false);
             showNotification(get(response, "data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
@@ -45,7 +67,7 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
             }
         }
         catch (error) {
-            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
+            showNotification(get(error, "response.data.message", get(error, "message", SOMETHING_WENT_WRONG)), NotificationStatus.ERROR);
             setRefreshingKey(false);
         }
     });

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

@@ -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/index.d.ts

@@ -11,7 +11,7 @@ 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;

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/RefreshKey/RefreshKeyBtn.js

@@ -9,32 +9,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Button } from "antd";
-import { useMemo, useState } from "react";
+import { useState } from "react";
+import axios from "axios";
 import { showNotification } from "../common/notifications";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { SOMETHING_WENT_WRONG } from "../utilities/constants/messages";
 import { get } from "lodash";
-import { REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
+import { REFRESH_KEY_URL, USER_LOGIN } from "../utilities/constants/apiUrls";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { createApiClient } from "../hocs/configureAxios";
+import { getBaseUrl } from "../hocs/helpers";
 export default function RefreshKeyBtn() {
     const [loading, setLoading] = useState(false);
     const damConfig = useDamConfig();
-    const { damAccessKey, secretKey } = damConfig;
-    const api = useMemo(() => createApiClient(damConfig), [damConfig]);
+    const { damAccessKey, secretKey, subdomain, teamIds, appType } = damConfig;
     const onRefreshKey = () => __awaiter(this, void 0, void 0, function* () {
+        if (!damAccessKey || !secretKey || !subdomain) {
+            showNotification("Access key, secret key, and subdomain are required to refresh", NotificationStatus.ERROR);
+            return;
+        }
         setLoading(true);
         try {
-            const response = yield api.put(REFRESH_KEY_URL, {
+            // Step 1: Login with keys to get DAM token (same as Edit Client flow)
+            const loginResponse = yield axios.post(getBaseUrl(appType) + USER_LOGIN, {
                 accessKey: damAccessKey,
                 secretKey,
+                subdomain,
+                teams: teamIds && teamIds.length > 0 ? teamIds : [""],
+            });
+            const token = get(loginResponse, "data.data.access_token");
+            if (!token) {
+                throw new Error("Failed to get token from login");
+            }
+            // Step 2: Call refresh API with the DAM token (include subdomain header)
+            const response = yield axios.put(getBaseUrl(appType) + REFRESH_KEY_URL, { accessKey: damAccessKey, secretKey }, {
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    subdomain: subdomain,
+                },
             });
-            // console.log(response);
             setLoading(false);
             showNotification(get(response, "data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
         }
         catch (error) {
-            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
+            showNotification(get(error, "response.data.message", get(error, "message", SOMETHING_WENT_WRONG)), NotificationStatus.ERROR);
             setLoading(false);
         }
     });

package/package.json

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