@strapi/admin 4.9.0-alpha.0 → 4.9.0-beta.2

package/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js

@@ -1,25 +1,17 @@
 import adminPermissions from '../../../../../admin/src/permissions';
 
-const items = [];
+const ssoGlobalRoutes = strapi.features.isEnabled(strapi.features.SSO)
+  ? [
+      {
+        intlLabel: { id: 'Settings.sso.title', defaultMessage: 'Single Sign-On' },
+        to: '/settings/single-sign-on',
+        id: 'sso',
+        isDisplayed: false,
+        permissions: adminPermissions.settings.sso.main,
+      },
+    ]
+  : [];
 
-if (window.strapi.features.isEnabled(window.strapi.features.SSO)) {
-  items.push({
-    intlLabel: { id: 'Settings.sso.title', defaultMessage: 'Single Sign-On' },
-    to: '/settings/single-sign-on',
-    id: 'sso',
-    isDisplayed: false,
-    permissions: adminPermissions.settings.sso.main,
-  });
-}
+const customGlobalLinks = [...ssoGlobalRoutes];
 
-if (window.strapi.features.isEnabled(window.strapi.features.REVIEW_WORKFLOWS)) {
-  items.push({
-    intlLabel: { id: 'Settings.review-workflows.title', defaultMessage: 'Review Workflow' },
-    to: '/settings/review-workflows',
-    id: 'review-workflows',
-    isDisplayed: false,
-    permissions: adminPermissions.settings['review-workflows'].main,
-  });
-}
-
-export default items;
+export default customGlobalLinks;

package/ee/admin/pages/AuthPage/components/Login/index.js

@@ -1,11 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
-import { Divider } from '@strapi/design-system/Divider';
-import { Stack } from '@strapi/design-system/Stack';
-import { Typography } from '@strapi/design-system/Typography';
+import { Box, Flex, Divider, Typography } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import BaseLogin from '../../../../../../admin/src/pages/AuthPage/components/Login/BaseLogin';
 import { useAuthProviders } from '../../../../hooks';
@@ -33,7 +29,7 @@ const Login = (loginProps) => {
     <UnauthenticatedLayout>
       <BaseLogin {...loginProps}>
         <Box paddingTop={7}>
-          <Stack spacing={7}>
+          <Flex direction="column" alignItems="stretch" gap={7}>
             <Flex>
               <DividerFull />
               <Box paddingLeft={3} paddingRight={3}>
@@ -44,7 +40,7 @@ const Login = (loginProps) => {
               <DividerFull />
             </Flex>
             <SSOProviders providers={providers} displayAllProviders={false} />
-          </Stack>
+          </Flex>
         </Box>
       </BaseLogin>
     </UnauthenticatedLayout>

package/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js

@@ -1,9 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Grid, GridItem } from '@strapi/design-system/Grid';
-import { Flex } from '@strapi/design-system/Flex';
-import { Typography } from '@strapi/design-system/Typography';
-import { Tooltip } from '@strapi/design-system/Tooltip';
+import { Grid, GridItem, Flex, Typography, Tooltip } from '@strapi/design-system';
 import styled from 'styled-components';
 import { useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';

package/ee/admin/pages/AuthPage/components/Providers/index.js

@@ -2,14 +2,7 @@ import React from 'react';
 import { Redirect, useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 import { Link } from '@strapi/helper-plugin';
-import { Divider } from '@strapi/design-system/Divider';
-import { Stack } from '@strapi/design-system/Stack';
-import { Flex } from '@strapi/design-system/Flex';
-import { Box } from '@strapi/design-system/Box';
-import { Button } from '@strapi/design-system/Button';
-import { Loader } from '@strapi/design-system/Loader';
-import { Typography } from '@strapi/design-system/Typography';
-import { Main } from '@strapi/design-system/Main';
+import { Divider, Flex, Box, Button, Loader, Typography, Main } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import { useAuthProviders } from '../../../../hooks';
 import UnauthenticatedLayout, {
@@ -55,7 +48,7 @@ const Providers = () => {
               </Typography>
             </Box>
           </Column>
-          <Stack spacing={7}>
+          <Flex direction="column" alignItems="stretch" gap={7}>
             {isLoading ? (
               <Flex justifyContent="center">
                 <Loader>{formatMessage({ id: 'Auth.login.sso.loading' })}</Loader>
@@ -75,7 +68,7 @@ const Providers = () => {
             <Button fullWidth size="L" onClick={handleClick}>
               {formatMessage({ id: 'Auth.form.button.login.strapi' })}
             </Button>
-          </Stack>
+          </Flex>
         </LayoutContent>
         <Flex justifyContent="center">
           <Box paddingTop={4}>

package/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js

@@ -0,0 +1,88 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { Flex, Tooltip, Icon, GridItem, Typography } from '@strapi/design-system';
+import { Link } from '@strapi/design-system/v2';
+import { ExternalLink, ExclamationMarkCircle } from '@strapi/icons';
+import { pxToRem } from '@strapi/helper-plugin';
+import { useLicenseLimits } from '../../../../../../hooks';
+
+const BILLING_STRAPI_CLOUD_URL = 'https://cloud.strapi.io/profile/billing';
+const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
+
+const AdminSeatInfo = () => {
+  const { formatMessage } = useIntl();
+  const { license } = useLicenseLimits();
+  const { licenseLimitStatus, enforcementUserCount, permittedSeats, isHostedOnStrapiCloud } =
+    license?.data ?? {};
+
+  if (!permittedSeats) {
+    return null;
+  }
+
+  return (
+    <GridItem col={6} s={12}>
+      <Typography variant="sigma" textColor="neutral600">
+        {formatMessage({
+          id: 'Settings.application.admin-seats',
+          defaultMessage: 'Admin seats',
+        })}
+      </Typography>
+      <Flex gap={2}>
+        <Flex>
+          <Typography as="p">
+            {formatMessage(
+              {
+                id: 'Settings.application.ee.admin-seats.count',
+                defaultMessage: '<text>{enforcementUserCount}</text>/{permittedSeats}',
+              },
+              {
+                permittedSeats,
+                enforcementUserCount,
+                // eslint-disable-next-line react/no-unstable-nested-components
+                text: (chunks) => (
+                  <Typography
+                    fontWeight="semiBold"
+                    textColor={enforcementUserCount > permittedSeats ? 'danger500' : null}
+                  >
+                    {chunks}
+                  </Typography>
+                ),
+              }
+            )}
+          </Typography>
+        </Flex>
+        {licenseLimitStatus === 'OVER_LIMIT' && (
+          <Tooltip
+            description={formatMessage({
+              id: 'Settings.application.ee.admin-seats.at-limit-tooltip',
+              defaultMessage: 'At limit: add seats to invite more users',
+            })}
+          >
+            <Icon
+              width={`${pxToRem(14)}rem`}
+              height={`${pxToRem(14)}rem`}
+              color="danger500"
+              as={ExclamationMarkCircle}
+            />
+          </Tooltip>
+        )}
+      </Flex>
+      <Link
+        href={isHostedOnStrapiCloud ? BILLING_STRAPI_CLOUD_URL : BILLING_SELF_HOSTED_URL}
+        isExternal
+        endIcon={<ExternalLink />}
+      >
+        {formatMessage(
+          {
+            id: 'Settings.application.ee.admin-seats.add-seats',
+            defaultMessage:
+              '{isHostedOnStrapiCloud, select, true {Add seats} other {Contact sales}}',
+          },
+          { isHostedOnStrapiCloud }
+        )}
+      </Link>
+    </GridItem>
+  );
+};
+
+export default AdminSeatInfo;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js

@@ -1,12 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { Loader } from '@strapi/design-system/Loader';
-import { Grid } from '@strapi/design-system/Grid';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
-import { Typography } from '@strapi/design-system/Typography';
-import { JSONInput } from '@strapi/design-system/JSONInput';
+import { Loader, Grid, Box, Flex, Typography, JSONInput } from '@strapi/design-system';
 import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages';
 import ActionItem from './ActionItem';
 
@@ -69,7 +64,7 @@ const ActionBody = ({ status, data, formattedDate }) => {
             id: 'Settings.permissions.auditLogs.user',
             defaultMessage: 'User',
           })}
-          actionName={user?.fullname || '-'}
+          actionName={user?.displayName || '-'}
         />
         <ActionItem
           actionLabel={formatMessage({

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionItem.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Flex } from '@strapi/design-system/Flex';
-import { Typography } from '@strapi/design-system/Typography';
+import { Flex, Typography } from '@strapi/design-system';
 
 const ActionItem = ({ actionLabel, actionName }) => {
   return (

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/index.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from 'react-query';
-import { ModalLayout, ModalHeader, ModalBody } from '@strapi/design-system/ModalLayout';
-import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
+import { ModalLayout, ModalHeader, ModalBody, Breadcrumbs, Crumb } from '@strapi/design-system';
 import { useNotification, useFetchClient } from '@strapi/helper-plugin';
 import useFormatTimeStamp from '../hooks/useFormatTimeStamp';
 import ActionBody from './ActionBody';

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/PaginationFooter/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
+import { Box, Flex } from '@strapi/design-system';
 import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin';
 
 const PaginationFooter = ({ pagination }) => {

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js

@@ -1,11 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { IconButton } from '@strapi/design-system/IconButton';
-import { Flex } from '@strapi/design-system/Flex';
-import { Typography } from '@strapi/design-system/Typography';
-import { Tbody, Td, Tr } from '@strapi/design-system/Table';
-import Eye from '@strapi/icons/Eye';
+import { IconButton, Flex, Typography, Tbody, Td, Tr } from '@strapi/design-system';
+import { Eye } from '@strapi/icons';
 import { onRowClick, stopPropagation } from '@strapi/helper-plugin';
 import useFormatTimeStamp from '../hooks/useFormatTimeStamp';
 import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages';

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js

@@ -13,6 +13,26 @@ const customOperators = [
 ];
 
 const getDisplayedFilters = ({ formatMessage, users }) => {
+  const getDisplaynameFromUser = (user) => {
+    if (user.username) {
+      return user.username;
+    }
+    if (user.firstname && user.lastname) {
+      return formatMessage(
+        {
+          id: 'Settings.permissions.auditLogs.user.fullname',
+          defaultMessage: '{firstname} {lastname}',
+        },
+        {
+          firstname: user.firstname,
+          lastname: user.lastname,
+        }
+      );
+    }
+
+    return user.email;
+  };
+
   const actionOptions = Object.keys(actionTypes).map((action) => {
     return {
       label: formatMessage(
@@ -30,16 +50,7 @@ const getDisplayedFilters = ({ formatMessage, users }) => {
     users &&
     users.results.map((user) => {
       return {
-        label: formatMessage(
-          {
-            id: 'Settings.permissions.auditLogs.user.fullname',
-            defaultMessage: '{firstname} {lastname}',
-          },
-          {
-            firstname: user.firstname,
-            lastname: user.lastname,
-          }
-        ),
+        label: getDisplaynameFromUser(user),
         // Combobox expects a string value
         customValue: user.id.toString(),
       };

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/tableHeaders.js

@@ -31,7 +31,7 @@ const tableHeaders = [
       },
       sortable: false,
     },
-    cellFormatter: (user) => (user ? user.fullname : ''),
+    cellFormatter: (user) => (user ? user.displayName : ''),
   },
 ];
 

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js

@@ -6,15 +6,21 @@ import {
   LoadingIndicatorPage,
   useFocusWhenNavigate,
 } from '@strapi/helper-plugin';
-import Check from '@strapi/icons/Check';
-import { ContentLayout, HeaderLayout, Layout } from '@strapi/design-system/Layout';
-import { Button } from '@strapi/design-system/Button';
-import { Main } from '@strapi/design-system/Main';
-import { Stack } from '@strapi/design-system/Stack';
-import { Typography } from '@strapi/design-system/Typography';
-import { ToggleInput } from '@strapi/design-system/ToggleInput';
-import { Select, Option } from '@strapi/design-system/Select';
-import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Check } from '@strapi/icons';
+import {
+  ContentLayout,
+  HeaderLayout,
+  Layout,
+  Button,
+  Main,
+  Typography,
+  ToggleInput,
+  Select,
+  Option,
+  Grid,
+  GridItem,
+  Flex,
+} from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import isEqual from 'lodash/isEqual';
 import { getRequestUrl } from '../../../../../../admin/src/utils';
@@ -100,7 +106,15 @@ export const SingleSignOn = () => {
             {showLoader ? (
               <LoadingIndicatorPage />
             ) : (
-              <Stack spacing={4} background="neutral0" padding={6} shadow="filterShadow" hasRadius>
+              <Flex
+                direction="column"
+                alignItems="stretch"
+                gap={4}
+                background="neutral0"
+                padding={6}
+                shadow="filterShadow"
+                hasRadius
+              >
                 <Typography variant="delta" as="h2">
                   {formatMessage({
                     id: 'global.settings',
@@ -176,7 +190,7 @@ export const SingleSignOn = () => {
                     </Select>
                   </GridItem>
                 </Grid>
-              </Stack>
+              </Flex>
             )}
           </ContentLayout>
         </form>

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js

@@ -0,0 +1,52 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+import { Flex, Button, Tooltip, Icon } from '@strapi/design-system';
+import { Envelop, ExclamationMarkCircle } from '@strapi/icons';
+import isNil from 'lodash/isNil';
+import { useLicenseLimits } from '../../../../../../hooks';
+
+const CreateAction = ({ onClick }) => {
+  const { formatMessage } = useIntl();
+  const { license } = useLicenseLimits();
+  const { permittedSeats, shouldStopCreate } = license?.data ?? {};
+
+  return (
+    <Flex gap={2}>
+      {!isNil(permittedSeats) && shouldStopCreate && (
+        <Tooltip
+          description={formatMessage({
+            id: 'Settings.application.admin-seats.at-limit-tooltip',
+            defaultMessage: 'At limit: add seats to invite more users',
+          })}
+          position="left"
+        >
+          <Icon
+            width={`${14 / 16}rem`}
+            height={`${14 / 16}rem`}
+            color="danger500"
+            as={ExclamationMarkCircle}
+          />
+        </Tooltip>
+      )}
+      <Button
+        data-testid="create-user-button"
+        onClick={onClick}
+        startIcon={<Envelop />}
+        size="S"
+        disabled={shouldStopCreate}
+      >
+        {formatMessage({
+          id: 'Settings.permissions.users.create',
+          defaultMessage: 'Invite new user',
+        })}
+      </Button>
+    </Flex>
+  );
+};
+
+CreateAction.propTypes = {
+  onClick: PropTypes.func.isRequired,
+};
+
+export default CreateAction;

package/ee/admin/pages/SettingsPage/utils/customRoutes.js

@@ -1,6 +1,6 @@
 const routes = [];
 
-if (window.strapi.features.isEnabled(window.strapi.features.SSO)) {
+if (strapi.features.isEnabled(strapi.features.SSO)) {
   routes.push({
     async Component() {
       const component = await import(
@@ -14,21 +14,7 @@ if (window.strapi.features.isEnabled(window.strapi.features.SSO)) {
   });
 }
 
-if (window.strapi.isEE) {
-  routes.push({
-    async Component() {
-      const component = await import(
-        /* webpackChunkName: "review-workflows-settings" */ '../pages/ReviewWorkflows'
-      );
-
-      return component;
-    },
-    to: '/settings/review-workflows',
-    exact: true,
-  });
-}
-
-if (window.strapi.features.isEnabled(strapi.features.AUDIT_LOGS)) {
+if (strapi.features.isEnabled(strapi.features.AUDIT_LOGS)) {
   routes.push({
     async Component() {
       const component = await import(

package/ee/admin/permissions/customPermissions.js

@@ -4,9 +4,6 @@ const customPermissions = {
       main: [{ action: 'admin::audit-logs.read', subject: null }],
       read: [{ action: 'admin::audit-logs.read', subject: null }],
     },
-    'review-workflows': {
-      main: [{ action: 'admin::review-workflows.read', subject: null }],
-    },
     sso: {
       main: [{ action: 'admin::provider-login.read', subject: null }],
       read: [{ action: 'admin::provider-login.read', subject: null }],

package/ee/server/bootstrap.js

@@ -5,6 +5,7 @@ const { features } = require('@strapi/strapi/lib/utils/ee');
 const executeCEBootstrap = require('../../server/bootstrap');
 const { getService } = require('../../server/utils');
 const actions = require('./config/admin-actions');
+const { persistTablesWithPrefix } = require('./utils/persisted-tables');
 
 module.exports = async () => {
   const { actionProvider } = getService('permission');
@@ -14,16 +15,12 @@ module.exports = async () => {
   }
 
   if (features.isEnabled('audit-logs')) {
+    await persistTablesWithPrefix('strapi_audit_logs');
+
     await actionProvider.registerMany(actions.auditLogs);
   }
 
-  if (features.isEnabled('review-workflows')) {
-    const { bootstrap: rwBootstrap } = getService('review-workflows');
-
-    await rwBootstrap();
-    await actionProvider.registerMany(actions.reviewWorkflows);
-  }
+  await getService('seat-enforcement').seatEnforcementWorkflow();
 
-  // TODO: check admin seats
   await executeCEBootstrap();
 };

package/ee/server/config/admin-actions.js

@@ -29,14 +29,4 @@ module.exports = {
       subCategory: 'options',
     },
   ],
-  reviewWorkflows: [
-    {
-      uid: 'review-workflows.read',
-      displayName: 'Read',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'review workflows',
-      subCategory: 'options',
-    },
-  ],
 };

package/ee/server/controllers/admin.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const { isNil } = require('lodash/fp');
+// eslint-disable-next-line node/no-extraneous-require
+const ee = require('@strapi/strapi/lib/utils/ee');
+const { env } = require('@strapi/utils');
+const { getService } = require('../../../server/utils');
+
+module.exports = {
+  async licenseLimitInformation() {
+    const permittedSeats = ee.seats;
+
+    let shouldNotify = false;
+    let licenseLimitStatus = null;
+    let enforcementUserCount;
+
+    const currentActiveUserCount = await getService('user').getCurrentActiveUserCount();
+
+    const eeDisabledUsers = await getService('seat-enforcement').getDisabledUserList();
+
+    if (eeDisabledUsers) {
+      enforcementUserCount = currentActiveUserCount + eeDisabledUsers.length;
+    } else {
+      enforcementUserCount = currentActiveUserCount;
+    }
+
+    if (!isNil(permittedSeats) && enforcementUserCount > permittedSeats) {
+      shouldNotify = true;
+      licenseLimitStatus = 'OVER_LIMIT';
+    }
+
+    if (!isNil(permittedSeats) && enforcementUserCount === permittedSeats) {
+      shouldNotify = true;
+      licenseLimitStatus = 'AT_LIMIT';
+    }
+
+    const data = {
+      enforcementUserCount,
+      currentActiveUserCount,
+      permittedSeats,
+      shouldNotify,
+      shouldStopCreate: isNil(permittedSeats) ? false : currentActiveUserCount >= permittedSeats,
+      licenseLimitStatus,
+      isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
+    };
+
+    return { data };
+  },
+};

package/ee/server/controllers/index.js

@@ -2,10 +2,8 @@
 
 module.exports = {
   authentication: require('./authentication'),
-  permission: require('./permission'),
   role: require('./role'),
   user: require('./user'),
   auditLogs: require('./audit-logs'),
-  workflows: require('./workflows'),
-  stages: require('./workflows/stages'),
+  admin: require('./admin'),
 };

package/ee/server/controllers/role.js

@@ -1,14 +1,11 @@
 'use strict';
 
-const { ApplicationError } = require('@strapi/utils').errors;
 const {
   validateRoleCreateInput,
   validateRoleDeleteInput,
   validateRolesDeleteInput,
 } = require('../validation/role');
 const { getService } = require('../../../server/utils');
-const { validatedUpdatePermissionsInput } = require('../validation/permission');
-const { SUPER_ADMIN_CODE } = require('../../../server/services/constants');
 
 module.exports = {
   /**
@@ -64,40 +61,4 @@ module.exports = {
       data: sanitizedRoles,
     });
   },
-
-  /**
-   * Updates the permissions assigned to a role
-   * @param {KoaContext} ctx - koa context
-   */
-  async updatePermissions(ctx) {
-    const { id } = ctx.params;
-    const { body: input } = ctx.request;
-
-    const roleService = getService('role');
-    const permissionService = getService('permission');
-
-    const role = await roleService.findOne({ id });
-
-    if (!role) {
-      return ctx.notFound('role.notFound');
-    }
-
-    if (role.code === SUPER_ADMIN_CODE) {
-      throw new ApplicationError("Super admin permissions can't be edited.");
-    }
-
-    await validatedUpdatePermissionsInput(input);
-
-    if (!role) {
-      return ctx.notFound('role.notFound');
-    }
-
-    const permissions = await roleService.assignPermissions(role.id, input.permissions);
-
-    const sanitizedPermissions = permissions.map(permissionService.sanitizePermission);
-
-    return ctx.send({
-      data: sanitizedPermissions,
-    });
-  },
 };