fix: don't let users submit an empty field for labels

strapi · Feb 8, 2024 · 96b5260 · 96b5260
1 parent 1d47602
commit 96b5260
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/packages/core/admin/admin/src/content-manager/components/Form.tsx b/packages/core/admin/admin/src/content-manager/components/Form.tsx
@@ -454,7 +454,8 @@ const reducer = <TFormValues extends FormValues = FormValues>(
       }
       case 'SET_ERRORS':
         if (!isEqual(state.errors, action.payload)) {
-          state.errors = action.payload;
+          // @ts-expect-error – TODO: figure out why this fails a TS check.
+          draft.errors = action.payload;
         }
         break;
       case 'SET_ISSUBMITTING':

diff --git a/packages/core/admin/admin/src/content-manager/components/FormInputs/String.tsx b/packages/core/admin/admin/src/content-manager/components/FormInputs/String.tsx
@@ -25,6 +25,7 @@ export const StringInput = forwardRef<any, InputProps>(
         hint={hint}
         label={label}
         name={name}
+        error={field.error}
         defaultValue={field.initialValue}
         onChange={field.onChange}
         placeholder={placeholder}

diff --git a/...es/core/admin/admin/src/content-manager/pages/ListConfiguration/ListConfigurationPage.tsx b/...es/core/admin/admin/src/content-manager/pages/ListConfiguration/ListConfigurationPage.tsx
@@ -13,6 +13,7 @@ import { Navigate } from 'react-router-dom';
 
 import { useTypedSelector } from '../../../core/store/hooks';
 import { Form, FormProps } from '../../components/Form';
+import { SINGLE_TYPES } from '../../constants/collections';
 import { useDoc } from '../../hooks/useDocument';
 import { ListFieldLayout, ListLayout, useDocLayout } from '../../hooks/useDocumentLayout';
 import { useUpdateContentTypeConfigurationMutation } from '../../services/contentTypes';
@@ -113,7 +114,7 @@ const ListConfiguration = () => {
     } satisfies FormData;
   }, [formatMessage, list.layout, list.settings]);
 
-  if (collectionType === 'single-types') {
+  if (collectionType === SINGLE_TYPES) {
     return <Navigate to={`/single-types/${model}`} />;
   }
 

diff --git a/...core/admin/admin/src/content-manager/pages/ListConfiguration/components/EditFieldForm.tsx b/...core/admin/admin/src/content-manager/pages/ListConfiguration/components/EditFieldForm.tsx
@@ -13,6 +13,7 @@ import {
 } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
+import * as yup from 'yup';
 
 import { capitalise } from '../../../../utils/strings';
 import { FieldTypeIcon } from '../../../components/FieldTypeIcon';
@@ -28,6 +29,11 @@ interface EditFieldFormProps extends Pick<ListFieldLayout, 'attribute'> {
   onClose: () => void;
 }
 
+const FIELD_SCHEMA = yup.object().shape({
+  label: yup.string().required(),
+  sortable: yup.boolean(),
+});
+
 const EditFieldForm = ({ attribute, name, onClose }: EditFieldFormProps) => {
   const { formatMessage } = useIntl();
   const id = useId();
@@ -52,6 +58,7 @@ const EditFieldForm = ({ attribute, name, onClose }: EditFieldFormProps) => {
       <Form
         method="PUT"
         initialValues={value}
+        validationSchema={FIELD_SCHEMA}
         onSubmit={(data) => {
           onChange(name, data);
           onClose();

diff --git a/...ages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx b/...ages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx
@@ -74,7 +74,7 @@ const Settings = () => {
         return [...ceOptions, { ...eeOption, label: formatMessage(eeOption.label) }];
       },
       defaultValue: sortOptionsCE,
-      enabled: schema?.options?.reviewWorkflows,
+      enabled: !!schema?.options?.reviewWorkflows,
     }
   ) as SortOption[];
 

diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/ListViewPage.tsx b/packages/core/admin/admin/src/content-manager/pages/ListView/ListViewPage.tsx
@@ -153,7 +153,7 @@ const ListViewPage = () => {
       (await import('../../../../../ee/admin/src/content-manager/pages/ListView/constants'))
         .REVIEW_WORKFLOW_COLUMNS_EE,
     {
-      enabled: schema?.options?.reviewWorkflows,
+      enabled: !!schema?.options?.reviewWorkflows,
     }
   );
   const ReviewWorkflowsColumns = useEnterprise(
@@ -165,7 +165,7 @@ const ListViewPage = () => {
       return { ReviewWorkflowsStageEE, ReviewWorkflowsAssigneeEE };
     },
     {
-      enabled: schema?.options?.reviewWorkflows,
+      enabled: !!schema?.options?.reviewWorkflows,
     }
   );