From 28c2b8cc435bba76c44cb14ae14165bb25b0558d Mon Sep 17 00:00:00 2001
From: Allan Amaral <allanmaral@hotmai.com>
Date: Mon, 8 Jun 2020 10:53:36 -0300
Subject: [PATCH] #292 - Adjustments in the Admin

---
 admin/src/components/sidebar/index.tsx | 32 +++++++++---------
 admin/src/pages/consumption/index.tsx  |  2 +-
 admin/src/pages/families/list.tsx      |  7 +---
 admin/src/pages/user/form.tsx          | 47 +++++++++++++++-----------
 backend/src/models/users.ts            |  2 +-
 5 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/admin/src/components/sidebar/index.tsx b/admin/src/components/sidebar/index.tsx
index c85b5e8c..601d508b 100644
--- a/admin/src/components/sidebar/index.tsx
+++ b/admin/src/components/sidebar/index.tsx
@@ -41,31 +41,36 @@ const routes: RouteItem[] = [
     icon: () => <BookOutlined />,
     name: 'Validar Produtos'
   },
-  // {
-  //   path: '/relatorios',
-  //   icon: () => <BarChartOutlined />,
-  //   name: 'Relatórios'
-  // },
   {
-    path: '/beneficios',
+    path: '/consumo',
     icon: () => <CarryOutOutlined />,
-    name: 'Beneficios'
+    name: 'Informar consumo'
   },
   {
     path: '/familias',
     icon: () => <IdcardOutlined />,
     name: 'Famílias'
   },
+  {
+    path: '/beneficios',
+    icon: () => <CarryOutOutlined />,
+    name: 'Beneficios'
+  },
   {
     path: '/usuarios',
     icon: () => <UserOutlined />,
     name: 'Usuários'
   },
   {
-    path: '/consumo',
-    icon: () => <CarryOutOutlined />,
-    name: 'Informar consumo'
-  },
+    path: '/instituicoes',
+    icon: () => <BankOutlined />,
+    name: 'Instituições'
+  }
+  // {
+  //   path: '/relatorios',
+  //   icon: () => <BarChartOutlined />,
+  //   name: 'Relatórios'
+  // },
   // {
   //   path: '/lojas',
   //   icon: () => <ShopOutlined />,
@@ -76,11 +81,6 @@ const routes: RouteItem[] = [
   //   icon: () => <SolutionOutlined />,
   //   name: 'Estabelecimentos'
   // },
-  {
-    path: '/instituicoes',
-    icon: () => <BankOutlined />,
-    name: 'Instituições'
-  }
 ];
 
 const privateRoutes: RouteItem[] = [
diff --git a/admin/src/pages/consumption/index.tsx b/admin/src/pages/consumption/index.tsx
index b69997de..c9bd2731 100644
--- a/admin/src/pages/consumption/index.tsx
+++ b/admin/src/pages/consumption/index.tsx
@@ -124,7 +124,7 @@ export const ConsumptionForm: React.FC<RouteComponentProps<{ id: string }>> = ()
 
   return (
     <PageContainer>
-      <Card title="Informar consumo">
+      <Card title={<Typography.Title>Informar consumo</Typography.Title>}>
         <form style={{ marginBottom: 20 }} onSubmit={handleSubmit}>
           <Form layout="vertical">
             <ConsumptionFamilySearch onFamilySelect={(id) => setFieldValue('familyId', id)} />
diff --git a/admin/src/pages/families/list.tsx b/admin/src/pages/families/list.tsx
index 7f1c935f..966800f3 100644
--- a/admin/src/pages/families/list.tsx
+++ b/admin/src/pages/families/list.tsx
@@ -111,12 +111,7 @@ export const FamiliesList: React.FC<{}> = () => {
     <PageContainer>
       <Row gutter={[16, 16]}>
         <Col span={24}>
-          <Typography.Title>{`Famílias`}</Typography.Title>
-        </Col>
-      </Row>
-      <Row gutter={[16, 16]}>
-        <Col span={24}>
-          <Card loading={dashboardLoading}>
+          <Card title={<Typography.Title>{`Famílias`}</Typography.Title>} loading={dashboardLoading}>
             <Row gutter={[16, 16]}>
               <Col span={8}>
                 <Statistic
diff --git a/admin/src/pages/user/form.tsx b/admin/src/pages/user/form.tsx
index 9581a844..970b8db2 100644
--- a/admin/src/pages/user/form.tsx
+++ b/admin/src/pages/user/form.tsx
@@ -15,10 +15,16 @@ const { Option } = Select;
 
 const schema = yup.object().shape({
   name: yup.string().label('Nome').required(),
-  password: yup.string().label('Senha').required(),
+  password: yup
+    .string()
+    .label('Senha')
+    .when('isCreating', (isCreating: boolean | null | undefined, schema: yup.StringSchema) =>
+      isCreating ? schema.required() : schema
+    ),
   cpf: yup.string().label('CPF').required(),
   email: yup.string().label('Email').required(),
-  role: yup.string().label('Cargo').required()
+  role: yup.string().label('Cargo').required(),
+  isCreating: yup.boolean().label('CriandoUsuario').nullable()
 });
 
 /**
@@ -57,10 +63,15 @@ export const UserForm: React.FC<RouteComponentProps<{ id: string }>> = (props) =
       cpf: '',
       email: '',
       role: 'admin',
-      active: false
+      active: false,
+      isCreating
     },
     validationSchema: schema,
-    onSubmit: (values, { setStatus }) => {
+    onSubmit: (formikValues, { setStatus }) => {
+      const values = { ...formikValues };
+      // Prevent sending an empty password when editing an already existing user
+      if (!isCreating && user && !values.password) values.password = user.password;
+
       setStatus();
       dispatch(
         requestSaveUser(
@@ -108,21 +119,19 @@ export const UserForm: React.FC<RouteComponentProps<{ id: string }>> = (props) =
             <Input id="email" name="email" onChange={handleChange} value={values.email} onPressEnter={submitForm} />
           </Form.Item>
 
-          {isCreating && (
-            <Form.Item
-              label={'Senha'}
-              validateStatus={!!passwordMeta.error && !!passwordMeta.touched ? 'error' : ''}
-              help={!!passwordMeta.error && !!passwordMeta.touched ? passwordMeta.error : undefined}
-            >
-              <Input
-                id="password"
-                name="password"
-                onChange={handleChange}
-                value={values.password}
-                onPressEnter={submitForm}
-              />
-            </Form.Item>
-          )}
+          <Form.Item
+            label={'Senha'}
+            validateStatus={!!passwordMeta.error && !!passwordMeta.touched ? 'error' : ''}
+            help={!!passwordMeta.error && !!passwordMeta.touched ? passwordMeta.error : undefined}
+          >
+            <Input
+              id="password"
+              name="password"
+              onChange={handleChange}
+              value={passwordMeta.touched ? values.password : undefined}
+              onPressEnter={submitForm}
+            />
+          </Form.Item>
 
           <Form.Item
             label={'CPF'}
diff --git a/backend/src/models/users.ts b/backend/src/models/users.ts
index 78cd351a..158b5b34 100644
--- a/backend/src/models/users.ts
+++ b/backend/src/models/users.ts
@@ -63,7 +63,7 @@ export const updateById = async (
   const cityItem = getById(id, cityId);
   if (cityItem) {
     // The update return an array [count, item[]], so I'm destructuring to get the updated user
-    const [, [item]] = await db.users.update(values, { where: { id }, returning: true });
+    const [, [item]] = await db.users.update(values, { where: { id }, returning: true, individualHooks: true });
     return item;
   }
   return null;