@bindu-dashing/dam-solution-v2 5.8.200 → 5.8.203

package/build/CreateClient/CreateClientBtn.js

@@ -9,12 +9,11 @@ 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 } from "react";
-import axios from "axios";
+import { useState, useMemo } from "react";
 import CreateClientForm from "./CreateClientForm";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { getBaseUrl } from "../hocs/helpers";
-import { REFRESH_KEY_URL, USER_LOGIN } from "../utilities/constants/apiUrls";
+import { createApiClient } from "../hocs/configureAxios";
+import { REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
 import { showNotification } from "../common/notifications";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { SOMETHING_WENT_WRONG } from "../utilities/constants/messages";
@@ -24,7 +23,7 @@ const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password
     const [refreshingKey, setRefreshingKey] = useState(false);
     const isEditMode = !!existingClientData;
     const damConfig = useDamConfig();
-    const { appType, teamIds } = damConfig;
+    const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const toggleShow = () => {
         setShowForm(!showForm);
     };
@@ -33,38 +32,20 @@ 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 {
-            // 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,
-                },
+            const response = yield api.put(REFRESH_KEY_URL, {
+                accessKey: existingClientData.accessKey,
+                secretKey: existingClientData.secretKey,
             });
             setRefreshingKey(false);
-            showNotification(get(response, "data.data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
+            showNotification(get(response, "data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
+            if (onSuccess) {
+                onSuccess(response === null || response === void 0 ? void 0 : response.data);
+            }
         }
         catch (error) {
-            showNotification(get(error, "response.data.message", get(error, "message", SOMETHING_WENT_WRONG)), NotificationStatus.ERROR);
+            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
             setRefreshingKey(false);
         }
     });

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, isEqual } from "lodash";
+import { get } from "lodash";
 const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess, clientSubdomain, existingClientData, }) => {
     const damConfig = useDamConfig();
     const { appType } = damConfig;
@@ -34,51 +34,6 @@ 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 });
@@ -197,40 +152,33 @@ 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;
+        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))
-                : [];
             setLoading(true);
             let response;
             const baseUrl = getBaseUrl(appType);
             if (isEditMode && brandIdForUpdate && authToken) {
-                // Edit mode: send only changed fields (partial update)
-                const originalAdminTeams = get(clientData, "adminTeams", []);
-                const originalAdminTeamsStr = Array.isArray(originalAdminTeams)
-                    ? originalAdminTeams.map((t) => String(t)).sort()
+                // Edit mode: send only changed fields via PUT
+                const adminTeamsAsStrings = Array.isArray(data.adminTeams)
+                    ? data.adminTeams.map((team) => String(team))
                     : [];
-                const newAdminTeamsStr = [...adminTeamsAsStrings].sort();
+                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 !== undefined && data.name !== get(clientData, "name")) {
+                if (data.name !== get(clientData, "name"))
                     payload.name = data.name;
-                }
-                if (!isEqual(newAdminTeamsStr, originalAdminTeamsStr)) {
+                if (accessTypesChanged)
+                    payload.accessTypes = data.accessTypes || [];
+                if (!arraysEqual(adminTeamsAsStrings, existingAdminTeams))
                     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)) {
+                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);
@@ -238,18 +186,39 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                 }
                 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 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"
+                // 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
@@ -259,35 +228,29 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                         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
+                    }, damLocationDetails });
                 response = yield api.post(CREATE_SUB_BRAND, values);
             }
             setLoading(false);
             showNotification((_d = response === null || response === void 0 ? void 0 : response.message) !== null && _d !== void 0 ? _d : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
-            toggleShow();
+            // 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) {
-                // 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);
+                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);
@@ -376,48 +339,70 @@ 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",
                                 },
                             ], children: _jsx(Select, { options: DAM_LOCATION_TYPES, onChange: (e) => {
                                     onChangeDamLocationType(e);
-                                }, placeholder: "Type", disabled: isEditMode }) }), _jsx(Form.Item, { label: "Root Path", name: ["damLocationDetails", "rootPath"], rules: [
+                                }, placeholder: "Type" }) }), _jsx(Form.Item, { label: "Root Path", name: ["damLocationDetails", "rootPath"], rules: [
                                 {
                                     required: true,
                                     message: "Root path is required",
                                 },
-                            ], children: _jsx(Input, { placeholder: "Root path", disabled: isEditMode }) }), shouldShowExternalFields && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Bucket", name: ["damLocationDetails", "bucket"], rules: [
+                            ], children: _jsx(Input, { placeholder: "Root path" }) }), 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" || isEditMode }) }), _jsx(Form.Item, { label: "Access Key", name: ["damLocationDetails", "accessKeyId"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Bucket", disabled: damLocationType === "internal" }) }), _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" || isEditMode }) }), _jsx(Form.Item, { label: "Secret Access Key", name: ["damLocationDetails", "secretAccessKey"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Access Key", disabled: damLocationType === "internal" }) }), _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" || isEditMode }) }), _jsx(Form.Item, { label: "Url", name: ["damLocationDetails", "url"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Secret Key", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Url", name: ["damLocationDetails", "url"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Url is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Url", disabled: damLocationType === "internal" || isEditMode }) }), _jsx(Form.Item, { label: "Region", name: ["damLocationDetails", "region"], rules: [
+                                    ], children: _jsx(Input, { placeholder: "Url", disabled: damLocationType === "internal" }) }), _jsx(Form.Item, { label: "Region", name: ["damLocationDetails", "region"], rules: [
                                         {
                                             required: damLocationType === "external",
                                             message: "Region is required",
                                         },
-                                    ], children: _jsx(Input, { placeholder: "Region", disabled: damLocationType === "internal" || isEditMode }) })] }))] }), _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", 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" }) })] })) }));
+                    ], 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/RefreshKey/RefreshKeyBtn.js

@@ -9,49 +9,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Button } from "antd";
-import { useState } from "react";
-import axios from "axios";
+import { useMemo, useState } from "react";
 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, USER_LOGIN } from "../utilities/constants/apiUrls";
+import { REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { getBaseUrl } from "../hocs/helpers";
+import { createApiClient } from "../hocs/configureAxios";
 export default function RefreshKeyBtn() {
     const [loading, setLoading] = useState(false);
     const damConfig = useDamConfig();
-    const { damAccessKey, secretKey, subdomain, teamIds, appType } = damConfig;
+    const { damAccessKey, secretKey } = damConfig;
+    const api = useMemo(() => createApiClient(damConfig), [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 {
-            // Step 1: Login with keys to get DAM token (same as Edit Client flow)
-            const loginResponse = yield axios.post(getBaseUrl(appType) + USER_LOGIN, {
+            const response = yield api.put(REFRESH_KEY_URL, {
                 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, "response.data.message", get(error, "message", SOMETHING_WENT_WRONG)), NotificationStatus.ERROR);
+            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
             setLoading(false);
         }
     });

package/build/hocs/DamConfigContext.js

@@ -143,7 +143,6 @@ export const DamConfigProvider = ({ children, config }) => {
             loading,
             setAccessToken,
             setDamUser,
-            setBrand,
             appType,
             setRootFolderId,
             rootFolderId,

package/build/hocs/configureAxios.js

@@ -44,10 +44,10 @@ export const createApiClient = ({ accessToken, appType, subdomain, damAccessKey,
                 const token = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.access_token;
                 const userData = (_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.user;
                 const brandData = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f.brand;
-                setAccessToken === null || setAccessToken === void 0 ? void 0 : setAccessToken(token);
-                setDamUser === null || setDamUser === void 0 ? void 0 : setDamUser(userData);
-                setBrand === null || setBrand === void 0 ? void 0 : setBrand(brandData);
-                setRootFolderId === null || setRootFolderId === void 0 ? void 0 : setRootFolderId(get(response, "data.data.rootFolderId"));
+                setAccessToken(token);
+                setDamUser(userData);
+                setBrand(brandData);
+                setRootFolderId(get(response, "data.data.rootFolderId"));
                 originalRequest.headers["Authorization"] = `Bearer ${token}`;
                 return api(originalRequest);
             }

package/package.json

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