@bindu-dashing/dam-solution-v2 5.8.189 → 5.8.190

package/build/AssetType/AddFieldProperties.js

@@ -280,6 +280,11 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         if ((defaultName === InputTypes.DATE ||
             defaultName === InputTypes.DATE_RANGE) &&
             settings[InputSupportedTypes.ALLOW_TIME] !== undefined) {
+            const hasNonZeroTime = (d) => {
+                if (!d || typeof d.hour !== "function")
+                    return false;
+                return d.hour() !== 0 || d.minute() !== 0 || d.second() !== 0;
+            };
             rules.push({
                 validator: (_, value) => {
                     const allowTime = !!get(settings, `${InputSupportedTypes.ALLOW_TIME}.allow`);
@@ -294,7 +299,8 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                         if (allowTime && !hasTimeMethods) {
                             return Promise.reject("Please select a date with time (hour/minute/second).");
                         }
-                        if (!allowTime && hasTimeMethods) {
+                        // When time is not allowed: reject only if user selected a non-zero time
+                        if (!allowTime && hasNonZeroTime(value)) {
                             return Promise.reject("Time is not allowed. Please select only a date.");
                         }
                     }
@@ -312,7 +318,8 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                         if (allowTime && (!startHasTimeMethods || !endHasTimeMethods)) {
                             return Promise.reject("Please select both start and end dates with time.");
                         }
-                        if (!allowTime && (startHasTimeMethods || endHasTimeMethods)) {
+                        // When time is not allowed: reject only if user selected a non-zero time
+                        if (!allowTime && (hasNonZeroTime(start) || hasNonZeroTime(end))) {
                             return Promise.reject("Time is not allowed. Please select only dates.");
                         }
                     }

package/build/AssetType/EditAssetTemplate.js

@@ -218,13 +218,13 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
         {
             key: "1",
             label: "Fields",
-            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: false })),
+            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: false, assetId: id || get(assetTemplate, "_id") })),
         },
         {
             key: "2",
             label: "Image picker output format",
             disabled: fields.length === 0,
-            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: true })),
+            children: (_jsx(AddWidgets, { name: name, inputTypes: inputTypes, transformInputTypePayload: transformInputTypePayload, currentFieldIndex: currentFieldIndex, setState: setState, fields: fields, imagePickerOutputFormat: imagePickerOutputFormat, setCurrentFieldIndex: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { currentFieldIndex: value }))), showOutputFormat: true, assetId: id || get(assetTemplate, "_id") })),
         },
     ];
     // console.log("edit asset template", fields, imagePickerOutputFormat);

package/build/AssetType/FieldsSection.d.ts

@@ -1,7 +1,7 @@
 import { SetStateAction } from "react";
 import { InputTypeEntity } from "../utilities/constants/interface";
 export declare const getWidgetIcon: (defaultName: string | undefined | null) => import("react-icons").IconType | null;
-export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, }: {
+export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, assetId: assetIdProp, }: {
     name: string;
     inputTypes: InputTypeEntity[];
     transformInputTypePayload: (values: any, field: InputTypeEntity, mapId: string) => void;
@@ -11,4 +11,5 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
     setState: React.Dispatch<SetStateAction<any>>;
     showOutputFormat: boolean;
     imagePickerOutputFormat: InputTypeEntity[];
+    assetId?: string;
 }): JSX.Element;

package/build/AssetType/FieldsSection.js

@@ -76,8 +76,9 @@ export const getWidgetIcon = (defaultName) => {
         return null;
     }
 };
-export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, }) {
-    const { id } = useAppParams();
+export default function FieldsSection({ name, inputTypes, transformInputTypePayload, currentFieldIndex, setCurrentFieldIndex, fields, setState, showOutputFormat, imagePickerOutputFormat, assetId: assetIdProp, }) {
+    const { id: idFromParams } = useAppParams();
+    const assetId = assetIdProp !== null && assetIdProp !== void 0 ? assetIdProp : idFromParams;
     const [fieldState, setFieldState] = useState({
         showConfirmModal: false,
         selectedField: null,
@@ -166,9 +167,13 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
         }
     };
     const onDeleteExistedField = () => __awaiter(this, void 0, void 0, function* () {
+        if (!assetId) {
+            showNotification("Asset ID is missing. Unable to delete field.", NotificationStatus.ERROR);
+            return;
+        }
         setFieldState((prevState) => (Object.assign(Object.assign({}, prevState), { loading: true })));
         try {
-            const response = yield api.delete(DELETE_ASSET_FIELD_URL.replace(":assetId", id).replace(":id", get(selectedField, "_id")));
+            const response = yield api.delete(DELETE_ASSET_FIELD_URL.replace(":assetId", assetId).replace(":id", get(selectedField, "_id")));
             const updatedFields = filter(fields, (field, index) => get(field, "_id") !== get(selectedField, "_id"));
             const updatedImagePickerOutputFormat = filter(imagePickerOutputFormat, (field, index) => get(field, "mapId") !== get(selectedField, "mapId"));
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { fields: updatedFields, currentFieldIndex: null, imagePickerOutputFormat: updatedImagePickerOutputFormat })));

package/build/MyDrive/files/MapFile.js

@@ -231,7 +231,15 @@ function MapFile({ open, handleCancel, filesList, fromUpload, parentFolderId, })
             },
         });
     };
-    const getMetadataForm = (_jsxs(Form, { layout: "vertical", form: form, scrollToFirstError: true, onFinish: fromUpload ? handleSubmit : handleUpdate, className: "md-lib-m-2", children: [_jsx(AssetSelectionFormItem, { handleAssetTemplateChange: handleAssetTemplateChange, assetOptions: assetOptions, assetsLoading: assetsLoading }), selectedAssetTemplate && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { name: "teamIds", label: "Teams", children: _jsx(Select, { options: teamOptions, placeholder: "Select teams", mode: "multiple", onChange: (val) => onChangeTeams(val), style: { width: "100%" }, showSearch: true, optionFilterProp: "key" }) }), _jsx(Form.Item, { name: "expiryDate", label: "Expiry Date", children: _jsx(DatePicker, { placeholder: "Expiry Date", style: { width: "100%" } }) }), _jsx(Metadata, { asset: selectedAssetTemplate, form: form, file: (filesList === null || filesList === void 0 ? void 0 : filesList[0]) || null })] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-justify-end md-lib-gap-3", children: [_jsx(Button, { onClick: handleCancelWithConfirmation, children: "Cancel" }), _jsx(Button, { disabled: !selectedAssetTemplate, type: "primary", 
+    const preventEnterSubmit = (e) => {
+        if (e.key === "Enter" && e.target instanceof HTMLElement) {
+            const tagName = e.target.tagName.toLowerCase();
+            if (tagName !== "textarea") {
+                e.preventDefault();
+            }
+        }
+    };
+    const getMetadataForm = (_jsxs(Form, { layout: "vertical", form: form, scrollToFirstError: true, onFinish: fromUpload ? handleSubmit : handleUpdate, onKeyDown: preventEnterSubmit, className: "md-lib-m-2", children: [_jsx(AssetSelectionFormItem, { handleAssetTemplateChange: handleAssetTemplateChange, assetOptions: assetOptions, assetsLoading: assetsLoading }), selectedAssetTemplate && (_jsxs(_Fragment, { children: [_jsx(Form.Item, { name: "teamIds", label: "Teams", children: _jsx(Select, { options: teamOptions, placeholder: "Select teams", mode: "multiple", onChange: (val) => onChangeTeams(val), style: { width: "100%" }, showSearch: true, optionFilterProp: "key" }) }), _jsx(Form.Item, { name: "expiryDate", label: "Expiry Date", children: _jsx(DatePicker, { placeholder: "Expiry Date", style: { width: "100%" } }) }), _jsx(Metadata, { asset: selectedAssetTemplate, form: form, file: (filesList === null || filesList === void 0 ? void 0 : filesList[0]) || null })] })), _jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-justify-end md-lib-gap-3", children: [_jsx(Button, { onClick: handleCancelWithConfirmation, children: "Cancel" }), _jsx(Button, { disabled: !selectedAssetTemplate, type: "primary", 
                         // onClick={handleSubmit}
                         loading: loading || updateFileMutation.isLoading, htmlType: "submit", children: "Save" })] })] }));
     return (_jsx(_Fragment, { children: fromUpload ? (_jsx(Drawer, { title: "Metadata", open: open, onClose: handleCancelWithConfirmation, maskClosable: false, children: getMetadataForm })) : (_jsxs("div", { className: "md-lib-p-2 md-lib-overflow-y-scroll md-lib-max-h-[calc(100vh-65px)]", children: [_jsx("p", { className: "md-lib-text-lg md-lib-font-semibold", children: "Metadata" }), getMetadataForm] })) }));

package/package.json

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