@bindu-dashing/dam-solution-v2 5.8.144 → 5.8.148

package/build/MyDrive/BulkUploadModal.js

@@ -8,9 +8,9 @@ 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 { Form, Modal, Button, Upload, Select, Input, Radio, Typography, Tooltip, } from "antd";
+import { Form, Modal, Button, Upload, Select, Input, Radio, Typography, Tooltip, Checkbox, Popover, } from "antd";
 import { useEffect, useMemo, useState } from "react";
-import { UploadOutlined, InfoCircleOutlined } from "@ant-design/icons";
+import { UploadOutlined, InfoCircleOutlined, QuestionCircleOutlined } from "@ant-design/icons";
 import { useDamConfig } from "../hocs/DamConfigContext";
 import { createApiClient } from "../hocs/configureAxios";
 import { BULK_UPLOAD_URL, FETCH_ASSETS_URL, FILE_UPLOAD_URL, GENERATE_THUMBNAILS_URL, SAMPLE_FILE_DOWNLOAD_URL, } from "../utilities/constants/apiUrls";
@@ -113,7 +113,7 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
             else {
                 const formData = new FormData();
                 formData.append("assetId", values === null || values === void 0 ? void 0 : values.asset_type_id);
-                formData.append("rejectInvalidMetaFile", "true");
+                formData.append("rejectInvalidMetaFile", (values === null || values === void 0 ? void 0 : values.reject_invalid_meta_file) ? "true" : "false");
                 formData.append("zipFileUrl", values === null || values === void 0 ? void 0 : values.zip_file_url);
                 formData.append("file", metaFile);
                 formData.append("folderId", folderId);
@@ -206,7 +206,7 @@ const BulkUploadModal = ({ toggleUpload, userEmail, folderId, thumbnailsOnly, })
                                 }, disabled: !assetTypeId, onRemove: () => {
                                     setMetaFile(null);
                                     setFileError("Meta File is required");
-                                }, accept: ".csv,.xlsx,.xls", maxCount: 1, children: _jsx(Button, { icon: _jsx(UploadOutlined, {}), disabled: !assetTypeId, children: "Upload" }) }) }), fileError && (_jsx(Typography.Text, { style: { color: "red" }, children: fileError }))] })), _jsx(Form.Item, { label: "Upload your DAM Files (must be zipped)", name: "assets_source_type", children: _jsxs(Radio.Group, { onChange: (e) => setAssetsSourceType(e.target.value), value: assetsSourceType, disabled: thumbnailsOnly ? false : !assetTypeId, children: [_jsx(Radio, { value: "zip", children: "Zip file" }), _jsx(Radio, { value: "zipUrl", children: "Zip file url" })] }) }), assetsSourceType == "zip" ? (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Assets zip file", name: "assets_zip_file", rules: [
+                                }, accept: ".csv,.xlsx,.xls", maxCount: 1, children: _jsx(Button, { icon: _jsx(UploadOutlined, {}), disabled: !assetTypeId, children: "Upload" }) }) }), fileError && (_jsx(Typography.Text, { style: { color: "red" }, children: fileError })), _jsx(Form.Item, { name: "reject_invalid_meta_file", valuePropName: "checked", children: _jsxs(Checkbox, { name: "reject_invalid_meta_file", children: ["Reject invalid meta file", _jsx(Popover, { content: _jsxs("span", { style: { color: "grey", padding: "5px" }, children: ["When this option is selected the uploaded metadata", _jsx("br", {}), " file will be rejected if it contains invalid values"] }), children: _jsx(QuestionCircleOutlined, { style: { marginLeft: "5px", color: "silver" } }) })] }) })] })), _jsx(Form.Item, { label: "Upload your DAM Files (must be zipped)", name: "assets_source_type", children: _jsxs(Radio.Group, { onChange: (e) => setAssetsSourceType(e.target.value), value: assetsSourceType, disabled: thumbnailsOnly ? false : !assetTypeId, children: [_jsx(Radio, { value: "zip", children: "Zip file" }), _jsx(Radio, { value: "zipUrl", children: "Zip file url" })] }) }), assetsSourceType == "zip" ? (_jsxs(_Fragment, { children: [_jsx(Form.Item, { label: "Assets zip file", name: "assets_zip_file", rules: [
                                 {
                                     required: true,
                                     message: "Asset zip file is required",

package/build/MyDrive/DriveContainer.js

@@ -13,7 +13,7 @@ import _, { filter, first, flatMap, get, includes, isEmpty, merge, } from "lodas
 import FolderListView from "./FolderListView";
 import FolderGridView from "./FolderGridView";
 import TypeAndDateFilters from "../common/folders/TypeAndDateFilters";
-import { Button, Input, Upload } from "antd";
+import { Button, Upload } from "antd";
 import { addQueryParams, getDateRangeFromKey } from "../hocs/helpers";
 import { useFolders } from "../react-query/services/folder-services";
 import { DEFAULT_PAGE } from "../hocs/appConstants";
@@ -33,10 +33,8 @@ import ImagePickerBreadCrumbList from "./ImagePickerBreadCrumbList";
 import { FETCH_ASSETS_URL, FETCH_IMAGE_PCIKER_THUMBNAIL_URL, UPLOAD_IMAGE_PICKER_LOCAL_FILE_URL, } from "../utilities/constants/apiUrls";
 import { showNotification } from "../common/notifications";
 import useAppParams from "../utilities/useAppParams";
-import { IoIosSearch } from "react-icons/io";
 import { RefetchFoldersProvider } from "../utilities/FoldersContext";
 const BsUploadIcon = BsUpload;
-const IoIosSearchIcon = IoIosSearch;
 function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, }) {
     const damConfig = useDamConfig();
     const { rootFolderId, brand, isAdmin } = damConfig;
@@ -59,7 +57,6 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         folderSearch: "",
     });
     const { selectedType, selectedDateKey, showGrid, loadingType, selectedItems, assets, sortBy, sortOrder, searchKey, searchValue, metadataKey, metadataValue, folderSearch, } = state;
-    const nameSearchRef = useRef();
     const getSearchParams = () => {
         const params = {};
         if (searchKey === "name") {
@@ -234,23 +231,12 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
                                     onSelectNewFile(file);
                                 }, showUploadList: false, accept: "image/*", children: _jsx(CustomButton, { loading: loadingType === "NEW_FILE_UPLOAD", label: "Select File", icon: _jsx(BsUploadIcon, {}) }) }))] }) })), _jsxs("div", { className: `md-lib-px-4 md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex ${!includes([DriveModes.FOLDERS, DriveModes.FILE], type)
                         ? "md-lib-justify-between"
-                        : "md-lib-justify-end md-lib-my-4"}`, children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4 md-lib-mb-4", children: [_jsx(Input, { placeholder: "Search files (min. 2 characters required)", ref: nameSearchRef, prefix: _jsx(IoIosSearchIcon, {}), onPressEnter: () => {
-                                        var _a;
-                                        const currentObj = nameSearchRef.current;
-                                        if (currentObj) {
-                                            const value = ((_a = currentObj === null || currentObj === void 0 ? void 0 : currentObj.input) === null || _a === void 0 ? void 0 : _a.value) || "";
-                                            if (value.length >= 2 || !value) {
-                                                setState((prevState) => {
-                                                    return Object.assign(Object.assign({}, prevState), { folderSearch: value });
-                                                });
-                                            }
-                                        }
-                                    } }), !includes([DriveModes.FOLDERS, DriveModes.FILE], type) && (_jsx(TypeAndDateFilters, { selectedDateKey: selectedDateKey, selectedType: selectedType, onDateMenuClick: onDateMenuClick, onTypeMenuClick: onTypeMenuClick, onChangeDates: (dates) => {
-                                        if (dates) {
-                                            const [start, end] = dates;
-                                            setState((prev) => (Object.assign(Object.assign({}, prev), { customDateRange: dates, selectedDateKey: "custom" })));
-                                        }
-                                    }, loading: isFetching, loadingType: loadingType }))] }), _jsx(ToggleView, { showGrid: showGrid, toggleView: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGrid: value }))) })] }), _jsx("div", { className: "md-lib-border-b md-lib-border-borderColor md-lib-mb-4" }), isLoading ? (_jsx(Loader, {})) : isEmpty(folders) ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center", children: [_jsx("img", { src: NOT_FOUND_IMAGE_URL, alt: "Not Found", width: 300, height: 300 }), _jsx("p", { className: "md-lib-mt-3 md-lib-text-sm md-lib-font-semibold", children: error
+                        : "md-lib-justify-end md-lib-my-4"}`, children: [!includes([DriveModes.FOLDERS, DriveModes.FILE], type) && (_jsx("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4 md-lib-mb-4", children: _jsx(TypeAndDateFilters, { selectedDateKey: selectedDateKey, selectedType: selectedType, onDateMenuClick: onDateMenuClick, onTypeMenuClick: onTypeMenuClick, onChangeDates: (dates) => {
+                                    if (dates) {
+                                        const [start, end] = dates;
+                                        setState((prev) => (Object.assign(Object.assign({}, prev), { customDateRange: dates, selectedDateKey: "custom" })));
+                                    }
+                                }, loading: isFetching, loadingType: loadingType }) })), _jsx(ToggleView, { showGrid: showGrid, toggleView: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGrid: value }))) })] }), _jsx("div", { className: "md-lib-border-b md-lib-border-borderColor md-lib-mb-4" }), isLoading ? (_jsx(Loader, {})) : isEmpty(folders) ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center", children: [_jsx("img", { src: NOT_FOUND_IMAGE_URL, alt: "Not Found", width: 300, height: 300 }), _jsx("p", { className: "md-lib-mt-3 md-lib-text-sm md-lib-font-semibold", children: error
                                 ? get(error, "message", SOMETHING_WENT_WRONG)
                                 : includes(Object.values(DriveModes), type)
                                     ? "No data found"

package/build/hocs/DamConfigContext.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createContext, useContext, useState, useEffect } from "react";
 import { USER_LOGIN, FETCH_TEAMS_LIST, } from "../utilities/constants/apiUrls";
 import axios from "axios";
-import { getBaseUrl } from "./helpers";
+import { getBaseUrl, encodeBase64 } from "./helpers";
 import { get } from "lodash";
 import Loader from "../common/loader/loader";
 import { SUBSCRIPTION_EXPIRED_ERROR_MESSAGE } from "./appConstants";
@@ -76,23 +76,33 @@ export const DamConfigProvider = ({ children, config }) => {
                 console.log("Could not extract teamID from token");
                 return;
             }
-            // Get the Teams API base URL (different from MIXDRIVE_API_URL)
-            const teamsApiBaseUrl = "https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1";
+            // Get the Teams API base URL from environment variable
+            const teamsApiBaseUrl = process.env.REACT_APP_CORE_API_URL || "";
+            if (!teamsApiBaseUrl) {
+                console.error("REACT_APP_CORE_API_URL is not defined in environment variables");
+                return;
+            }
+            // Get Basic Auth credentials from environment variables
+            const username = process.env.REACT_APP_TEAMS_API_TOKEN_USERNAME || "";
+            const password = process.env.REACT_APP_TEAMS_API_TOKEN_PASSWORD || "";
+            if (!username || !password) {
+                console.error("REACT_APP_TEAMS_API_TOKEN_USERNAME or REACT_APP_TEAMS_API_TOKEN_PASSWORD is not defined in environment variables");
+                return;
+            }
+            // Create Basic Auth header by encoding username:password to Base64
+            const basicAuthToken = encodeBase64(`${username}:${password}`);
+            const authorizationHeader = `Basic ${basicAuthToken}`;
             const teamsEndpoint = FETCH_TEAMS_LIST.replace(":teamID", teamID);
             const fullUrl = teamsApiBaseUrl + teamsEndpoint;
             console.log("Fetching teams from:", fullUrl);
             console.log("TeamID from token:", teamID);
-            // Call the new API endpoint using Teams API base URL
             const response = yield axios.get(fullUrl, {
                 headers: {
-                    Authorization: `Basic ZXh0ZXJuYWxfdXNlcjp1SHlTZ0toYTEyM1VqZWhL`,
+                    Authorization: authorizationHeader,
                 },
             });
             console.log("Teams API response:", response === null || response === void 0 ? void 0 : response.data);
-            // Set teams from the API response
-            // Assuming the response structure is { data: [...] } or similar
             const teamsData = ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.data) || (response === null || response === void 0 ? void 0 : response.data) || [];
-            console.log("Parsed teams data:", teamsData);
             setTeams(Array.isArray(teamsData) ? teamsData : []);
         }
         catch (err) {
@@ -103,7 +113,6 @@ export const DamConfigProvider = ({ children, config }) => {
                 status: (_c = err === null || err === void 0 ? void 0 : err.response) === null || _c === void 0 ? void 0 : _c.status,
                 url: (_d = err === null || err === void 0 ? void 0 : err.config) === null || _d === void 0 ? void 0 : _d.url,
             });
-            // Set empty array on error to prevent stale data
             setTeams([]);
         }
     });
@@ -117,12 +126,10 @@ export const DamConfigProvider = ({ children, config }) => {
             }
         }
     }, [damAccessKey, secretKey, subdomain]);
-    // Fetch teams after token is available
     useEffect(() => {
         if (accessToken) {
             getTeams(accessToken);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [accessToken]);
     return (_jsx(DamConfigContext.Provider, { value: {
             damAccessKey,

package/build/hocs/helpers.d.ts

@@ -9,6 +9,7 @@ export declare const getDateRangeFromKey: (key: string) => {
     endDate?: string;
 };
 export declare const getBaseUrl: (appType: string) => string;
+export declare const encodeBase64: (str: string) => string;
 export declare const getRelativeTime: (timestamp: string) => string;
 export declare const getReadableFileType: (file: FileEntity) => string;
 export declare const humanFileSize: (size: any) => any;

package/build/hocs/helpers.js

@@ -102,6 +102,19 @@ export const getBaseUrl = (appType) => {
             return process.env.REACT_APP_MIXDRIVE_API_URL || "";
     }
 };
+export const encodeBase64 = (str) => {
+    if (typeof Buffer !== "undefined") {
+        return Buffer.from(str, "utf-8").toString("base64");
+    }
+    try {
+        return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, (match, p1) => {
+            return String.fromCharCode(parseInt(p1, 16));
+        }));
+    }
+    catch (e) {
+        throw new Error("Failed to encode string to Base64");
+    }
+};
 export const getRelativeTime = (timestamp) => {
     const now = new Date();
     const created = new Date(timestamp);

package/package.json

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