awing-library 2.1.2-dev.8 → 2.1.2-dev.9

package/dist/esm/index.js

@@ -111978,18 +111978,24 @@ const AutocompleteInput = fieldDefinition => {
       multiple = true,
       isDirectory = false,
       onValidateCustom,
-      disabled
+      disabled,
+      required = false
     } = fieldDefinition,
-    other = __rest$1(fieldDefinition, ["options", "value", "onChange", "readOnly", "error", "disableHelperText", "helperText", "disableClearable", "multiple", "isDirectory", "onValidateCustom", "disabled"]);
+    other = __rest$1(fieldDefinition, ["options", "value", "onChange", "readOnly", "error", "disableHelperText", "helperText", "disableClearable", "multiple", "isDirectory", "onValidateCustom", "disabled", "required"]);
+  console.log('fieldDefinition', fieldDefinition);
   const onValidate = val => {
-    if (!val) return false;
-    if (onValidateCustom) {
-      return onValidateCustom(val);
-    }
-    if (Array.isArray(val)) {
-      return arrayIsNotEmptyValid(val);
+    if (required) {
+      if (!val) return false;
+      if (onValidateCustom) {
+        return onValidateCustom(val);
+      }
+      if (Array.isArray(val)) {
+        return arrayIsNotEmptyValid(val);
+      } else {
+        return notNullValid(val);
+      }
     } else {
-      return notNullValid(val);
+      return true;
     }
   };
   return jsxRuntimeExports.jsx(Autocomplete$2, Object.assign({
@@ -112019,6 +112025,7 @@ const AutocompleteInput = fieldDefinition => {
     renderInput: params => jsxRuntimeExports.jsx(TextField$1, Object.assign({}, params, other, {
       variant: "standard",
       error: error,
+      required: required,
       helperText: !disableHelperText && error ? helperText !== null && helperText !== void 0 ? helperText : t('Common.InvalidData') : ''
     }))
   }, multiple && {
@@ -185090,9 +185097,32 @@ const Edit = () => {
     roleTagOptions,
     groupsTagOptions
   } = useContextUser();
+  //GetUserById to get user information
+  useEffect(() => {
+    if (services) {
+      setLoadingUser(true);
+      services.getUserById({
+        id: Number(userId)
+      }).then(data => {
+        setUser(data);
+        setUserRoleAuthens(lodashExports.map(lodashExports.get(data, 'roleAuthens', []), i => {
+          var _a;
+          return {
+            id: i.id,
+            roleId: i.roleId,
+            roleName: (_a = i === null || i === void 0 ? void 0 : i.role) === null || _a === void 0 ? void 0 : _a.name
+          };
+        }));
+      }).finally(() => {
+        setLoadingUser(false);
+      });
+    }
+  }, []);
+  //handle confirm exit
   const getUserRoles = () => {
+    var _a;
     const userRolesInput = [];
-    const currentUserRoles = lodashExports.cloneDeep(lodashExports.get(user, 'roles', userRoleAuthens.map(i => i.roleId)));
+    const currentUserRoles = lodashExports.cloneDeep(lodashExports.get(user, 'roles', (_a = user === null || user === void 0 ? void 0 : user.roleAuthens) === null || _a === void 0 ? void 0 : _a.map(i => i.roleId)));
     // add more new items
     lodashExports.each(currentUserRoles, i => {
       if (!lodashExports.find(userRoleAuthens, j => j.roleId === i)) {
@@ -185113,6 +185143,7 @@ const Edit = () => {
     });
     return userRolesInput;
   };
+  //onUpdateUser function to update user information
   const onUpdateUser = async () => {
     if (!services) return;
     setLoadingUpdateUser(true);
@@ -185132,25 +185163,16 @@ const Edit = () => {
       setLoadingUpdateUser(false);
     });
   };
-  useEffect(() => {
-    if (services) {
-      setLoadingUser(true);
-      services.getUserById({
-        id: Number(userId)
-      }).then(data => {
-        setUser(data);
-        setUserRoleAuthens(lodashExports.map(lodashExports.get(data, 'roleAuthens', []), i => {
-          var _a;
-          return {
-            id: i.id,
-            roleId: i.roleId,
-            roleName: (_a = i === null || i === void 0 ? void 0 : i.role) === null || _a === void 0 ? void 0 : _a.name
-          };
-        }));
-      }).finally(() => {
-        setLoadingUser(false);
+  const handleUpdate = useCallback((fieldsToUpdate, _formValid, key) => {
+    if (!fieldsToUpdate || !Object.keys(fieldsToUpdate).length) return;
+    setUser(prev => {
+      if (!prev) return prev;
+      return Object.assign(Object.assign({}, prev), {
+        [key]: key !== 'roleAuthens' ? fieldsToUpdate[key] : fieldsToUpdate[key].map(i => ({
+          roleId: i
+        }))
       });
-    }
+    });
   }, []);
   return jsxRuntimeExports.jsx(DrawerWrapper$1, {
     title: t('User.TitleEdit'),
@@ -185169,11 +185191,12 @@ const Edit = () => {
         required: true,
         length: 200
       }, {
-        fieldName: 'roles',
-        // multiple: true,
+        fieldName: 'roleAuthens',
+        multiple: true,
         type: FIELD_TYPE.AUTOCOMPLETE,
         label: t('User.Roles'),
-        options: roleTagOptions
+        options: roleTagOptions,
+        required: false
       },
       //Todo: API getUserById does not return groups, so we need to handle it later
       {
@@ -185181,7 +185204,8 @@ const Edit = () => {
         multiple: true,
         type: FIELD_TYPE.AUTOCOMPLETE,
         label: t('User.Groups'),
-        options: groupsTagOptions
+        options: groupsTagOptions,
+        required: false
       }, {
         fieldName: 'description',
         type: FIELD_TYPE.TEXT_AREA,
@@ -185190,19 +185214,15 @@ const Edit = () => {
       }],
       oldValue: user ? {
         name: user.name,
-        roles: (_a = user === null || user === void 0 ? void 0 : user.roleAuthens) === null || _a === void 0 ? void 0 : _a.map(i => i.roleId),
+        roleAuthens: (_a = user === null || user === void 0 ? void 0 : user.roleAuthens) === null || _a === void 0 ? void 0 : _a.map(i => i.roleId),
         description: user.description,
         groups: user.groups
       } : undefined,
-      onUpdate: (obj, formValid) => {
-        var _a, _b;
+      onUpdate: (obj, formValid, key) => {
         if (!lodashExports.isEmpty(obj)) {
-          obj && setUser(Object.assign(Object.assign(Object.assign({}, user), obj), {
-            roles: (_a = obj.roles) === null || _a === void 0 ? void 0 : _a.filter(role => role !== undefined),
-            groups: (_b = obj.groups) === null || _b === void 0 ? void 0 : _b.filter(group => group !== undefined)
-          }));
+          handleUpdate(obj, formValid, key);
           setConfirmExit(true);
-          setReadyForSubmit(formValid);
+          if (obj.name !== (user === null || user === void 0 ? void 0 : user.name)) setReadyForSubmit(formValid);
         }
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-dev.8",
+    "version": "2.1.2-dev.9",
     "main": "dist/esm/index.js",
     "module": "dist/esm/index.js",
     "types": "dist/index.d.ts",