awing-library 2.1.2-stable.38 → 2.1.2-stable.39

package/dist/AWING/DataInput/components/CheckBoxInput.js

@@ -5,7 +5,7 @@ const CheckBoxInput = (fieldDefinition)=>{
     const { name, value, onChange, readOnly, disabled, label, onValidateCustom } = fieldDefinition;
     const onValidate = (val)=>{
         if (onValidateCustom) return onValidateCustom(val);
-        return notNullValid(value);
+        return notNullValid(val);
     };
     const isChecked = Boolean(value);
     return /*#__PURE__*/ jsx(FormControl, {

package/dist/Features/SYSTEM/Schema/AddOrEdit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddOrEdit.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Schema/AddOrEdit.tsx"],"names":[],"mappings":"AAqBA,MAAM,MAAM,iBAAiB,GAAG;IAC5B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,QAAA,MAAM,SAAS,UAAW,iBAAiB,4CA2H1C,CAAC;AACF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"AddOrEdit.d.ts","sourceRoot":"","sources":["../../../../src/Features/SYSTEM/Schema/AddOrEdit.tsx"],"names":[],"mappings":"AAqBA,MAAM,MAAM,iBAAiB,GAAG;IAC5B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,QAAA,MAAM,SAAS,UAAW,iBAAiB,4CAiI1C,CAAC;AACF,eAAe,SAAS,CAAC"}

package/dist/Features/SYSTEM/Schema/AddOrEdit.js

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { textValidation } from "../../../AWING/index.js";
+import { CircularProgress, textValidation } from "../../../AWING/index.js";
 import { ClassicDrawer } from "../../../Commons/index.js";
 import { patternFieldText } from "../../constants.js";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
@@ -26,6 +26,7 @@ const AddOrEdit_AddOrEdit = (props)=>{
     const hasValidationErrors = useAtomValue(validationErrorsState);
     const getResetAllState = useSetAtom(resetAllState);
     const [loadingCreateSchema, setLoadingCreateSchema] = useState(false);
+    const [loading, setLoading] = useState(false);
     useEffect(()=>{
         if (services && 0 === objectTypeCodes.length) services.getObjectDefinitions().then((data)=>{
             const objectDefinitions = data.items;
@@ -33,19 +34,25 @@ const AddOrEdit_AddOrEdit = (props)=>{
         });
     }, []);
     useEffect(()=>{
-        if (!isCreate && services) services.getSchemaById({
-            id: Number(chemaId)
-        }).then((schema)=>{
-            setSchema(schema);
-            setCurrentSchema(schema);
-            if (schema.objectTypeCode) services?.getTypeDefinitions({
-                objectTypeCode: schema.objectTypeCode
-            }).then((data)=>{
-                setFullFields(data.items);
-            }).catch((error)=>{
-                console.error('Error fetching type definitions:', error);
+        if (!isCreate && services) {
+            setLoading(true);
+            services.getSchemaById({
+                id: Number(chemaId)
+            }).then((schema)=>{
+                setSchema(schema);
+                setCurrentSchema(schema);
+                if (schema.objectTypeCode) return services?.getTypeDefinitions({
+                    objectTypeCode: schema.objectTypeCode
+                }).then((data)=>{
+                    setFullFields(data.items);
+                }).catch((error)=>{
+                    console.error('Error fetching type definitions:', error);
+                });
+                return null;
+            }).finally(()=>{
+                setLoading(false);
             });
-        });
+        }
     }, [
         chemaId
     ]);
@@ -101,7 +108,7 @@ const AddOrEdit_AddOrEdit = (props)=>{
         childrenWrapperStyle: {
             padding: 0
         },
-        children: /*#__PURE__*/ jsx(TabConfigtion, {
+        children: loading ? /*#__PURE__*/ jsx(CircularProgress, {}) : /*#__PURE__*/ jsx(TabConfigtion, {
             ref: tabConfigtionRef
         })
     });

package/dist/Features/SYSTEM/Schema/components/SchemaInformation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaInformation.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Schema/components/SchemaInformation.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,oBAAoB;IACjC,qBAAqB,EAAE,MAAM,GAAG,EAAE,CAAC;IACnC,mBAAmB,EAAE,MAAM,OAAO,CAAC;CACtC;AAED,QAAA,MAAM,iBAAiB,gGA4GrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"SchemaInformation.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Schema/components/SchemaInformation.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,oBAAoB;IACjC,qBAAqB,EAAE,MAAM,GAAG,EAAE,CAAC;IACnC,mBAAmB,EAAE,MAAM,OAAO,CAAC;CACtC;AAED,QAAA,MAAM,iBAAiB,gGA+GrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/dist/Features/SYSTEM/Schema/components/SchemaInformation.js

@@ -1,6 +1,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Typography } from "@mui/material";
-import { DataForm, FIELD_TYPE, textValidation } from "../../../../AWING/index.js";
+import { CircularProgress, DataForm, FIELD_TYPE, textValidation } from "../../../../AWING/index.js";
 import { patternFieldText } from "../../../constants.js";
 import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { forwardRef, useImperativeHandle, useRef, useState } from "react";
@@ -19,6 +19,7 @@ const SchemaInformation_SchemaInformation = /*#__PURE__*/ forwardRef((_props, re
     const setConfirmExit = useSetAtom(confirmExitState);
     const isCreate = !schema?.id;
     const [isChangeName, setIsChangeName] = useState(false);
+    const [loading, setLoading] = useState(false);
     const handleChangeObjectTypeCode = (e)=>{
         const value = e.target?.value;
         setCurrentSchema((prev)=>({
@@ -26,12 +27,15 @@ const SchemaInformation_SchemaInformation = /*#__PURE__*/ forwardRef((_props, re
                 objectTypeCode: value
             }));
         isCreate && setConfirmExit(true);
+        setLoading(true);
         services?.getTypeDefinitions({
             objectTypeCode: value
         }).then((data)=>{
             setFullFields(data.items);
+            setLoading(false);
         }).catch((error)=>{
             console.error('Error fetching type definitions:', error);
+            setLoading(false);
         });
     };
     const handleChangeSchemaName = (e)=>{
@@ -95,7 +99,7 @@ const SchemaInformation_SchemaInformation = /*#__PURE__*/ forwardRef((_props, re
                 },
                 children: `${t('Schema.FieldLabel')} *`
             }),
-            /*#__PURE__*/ jsx(TreeSchema, {
+            loading ? /*#__PURE__*/ jsx(CircularProgress, {}) : /*#__PURE__*/ jsx(TreeSchema, {
                 ref: treeSchemaRef
             })
         ]

package/dist/Features/SYSTEM/Schema/utils.js

@@ -225,7 +225,8 @@ const getSchemaInput = (currentSchemaDetails, oldSchemaDetails)=>{
 function validateJsonString(jsonString, schema, selectedItems) {
     try {
         if (jsonString.includes('{workspaceId}')) jsonString = jsonString.replace(/{workspaceId}/g, '0');
-        const obj = JSON.parse(jsonString);
+        const formatJson = jsonString.replace(/([{,]\s*)(\w+)(\s*:)/g, '$1"$2"$3');
+        const obj = JSON.parse(formatJson);
         const allowedKeys = (schema.children ?? []).map((child)=>({
                 fieldName: child?.fieldName ?? '',
                 targetType: child?.targetType ?? '',
@@ -233,13 +234,10 @@ function validateJsonString(jsonString, schema, selectedItems) {
                 isSelected: selectedItems ? selectedItems.includes(String(child?.id)) : true
             }));
         const objKeys = Object.keys(obj);
-        for (const key of objKeys)if (!allowedKeys.some((allowed)=>allowed.fieldName === key && allowed.isSelected)) {
-            debugger;
-            return {
-                isValid: false,
-                error: `Key không được phép: ${key}`
-            };
-        }
+        for (const key of objKeys)if (!allowedKeys.some((allowed)=>allowed.fieldName === key && allowed.isSelected)) return {
+            isValid: false,
+            error: `Key không được phép: ${key}`
+        };
         const hasPrimaryKey = allowedKeys.some(({ fieldName, isPrimaryKey, isSelected })=>isPrimaryKey && isSelected && fieldName in obj);
         if (!hasPrimaryKey) return {
             isValid: false,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-stable.38",
+    "version": "2.1.2-stable.39",
     "license": "MIT",
     "exports": {
         ".": {