@strapi/admin 4.6.0 → 4.7.0-beta.0

package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js

@@ -15,12 +15,17 @@ import { Stack } from '@strapi/design-system/Stack';
 import { Typography } from '@strapi/design-system/Typography';
 
 import { Formik } from 'formik';
-import { Form, GenericInput, useNotification, useOverlayBlocker } from '@strapi/helper-plugin';
+import {
+  Form,
+  GenericInput,
+  useNotification,
+  useOverlayBlocker,
+  useFetchClient,
+} from '@strapi/helper-plugin';
 import { useQueryClient, useMutation } from 'react-query';
 import formDataModel from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel';
 import roleSettingsForm from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm';
 import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink';
-import { axiosInstance } from '../../../../../../core/utils';
 import SelectRoles from '../../components/SelectRoles';
 import layout from './utils/layout';
 import schema from './utils/schema';
@@ -34,9 +39,10 @@ const ModalForm = ({ queryName, onToggle }) => {
   const { formatMessage } = useIntl();
   const toggleNotification = useNotification();
   const { lockApp, unlockApp } = useOverlayBlocker();
+  const { post } = useFetchClient();
   const postMutation = useMutation(
     (body) => {
-      return axiosInstance.post('/admin/users', body);
+      return post('/admin/users', body);
     },
     {
       async onSuccess({ data }) {

package/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js

@@ -18,7 +18,7 @@ import { useIntl } from 'react-intl';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 import adminPermissions from '../../../../../permissions';
 import TableRows from './DynamicTable/TableRows';
-import Filters from './Filters';
+import Filters from '../../../components/Filters';
 import ModalForm from './ModalForm';
 import PaginationFooter from './PaginationFooter';
 import { deleteData, fetchData } from './utils/api';

package/admin/src/pages/SettingsPage/pages/Users/ListPage/utils/api.js

@@ -1,9 +1,10 @@
-import { axiosInstance } from '../../../../../../core/utils';
+import { getFetchClient } from '@strapi/helper-plugin';
 
 const fetchData = async (search, notify) => {
+  const { get } = getFetchClient();
   const {
     data: { data },
-  } = await axiosInstance.get(`/admin/users${search}`);
+  } = await get(`/admin/users${search}`);
 
   notify();
 
@@ -11,7 +12,9 @@ const fetchData = async (search, notify) => {
 };
 
 const deleteData = async (ids) => {
-  await axiosInstance.post('/admin/users/batch-delete', { ids });
+  const { post } = getFetchClient();
+
+  await post('/admin/users/batch-delete', { ids });
 };
 
 export { deleteData, fetchData };

package/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js

@@ -5,7 +5,7 @@ import { Select, Option } from '@strapi/design-system/Select';
 import { useQuery } from 'react-query';
 import styled, { keyframes } from 'styled-components';
 import LoadingIcon from '@strapi/icons/Loader';
-import { axiosInstance } from '../../../../../../core/utils';
+import { getFetchClient } from '@strapi/helper-plugin';
 
 const rotation = keyframes`
   from {
@@ -27,7 +27,8 @@ const Loader = () => (
 );
 
 const fetchData = async () => {
-  const { data } = await axiosInstance.get('/admin/roles');
+  const { get } = getFetchClient();
+  const { data } = await get('/admin/roles');
 
   return data.data;
 };

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/index.js

@@ -11,12 +11,12 @@ import {
   to,
   useNotification,
   useOverlayBlocker,
+  useFetchClient,
 } from '@strapi/helper-plugin';
 import { Main } from '@strapi/design-system/Main';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import { useModels } from '../../../../../hooks';
-import { axiosInstance } from '../../../../../core/utils';
 import WebhookForm from './components/WebhookForm';
 import cleanData from './utils/formatData';
 
@@ -30,6 +30,7 @@ const EditView = () => {
   const toggleNotification = useNotification();
   const queryClient = useQueryClient();
   const { isLoading: isLoadingForModels, collectionTypes } = useModels();
+  const { post } = useFetchClient();
 
   const isCreating = id === 'create';
 
@@ -64,7 +65,7 @@ const EditView = () => {
     data: triggerResponse,
     isIdle: isTriggerIdle,
     mutate,
-  } = useMutation(() => axiosInstance.post(`/admin/webhooks/${id}/trigger`));
+  } = useMutation(() => post(`/admin/webhooks/${id}/trigger`));
 
   const triggerWebhook = () =>
     mutate(null, {

package/admin/src/pages/SettingsPage/utils/defaultRoutes.js

@@ -123,6 +123,39 @@ const defaultRoutes = [
     to: '/settings/api-tokens/:id',
     exact: true,
   },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "transfer-tokens-create-page" */ '../pages/TransferTokens/ProtectedCreateView'
+      );
+
+      return component;
+    },
+    to: '/settings/transfer-tokens/create',
+    exact: true,
+  },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "transfer-tokens-list-page" */ '../pages/TransferTokens/ProtectedListView'
+      );
+
+      return component;
+    },
+    to: '/settings/transfer-tokens',
+    exact: true,
+  },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "transfer-tokens-edit-page" */ '../pages/TransferTokens/ProtectedEditView'
+      );
+
+      return component;
+    },
+    to: '/settings/transfer-tokens/:id',
+    exact: true,
+  },
 ];
 
 export default defaultRoutes;

package/admin/src/permissions/defaultPermissions.js

@@ -87,6 +87,14 @@ const permissions = {
       update: [{ action: 'admin::api-tokens.update', subject: null }],
       regenerate: [{ action: 'admin::api-tokens.regenerate', subject: null }],
     },
+    'transfer-tokens': {
+      main: [{ action: 'admin::transfer.tokens.access', subject: null }],
+      create: [{ action: 'admin::transfer.tokens.create', subject: null }],
+      delete: [{ action: 'admin::transfer.tokens.delete', subject: null }],
+      read: [{ action: 'admin::transfer.tokens.read', subject: null }],
+      update: [{ action: 'admin::transfer.tokens.update', subject: null }],
+      regenerate: [{ action: 'admin::transfer.tokens.regenerate', subject: null }],
+    },
     'project-settings': {
       read: [{ action: 'admin::project-settings.read', subject: null }],
       update: [{ action: 'admin::project-settings.update', subject: null }],

package/admin/src/translations/en.json

@@ -109,6 +109,17 @@
   "Settings.apiTokens.popUpWarning.message": "Are you sure you want to regenerate this token?",
   "Settings.apiTokens.Button.cancel": "Cancel",
   "Settings.apiTokens.Button.regenerate": "Regenerate",
+  "Settings.transferTokens.title": "Transfer Tokens",
+  "Settings.transferTokens.description": "List of generated transfer tokens",
+  "Settings.transferTokens.create": "Create new Transfer Token",
+  "Settings.transferTokens.addFirstToken": "Add your first Transfer Token",
+  "Settings.transferTokens.addNewToken": "Add new Transfer Token",
+  "Settings.transferTokens.emptyStateLayout": "You don’t have any content yet...",
+  "Settings.transferTokens.ListView.headers.name": "Name",
+  "Settings.transferTokens.ListView.headers.description": "Description",
+  "Settings.transferTokens.ListView.headers.type": "Token type",
+  "Settings.transferTokens.ListView.headers.createdAt": "Created at",
+  "Settings.transferTokens.ListView.headers.lastUsedAt": "Last used",
   "Settings.application.description": "Administration panel’s global information",
   "Settings.application.edition-title": "current plan",
   "Settings.application.get-help": "Get help",
@@ -181,15 +192,16 @@
   "Settings.permissions.auditLogs.action": "Action",
   "Settings.permissions.auditLogs.date": "Date",
   "Settings.permissions.auditLogs.user": "User",
+  "Settings.permissions.auditLogs.user.fullname": "{firstname} {lastname}",
   "Settings.permissions.auditLogs.userId": "User ID",
   "Settings.permissions.auditLogs.details": "Log Details",
   "Settings.permissions.auditLogs.payload": "Payload",
   "Settings.permissions.auditLogs.listview.header.subtitle": "Logs of all the activities that happened in your environment",
-  "Settings.permissions.auditLogs.entry.create": "Create entry ({model})",
-  "Settings.permissions.auditLogs.entry.update": "Update entry ({model})",
-  "Settings.permissions.auditLogs.entry.delete": "Delete entry ({model})",
-  "Settings.permissions.auditLogs.entry.publish": "Publish entry ({model})",
-  "Settings.permissions.auditLogs.entry.unpublish": "Unpublish entry ({model})",
+  "Settings.permissions.auditLogs.entry.create": "Create entry{model, select, undefined {} other { ({model})}}",
+  "Settings.permissions.auditLogs.entry.update": "Update entry{model, select, undefined {} other { ({model})}}",
+  "Settings.permissions.auditLogs.entry.delete": "Delete entry{model, select, undefined {} other { ({model})}}",
+  "Settings.permissions.auditLogs.entry.publish": "Publish entry {model, select, undefined {} other {({model})}}",
+  "Settings.permissions.auditLogs.entry.unpublish": "Unpublish entry{model, select, undefined {} other { ({model})}}",
   "Settings.permissions.auditLogs.media.create": "Create media",
   "Settings.permissions.auditLogs.media.update": "Update media",
   "Settings.permissions.auditLogs.media.delete": "Delete media",
@@ -210,6 +222,7 @@
   "Settings.permissions.auditLogs.permission.create": "Create permission",
   "Settings.permissions.auditLogs.permission.update": "Update permission",
   "Settings.permissions.auditLogs.permission.delete": "Delete permission",
+  "Settings.permissions.auditLogs.filters.combobox.aria-label": "Search and select an option to filter",
   "Settings.profile.form.notify.data.loaded": "Your profile data has been loaded",
   "Settings.profile.form.section.experience.clear.select": "Clear the interface language selected",
   "Settings.profile.form.section.experience.here": "here",
@@ -431,7 +444,11 @@
   "app.components.Official": "Official",
   "app.components.Onboarding.help.button": "Help button",
   "app.components.Onboarding.label.completed": "% completed",
-  "app.components.Onboarding.title": "Get Started Videos",
+  "app.components.Onboarding.title": "Get started videos",
+  "app.components.Onboarding.link.more-videos": "Watch more videos",
+  "app.components.Onboarding.link.build-content": "Build a content architecture",
+  "app.components.Onboarding.link.manage-content": "Add & manage content",
+  "app.components.Onboarding.link.manage-media": "Manage media",
   "app.components.PluginCard.Button.label.download": "Download",
   "app.components.PluginCard.Button.label.install": "Already installed",
   "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "The autoReload feature needs to be enabled. Please start your app with `yarn develop`.",
@@ -839,6 +856,8 @@
   "notification.success.title": "Success:",
   "notification.success.tokencreated": "API Token successfully created",
   "notification.success.tokenedited": "API Token successfully edited",
+  "notification.success.transfertokencreated": "Transfer Token successfully created",
+  "notification.success.transfertokenedited": "Transfer Token successfully edited",
   "notification.error.tokennamenotunique": "Name already assigned to another token",
   "notification.version.update.message": "A new version of Strapi is available!",
   "notification.warning.title": "Warning:",