Updated settings components.

components/pages/settings/users/UserAddForm.js

@@ -0,0 +1,65 @@
+import {
+  Dropdown,
+  Item,
+  Form,
+  FormRow,
+  FormButtons,
+  FormInput,
+  TextField,
+  PasswordField,
+  SubmitButton,
+} from 'react-basics';
+import { useIntl, defineMessages } from 'react-intl';
+import useApi from 'hooks/useApi';
+import { ROLES } from 'lib/constants';
+
+const messages = defineMessages({
+  username: { id: 'label.username', defaultMessage: 'Username' },
+  password: { id: 'label.password', defaultMessage: 'Password' },
+  role: { id: 'label.role', defaultMessage: 'Role' },
+  user: { id: 'label.user', defaultMessage: 'User' },
+  admin: { id: 'label.admin', defaultMessage: 'Admin' },
+  save: { id: 'label.save', defaultMessage: 'Save' },
+  cancel: { id: 'label.cancel', defaultMessage: 'Cancel' },
+  required: { id: 'label.required', defaultMessage: 'Required' },
+});
+
+export default function UserAddForm({ onSave }) {
+  const { post, useMutation } = useApi();
+  const { mutate, error } = useMutation(data => post(`/users`, data));
+  const { formatMessage } = useIntl();
+
+  const handleSubmit = async data => {
+    mutate(data, {
+      onSuccess: async () => {
+        onSave(data);
+      },
+    });
+  };
+
+  return (
+    <Form onSubmit={handleSubmit} error={error}>
+      <FormRow label={formatMessage(messages.username)}>
+        <FormInput name="username" rules={{ required: formatMessage(messages.required) }}>
+          <TextField />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(messages.password)}>
+        <FormInput name="password" rules={{ required: formatMessage(messages.required) }}>
+          <PasswordField />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(messages.role)}>
+        <FormInput name="role" rules={{ required: formatMessage(messages.required) }}>
+          <Dropdown style={{ width: 200 }}>
+            <Item key={ROLES.user}>{formatMessage(messages.user)}</Item>
+            <Item key={ROLES.admin}>{formatMessage(messages.admin)}</Item>
+          </Dropdown>
+        </FormInput>
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary">{formatMessage(messages.save)}</SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}

components/pages/settings/users/UserEditForm.js

@@ -9,7 +9,6 @@ import {
   SubmitButton,
 } from 'react-basics';
 import { useRef } from 'react';
-import { useMutation } from '@tanstack/react-query';
 import useApi from 'hooks/useApi';
 import { ROLES } from 'lib/constants';
 
@@ -26,7 +25,7 @@ const items = [
 
 export default function UserEditForm({ data, onSave }) {
   const { id } = data;
-  const { post } = useApi();
+  const { post, useMutation } = useApi();
   const { mutate, error } = useMutation(({ username }) => post(`/user/${id}`, { username }));
   const ref = useRef(null);
 

components/pages/settings/users/UserPasswordForm.js

@@ -5,7 +5,6 @@ import useUser from 'hooks/useUser';
 
 export default function UserPasswordForm({ onSave, onClose, userId }) {
   const user = useUser();
-
   const isCurrentUser = !userId || user?.id === userId;
   const url = isCurrentUser ? `/users/${user?.id}/password` : `/users/${user?.id}`;
   const { post, useMutation } = useApi();

components/pages/settings/users/UserSettings.js

@@ -1,21 +1,30 @@
-import { useQuery } from '@tanstack/react-query';
+import { useEffect, useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';
+import Link from 'next/link';
+import { useRouter } from 'next/router';
 import UserDelete from 'components/pages/settings/users/UserDelete';
-import UserEditForm from 'components/pages/settings/users/UserEditForm';
+import UserEditForm from 'components/pages/settings/users//UserEditForm';
 import UserPasswordForm from 'components/pages/settings/users/UserPasswordForm';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import useApi from 'hooks/useApi';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Icon, Tabs, useToast, Modal, Button } from 'react-basics';
-import Pen from 'assets/pen.svg';
+
+const messages = defineMessages({
+  users: { id: 'label.users', defaultMessage: 'Users' },
+  details: { id: 'label.details', defaultMessage: 'Details' },
+  changePassword: { id: 'label.change-password', defaultMessage: 'Change password' },
+  actions: { id: 'label.actions', defaultMessage: 'Actions' },
+  saved: { id: 'message.saved-successfully', defaultMessage: 'Saved successfully.' },
+  delete: { id: 'message.delete-successfully', defaultMessage: 'Delete successfully.' },
+});
 
 export default function UserSettings({ userId }) {
+  const { formatMessage } = useIntl();
   const [edit, setEdit] = useState(false);
   const [values, setValues] = useState(null);
-  const [tab, setTab] = useState('general');
-  const { get } = useApi();
+  const [tab, setTab] = useState('details');
+  const { get, useQuery } = useApi();
   const { toast, showToast } = useToast();
   const router = useRouter();
   const { data, isLoading } = useQuery(
@@ -39,14 +48,6 @@ export default function UserSettings({ userId }) {
     }
   };
 
-  const handleAdd = () => {
-    setEdit(true);
-  };
-
-  const handleClose = () => {
-    setEdit(false);
-  };
-
   const handleDelete = async () => {
     showToast({ message: 'Deleted successfully.', variant: 'danger' });
     await router.push('/users');
@@ -64,30 +65,19 @@ export default function UserSettings({ userId }) {
       <PageHeader>
         <Breadcrumbs>
           <Item>
-            <Link href="/users">Users</Link>
+            <Link href="/settings/users">{formatMessage(messages.users)}</Link>
           </Item>
           <Item>{values?.username}</Item>
         </Breadcrumbs>
-        <Button onClick={handleAdd}>
-          <Icon>
-            <Pen />
-          </Icon>
-          Change Password
-        </Button>
       </PageHeader>
       <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
-        <Item key="general">General</Item>
-        <Item key="delete">Danger Zone</Item>
+        <Item key="details">{formatMessage(messages.details)}</Item>
+        <Item key="password">{formatMessage(messages.changePassword)}</Item>
+        <Item key="delete">{formatMessage(messages.actions)}</Item>
       </Tabs>
-      {tab === 'general' && <UserEditForm userId={userId} data={values} onSave={handleSave} />}
+      {tab === 'details' && <UserEditForm userId={userId} data={values} onSave={handleSave} />}
+      {tab === 'password' && <UserPasswordForm userId={userId} onSave={handleSave} />}
       {tab === 'delete' && <UserDelete userId={userId} onSave={handleDelete} />}
-      {edit && (
-        <Modal title="Add website" onClose={handleClose}>
-          {close => (
-            <UserPasswordForm userId={userId} data={values} onSave={handleSave} onClose={close} />
-          )}
-        </Modal>
-      )}
     </Page>
   );
 }

components/pages/settings/users/UsersList.js

@@ -1,44 +1,69 @@
+import { useState } from 'react';
+import { Button, Text, Icon, useToast, Icons, Modal } from 'react-basics';
+import { useIntl, defineMessages } from 'react-intl';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import UsersTable from 'components/pages/settings/users/UsersTable';
-import { useState } from 'react';
-import { Button, Icon, useToast } from 'react-basics';
-import { useMutation } from '@tanstack/react-query';
+import UserEditForm from 'components/pages/settings/users/UserEditForm';
 import useApi from 'hooks/useApi';
+import useUser from 'hooks/useUser';
+
+const { Plus } = Icons;
+
+const messages = defineMessages({
+  saved: { id: 'messages.api-key-saved', defaultMessage: 'API key saved.' },
+  noUsers: {
+    id: 'messages.no-useres',
+    defaultMessage: "You don't have any users.",
+  },
+  users: { id: 'label.users', defaultMessage: 'Users' },
+  createUser: { id: 'label.create-user', defaultMessage: 'Create user' },
+});
 
 export default function UsersList() {
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState();
+  const [edit, setEdit] = useState(false);
+  const { formatMessage } = useIntl();
   const { toast, showToast } = useToast();
-  const { post } = useApi();
-  const { mutate, isLoading } = useMutation(data => post('/api-key', data));
+  const { user } = useUser();
+  const { get, useQuery } = useApi();
+  const { data, isLoading, error, refetch } = useQuery(['user'], () => get(`/users`), {
+    enabled: !!user,
+  });
+  const hasData = data && data.length !== 0;
 
-  const handleSave = () => {
-    mutate(
-      {},
-      {
-        onSuccess: async () => {
-          showToast({ message: 'API key saved.', variant: 'success' });
-        },
-      },
-    );
+  const handleSave = async () => {
+    await refetch();
+    setEdit(false);
+    showToast({ message: formatMessage(messages.saved), variant: 'success' });
   };
 
+  const handleAdd = () => setEdit(true);
+
+  const handleClose = () => setEdit(false);
+
+  const addButton = (
+    <Button variant="primary" onClick={handleAdd}>
+      <Icon>
+        <Plus />
+      </Icon>
+      <Text>{formatMessage(messages.createUser)}</Text>
+    </Button>
+  );
+
   return (
-    <Page loading={loading || isLoading} error={error}>
+    <Page loading={isLoading} error={error}>
       {toast}
-      <PageHeader title="Users">
-        <Button onClick={handleSave}>
-          <Icon icon="plus" /> Create user
-        </Button>
-      </PageHeader>
-      <UsersTable
-        onLoading={({ isLoading, error }) => {
-          setLoading(isLoading);
-          setError(error);
-        }}
-        onAddKeyClick={handleSave}
-      />
+      <PageHeader title={formatMessage(messages.users)}>{addButton}</PageHeader>
+      {hasData && <UsersTable data={data} />}
+      {!hasData && (
+        <EmptyPlaceholder message={formatMessage(messages.noUsers)}>{addButton}</EmptyPlaceholder>
+      )}
+      {edit && (
+        <Modal title={formatMessage(messages.createUser)} onClose={handleClose}>
+          {close => <UserEditForm onSave={handleSave} onClose={close} />}
+        </Modal>
+      )}
     </Page>
   );
 }

components/pages/settings/users/UsersTable.js

@@ -1,11 +1,6 @@
-import { useQuery } from '@tanstack/react-query';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import { formatDistance } from 'date-fns';
-import useApi from 'hooks/useApi';
-import Link from 'next/link';
-import { useEffect, useState } from 'react';
 import {
   Button,
+  Text,
   Icon,
   Table,
   TableBody,
@@ -14,84 +9,66 @@ import {
   TableHeader,
   TableRow,
 } from 'react-basics';
+import { formatDistance } from 'date-fns';
+import Link from 'next/link';
+import { Edit } from 'components/icons';
 import styles from './UsersTable.module.css';
 
-const defaultColumns = [
+const columns = [
   { name: 'username', label: 'Username', style: { flex: 2 } },
   { name: 'role', label: 'Role', style: { flex: 2 } },
   { name: 'created', label: 'Created' },
   { name: 'action', label: ' ' },
 ];
 
-export default function UsersTable({ columns = defaultColumns, onLoading, onAddKeyClick }) {
-  const [values, setValues] = useState(null);
-  const { get } = useApi();
-  const { data, isLoading, error } = useQuery(['user'], () => get(`/users`));
-  const hasData = data && data.length !== 0;
-
-  useEffect(() => {
-    if (data) {
-      setValues(data);
-      onLoading({ data, isLoading, error });
-    }
-  }, [onLoading, data, isLoading, error]);
-
+export default function UsersTable({ data = [] }) {
   return (
-    <>
-      {hasData && (
-        <Table className={styles.table} columns={columns} rows={values}>
-          <TableHeader>
-            {(column, index) => {
-              return (
-                <TableColumn key={index} className={styles.header} style={{ ...column.style }}>
-                  {column.label}
-                </TableColumn>
-              );
-            }}
-          </TableHeader>
-          <TableBody>
-            {(row, keys, rowIndex) => {
-              row.created = formatDistance(new Date(row.createdAt), new Date(), {
-                addSuffix: true,
-              });
+    <Table className={styles.table} columns={columns} rows={data}>
+      <TableHeader>
+        {(column, index) => {
+          return (
+            <TableColumn key={index} className={styles.header} style={{ ...column.style }}>
+              {column.label}
+            </TableColumn>
+          );
+        }}
+      </TableHeader>
+      <TableBody>
+        {(row, keys, rowIndex) => {
+          row.created = formatDistance(new Date(row.createdAt), new Date(), {
+            addSuffix: true,
+          });
 
-              row.action = (
-                <div className={styles.actions}>
-                  <Link href={`/settings/users/${row.id}`}>
-                    <Button>
-                      <Icon icon="arrow-right" />
-                      Settings
-                    </Button>
-                  </Link>
-                </div>
-              );
+          row.action = (
+            <div className={styles.actions}>
+              <Link href={`/settings/users/${row.id}`}>
+                <Button>
+                  <Icon>
+                    <Edit />
+                  </Icon>
+                  <Text>Edit</Text>
+                </Button>
+              </Link>
+            </div>
+          );
 
-              return (
-                <TableRow key={rowIndex} data={row} keys={keys}>
-                  {(data, key, colIndex) => {
-                    return (
-                      <TableCell
-                        key={colIndex}
-                        className={styles.cell}
-                        style={{ ...columns[colIndex]?.style }}
-                      >
-                        {data[key]}
-                      </TableCell>
-                    );
-                  }}
-                </TableRow>
-              );
-            }}
-          </TableBody>
-        </Table>
-      )}
-      {!hasData && (
-        <EmptyPlaceholder className={styles.empty} msg="You don't have any Users.">
-          <Button variant="primary" onClick={onAddKeyClick}>
-            <Icon icon="plus" /> Create User
-          </Button>
-        </EmptyPlaceholder>
-      )}
-    </>
+          return (
+            <TableRow key={rowIndex} data={row} keys={keys}>
+              {(data, key, colIndex) => {
+                return (
+                  <TableCell
+                    key={colIndex}
+                    className={styles.cell}
+                    style={{ ...columns[colIndex]?.style }}
+                  >
+                    {data[key]}
+                  </TableCell>
+                );
+              }}
+            </TableRow>
+          );
+        }}
+      </TableBody>
+    </Table>
   );
 }