awing-library 2.1.2-dev.540 → 2.1.2-dev.542

package/dist/AWING/AsyncAutocomplete/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/AWING/AsyncAutocomplete/Container.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC,2CAgO5E"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../src/AWING/AsyncAutocomplete/Container.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC,2CA+N5E"}

package/dist/AWING/AsyncAutocomplete/Container.js

@@ -21,9 +21,9 @@ function AsyncAutocomplete(props) {
     const [isOpen, setIsOpen] = useState(open ?? false);
     const [fetched, setFetched] = useState(false);
     useEffect(()=>{
-        if (value) setInputValue(getOptionLabel(value));
+        value && Object.keys(value).length > 0 ? setInputValue(getOptionLabel(value)) : setInputValue('');
     }, [
-        value
+        JSON.stringify(value)
     ]);
     const fetchRef = useRef(null);
     useEffect(()=>{

package/dist/AWING/DataForm/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/container.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,2CA4PzE"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/container.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,2CA6QzE"}

package/dist/AWING/DataForm/container.js

@@ -14,7 +14,9 @@ function DataForm(props) {
         const isEditMode = !!(propsOldValue && Object.keys(propsOldValue).length > 0);
         fields.forEach((fieldDef)=>{
             const fieldName = fieldDef.fieldName;
-            if (!isEditMode && void 0 !== fieldDef.defaultValue) fieldsToUpdate[fieldName] = fieldDef.defaultValue;
+            if (isEditMode || void 0 === fieldDef.defaultValue) {
+                if (isEditMode && propsOldValue) fieldsToUpdate[fieldName] = propsOldValue[fieldName];
+            } else fieldsToUpdate[fieldName] = fieldDef.defaultValue;
             validation[fieldName] = true;
         });
         return {
@@ -24,18 +26,37 @@ function DataForm(props) {
     });
     useEffect(()=>{
         if (propsOldValue) {
-            const isNewPropsPopulated = !!(propsOldValue && Object.keys(propsOldValue).length > 0);
-            const isCurrentOldValueEmpty = !oldValue || 0 === Object.keys(oldValue).length;
+            const isFirstLoad = !oldValue || 0 === Object.keys(oldValue).length;
+            const newId = propsOldValue?.id;
+            const currentId = oldValue?.id;
+            const isNewId = newId !== currentId;
+            const isNewVersion = propsOldValue?.versionId !== oldValue?.versionId;
+            const isContentDifferent = JSON.stringify(propsOldValue) !== JSON.stringify(oldValue);
             setOldValue(propsOldValue);
-            if (isNewPropsPopulated) setDataFormState((pre)=>{
-                if (!isCurrentOldValueEmpty && Object.keys(pre.fieldsToUpdate).length > 0) return pre;
-                const newValidation = {};
-                fields.forEach((field)=>{
-                    newValidation[field.fieldName] = true;
+            if (isFirstLoad || isNewId || isNewVersion || isContentDifferent) setDataFormState((pre)=>{
+                const newFieldsToUpdate = {
+                    ...pre.fieldsToUpdate
+                };
+                if (isFirstLoad || isNewId) {
+                    const resetFields = {};
+                    const newValidation = {};
+                    fields.forEach((field)=>{
+                        const fieldName = field.fieldName;
+                        resetFields[fieldName] = propsOldValue[fieldName];
+                        newValidation[fieldName] = true;
+                    });
+                    return {
+                        fieldsToUpdate: resetFields,
+                        validation: newValidation
+                    };
+                }
+                Object.keys(propsOldValue).forEach((key)=>{
+                    const fieldKey = key;
+                    newFieldsToUpdate[fieldKey] = propsOldValue[fieldKey];
                 });
                 return {
-                    fieldsToUpdate: {},
-                    validation: newValidation
+                    ...pre,
+                    fieldsToUpdate: newFieldsToUpdate
                 };
             });
         }
@@ -50,13 +71,12 @@ function DataForm(props) {
             let newValidation = {
                 ...pre.validation
             };
-            if (oldValue && oldValue[fieldName] === newValue) delete newFieldsToUpdate[fieldName];
-            else if (newFieldsToUpdate[fieldName] !== newValue) newFieldsToUpdate[fieldName] = newValue;
+            newFieldsToUpdate[fieldName] = newValue;
             newValidation[fieldName] = valid;
             if (props.fieldDependencies && props.fieldDependencies[fieldName]) {
                 const dependentFields = props.fieldDependencies[fieldName];
                 dependentFields.forEach((depField)=>{
-                    delete newFieldsToUpdate[depField];
+                    newFieldsToUpdate[depField] = void 0;
                     newValidation[depField] = void 0;
                 });
             }
@@ -108,7 +128,8 @@ function DataForm(props) {
         if (onValues) onValues(completeValues, formValid, keyUpdate);
     }, [
         dataFormState,
-        keyUpdate
+        keyUpdate,
+        oldValue
     ]);
     const renderField = (fieldDef)=>{
         const { fieldName } = fieldDef;

package/dist/AWING/DataForm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,iBAC1B,aAAa,CAAC,CAAC,CAAC,YACrB,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,YACtB,oBAAoB,CAAC,CAAC,CAAC,yBACV,OAAO;;;CAuBjC,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,MAAM,mBACpC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,iBACpD,KAAK,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,YAChD,OAAO,CAAC,CAAC,CAAC,cACR,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,GAAE,CAAC,kBAChC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE;;2BAGlC,CAAC;CAyBpC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,iBAChC,aAAa,CAAC,CAAC,CAAC,UACvB,oBAAoB,CAAC,CAAC,CAAC,EAAE,cACrB,OAAO,CAAC,CAAC,CAAC,mBACL,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,gBAC1C,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,YAsC3C,CAAC;AAGF,wBAAgB,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,CAG7C;AAGD,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAGlE;AAGD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAGrF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,iBAC1B,aAAa,CAAC,CAAC,CAAC,YACrB,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,YACtB,oBAAoB,CAAC,CAAC,CAAC,yBACV,OAAO;;;CA6BjC,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,MAAM,mBACpC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,iBACpD,KAAK,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,YAChD,OAAO,CAAC,CAAC,CAAC,cACR,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,GAAE,CAAC,kBAChC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE;;2BAGlC,CAAC;CAyBpC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,iBAChC,aAAa,CAAC,CAAC,CAAC,UACvB,oBAAoB,CAAC,CAAC,CAAC,EAAE,cACrB,OAAO,CAAC,CAAC,CAAC,mBACL,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,gBAC1C,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,YAsC3C,CAAC;AAGF,wBAAgB,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,CAG7C;AAGD,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAGlE;AAGD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAGrF"}

package/dist/AWING/DataForm/utils.js

@@ -3,7 +3,9 @@ import { calculateValue, convertFormulaToBinaryTree, replaceFieldsValue } from "
 import { patternFieldText } from "../../Features/constants.js";
 const handleFields = (dataFormState, oldValue, fieldDef, autoValidateFieldText)=>{
     const { fieldName, value } = fieldDef;
-    const fieldValue = dataFormState.fieldsToUpdate[fieldName] ?? (oldValue ? oldValue[fieldName] : value);
+    const fieldKey = fieldName;
+    const isFieldDirty = fieldKey in dataFormState.fieldsToUpdate;
+    const fieldValue = isFieldDirty ? dataFormState.fieldsToUpdate[fieldKey] : oldValue?.[fieldKey] ?? value;
     const showError = void 0 !== dataFormState.validation[fieldName] ? !dataFormState.validation[fieldName] : void 0;
     if (autoValidateFieldText) {
         if (fieldDef.type === FIELD_TYPE.TEXT || fieldDef.type === FIELD_TYPE.TEXT_AREA) fieldDef.pattern = fieldDef.pattern ? fieldDef.pattern : patternFieldText;

package/dist/Features/SYSTEM/Group/SearchUser/component.d.ts

@@ -3,6 +3,8 @@ interface SearchUserGroupUserProps {
     listUserId: number[];
     onListUserIdChange: (listUserId: number[]) => void;
     users: User[];
+    onSearch?: (searchString: string) => void;
+    loading?: boolean;
 }
 declare function SearchUserGroupUser(props: SearchUserGroupUserProps): import("react/jsx-runtime").JSX.Element;
 export default SearchUserGroupUser;

package/dist/Features/SYSTEM/Group/SearchUser/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/component.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,UAAU,wBAAwB;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,IAAI,EAAE,CAAC;CACjB;AAED,iBAAS,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CA2E3D;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/component.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,UAAU,wBAAwB;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,iBAAS,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CAwE3D;AAED,eAAe,mBAAmB,CAAC"}

package/dist/Features/SYSTEM/Group/SearchUser/component.js

@@ -2,18 +2,11 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
 import { filter, some } from "lodash";
 import { Checkbox, FormControlLabel, Paper } from "@mui/material";
-import { NoData, SearchBox } from "../../../../AWING/index.js";
+import { CircularProgress, NoData, SearchBox } from "../../../../AWING/index.js";
 import Grid from "@mui/material/Grid";
 function SearchUserGroupUser(props) {
-    const { listUserId, onListUserIdChange, users } = props;
-    const [usersSearchResult, setUsersSearchResult] = useState([]);
+    const { listUserId, onListUserIdChange, users, onSearch, loading } = props;
     const [keyWordSearch, setKeyWordSearch] = useState('');
-    const handleFilterByFieldName = (list, newSearchString)=>{
-        let result = [];
-        if ('' === newSearchString) return [];
-        result = list?.filter((item)=>item.username === newSearchString) || [];
-        return result;
-    };
     const handleChangeUserList = (userId, e)=>{
         let newUserIds = listUserId.slice();
         if (e.target.checked) onListUserIdChange([
@@ -27,13 +20,14 @@ function SearchUserGroupUser(props) {
     };
     const handleSearch = (searchString)=>{
         setKeyWordSearch(searchString);
-        const newUsersSearchResult = handleFilterByFieldName(users, searchString);
-        setUsersSearchResult(newUsersSearchResult);
+        if (onSearch) onSearch(searchString);
     };
     return /*#__PURE__*/ jsxs(Paper, {
         sx: (theme)=>({
                 padding: (theme)=>theme.spacing(3),
-                border: theme.palette.background.paper
+                border: theme.palette.background.paper,
+                minHeight: '200px',
+                position: 'relative'
             }),
         children: [
             /*#__PURE__*/ jsx(SearchBox, {
@@ -45,12 +39,19 @@ function SearchUserGroupUser(props) {
                     handleSearch(searchString);
                 }
             }),
-            usersSearchResult && usersSearchResult?.length > 0 ? /*#__PURE__*/ jsx(Grid, {
+            loading ? /*#__PURE__*/ jsx(Grid, {
+                container: true,
+                justifyContent: "center",
+                sx: {
+                    mt: 3
+                },
+                children: /*#__PURE__*/ jsx(CircularProgress, {})
+            }) : users && users?.length > 0 ? /*#__PURE__*/ jsx(Grid, {
                 container: true,
                 sx: {
                     mt: 3
                 },
-                children: usersSearchResult?.map((user, key)=>/*#__PURE__*/ jsx(Grid, {
+                children: users?.map((user, key)=>/*#__PURE__*/ jsx(Grid, {
                         size: {
                             xs: 12,
                             sm: 6,

package/dist/Features/SYSTEM/Group/SearchUser/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/container.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,UAAU,YAAY;IAClB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CAC7C;AAED,QAAA,MAAM,OAAO,UAAW,YAAY,4CA0EnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../../src/Features/SYSTEM/Group/SearchUser/container.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAQlD,UAAU,YAAY;IAClB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CAC7C;AAED,QAAA,MAAM,OAAO,UAAW,YAAY,4CA+GnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/dist/Features/SYSTEM/Group/SearchUser/container.js

@@ -1,21 +1,24 @@
 import { jsx } from "react/jsx-runtime";
-import { useEffect, useState } from "react";
-import lodash from "lodash";
 import Grid from "@mui/material/Grid";
+import lodash from "lodash";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import component from "./component.js";
 import { ClassicDrawer } from "../../../../Commons/index.js";
-import { CircularProgress } from "../../../../AWING/index.js";
 import { useContextGroup } from "../context.js";
+import component from "./component.js";
 const AddUser = (props)=>{
     const { t } = useTranslation();
     const { usersSelected, onChangeAddUser = ()=>null } = props;
     const [listUserId, setListUserId] = useState([]);
     const [usersData, setUsersData] = useState([]);
     const [loading, setLoading] = useState(false);
+    const usersCache = useRef({});
     const { services } = useContextGroup();
     useEffect(()=>{
         setListUserId(usersSelected.length > 0 ? usersSelected.map((item)=>item.id).filter((id)=>void 0 !== id) : []);
+        usersSelected.forEach((user)=>{
+            if (void 0 !== user.id) usersCache.current[user.id] = user;
+        });
     }, [
         usersSelected
     ]);
@@ -26,7 +29,7 @@ const AddUser = (props)=>{
         const newUserIds = lodash.differenceWith(userIds, usersSelected, (a, b)=>a === b.id);
         const newUsers = [
             ...newUserIds.map((userId)=>{
-                const user = usersData?.find((user)=>user?.id === userId);
+                const user = usersCache.current[userId];
                 return {
                     id: userId,
                     username: user?.username ?? '',
@@ -36,14 +39,33 @@ const AddUser = (props)=>{
         ];
         onChangeAddUser(newUsers);
     };
-    useEffect(()=>{
+    const fetchUsers = (searchString)=>{
         if (services?.getUsers) {
             setLoading(true);
-            services.getUsers().then((data)=>{
+            services.getUsers({
+                where: {
+                    username: {
+                        eq: searchString
+                    }
+                }
+            }).then((data)=>{
                 setUsersData(data.users);
+                data.users.forEach((user)=>{
+                    if (void 0 !== user.id) usersCache.current[user.id] = user;
+                });
             }).finally(()=>setLoading(false));
         }
-    }, []);
+    };
+    const debouncedFetchUsers = useRef(lodash.debounce((query)=>{
+        fetchUsers(query);
+    }, 500)).current;
+    const handleSearch = (val)=>{
+        if ('' !== val) debouncedFetchUsers(val);
+        else {
+            debouncedFetchUsers.cancel();
+            setUsersData([]);
+        }
+    };
     return /*#__PURE__*/ jsx(ClassicDrawer, {
         title: t('UserGroup.TitleAdd'),
         onSubmit: ()=>new Promise((resolve, _reject)=>{
@@ -58,10 +80,12 @@ const AddUser = (props)=>{
                 pl: 1,
                 pr: 1
             },
-            children: loading ? /*#__PURE__*/ jsx(CircularProgress, {}) : /*#__PURE__*/ jsx(component, {
+            children: /*#__PURE__*/ jsx(component, {
                 users: usersData?.filter((x)=>null !== x).filter((x)=>!usersSelected?.map((y)=>y.id).includes(x.id)) ?? [],
                 listUserId: listUserId,
-                onListUserIdChange: handleListUserIdChange
+                onListUserIdChange: handleListUserIdChange,
+                onSearch: handleSearch,
+                loading: loading
             })
         })
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-dev.540",
+    "version": "2.1.2-dev.542",
     "license": "MIT",
     "exports": {
         ".": {