@omniumretail/component-library 1.1.80 → 1.1.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omniumretail/component-library",
-  "version": "1.1.80",
+  "version": "1.1.82",
   "private": false,
   "main": "dist/bundle.js",
   "typings": "./dist/types/index",

package/src/components/CategoryResponse/CategoryResponse.stories.tsx

@@ -114,7 +114,7 @@ Primary.args = {
                             "Description": "This is a description ",
                             "Grade": "0",
                             "Note": "asasas",
-                            "Answer": null,
+                            "Answer": [],
                             "IsDate": true
                         }
                     ]

package/src/components/CategoryResponse/index.tsx

@@ -1,6 +1,6 @@
 import styles from './styles.module.scss';
 import { useEffect, useImperativeHandle, useState } from 'react';
-import { Form, UploadFile, Upload, DatePicker, InputNumber } from 'antd';
+import { Form, UploadFile, Upload, DatePicker } from 'antd';
 import { useForm } from 'antd/es/form/Form';
 import classNames from 'classnames';
 import TextArea from 'antd/es/input/TextArea';
@@ -9,6 +9,7 @@ import { evaluationOptions } from './evaluationOptions';
 import React from 'react';
 import { t } from 'i18next';
 import { Button } from '../Button';
+import dayjs from 'dayjs';
 
 interface CategoryResponse {
     data: any;
@@ -84,15 +85,6 @@ const hasCategory = (currentKey: string, categories: Category[], direction: 'nex
     return !!category;
 };
 
-const getDateToUnixInUTC = (date: Date): string | null => {
-    if (date === null) {
-        return null;
-    }
-
-    const dateInUtc = new Date(Date.UTC(date?.getFullYear(), date?.getMonth(), date?.getDate(), 0, 0, 0));
-    return `${dateInUtc.getTime() / 1000}`;
-}
-
 export const CategoryResponse = React.forwardRef((props: CategoryResponse, ref) => {
     const { data } = props;
 
@@ -102,6 +94,7 @@ export const CategoryResponse = React.forwardRef((props: CategoryResponse, ref)
     const [selectedCategory, setSelectedCategory] = useState<any>(data.CategoryAnswers[0]);
     const [initialValues, setInitialValues] = useState<any>(data.CategoryAnswers[0].Data);
     const [fileLists, setFileLists] = useState<Record<string, UploadFile[]>>({});
+    const [dataValue, setDataValue] = useState<any>();
     const [isNoteVisible, setIsNoteVisible] = useState<{ categoryIndex: number; questionIndex: number } | null>(null);
     const [form] = useForm();
 
@@ -116,9 +109,11 @@ export const CategoryResponse = React.forwardRef((props: CategoryResponse, ref)
             Questions: Questions.map((question: any) => ({
                 Subject: question.Subject,
                 Description: question.Description,
-                Answer: question.Answer || "",
+                Answer: props.addButtons ? (question.IsDate ? (question?.Answer?.length > 0 ? dayjs.unix(Number(question?.Answer?.[0])) : null) : question.Answer) : question.Answer,
                 Note: question.Note || "",
-                IsMultipleChoise: question.IsMultipleChoise || false
+                IsMultipleChoise: question.IsMultipleChoise || false,
+                IsDate: question.IsDate || false,
+                IsOpenAnswer: question.IsOpenAnswer || false,
             })),
             OpenAnswer: OpenAnswer,
             IsYesOrNo: IsYesOrNo
@@ -186,11 +181,11 @@ export const CategoryResponse = React.forwardRef((props: CategoryResponse, ref)
                 ...question,
                 Answer: !props.addButtons
                     ? values.Questions[index].Answer
-                    : Array.isArray(values.Questions[index].Answer)
-                        ? values.Questions[index].Answer
-                        : values.Questions[index].Answer
-                            ? [values.Questions[index].Answer]
-                            : [],
+                        : Array.isArray(values.Questions[index].Answer)
+                            ? values.Questions[index].Answer
+                            : values.Questions[index].Answer
+                                ? [values.Questions[index].Answer]
+                                : [],
                 Note: values.Questions[index].Note,
                 IsMultipleChoise: values.Questions[index].IsMultipleChoise,
                 Files: fileLists[`${selectedCategory.Data.CategoryId}_${index}`] || [], // Include files in the form data
@@ -389,6 +384,9 @@ export const CategoryResponse = React.forwardRef((props: CategoryResponse, ref)
                                                     className={styles.select}
                                                     placeholder={''}
                                                     format={dateFormatList}
+                                                    value={dataValue}
+                                                    defaultValue={form.getFieldValue(`Questions`)?.[index].Answer}
+                                                    onChange={(value) => setDataValue(value)}
                                                 />
                                             </Form.Item>
 

package/src/components/Questions/SingleQuestion/index.tsx

@@ -28,7 +28,7 @@ export const SingleQuestion = ({
     const formContext = useContext(FieldContext);
 
     const filteredIds = responseTypeOptions
-        .filter((item: { IsMultipleChoise: any; }) => item.IsMultipleChoise)
+        ?.filter((item: { IsMultipleChoise: any; }) => item.IsMultipleChoise)
         .map((item: { Id: any; }) => item.Id);
 
     const answerTypeOptions = responseTypeOptions?.map((answerType: any) => ({
@@ -159,7 +159,7 @@ export const SingleQuestion = ({
                                     <span>{t('components.category.emphasisAnswer')}</span>
                                 </div>
 
-                                {filteredIds.includes(formContext.getFieldsValue().questions?.[name]?.responseType) &&
+                                {filteredIds?.includes(formContext.getFieldsValue().questions?.[name]?.responseType) &&
                                     < div className={styles.checkboxContainer}>
                                         <Form.Item
                                             {...restField}