@strapi/admin 4.0.0-beta.14 → 4.0.0-beta.15

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

@@ -11,6 +11,7 @@ import Trash from '@strapi/icons/Trash';
 import { useHistory } from 'react-router-dom';
 import { useIntl } from 'react-intl';
 import { stopPropagation, onRowClick } from '@strapi/helper-plugin';
+import { getFullName } from '../../../../../../../utils';
 
 const TableRows = ({
   canDelete,
@@ -49,7 +50,7 @@ const TableRows = ({
                       id: 'app.component.table.select.one-entry',
                       defaultMessage: `Select {target}`,
                     },
-                    { target: `${data.firstname} ${data.lastname}` }
+                    { target: getFullName(data.firstname, data.lastname) }
                   )}
                   checked={isChecked}
                   onChange={() => {
@@ -77,7 +78,7 @@ const TableRows = ({
                     onClick={() => push(`${pathname}/${data.id}`)}
                     label={formatMessage(
                       { id: 'app.component.table.edit', defaultMessage: 'Edit {target}' },
-                      { target: `${data.firstname} ${data.lastname}` }
+                      { target: getFullName(data.firstname, data.lastname) }
                     )}
                     noBorder
                     icon={<Pencil />}
@@ -89,7 +90,7 @@ const TableRows = ({
                         onClick={() => onClickDelete(data.id)}
                         label={formatMessage(
                           { id: 'app.component.table.delete', defaultMessage: 'Delete {target}' },
-                          { target: `${data.firstname} ${data.lastname}` }
+                          { target: getFullName(data.firstname, data.lastname) }
                         )}
                         noBorder
                         icon={<Trash />}

package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js

@@ -3,7 +3,7 @@ import { translatedErrors } from '@strapi/helper-plugin';
 
 const schema = yup.object().shape({
   firstname: yup.string().required(translatedErrors.required),
-  lastname: yup.string().required(translatedErrors.required),
+  lastname: yup.string(),
   email: yup
     .string()
     .email(translatedErrors.email)

package/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/edit.js

@@ -1,9 +1,9 @@
 import * as yup from 'yup';
-import profileValidation from './profile';
+import { commonUserSchema } from './profile';
 import rolesValidation from './roles';
 
 const schema = yup.object().shape({
-  ...profileValidation,
+  ...commonUserSchema,
   isActive: yup.bool(),
   ...rolesValidation,
 });

package/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js

@@ -1,9 +1,9 @@
 import * as yup from 'yup';
 import { translatedErrors } from '@strapi/helper-plugin';
 
-const schema = {
+export const commonUserSchema = {
   firstname: yup.mixed().required(translatedErrors.required),
-  lastname: yup.mixed().required(translatedErrors.required),
+  lastname: yup.mixed(),
   email: yup
     .string()
     .email(translatedErrors.email)
@@ -23,6 +23,10 @@ const schema = {
     .when('password', (password, passSchema) => {
       return password ? passSchema.required(translatedErrors.required) : passSchema;
     }),
+};
+
+const schema = {
+  ...commonUserSchema,
   currentPassword: yup
     .string()
     .when(['password', 'confirmPassword'], (password, confirmPassword, passSchema) => {

package/admin/src/utils/getFullName.js

@@ -0,0 +1,9 @@
+/**
+ * Get fullname from firstname+lastname joined with a space
+ * Handle missing lastname
+ * @param {string} firstname
+ * @param {string} lastname
+ */
+export default (firstname, lastname = '') => {
+  return [firstname, lastname].filter(str => str).join(' ');
+};

package/admin/src/utils/index.js

@@ -5,5 +5,5 @@ export { default as getAttributesToDisplay } from './getAttributesToDisplay';
 export { default as makeUniqueRoutes } from './makeUniqueRoutes';
 export { default as sortLinks } from './sortLinks';
 export { default as getExistingActions } from './getExistingActions';
-
 export { default as getRequestUrl } from './getRequestUrl';
+export { default as getFullName } from './getFullName';