@strapi/plugin-users-permissions 4.0.0-next.7 → 4.0.1

package/admin/src/pages/Providers/index.js

@@ -1,36 +1,45 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { Header, List } from '@buffetjs/custom';
-import { Text } from '@buffetjs/core';
-import { Pencil } from '@buffetjs/icons';
 import {
   SettingsPageTitle,
-  SizedInput,
+  LoadingIndicatorPage,
   useTracking,
-  getYupInnerErrors,
-  request,
   useNotification,
   useOverlayBlocker,
+  CheckPagePermissions,
+  useRBAC,
+  useFocusWhenNavigate,
+  onRowClick,
+  stopPropagation,
 } from '@strapi/helper-plugin';
-import { get, upperFirst, has } from 'lodash';
-import { Row } from 'reactstrap';
-import pluginPermissions from '../../permissions';
-import { useForm } from '../../hooks';
-import { getRequestURL, getTrad } from '../../utils';
-import ListBaselineAlignment from '../../components/ListBaselineAlignment';
-import ListRow from '../../components/ListRow';
-import ModalForm from '../../components/ModalForm';
-import createProvidersArray from './utils/createProvidersArray';
+import has from 'lodash/has';
+import upperFirst from 'lodash/upperFirst';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { HeaderLayout, Layout, ContentLayout } from '@strapi/design-system/Layout';
+import { Main } from '@strapi/design-system/Main';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Table, Thead, Tr, Th, Tbody, Td } from '@strapi/design-system/Table';
+import { Typography } from '@strapi/design-system/Typography';
+import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
+import { IconButton } from '@strapi/design-system/IconButton';
+import Pencil from '@strapi/icons/Pencil';
+import { useQuery, useMutation, useQueryClient } from 'react-query';
 import forms from './utils/forms';
+import { fetchData, putProvider } from './utils/api';
+import createProvidersArray from './utils/createProvidersArray';
+import { getTrad } from '../../utils';
+import pluginPermissions from '../../permissions';
+import FormModal from '../../components/FormModal';
 
-const ProvidersPage = () => {
+export const ProvidersPage = () => {
   const { formatMessage } = useIntl();
+  useFocusWhenNavigate();
+  const { notifyStatus } = useNotifyAT();
+  const queryClient = useQueryClient();
   const { trackUsage } = useTracking();
   const trackUsageRef = useRef(trackUsage);
   const [isOpen, setIsOpen] = useState(false);
   const [isSubmiting, setIsSubmiting] = useState(false);
-  const buttonSubmitRef = useRef(null);
-  const [showForm, setShowForm] = useState(false);
   const [providerToEditName, setProviderToEditName] = useState(null);
   const toggleNotification = useNotification();
   const { lockApp, unlockApp } = useOverlayBlocker();
@@ -40,22 +49,56 @@ const ProvidersPage = () => {
   }, []);
 
   const {
+    isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate },
-    dispatchResetForm,
-    dispatchSetFormErrors,
-    dispatchSubmitSucceeded,
-    formErrors,
-    handleChange,
-    isLoading,
-    isLoadingForPermissions,
-    modifiedData,
-  } = useForm('providers', updatePermissions);
+  } = useRBAC(updatePermissions);
+
+  const { isLoading: isLoadingForData, data: modifiedData, isFetching } = useQuery(
+    'get-providers',
+    () => fetchData(toggleNotification),
+    {
+      onSuccess: () => {
+        notifyStatus(
+          formatMessage({
+            id: getTrad('Providers.data.loaded'),
+            defaultMessage: 'Providers have been loaded',
+          })
+        );
+      },
+      initialData: {},
+    }
+  );
+
+  const isLoading = isLoadingForData || isFetching;
+
+  const submitMutation = useMutation(putProvider, {
+    onSuccess: async () => {
+      await queryClient.invalidateQueries('get-providers');
+      toggleNotification({
+        type: 'info',
+        message: { id: getTrad('notification.success.submit') },
+      });
+
+      trackUsageRef.current('didEditAuthenticationProvider');
+      setIsSubmiting(false);
+      handleToggleModal();
+      unlockApp();
+    },
+    onError: () => {
+      toggleNotification({
+        type: 'warning',
+        message: { id: 'notification.error' },
+      });
+      unlockApp();
+      setIsSubmiting(false);
+    },
+    refetchActive: false,
+  });
 
   const providers = useMemo(() => createProvidersArray(modifiedData), [modifiedData]);
-  const enabledProvidersCount = useMemo(
-    () => providers.filter(provider => provider.enabled).length,
-    [providers]
-  );
+
+  const rowCount = providers.length;
+
   const isProviderWithSubdomain = useMemo(() => {
     if (!providerToEditName) {
       return false;
@@ -65,34 +108,13 @@ const ProvidersPage = () => {
 
     return has(providerToEdit, 'subdomain');
   }, [providers, providerToEditName]);
-  const disabledProvidersCount = useMemo(() => {
-    return providers.length - enabledProvidersCount;
-  }, [providers, enabledProvidersCount]);
-
-  const listTitle = useMemo(() => {
-    const enabledMessage = formatMessage(
-      {
-        id: getTrad(
-          `List.title.providers.enabled.${enabledProvidersCount > 1 ? 'plural' : 'singular'}`
-        ),
-      },
-      { number: enabledProvidersCount }
-    );
-    const disabledMessage = formatMessage(
-      {
-        id: getTrad(
-          `List.title.providers.disabled.${disabledProvidersCount > 1 ? 'plural' : 'singular'}`
-        ),
-      },
-      { number: disabledProvidersCount }
-    );
-
-    return `${enabledMessage} ${disabledMessage}`;
-  }, [formatMessage, enabledProvidersCount, disabledProvidersCount]);
 
-  const pageTitle = formatMessage({ id: getTrad('HeaderNav.link.providers') });
+  const pageTitle = formatMessage({
+    id: getTrad('HeaderNav.link.providers'),
+    defaultMessage: 'Providers',
+  });
 
-  const formToRender = useMemo(() => {
+  const layoutToRender = useMemo(() => {
     if (providerToEditName === 'email') {
       return forms.email;
     }
@@ -104,179 +126,149 @@ const ProvidersPage = () => {
     return forms.providers;
   }, [providerToEditName, isProviderWithSubdomain]);
 
-  const handleClick = useCallback(() => {
-    buttonSubmitRef.current.click();
-  }, []);
-
-  const handleToggle = useCallback(() => {
+  const handleToggleModal = () => {
     setIsOpen(prev => !prev);
-  }, []);
-
-  const handleClickEdit = useCallback(
-    provider => {
-      if (canUpdate) {
-        setProviderToEditName(provider.name);
-        handleToggle();
-      }
-    },
-    [canUpdate, handleToggle]
-  );
-
-  const handleClosed = useCallback(() => {
-    setProviderToEditName(null);
-    setShowForm(false);
-    dispatchResetForm();
-  }, [dispatchResetForm]);
-
-  const handleOpened = useCallback(() => {
-    setShowForm(true);
-  }, []);
-
-  const handleSubmit = useCallback(
-    async e => {
-      e.preventDefault();
-      const { schema } = formToRender;
-      let errors = {};
-
-      setIsSubmiting(true);
-
-      try {
-        await schema.validate(modifiedData[providerToEditName], { abortEarly: false });
-        lockApp();
-
-        try {
-          trackUsageRef.current('willEditAuthenticationProvider');
+  };
 
-          await request(getRequestURL('providers'), {
-            method: 'PUT',
-            body: { providers: modifiedData },
-          });
-
-          trackUsageRef.current('didEditAuthenticationProvider');
+  const handleClickEdit = provider => {
+    if (canUpdate) {
+      setProviderToEditName(provider.name);
+      handleToggleModal();
+    }
+  };
 
-          toggleNotification({
-            type: 'success',
-            message: { id: getTrad('notification.success.submit') },
-          });
+  const handleSubmit = async values => {
+    setIsSubmiting(true);
 
-          dispatchSubmitSucceeded();
+    lockApp();
 
-          handleToggle();
-        } catch (err) {
-          console.error(err);
-          toggleNotification({
-            type: 'warning',
-            message: { id: 'notification.error' },
-          });
-        }
-      } catch (err) {
-        console.error(err);
-        errors = getYupInnerErrors(err);
-        console.log(errors);
-      }
+    trackUsageRef.current('willEditAuthenticationProvider');
 
-      dispatchSetFormErrors(errors);
+    const body = { ...modifiedData, [providerToEditName]: values };
 
-      setIsSubmiting(false);
-      unlockApp();
-    },
-    [
-      dispatchSetFormErrors,
-      dispatchSubmitSucceeded,
-      formToRender,
-      handleToggle,
-      modifiedData,
-      providerToEditName,
-      toggleNotification,
-      lockApp,
-      unlockApp,
-    ]
-  );
+    submitMutation.mutate({ providers: body });
+  };
 
   return (
-    <>
+    <Layout>
       <SettingsPageTitle name={pageTitle} />
-      <div>
-        <Header title={{ label: pageTitle }} isLoading={isLoadingForPermissions || isLoading} />
-        <ListBaselineAlignment />
-        <List
-          title={listTitle}
-          items={providers}
-          isLoading={isLoadingForPermissions || isLoading}
-          customRowComponent={provider => (
-            <ListRow
-              {...provider}
-              onClick={() => handleClickEdit(provider)}
-              links={[
-                {
-                  icon: canUpdate ? <Pencil fill="#0e1622" /> : null,
-                  onClick: e => {
-                    e.stopPropagation();
-                    handleClickEdit(provider);
-                  },
-                },
-              ]}
-            >
-              <td key="enabled">
-                <Text
-                  fontWeight="semiBold"
-                  lineHeight="18px"
-                  color={provider.enabled ? 'green' : 'lightOrange'}
-                >
-                  {provider.enabled ? 'Enabled' : 'Disabled'}
-                </Text>
-              </td>
-            </ListRow>
-          )}
+      <Main>
+        <HeaderLayout
+          title={formatMessage({
+            id: getTrad('HeaderNav.link.providers'),
+            defaultMessage: 'Providers',
+          })}
         />
-      </div>
-      <ModalForm
+        {isLoading || isLoadingForPermissions ? (
+          <LoadingIndicatorPage />
+        ) : (
+          <ContentLayout>
+            <Table colCount={4} rowCount={rowCount + 1}>
+              <Thead>
+                <Tr>
+                  <Th>
+                    <Typography variant="sigma" textColor="neutral600">
+                      <VisuallyHidden>
+                        {formatMessage({ id: getTrad('Providers.image'), defaultMessage: 'Image' })}
+                      </VisuallyHidden>
+                    </Typography>
+                  </Th>
+                  <Th>
+                    <Typography variant="sigma" textColor="neutral600">
+                      {formatMessage({ id: getTrad('Providers.name'), defaultMessage: 'Name' })}
+                    </Typography>
+                  </Th>
+                  <Th>
+                    <Typography variant="sigma" textColor="neutral600">
+                      {formatMessage({ id: getTrad('Providers.status'), defaultMessage: 'Status' })}
+                    </Typography>
+                  </Th>
+                  <Th>
+                    <Typography variant="sigma">
+                      <VisuallyHidden>
+                        {formatMessage({
+                          id: getTrad('Providers.settings'),
+                          defaultMessage: 'Settings',
+                        })}
+                      </VisuallyHidden>
+                    </Typography>
+                  </Th>
+                </Tr>
+              </Thead>
+              <Tbody>
+                {providers.map(provider => (
+                  <Tr
+                    key={provider.name}
+                    {...onRowClick({
+                      fn: () => handleClickEdit(provider),
+                      condition: canUpdate,
+                    })}
+                  >
+                    <Td width="">
+                      <FontAwesomeIcon icon={provider.icon} />
+                    </Td>
+                    <Td width="45%">
+                      <Typography fontWeight="semiBold" textColor="neutral800">
+                        {provider.name}
+                      </Typography>
+                    </Td>
+                    <Td width="65%">
+                      <Typography
+                        textColor={provider.enabled ? 'success600' : 'danger600'}
+                        data-testid={`enable-${provider.name}`}
+                      >
+                        {provider.enabled
+                          ? formatMessage({
+                              id: getTrad('Providers.enabled'),
+                              defaultMessage: 'Enabled',
+                            })
+                          : formatMessage({
+                              id: getTrad('Providers.disabled'),
+                              defaultMessage: 'Disabled',
+                            })}
+                      </Typography>
+                    </Td>
+                    <Td {...stopPropagation}>
+                      {canUpdate && (
+                        <IconButton
+                          onClick={() => handleClickEdit(provider)}
+                          noBorder
+                          icon={<Pencil />}
+                          label="Edit"
+                        />
+                      )}
+                    </Td>
+                  </Tr>
+                ))}
+              </Tbody>
+            </Table>
+          </ContentLayout>
+        )}
+      </Main>
+      <FormModal
+        initialData={modifiedData[providerToEditName]}
         isOpen={isOpen}
-        onClick={handleClick}
-        onCancel={handleToggle}
-        isLoading={isSubmiting}
-        onOpened={handleOpened}
-        onClosed={handleClosed}
-        onToggle={handleToggle}
+        isSubmiting={isSubmiting}
+        layout={layoutToRender}
         headerBreadcrumbs={[
-          getTrad('PopUpForm.header.edit.providers'),
+          formatMessage({
+            id: getTrad('PopUpForm.header.edit.providers'),
+            defaultMessage: 'Edit Provider',
+          }),
           upperFirst(providerToEditName),
         ]}
-      >
-        {showForm && (
-          <form onSubmit={handleSubmit}>
-            <Row>
-              {formToRender.form.map(input => {
-                const label = input.label.params
-                  ? { ...input.label, params: { provider: upperFirst(providerToEditName) } }
-                  : input.label;
-
-                const value =
-                  input.name === 'noName'
-                    ? `${strapi.backendURL}/connect/${providerToEditName}/callback`
-                    : get(modifiedData, [providerToEditName, ...input.name.split('.')], '');
-
-                return (
-                  <SizedInput
-                    key={input.name}
-                    {...input}
-                    label={label}
-                    error={formErrors[input.name]}
-                    name={`${providerToEditName}.${input.name}`}
-                    onChange={handleChange}
-                    value={value}
-                  />
-                );
-              })}
-            </Row>
-            <button type="submit" style={{ display: 'none' }} ref={buttonSubmitRef}>
-              hidden button to use the native form event
-            </button>
-          </form>
-        )}
-      </ModalForm>
-    </>
+        onToggle={handleToggleModal}
+        onSubmit={handleSubmit}
+        providerToEditName={providerToEditName}
+      />
+    </Layout>
   );
 };
 
-export default ProvidersPage;
+const ProtectedProvidersPage = () => (
+  <CheckPagePermissions permissions={pluginPermissions.readProviders}>
+    <ProvidersPage />
+  </CheckPagePermissions>
+);
+
+export default ProtectedProvidersPage;

package/admin/src/pages/Providers/utils/api.js

@@ -0,0 +1,21 @@
+import { getRequestURL, axiosInstance } from '../../../utils';
+
+// eslint-disable-next-line import/prefer-default-export
+export const fetchData = async toggleNotification => {
+  try {
+    const { data } = await axiosInstance.get(getRequestURL('providers'));
+
+    return data;
+  } catch (err) {
+    toggleNotification({
+      type: 'warning',
+      message: { id: 'notification.error' },
+    });
+
+    throw new Error('error');
+  }
+};
+
+export const putProvider = body => {
+  return axiosInstance.put(getRequestURL('providers'), body);
+};