@bindu-dashing/dam-solution-v2 5.8.156 → 5.8.158

package/build/CreateClient/CreateClientBtn.d.ts

@@ -8,6 +8,7 @@ declare const CreateClient: ({ onSuccess, clientSubdomain, teamsApi, username, p
         accessKey: string;
         secretKey: string;
         subdomain: string;
+        brandId?: string;
     } | null;
 }) => JSX.Element;
 export default CreateClient;

package/build/CreateClient/CreateClientForm.d.ts

@@ -9,6 +9,7 @@ declare const CreateClientForm: ({ teamsApi, username, password, toggleShow, onS
         accessKey: string;
         secretKey: string;
         subdomain: string;
+        brandId?: string;
     } | null;
 }) => JSX.Element;
 export default CreateClientForm;

package/build/CreateClient/CreateClientForm.js

@@ -8,13 +8,14 @@ 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, Checkbox, Drawer, Form, Input, Select, Typography } from "antd";
+import { Button, Checkbox, Drawer, Form, Input, Select, Typography, Space } from "antd";
 import { useEffect, useMemo, useState } from "react";
 import { ACCESS_TYPES, DAM_LOCATION_TYPES } from "../hocs/appConstants";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { CREATE_SUB_BRAND, FETCH_BRAND_USING_SUBDOMAIN } from "../utilities/constants/apiUrls";
+import { CREATE_SUB_BRAND, FETCH_BRAND_USING_SUBDOMAIN, REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
 import axios from "axios";
 import { createApiClient } from "../hocs/configureAxios";
+import { fetchBrandDetails } from "../react-query/services/brand-services";
 import { CREATE_SUCCESS, SOMETHING_WENT_WRONG, } from "../utilities/constants/messages";
 import { NotificationStatus } from "../utilities/constants/interface";
 import { showNotification } from "../common/notifications";
@@ -24,6 +25,7 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
     const { appType, brand } = damConfig;
     const [loading, setLoading] = useState(false);
     const [fetchingClientData, setFetchingClientData] = useState(false);
+    const [refreshingKey, setRefreshingKey] = useState(false);
     const [damLocationType, setDamLocationType] = useState("external");
     const [filteredTeams, setFilteredTeams] = useState([]);
     const [clientData, setClientData] = useState(null);
@@ -37,12 +39,23 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
     // Fetch client data when editing
     useEffect(() => {
         const fetchClientData = () => __awaiter(void 0, void 0, void 0, function* () {
-            if (isEditMode && (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain)) {
+            if (isEditMode) {
                 setFetchingClientData(true);
                 try {
-                    const response = yield api.get(`${FETCH_BRAND_USING_SUBDOMAIN}?subdomain=${existingClientData.subdomain}`);
-                    // API response structure: { status: true, code: 200, data: { _id, name, adminTeams, subdomain, ... } }
-                    const fetchedData = get(response, "data.data", {});
+                    let fetchedData;
+                    // Prioritize brandId if available, otherwise use subdomain
+                    if (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.brandId) {
+                        // Use reusable fetchBrandDetails function
+                        fetchedData = yield fetchBrandDetails(api, existingClientData.brandId);
+                    }
+                    else if (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain) {
+                        const response = yield api.get(`${FETCH_BRAND_USING_SUBDOMAIN}?subdomain=${existingClientData.subdomain}`);
+                        fetchedData = get(response, "data.data", {});
+                    }
+                    else {
+                        setFetchingClientData(false);
+                        return;
+                    }
                     console.log("Fetched client data:", fetchedData);
                     // Store client data in state
                     setClientData(fetchedData);
@@ -82,6 +95,11 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
     const onFinish = (data) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         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;
             const values = Object.assign(Object.assign({}, data), { 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"
@@ -89,9 +107,9 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                     : 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: teamsApi,
-                    username: username,
-                    password: password,
+                    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,
@@ -152,16 +170,24 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
         }
     }, [clientData, filteredTeams, form, existingClientData]);
     useEffect(() => {
-        if (teamsApi && username && password) {
-            fetchTeams();
+        // Use teamsApiDetails from clientData if available, otherwise use props
+        const teamsApiDetailsFromData = get(clientData, "teamsApiDetails", {});
+        const finalTeamsApi = teamsApiDetailsFromData.teamsApi || teamsApi;
+        const finalUsername = teamsApiDetailsFromData.username || username;
+        const finalPassword = teamsApiDetailsFromData.password || password;
+        if (finalTeamsApi && finalUsername && finalPassword) {
+            fetchTeams(finalTeamsApi, finalUsername, finalPassword);
         }
-    }, [teamsApi, username, password]);
-    const fetchTeams = () => __awaiter(void 0, void 0, void 0, function* () {
+        else if (teamsApi && username && password) {
+            fetchTeams(teamsApi, username, password);
+        }
+    }, [teamsApi, username, password, clientData]);
+    const fetchTeams = (apiUrl, apiUsername, apiPassword) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         try {
-            const response = yield axios.get(teamsApi, {
+            const response = yield axios.get(apiUrl, {
                 headers: {
-                    Authorization: "Basic " + btoa(username + ":" + password),
+                    Authorization: "Basic " + btoa(apiUsername + ":" + apiPassword),
                 },
             });
             const options = (_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.map((team) => {
@@ -177,6 +203,26 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
             console.log("Error while fetching external teams", err);
         }
     });
+    // Refresh key functionality
+    const onRefreshKey = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (!(existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.accessKey) || !(existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.secretKey)) {
+            showNotification("Access key and secret key are required to refresh", NotificationStatus.ERROR);
+            return;
+        }
+        setRefreshingKey(true);
+        try {
+            const response = yield api.put(REFRESH_KEY_URL, {
+                accessKey: existingClientData.accessKey,
+                secretKey: existingClientData.secretKey,
+            });
+            setRefreshingKey(false);
+            showNotification(get(response, "data.message", "Key refreshed successfully"), NotificationStatus.SUCCESS);
+        }
+        catch (error) {
+            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
+            setRefreshingKey(false);
+        }
+    });
     // Debug: Log edit mode and location type
     const shouldShowExternalFields = damLocationType === "external" || isEditMode;
     console.log("CreateClientForm - isEditMode:", isEditMode, "damLocationType:", damLocationType, "shouldShowExternalFields:", shouldShowExternalFields, "existingClientData:", existingClientData);
@@ -237,6 +283,6 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                             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" }) }), _jsx(Form.Item, { name: "showFilePreview", valuePropName: "checked", initialValue: false, children: _jsx(Checkbox, { children: "Show File Preview Editor" }) }), _jsx(Form.Item, { children: _jsxs(Space, { style: { width: "100%" }, children: [_jsx(Button, { htmlType: "submit", type: "primary", block: true, loading: loading, children: "Submit" }), isEditMode && (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.accessKey) && (existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.secretKey) && (_jsx(Button, { type: "default", loading: refreshingKey, onClick: onRefreshKey, children: "Refresh Key" }))] }) })] })) }));
 };
 export default CreateClientForm;

package/build/CreateClient/index.d.ts

@@ -14,6 +14,7 @@ declare function App(props: {
         accessKey: string;
         secretKey: string;
         subdomain: string;
+        brandId?: string;
     } | null;
 }): JSX.Element;
 export default App;

package/build/react-query/services/brand-services.d.ts

@@ -1,3 +1,4 @@
+export declare function fetchBrandDetails(api: any, brandId: string): Promise<any>;
 export declare function useCurrentBrand(headers: {
     headers: any;
 }, brandId: string, enabled: boolean): import("react-query").UseQueryResult<any, unknown>;

package/build/react-query/services/brand-services.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { FETCH_BRAND_URL } from "../../utilities/constants/apiUrls";
+import { FETCH_BRAND_URL, FETCH_BRAND_DETAILS_URL } from "../../utilities/constants/apiUrls";
 import { QueryKeys } from "../../utilities/constants/queryKeys";
 import { get } from "lodash";
 import { useQuery } from "react-query";
@@ -22,6 +22,19 @@ function fetchBrand(api, brandId) {
         }
     });
 }
+export function fetchBrandDetails(api, brandId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const response = yield api.get(FETCH_BRAND_DETAILS_URL.replace(":brandId", brandId));
+            // API response structure: { status: true, code: 200, data: { ... } }
+            // The axios interceptor already extracts response.data, so response is { status, code, data }
+            return get(response, "data", {});
+        }
+        catch (error) {
+            throw error;
+        }
+    });
+}
 export function useCurrentBrand(headers, brandId, enabled) {
     return useQuery([QueryKeys.BRAND, brandId], () => fetchBrand(headers, brandId), {
         enabled: enabled && !!get(headers, "headers.Authorization"),

package/build/utilities/constants/apiUrls.d.ts

@@ -83,6 +83,7 @@ export declare const USER_LOGIN = "/users/login/keys";
 export declare const FETCH_BRAND_USING_SUBDOMAIN = "/brands/subdomain";
 export declare const FETCH_TEAMS_LIST = "/teams/:teamID/list";
 export declare const CREATE_SUB_BRAND = "/brands/sub-brand";
+export declare const FETCH_BRAND_DETAILS_URL = "/brands/details/:brandId";
 export declare const FETCH_IMAGEPICKERS_URL = "/image-picker";
 export declare const FETCH_IMAGEPICKER_URL = "/image-picker/:id";
 export declare const FETCH_META_FIELD_OPTIONS_URL = "/image-picker/file-filters/:id";

package/build/utilities/constants/apiUrls.js

@@ -99,6 +99,7 @@ export const FETCH_BRAND_USING_SUBDOMAIN = "/brands/subdomain";
 export const FETCH_TEAMS_LIST = "/teams/:teamID/list";
 // brand
 export const CREATE_SUB_BRAND = "/brands/sub-brand";
+export const FETCH_BRAND_DETAILS_URL = "/brands/details/:brandId";
 //image picker
 export const FETCH_IMAGEPICKERS_URL = "/image-picker";
 export const FETCH_IMAGEPICKER_URL = "/image-picker/:id";

package/package.json

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