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

package/build/CreateClient/CreateClientBtn.js

@@ -1,13 +1,54 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button } from "antd";
-import { useState } from "react";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 CreateClientForm from "./CreateClientForm";
+import { useDamConfig } from "../hocs/DamConfigContext";
+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";
+import { get } from "lodash";
 const CreateClient = ({ onSuccess, clientSubdomain, teamsApi, username, password, existingClientData, }) => {
     const [showForm, setShowForm] = useState(false);
+    const [refreshingKey, setRefreshingKey] = useState(false);
     const isEditMode = !!existingClientData;
+    const damConfig = useDamConfig();
+    const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const toggleShow = () => {
         setShowForm(!showForm);
     };
-    return (_jsxs(_Fragment, { children: [_jsx(Button, { type: "primary", onClick: toggleShow, children: isEditMode ? "Edit Client" : "Create Client" }), showForm && (_jsx(CreateClientForm, { toggleShow: toggleShow, onSuccess: onSuccess, clientSubdomain: clientSubdomain, teamsApi: teamsApi, username: username, password: password, existingClientData: existingClientData }))] }));
+    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);
+            if (onSuccess) {
+                onSuccess(response === null || response === void 0 ? void 0 : response.data);
+            }
+        }
+        catch (error) {
+            showNotification(get(error, "message", SOMETHING_WENT_WRONG), NotificationStatus.ERROR);
+            setRefreshingKey(false);
+        }
+    });
+    return (_jsxs(_Fragment, { children: [_jsxs(Space, { children: [_jsx(Button, { type: "primary", onClick: toggleShow, children: isEditMode ? "Edit Client" : "Create Client" }), 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" }))] }), showForm && (_jsx(CreateClientForm, { toggleShow: toggleShow, onSuccess: onSuccess, clientSubdomain: clientSubdomain, teamsApi: teamsApi, username: username, password: password, existingClientData: existingClientData }))] }));
 };
 export default CreateClient;

package/build/CreateClient/CreateClientForm.js

@@ -8,11 +8,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, Checkbox, Drawer, Form, Input, Select, Typography, Space } from "antd";
+import { Button, Checkbox, Drawer, Form, Input, Select, Typography } 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, REFRESH_KEY_URL } from "../utilities/constants/apiUrls";
+import { CREATE_SUB_BRAND, FETCH_BRAND_USING_SUBDOMAIN } from "../utilities/constants/apiUrls";
 import axios from "axios";
 import { createApiClient } from "../hocs/configureAxios";
 import { fetchBrandDetails } from "../react-query/services/brand-services";
@@ -25,10 +25,10 @@ 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);
+    const [teamsFetched, setTeamsFetched] = useState(false);
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const [form] = Form.useForm();
     const isEditMode = !!existingClientData;
@@ -59,6 +59,7 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                     console.log("Fetched client data:", fetchedData);
                     // Store client data in state
                     setClientData(fetchedData);
+                    setTeamsFetched(false); // Reset teams fetched flag when new client data is loaded
                     // Populate form with existing client data
                     if (fetchedData && Object.keys(fetchedData).length > 0) {
                         const damLocationDetails = get(fetchedData, "damLocationDetails", {});
@@ -91,9 +92,9 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
             }
         });
         fetchClientData();
-    }, [isEditMode, existingClientData, api, form, filteredTeams]);
+    }, [isEditMode, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.brandId, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain, api]);
     const onFinish = (data) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             // Use teamsApiDetails from clientData if available (from API response), otherwise use props
             const teamsApiDetailsFromData = get(clientData, "teamsApiDetails", {});
@@ -113,7 +114,7 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                 }, damLocationDetails: damLocationType === "external"
                     ? {
                         bucket: (_b = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _b === void 0 ? void 0 : _b.bucket,
-                        locationType: damLocationType === "external" ? "EXTERNAL" : "INTERNAL",
+                        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,
@@ -121,12 +122,13 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                         region: (_g = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _g === void 0 ? void 0 : _g.region,
                     }
                     : {
-                        locationType: damLocationType === "external" ? "EXTERNAL" : "INTERNAL",
+                        locationType: "INTERNAL",
+                        rootPath: (_h = data === null || data === void 0 ? void 0 : data.damLocationDetails) === null || _h === void 0 ? void 0 : _h.rootPath,
                     } });
             setLoading(true);
             const response = yield api.post(CREATE_SUB_BRAND, values);
             setLoading(false);
-            showNotification((_h = response === null || response === void 0 ? void 0 : response.message) !== null && _h !== void 0 ? _h : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
+            showNotification((_j = response === null || response === void 0 ? void 0 : response.message) !== null && _j !== void 0 ? _j : (get(response, "message") || CREATE_SUCCESS), NotificationStatus.SUCCESS);
             toggleShow();
             if (onSuccess) {
                 onSuccess(response === null || response === void 0 ? void 0 : response.data);
@@ -168,20 +170,22 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                 },
             });
         }
-    }, [clientData, filteredTeams, form, existingClientData]);
+    }, [clientData, form, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain]);
+    // Extract teamsApiDetails from clientData to avoid dependency on entire clientData object
+    const teamsApiFromData = useMemo(() => get(clientData, "teamsApiDetails.teamsApi"), [clientData]);
+    const usernameFromData = useMemo(() => get(clientData, "teamsApiDetails.username"), [clientData]);
+    const passwordFromData = useMemo(() => get(clientData, "teamsApiDetails.password"), [clientData]);
     useEffect(() => {
         // 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) {
+        const finalTeamsApi = teamsApiFromData || teamsApi;
+        const finalUsername = usernameFromData || username;
+        const finalPassword = passwordFromData || password;
+        // Only fetch teams if we have the required credentials and haven't fetched yet
+        if (!teamsFetched && finalTeamsApi && finalUsername && finalPassword) {
             fetchTeams(finalTeamsApi, finalUsername, finalPassword);
+            setTeamsFetched(true);
         }
-        else if (teamsApi && username && password) {
-            fetchTeams(teamsApi, username, password);
-        }
-    }, [teamsApi, username, password, clientData]);
+    }, [teamsApi, username, password, teamsApiFromData, usernameFromData, passwordFromData, teamsFetched]);
     const fetchTeams = (apiUrl, apiUsername, apiPassword) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         try {
@@ -203,26 +207,6 @@ 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);
@@ -248,17 +232,17 @@ const CreateClientForm = ({ teamsApi, username, password, toggleShow, onSuccess,
                                 },
                             ], children: _jsx(Select, { options: DAM_LOCATION_TYPES, onChange: (e) => {
                                     onChangeDamLocationType(e);
-                                }, placeholder: "Type" }) }), shouldShowExternalFields && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Bucket", name: ["damLocationDetails", "bucket"], 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" }) }), 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: "Root Path", name: ["damLocationDetails", "rootPath"], rules: [
-                                        {
-                                            required: damLocationType === "external",
-                                            message: "Root path is required",
-                                        },
-                                    ], children: _jsx(Input, { placeholder: "Root path", disabled: damLocationType === "internal" }) }), _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",
@@ -283,6 +267,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: _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" }))] }) })] })) }));
+                    ], 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" }) })] })) }));
 };
 export default CreateClientForm;

package/package.json

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