@bindu-dashing/dam-solution-v2 5.9.229 → 5.9.231

package/build/AssetType/DraggedField.js

@@ -5,7 +5,8 @@ import { MdDragIndicator } from "react-icons/md";
 import { MdOutlineEdit } from "react-icons/md";
 import { IoMdClose } from "react-icons/io";
 import { get } from "lodash";
-import { InputTypes, } from "../utilities/constants/interface";
+import { InputSupportedTypes, InputTypes, } from "../utilities/constants/interface";
+import { DATE_FORMAT, DATE_WITH_TIME_FORMAT } from "../hocs/appConstants";
 import { getWidgetIcon } from "./FieldsSection";
 const { RangePicker } = DatePicker;
 const MdDragIndicatorIcon = MdDragIndicator;
@@ -47,7 +48,15 @@ export default function DraggedField({ provided, field, onAddLabel, onDeleteFiel
                                 const maxValue = get(charLimitSettings, "maxValue");
                                 const maxLength = charLimitEnabled && maxValue ? maxValue : 255; // Default to 255
                                 return (_jsx(Input.TextArea, { rows: 2, placeholder: get(field, "placeholder", ""), style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none", maxLength: maxLength, showCount: true }));
-                            })(), defaultName === InputTypes.NUMBERS && (_jsx(InputNumber, { placeholder: get(field, "placeholder", ""), style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" })), defaultName === InputTypes.DATE && (_jsx(DatePicker, { style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" })), defaultName === InputTypes.DATE_RANGE && (_jsx(RangePicker, { placeholder: ["Start", "End"], style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" })), (defaultName === InputTypes.SELECT ||
+                            })(), defaultName === InputTypes.NUMBERS && (_jsx(InputNumber, { placeholder: get(field, "placeholder", ""), style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" })), defaultName === InputTypes.DATE && (() => {
+                                const settings = get(field, "inputTypeSettings", {});
+                                const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
+                                return (_jsx(DatePicker, { showTime: allowTime, format: allowTime ? DATE_WITH_TIME_FORMAT : DATE_FORMAT, style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" }));
+                            })(), defaultName === InputTypes.DATE_RANGE && (() => {
+                                const settings = get(field, "inputTypeSettings", {});
+                                const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
+                                return (_jsx(RangePicker, { showTime: allowTime, format: allowTime ? DATE_WITH_TIME_FORMAT : DATE_FORMAT, placeholder: ["Start", "End"], style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none" }));
+                            })(), (defaultName === InputTypes.SELECT ||
                                 defaultName === InputTypes.TEAM) && (_jsx(Select, { placeholder: get(field, "placeholder", ""), style: { width: "100%" }, size: "large", className: "md-lib-pointer-events-none", disabled: true })), defaultName === InputTypes.LINK && (() => {
                                 const charLimitSettings = get(field, "inputTypeSettings.CHARACTER_LIMIT", {});
                                 const charLimitEnabled = get(charLimitSettings, "allow", false);

package/build/CreateClient/CreateClientForm.js

@@ -151,7 +151,7 @@ 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]);
+    }, [isEditMode, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.brandId, existingClientData === null || existingClientData === void 0 ? void 0 : existingClientData.subdomain, form]);
     const onFinish = (data) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         try {

package/build/MyDrive/ActionBar.js

@@ -139,6 +139,8 @@ const ActionsBar = ({ fileIds, folderIds, onCloseSelection, selectedFilesData =
             const url = get(response, "data");
             if (url) {
                 window.open(url, "_blank");
+                // Invalidate folder list to refresh download count
+                invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);
             }
             else {
                 onFailure(INVALID_URL);

package/build/MyDrive/FileMenuOptions.js

@@ -235,6 +235,8 @@ function FileMenuOptions({ file, folderIds = [], fileIds = [], folder, onCloseSe
             const url = get(response, "data");
             if (url) {
                 window.open(url, "_blank");
+                // Invalidate folder list to refresh download count
+                invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);
             }
             else {
                 onFailure(INVALID_URL);

package/build/MyDrive/FolderListView.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { LIST_VIEW_DATE_FORMAT, LOCAL_TIMEZONE, UPLOAD_FILE_IN_PROGRESS_WHITE_IMAGE, } from "../hocs/appConstants";
-import { DriveModes, EntityType, InputTypes, SortByKeys, SortOrders, ThumbnailStatus, } from "../utilities/constants/interface";
+import { APP_DATE_TIME_FORMAT, LIST_VIEW_DATE_FORMAT, LOCAL_TIMEZONE, UPLOAD_FILE_IN_PROGRESS_WHITE_IMAGE, } from "../hocs/appConstants";
+import { DriveModes, EntityType, InputSupportedTypes, InputTypes, SortByKeys, SortOrders, ThumbnailStatus, } from "../utilities/constants/interface";
 import moment from "moment-timezone";
 import { filter, get, groupBy, includes, isArray, map, reverse, sortBy, toLower, } from "lodash";
 import LoadMoreItems from "../common/LoadMoreItems";
@@ -25,6 +25,7 @@ import { FaSort } from "react-icons/fa";
 import { LuFilterX } from "react-icons/lu";
 import SearchFilter from "./SearchFilter";
 import { useTheme } from "../hocs/ThemeContext";
+import { useDamConfig } from "../hocs/DamConfigContext";
 dayjs.extend(isToday);
 dayjs.extend(isYesterday);
 const ClearFilterIcon = LuFilterX;
@@ -38,16 +39,58 @@ const formatGroupDate = (date) => {
         return "Yesterday";
     return d.format(LIST_VIEW_DATE_FORMAT);
 };
-const formatMetadataDisplayValue = (value, field) => {
+const formatTeamDisplayValue = (teamIds, teams) => {
+    const ids = isArray(teamIds) ? teamIds : [teamIds];
+    const externalTeams = (teams || []).filter((team) => get(team, "id") != null || get(team, "_id") != null);
+    const formatted = ids.map((id) => {
+        const team = externalTeams.find((t) => String(get(t, "id") || get(t, "_id")) === String(id));
+        const teamId = get(team, "id") || get(team, "_id");
+        const teamName = get(team, "name", "");
+        const teamType = get(team, "type", "");
+        if (team) {
+            return `${teamId} ${teamName} ${teamType}`.trim();
+        }
+        return String(id);
+    });
+    return formatted.join(", ");
+};
+const formatDateValue = (val, dateFormat) => {
+    if (val == null || val === "")
+        return "";
+    const d = dayjs(val);
+    return d.isValid() ? d.format(dateFormat) : String(val);
+};
+const formatMetadataDisplayValue = (value, field, teams) => {
     if (value === undefined || value === null || value === "")
         return null;
-    const defaultName = get(field, "defaultName");
+    const defaultName = get(field, "defaultName") || get(field, "inputType.defaultName");
+    const settings = get(field, "inputTypeSettings", {}) || get(field, "inputType.inputTypeSettings", {});
+    const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
+    const dateFormat = allowTime ? APP_DATE_TIME_FORMAT : LIST_VIEW_DATE_FORMAT;
     if (defaultName === InputTypes.DATE) {
-        return dayjs(value).format(LIST_VIEW_DATE_FORMAT);
+        return formatDateValue(value, dateFormat);
+    }
+    if (defaultName === InputTypes.DATE_RANGE) {
+        let start;
+        let end;
+        if (isArray(value) && value.length >= 2) {
+            [start, end] = value;
+        }
+        else if (value && typeof value === "object" && ("start" in value || "end" in value)) {
+            start = get(value, "start");
+            end = get(value, "end");
+        }
+        else {
+            return String(value);
+        }
+        const startStr = formatDateValue(start, dateFormat);
+        const endStr = formatDateValue(end, dateFormat);
+        if (!startStr && !endStr)
+            return null;
+        return startStr && endStr ? `${startStr} - ${endStr}` : startStr || endStr;
     }
-    if (defaultName === InputTypes.DATE_RANGE && isArray(value) && value.length === 2) {
-        const [start, end] = value;
-        return `${dayjs(start).format(LIST_VIEW_DATE_FORMAT)} - ${dayjs(end).format(LIST_VIEW_DATE_FORMAT)}`;
+    if (defaultName === InputTypes.TEAM && teams) {
+        return formatTeamDisplayValue(value, teams);
     }
     if (defaultName === InputTypes.CHECKBOX || (defaultName === InputTypes.SELECT && isArray(value))) {
         return isArray(value) ? value.join(", ") : value;
@@ -56,6 +99,8 @@ const formatMetadataDisplayValue = (value, field) => {
 };
 const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage, selectedFileIds, selectedFolderIds, setSelectedItems, isImagePicker, setSelectedFile, setParentFolderId, selectedPickerFile, location, assets, sortByKey, sortOrder, setSortOrders, onSearch, searchKey, searchValue, metadataKey, metadataValue, setSelectedKeys, }) => {
     const navigate = useAppNavigate();
+    const damConfig = useDamConfig();
+    const teams = get(damConfig, "teams", []);
     const [state, setState] = useState({
         selectedFile: {},
         showPreviewModal: false,
@@ -225,7 +270,8 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                                             : "-", children: get(folder, "type") === EntityType.FILE
                                             ? currentAsset === null || currentAsset === void 0 ? void 0 : currentAsset.name
                                             : "-" }), metaFields.map((field) => {
-                                        const value = get(folder, `metadata.${field._id}`);
+                                        var _a;
+                                        const value = (_a = get(folder, `metadata.${field._id}`)) !== null && _a !== void 0 ? _a : get(folder, `metadata.${get(field, "mapId")}`);
                                         const isFile = get(folder, "type") === EntityType.FILE;
                                         const fieldFromAsset = isFile && currentAsset
                                             ? get(currentAsset, "metadataFields", []).find((f) => get(f, "_id") === field._id || get(f, "mapId") === field._id)
@@ -233,7 +279,7 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                                         const defaultValue = isFile && fieldFromAsset ? get(fieldFromAsset, "defaultValue") : get(field, "defaultValue");
                                         const rawDisplay = value !== null && value !== void 0 ? value : (isFile ? defaultValue : undefined);
                                         const displayValue = rawDisplay != null && rawDisplay !== ""
-                                            ? formatMetadataDisplayValue(rawDisplay, fieldFromAsset || field)
+                                            ? formatMetadataDisplayValue(rawDisplay, fieldFromAsset || field, teams)
                                             : null;
                                         return (_jsx("div", { title: displayValue || "-", className: "md-lib-text-secondaryTextColor dark:md-lib-text-darkTextColor md-lib-block md-lib-truncate md-lib-text-sm md-lib-w-[120px] md-lib-gap-2", children: displayValue || "-" }, get(field, "_id")));
                                     }), !metaFields.some((f) => toLower(String(get(f, "name", ""))).includes("download") &&

package/build/MyDrive/FolderMenuOptions.js

@@ -205,6 +205,8 @@ function FolderMenuOptions({ folder }) {
             const url = get(response, "data");
             if (url) {
                 window.open(url, "_blank");
+                // Invalidate folder list to refresh download count
+                invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);
             }
             else {
                 onFailure(INVALID_URL);

package/build/MyDrive/SearchFilter.js

@@ -24,7 +24,7 @@ export default function SearchFilter({ type, onSearch, name, isMetadata, isSelec
         switch (type) {
             case InputTypes.DATE_RANGE:
             case InputTypes.DATE:
-                return (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-gap-2", children: [_jsxs(Radio.Group, { value: withTime ? "withTime" : "dateOnly", onChange: (e) => setWithTime(e.target.value === "withTime"), children: [_jsx(Radio, { value: "dateOnly", children: "Date only" }), _jsx(Radio, { value: "withTime", children: "With time" })] }), _jsx(DatePicker, { style: { width: "100%" }, onChange: (val) => setValue(val), value: value, placeholder: withTime ? "Select date & time" : "Select date", showTime: withTime })] }));
+                return (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-gap-2", children: [_jsxs(Radio.Group, { value: withTime ? "withTime" : "dateOnly", onChange: (e) => setWithTime(e.target.value === "withTime"), children: [_jsx(Radio, { value: "dateOnly", children: "Date only" }), _jsx(Radio, { value: "withTime", children: "With time" })] }), _jsx(DatePicker, { style: { width: "100%" }, onChange: (val) => setValue(val), value: value, placeholder: withTime ? "Select date & time" : "Select date", showTime: withTime, format: withTime ? DATE_WITH_TIME_FORMAT : DATE_FORMAT })] }));
             default:
                 return (_jsx(Input, { value: value, onChange: (e) => setValue(e.target.value), placeholder: "Search (min. 2 characters required)" }));
         }

package/build/MyDrive/fileDetails/FileHeader.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from "react";
 import { Button } from "antd";
 import { IoIosClose } from "react-icons/io";
 import { BsDownload } from "react-icons/bs";
@@ -8,18 +9,47 @@ import { showNotification } from "../../common/notifications";
 import { INVALID_URL } from "../../utilities/constants/messages";
 import FileMenuOptions from "../FileMenuOptions";
 import { useDamConfig } from "../../hocs/DamConfigContext";
+import { useMutation, useQueryClient } from "react-query";
+import { downloadFiles } from "../../react-query/services/file-services";
+import { generateFoldersQueryKey, invalidateData } from "../../utilities/constants/queryKeys";
+import useAppParams from "../../utilities/useAppParams";
+import { createApiClient } from "../../hocs/configureAxios";
 const IoIosCloseIcon = IoIosClose;
 const BsDownloadIcon = BsDownload;
 const FileDetailsHeader = ({ handleClose, file, onCloseSelection, }) => {
     const damConfig = useDamConfig();
-    const { isAdmin } = damConfig;
-    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: () => handleClose === null || handleClose === void 0 ? void 0 : handleClose(), "aria-label": "Close" }), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, fileIds: get(file, "_id") ? [get(file, "_id")] : [], onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: () => {
-                            const url = get(file, "downloadUrl") || get(file, "s3Url") || get(file, "thumbnailUrl");
-                            if (!url) {
-                                showNotification(INVALID_URL, NotificationStatus.ERROR);
-                                return;
-                            }
-                            window.open(url, "_blank");
-                        }, children: _jsx(BsDownloadIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", size: 24 }) })] }))] }));
+    const { isAdmin, rootFolderId } = damConfig;
+    const { folderId, type } = useAppParams();
+    const queryClient = useQueryClient();
+    const api = React.useMemo(() => createApiClient(damConfig), [damConfig]);
+    const downloadFileMutation = useMutation({
+        mutationFn: downloadFiles,
+        onSuccess: (response) => {
+            const url = get(response, "data");
+            if (url) {
+                window.open(url, "_blank");
+                invalidateData(queryClient, generateFoldersQueryKey(type), folderId ? folderId : rootFolderId);
+            }
+            else {
+                showNotification(INVALID_URL, NotificationStatus.ERROR);
+            }
+        },
+        onError: () => {
+            showNotification(INVALID_URL, NotificationStatus.ERROR);
+        },
+    });
+    const onDownloadClick = () => {
+        const fileId = get(file, "_id");
+        if (!fileId) {
+            showNotification(INVALID_URL, NotificationStatus.ERROR);
+            return;
+        }
+        downloadFileMutation.mutate({
+            fileIds: [fileId],
+            folderIds: [],
+            api,
+        });
+    };
+    return (_jsxs("div", { className: "md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor md-lib-py-3 md-lib-px-5 md-lib-border-b md-lib-border-borderColor dark:md-lib-border-darkBorderColor md-lib-flex md-lib-justify-between md-lib-items-center", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-5", children: [_jsx(IoIosCloseIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-cursor-pointer", size: 24, onClick: () => handleClose === null || handleClose === void 0 ? void 0 : handleClose(), "aria-label": "Close" }), !!file && (_jsx("h4", { className: "md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor md-lib-text-base md-lib-truncate md-lib-max-w-[calc(100vw-180px)]", title: get(file, "name", "N/A"), children: get(file, "name", "N/A") }))] }), !!file && (_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-4", children: [_jsx(FileMenuOptions, { file: file, fileIds: get(file, "_id") ? [get(file, "_id")] : [], onCloseSelection: onCloseSelection, fileModal: true }), _jsx(Button, { size: "large", className: "md-lib-bg-secondaryColor dark:md-lib-bg-darkSecondaryColor hover:md-lib-bg-secondaryHoverColor dark:hover:md-lib-bg-darkSecondaryColor md-lib-border-none", onClick: onDownloadClick, loading: downloadFileMutation.isLoading, children: _jsx(BsDownloadIcon, { className: "md-lib-text-textColor dark:md-lib-text-darkTextColor", size: 24 }) })] }))] }));
 };
 export default FileDetailsHeader;

package/build/MyDrive/fileDetails/MetaForm.js

@@ -4,6 +4,7 @@ import { Form, Input, InputNumber, DatePicker, Select, Checkbox, Radio, Typograp
 import { first, get, includes, isArray, isNumber, map, nth, } from "lodash";
 import dayjs from "dayjs";
 import { InputSupportedTypes, InputTypes, } from "../../utilities/constants/interface";
+import { DATE_FORMAT, DATE_WITH_TIME_FORMAT } from "../../hocs/appConstants";
 import { INVALID_URL } from "../../utilities/constants/messages";
 import { useQueryClient } from "react-query";
 import { getCurrentBrandUsers } from "../../react-query/hooks/brand-hooks";
@@ -48,10 +49,6 @@ export const buildInitialValues = (formData, metaFields, isEditMode) => {
             return;
         const formValue = formData[id];
         const templateDefault = get(field, "defaultValue");
-        // In edit mode: use file's value if present (from existing metadata), else template default
-        // In create mode: use template default
-        // When assigning NEW template to existing file, formData has old template's keys,
-        // so formValue is undefined for new template's fields - use template default
         const hasExistingValue = formValue !== undefined && formValue !== null;
         const rawValue = isEditMode && hasExistingValue ? formValue : templateDefault;
         result[id] = transformValueForField(rawValue, field);
@@ -169,7 +166,9 @@ export const getFormItem = (item, fromDefaultValue, userOptions, teamOptions) =>
         case InputTypes.PARAGRAPH:
             return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(Input.TextArea, { rows: 4, placeholder: placeholder, maxLength: maxLength, showCount: true }) }, name));
         case InputTypes.DATE_RANGE:
-            return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(RangePicker, { showTime: !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`), style: { width: "100%" }, placeholder: ["Start", "End"], placement: "bottomLeft" }) }, name));
+            return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(RangePicker, { showTime: !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`), format: get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`)
+                        ? DATE_WITH_TIME_FORMAT
+                        : DATE_FORMAT, style: { width: "100%" }, placeholder: ["Start", "End"], placement: "bottomLeft" }) }, name));
         case InputTypes.LINK:
             rules.push({
                 type: "url",
@@ -184,7 +183,9 @@ export const getFormItem = (item, fromDefaultValue, userOptions, teamOptions) =>
         case InputTypes.NUMBERS:
             return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(InputNumber, { style: { width: "100%" }, placeholder: placeholder }) }, name));
         case InputTypes.DATE:
-            return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(DatePicker, { showTime: !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`), style: { width: "100%" }, placeholder: placeholder }) }, name));
+            return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(DatePicker, { showTime: !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`), format: get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`)
+                        ? DATE_WITH_TIME_FORMAT
+                        : DATE_FORMAT, style: { width: "100%" }, placeholder: placeholder }) }, name));
         case InputTypes.PERSON:
             return (_jsx(Form.Item, { name: itemName, label: label, rules: rules, children: _jsx(Select, { mode: get(settings, InputSupportedTypes.ALLOW_MULTIPLE)
                         ? "multiple"

package/package.json

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