@bindu-dashing/dam-solution-v2 5.9.223 → 5.9.227

package/build/AssetType/AddFieldProperties.js

@@ -11,20 +11,40 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, Checkbox, Form, Input } from "antd";
 import TextField from "./fieldProperties/TextField";
 import NumberField from "./fieldProperties/NumberField";
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import DateField from "./fieldProperties/DateField";
 import OptionsField from "./fieldProperties/OptionsField";
 import { InputSupportedTypes, InputTypes, NotificationStatus, } from "../utilities/constants/interface";
-import { first, get, includes, isArray, nth } from "lodash";
+import { first, get, includes, isArray, map, nth } from "lodash";
 import { useDamConfig } from "../hocs/DamConfigContext";
 import useAppNavigate from "../utilities/useAppNavigate";
 import { getFormItem } from "../MyDrive/fileDetails/MetaForm";
+import { useQueryClient } from "react-query";
+import { getCurrentBrandUsers } from "../react-query/hooks/brand-hooks";
+import { getUserAvatar } from "../settings/getUserAvatar";
 import dayjs from "dayjs";
 import { DATE_FORMAT, DATE_WITH_TIME_FORMAT } from "../hocs/appConstants";
 import { showNotification } from "../common/notifications";
 import { UPDATE_SUCCESS } from "../utilities/constants/messages";
 export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpdateField, currentInputType, index, allFields, onCancel, }) {
-    const { styles } = useDamConfig();
+    const { styles, brand, teams } = useDamConfig();
+    const queryClient = useQueryClient();
+    const brandId = get(brand, "_id");
+    const brandUsers = getCurrentBrandUsers(queryClient, brandId);
+    const userOptions = useMemo(() => map(brandUsers, (user) => getUserAvatar(user)), [brandUsers, brandId]);
+    const teamOptions = useMemo(() => {
+        const externalTeams = (teams || []).filter((team) => get(team, "id") != null || get(team, "_id") != null);
+        return map(externalTeams, (team) => {
+            const teamId = get(team, "id") || get(team, "_id");
+            const teamName = get(team, "name", "");
+            const teamType = get(team, "type", "");
+            return {
+                label: `${teamId} ${teamName} ${teamType}`,
+                value: teamId,
+                key: `${teamId} - ${teamName} - ${teamType}`,
+            };
+        });
+    }, [teams]);
     const navigate = useAppNavigate();
     const [defaultValueInput, setDefaultValueInput] = useState("");
     const [loading, setLoading] = useState(false);
@@ -220,6 +240,13 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 setDisabledReason(null);
         }, 100);
     }, [field, form]);
+    // Rebuild default value input when teams/users load (TEAM/PERSON need these options)
+    useEffect(() => {
+        const defaultName = get(currentInputType, "defaultName");
+        if (defaultName === InputTypes.TEAM || defaultName === InputTypes.PERSON) {
+            handleFormValuesChange();
+        }
+    }, [teamOptions, userOptions]);
     // Strip time from dayjs (set to midnight) - used when "Allow time" is toggled OFF
     const stripTimeFromDayjs = (d) => {
         if (!d || typeof d.hour !== "function")
@@ -366,8 +393,8 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 },
             });
         }
-        // Pass rules to getFormItem
-        const defaultValueItem = getFormItem(Object.assign(Object.assign({}, item), { additionalRules: rules }), true);
+        // Pass rules to getFormItem; TEAM and PERSON need options from context
+        const defaultValueItem = getFormItem(Object.assign(Object.assign({}, item), { additionalRules: rules }), true, defaultName === InputTypes.PERSON ? userOptions : undefined, defaultName === InputTypes.TEAM ? teamOptions : undefined);
         setDefaultValueInput(defaultValueItem);
     };
     return (_jsxs("div", { className: "md-lib-p-4", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2", children: [_jsx("h2", { className: "md-lib-text-xl md-lib-font-semibold", children: "Properties" }), _jsxs("p", { className: "md-lib-ml-auto md-lib-text-sm md-lib-truncate", style: { color: styles === null || styles === void 0 ? void 0 : styles.secondaryTextColor }, children: ["Type: ", get(field, "name", "N/A")] })] }), _jsx("div", { className: "md-lib-mt-4 md-lib-relative", children: _jsxs(Form, { layout: "vertical", form: form, requiredMark: true, scrollToFirstError: true, onFinish: onUpdate, initialValues: field, onValuesChange: handleFormValuesChange, children: [_jsx(Form.Item, { name: "isMandatory", valuePropName: "checked", children: _jsx(Checkbox, { children: "Marks as mandatory field" }) }), _jsx(Form.Item, { name: "name", label: "Name", rules: [

package/build/AssetType/EditAssetTemplate.js

@@ -105,20 +105,14 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
                 }
             }
         });
-        const payload = {
-            name: get(updatedValues, "name"),
-            placeholder: get(updatedValues, "placeholder"),
-            isMandatory: get(updatedValues, "isMandatory", false),
-            inputTypeSettings,
-            label: get(field, "label", get(field, "name", "")),
-            defaultName: get(field, "defaultName"),
-            mapId,
-            defaultValue: get(updatedValues, "defaultValue"),
-        };
+        const defaultName = get(field, "defaultName");
+        const skipPlaceholder = includes([InputTypes.CHECKBOX, InputTypes.RADIO], defaultName);
+        const payload = Object.assign(Object.assign({ name: get(updatedValues, "name") }, (skipPlaceholder ? {} : { placeholder: get(updatedValues, "placeholder") })), { isMandatory: get(updatedValues, "isMandatory", false), inputTypeSettings, label: get(field, "label", get(field, "name", "")), defaultName,
+            mapId, defaultValue: get(updatedValues, "defaultValue") });
         if (get(updatedValues, "_id", null)) {
             payload["_id"] = get(updatedValues, "_id");
         }
-        if (includes([InputTypes.CHECKBOX, InputTypes.RADIO, InputTypes.SELECT], get(field, "defaultName"))) {
+        if (includes([InputTypes.CHECKBOX, InputTypes.RADIO, InputTypes.SELECT], defaultName)) {
             payload["options"] = get(updatedValues, "options", []);
         }
         return payload;
@@ -145,7 +139,9 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
                 showNotification(`Field ${i + 1}: Name is required`, NotificationStatus.ERROR);
                 return false;
             }
-            if (!get(field, "placeholder") || get(field, "placeholder", "").trim() === "") {
+            // Checkbox and radio don't have placeholders - skip validation for them
+            const skipPlaceholder = includes([InputTypes.CHECKBOX, InputTypes.RADIO], get(field, "defaultName"));
+            if (!skipPlaceholder && (!get(field, "placeholder") || get(field, "placeholder", "").trim() === "")) {
                 showNotification(`Field ${i + 1}: Placeholder is required`, NotificationStatus.ERROR);
                 return false;
             }

package/build/MyDrive/FolderListView.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 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 moment from "moment-timezone";
-import { filter, get, groupBy, includes, map, reverse, sortBy, toLower, } from "lodash";
+import { filter, get, groupBy, includes, isArray, map, reverse, sortBy, toLower, } from "lodash";
 import LoadMoreItems from "../common/LoadMoreItems";
 import FolderMenuOptions from "./FolderMenuOptions";
 import { Image, Tooltip } from "antd";
@@ -38,6 +38,22 @@ const formatGroupDate = (date) => {
         return "Yesterday";
     return d.format(LIST_VIEW_DATE_FORMAT);
 };
+const formatMetadataDisplayValue = (value, field) => {
+    if (value === undefined || value === null || value === "")
+        return null;
+    const defaultName = get(field, "defaultName");
+    if (defaultName === InputTypes.DATE) {
+        return dayjs(value).format(LIST_VIEW_DATE_FORMAT);
+    }
+    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.CHECKBOX || (defaultName === InputTypes.SELECT && isArray(value))) {
+        return isArray(value) ? value.join(", ") : value;
+    }
+    return String(value);
+};
 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 [state, setState] = useState({
@@ -210,7 +226,16 @@ const FolderListView = ({ folders, foldersFetching, hasNextPage, fetchNextPage,
                                             ? currentAsset === null || currentAsset === void 0 ? void 0 : currentAsset.name
                                             : "-" }), metaFields.map((field) => {
                                         const value = get(folder, `metadata.${field._id}`);
-                                        return (_jsx("div", { title: value || "-", 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: value || "-" }, get(field, "_id")));
+                                        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)
+                                            : null;
+                                        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)
+                                            : 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") &&
                                         toLower(String(get(f, "name", ""))).includes("count")) && (_jsx("div", { title: get(folder, "type") === EntityType.FILE
                                             ? String((_b = get(folder, "fileDownload", []).length) !== null && _b !== void 0 ? _b : "-")

package/build/MyDrive/fileDetails/MetaForm.d.ts

@@ -1,10 +1,12 @@
 import React from "react";
 import type { FormInstance } from "antd";
-import { BrandUserEntity, MetaDataFieldEntity } from "../../utilities/constants/interface";
-export declare const buildInitialValues: (formData: Record<string, any>, metaFields: MetaDataFieldEntity[], isEditMode: boolean) => {
-    [x: string]: any;
-};
-export declare const getFormItem: (item: MetaDataFieldEntity, fromDefaultValue: boolean, userOptions?: BrandUserEntity[], teamOptions?: {
+import { MetaDataFieldEntity } from "../../utilities/constants/interface";
+export declare const buildInitialValues: (formData: Record<string, any>, metaFields: MetaDataFieldEntity[], isEditMode: boolean) => Record<string, any>;
+export declare const getFormItem: (item: MetaDataFieldEntity, fromDefaultValue: boolean, userOptions?: {
+    label: React.ReactNode;
+    value: string;
+    key?: string;
+}[], teamOptions?: {
     label: React.ReactNode;
     value: string;
     key?: string;

package/build/MyDrive/fileDetails/MetaForm.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo } from "react";
 import { Form, Input, InputNumber, DatePicker, Select, Checkbox, Radio, Typography, } from "antd";
-import { find, first, get, includes, isArray, isNumber, map, mapValues, nth, } from "lodash";
+import { first, get, includes, isArray, isNumber, map, nth, } from "lodash";
 import dayjs from "dayjs";
 import { InputSupportedTypes, InputTypes, } from "../../utilities/constants/interface";
 import { INVALID_URL } from "../../utilities/constants/messages";
@@ -10,40 +10,56 @@ import { getCurrentBrandUsers } from "../../react-query/hooks/brand-hooks";
 import { getUserAvatar } from "../../settings/getUserAvatar";
 import { useDamConfig } from "../../hocs/DamConfigContext";
 const { RangePicker } = DatePicker;
-export const buildInitialValues = (formData, metaFields, isEditMode) => {
-    const dataWithDefaultValues = metaFields.reduce((acc, field) => {
-        const id = get(field, "_id");
-        const defaultValue = get(field, "defaultValue");
-        if (defaultValue) {
-            acc[id] = defaultValue;
-        }
-        return acc;
-    }, {});
-    return mapValues(isEditMode ? formData : dataWithDefaultValues, (value, key) => {
-        const field = find(metaFields, { _id: key });
-        if (!field)
+const transformValueForField = (value, field) => {
+    const defaultName = get(field, "defaultName");
+    const inputTypeSettings = get(field, "inputTypeSettings", {});
+    const allowMultiple = get(inputTypeSettings, `${InputSupportedTypes.ALLOW_MULTIPLE}`, false);
+    switch (defaultName) {
+        case InputTypes.DATE:
+            return value ? dayjs(value) : undefined;
+        case InputTypes.DATE_RANGE:
+            return isArray(value) && get(value, "length") === 2
+                ? [dayjs(first(value)), dayjs(nth(value, 1))]
+                : undefined;
+        case InputTypes.SELECT:
+            return allowMultiple ? value || [] : value !== null && value !== void 0 ? value : undefined;
+        case InputTypes.CHECKBOX:
+            return value || [];
+        case InputTypes.NUMBERS:
+            if (value === null || value === undefined || value === "")
+                return undefined;
+            const num = Number(value);
+            return !Number.isNaN(num) && isFinite(num) ? num : value;
+        case InputTypes.TEXT:
+        case InputTypes.PARAGRAPH:
+        case InputTypes.LINK:
+            return value != null ? String(value) : undefined;
+        default:
             return value;
-        const defaultName = get(field, "defaultName");
-        const inputTypeSettings = get(field, "inputTypeSettings", {});
-        const allowMultiple = get(inputTypeSettings, `${InputSupportedTypes.ALLOW_MULTIPLE}`, false);
-        switch (defaultName) {
-            case InputTypes.DATE:
-                return value ? dayjs(value) : undefined;
-            case InputTypes.DATE_RANGE:
-                return isArray(value) && get(value, "length") === 2
-                    ? [dayjs(first(value)), dayjs(nth(value, 1))]
-                    : undefined;
-            case InputTypes.SELECT:
-                return allowMultiple ? value || [] : value !== null && value !== void 0 ? value : undefined;
-            case InputTypes.CHECKBOX:
-                return value || [];
-            default:
-                return value;
-        }
+    }
+};
+export const buildInitialValues = (formData, metaFields, isEditMode) => {
+    // Always build from metaFields (current template) so we include all fields
+    // and apply template defaults when editing + assigning a NEW template
+    const result = {};
+    metaFields.forEach((field) => {
+        const id = get(field, "_id") || get(field, "mapId");
+        if (!id)
+            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);
     });
+    return result;
 };
 export const getFormItem = (item, fromDefaultValue, userOptions, teamOptions) => {
-    const name = get(item, "_id");
+    const name = get(item, "_id") || get(item, "mapId");
     const label = get(item, "name");
     const placeholder = get(item, "placeholder", "");
     const defaultName = get(item, "defaultName");
@@ -227,7 +243,7 @@ const MetaForm = ({ metaFields, metaData, form, isEditMode, }) => {
             metadata: buildInitialValues(metaData, metaFields, isEditMode),
         };
         form.setFieldsValue(formData);
-    }, [metaData, metaFields]);
+    }, [metaData, metaFields, isEditMode, form]);
     const userOptions = useMemo(() => {
         return map(brandUsers, (user) => getUserAvatar(user));
     }, [brandUsers, brandId]);

package/package.json

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