npm - @strapi/admin - Versions diffs - 4.0.1 → 4.0.5 - Mend

@strapi/admin 4.0.1 → 4.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (301) hide show

package/admin/src/content-manager/components/Wysiwyg/index.js CHANGED Viewed

@@ -26,6 +26,10 @@ const LabelAction = styled(Box)`
   }
 `;
+const TypographyAsterisk = styled(Typography)`
+  line-height: 0;
+`;
 const Wysiwyg = ({
   description,
   disabled,
@@ -36,6 +40,7 @@ const Wysiwyg = ({
   onChange,
   placeholder,
   value,
+  required,
 }) => {
   const { formatMessage } = useIntl();
   const textareaRef = useRef(null);
@@ -49,7 +54,10 @@ const Wysiwyg = ({
   const handleToggleMediaLib = () => setMediaLibVisible(prev => !prev);
   const handleTogglePreviewMode = () => setIsPreviewMode(prev => !prev);
-  const handleToggleExpand = () => setIsExpandMode(prev => !prev);
+  const handleToggleExpand = () => {
+    setIsPreviewMode(false);
+    setIsExpandMode(prev => !prev);
+  };
   const handleActionClick = (value, currentEditorRef, togglePopover) => {
     switch (value) {
@@ -124,6 +132,7 @@ const Wysiwyg = ({
         <Stack horizontal size={1}>
           <Typography variant="pi" fontWeight="bold" textColor="neutral800">
             {label}
+            {required && <TypographyAsterisk textColor="danger600">*</TypographyAsterisk>}
           </Typography>
           {labelAction && <LabelAction paddingLeft={1}>{labelAction}</LabelAction>}
         </Stack>
@@ -154,9 +163,7 @@ const Wysiwyg = ({
             value={value}
           />
-          {!isExpandMode && (
-            <WysiwygFooter isPreviewMode={isPreviewMode} onToggleExpand={handleToggleExpand} />
-          )}
+          {!isExpandMode && <WysiwygFooter onToggleExpand={handleToggleExpand} />}
         </EditorLayout>
         <Hint description={description} name={name} error={error} />
       </Stack>
@@ -182,6 +189,7 @@ Wysiwyg.defaultProps = {
   error: '',
   labelAction: undefined,
   placeholder: null,
+  required: false,
   value: '',
 };
@@ -206,6 +214,7 @@ Wysiwyg.propTypes = {
     defaultMessage: PropTypes.string.isRequired,
     values: PropTypes.object,
   }),
+  required: PropTypes.bool,
   value: PropTypes.string,
 };

package/admin/src/content-manager/pages/App/LeftMenu/index.js CHANGED Viewed

@@ -108,8 +108,10 @@ const LeftMenu = () => {
               badgeLabel={section.links.length.toString()}
             >
               {section.links.map(link => {
+                const search = link.search ? `?${link.search}` : '';
                 return (
-                  <SubNavLink key={link.uid} to={`${link.to}?${link.search}`}>
+                  <SubNavLink key={link.uid} to={`${link.to}${search}`}>
                     {link.title}
                   </SubNavLink>
                 );

package/admin/src/content-manager/pages/App/index.js CHANGED Viewed

@@ -43,14 +43,20 @@ const App = () => {
     );
   }
+  // Array of models that are displayed in the content manager
+  const supportedModelsToDisplay = models.filter(({ isDisplayed }) => isDisplayed);
   // Redirect the user to the 403 page
-  // FIXME when changing the routing
-  if (authorisedModels.length === 0 && models.length > 0 && pathname !== '/content-manager/403') {
+  if (
+    authorisedModels.length === 0 &&
+    supportedModelsToDisplay.length > 0 &&
+    pathname !== '/content-manager/403'
+  ) {
     return <Redirect to="/content-manager/403" />;
   }
   // Redirect the user to the create content type page
-  if (models.length === 0 && pathname !== '/content-manager/no-content-types') {
+  if (supportedModelsToDisplay.length === 0 && pathname !== '/content-manager/no-content-types') {
     return <Redirect to="/content-manager/no-content-types" />;
   }

package/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFieldButton.js CHANGED Viewed

@@ -341,7 +341,7 @@ const DisplayedFieldButton = ({
           isHidden={isHidden}
         >
           <DragButton
-            as="button"
+            as="span"
             type="button"
             ref={refs.dragRef}
             onClick={e => e.stopPropagation()}

package/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js CHANGED Viewed

@@ -24,7 +24,7 @@ const FieldButtonContent = ({ attribute, onEditField, onDeleteField, children })
   return (
     <Box overflow="hidden" width="100%">
-      <Flex paddingLeft={3} alignItems="baseline" justifyContent="space-between">
+      <Flex paddingLeft={3} alignItems="center" justifyContent="space-between">
         <Typography fontWeight="semiBold" textColor="neutral800" ellipsis>
           {children}
         </Typography>

package/admin/src/content-manager/pages/EditSettingsView/components/RelationalFieldButton.js CHANGED Viewed

@@ -91,7 +91,7 @@ const RelationalFieldButton = ({
       isDragging={isDragging}
     >
       <DragButton
-        as="button"
+        as="span"
         type="button"
         ref={dragButtonRef}
         onClick={e => e.stopPropagation()}

package/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js CHANGED Viewed

@@ -195,6 +195,7 @@ const DraggableCard = ({
         >
           <Stack horizontal size={3}>
             <DragButton
+              as='span'
               aria-label={formatMessage(
                 {
                   id: getTrad('components.DraggableCard.move.field'),

package/admin/src/pages/AuthPage/components/Register/index.js CHANGED Viewed

@@ -178,7 +178,10 @@ const Register = ({ fieldsToDisable, noSignin, onSubmit, schema }) => {
                         : undefined
                     }
                     required
-                    label={formatMessage({ id: 'Auth.form.email.label', defaultMessage: 'Email' })}
+                    label={formatMessage({
+                      id: 'Auth.form.email.label',
+                      defaultMessage: 'Email',
+                    })}
                     type="email"
                   />
                   <PasswordInput

package/admin/src/pages/AuthPage/utils/forms.js CHANGED Viewed

@@ -94,6 +94,8 @@ const forms = {
       email: yup
         .string()
         .email(translatedErrors.email)
+        .strict()
+        .lowercase(translatedErrors.lowercase)
         .required(translatedErrors.required),
       confirmPassword: yup
         .string()

package/admin/src/pages/ProfilePage/index.js CHANGED Viewed

@@ -211,6 +211,7 @@ const ProfilePage = () => {
                               value={values.firstname || ''}
                               type="text"
                               name="firstname"
+                              required
                             />
                           </GridItem>
                           <GridItem s={12} col={6}>
@@ -234,6 +235,7 @@ const ProfilePage = () => {
                               value={values.email || ''}
                               type="email"
                               name="email"
+                              required
                             />
                           </GridItem>
                           <GridItem s={12} col={6}>

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js CHANGED Viewed

@@ -208,6 +208,7 @@ const ApiTokenCreateView = () => {
                             })}
                             onChange={handleChange}
                             value={values.name}
+                            required
                           />
                         </GridItem>
                         <GridItem key="description" col={6} xs={12}>

package/admin/src/pages/SettingsPage/pages/Users/EditPage/utils/layout.js CHANGED Viewed

@@ -15,6 +15,7 @@ const layout = [
         col: 6,
         xs: 12,
       },
+      required: true,
     },
     {
       intlLabel: {
@@ -49,6 +50,7 @@ const layout = [
         col: 6,
         xs: 12,
       },
+      required: true,
     },
     {
       intlLabel: {

package/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/layout.js CHANGED Viewed

@@ -15,6 +15,7 @@ const layout = [
         col: 6,
         xs: 12,
       },
+      required: true,
     },
     {
       intlLabel: {
@@ -49,6 +50,7 @@ const layout = [
         col: 6,
         xs: 12,
       },
+      required: true,
     },
   ],
 ];

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

@@ -68,6 +68,7 @@ const SelectRoles = ({ disabled, error, onChange, value }) => {
       startIcon={startIcon}
       value={value}
       withTags
+      required
     >
       {(data || []).map(role => {
         return (

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/EventInput/index.js CHANGED Viewed

@@ -63,7 +63,7 @@ const EventInput = ({ isDraftAndPublish }) => {
     : displayedData.events.default;
   const { formatMessage } = useIntl();
-  const { values, errors, handleChange: onChange } = useFormikContext();
+  const { values, handleChange: onChange } = useFormikContext();
   const inputName = 'events';
   const inputValue = values.events;
@@ -154,14 +154,6 @@ const EventInput = ({ isDraftAndPublish }) => {
           })}
         </tbody>
       </StyledTable>
-      {errors.events && (
-        <Typography variant="pi" textColor="danger600" data-strapi-field-error>
-          {formatMessage({
-            id: 'components.Input.error.validation.required',
-            defaultMessage: 'This value is required',
-          })}
-        </Typography>
-      )}
     </Stack>
   );
 };

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js CHANGED Viewed

@@ -114,6 +114,7 @@ const WebhookForm = ({
                           id: 'Settings.webhooks.form.name',
                           defaultMessage: 'Name',
                         })}
+                        required
                       />
                     </GridItem>
                     <GridItem col={12}>
@@ -125,6 +126,7 @@ const WebhookForm = ({
                           id: 'Settings.roles.form.input.url',
                           defaultMessage: 'Url',
                         })}
+                        required
                       />
                     </GridItem>
                   </Grid>

package/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/utils/schema.js CHANGED Viewed

@@ -29,10 +29,7 @@ const schema = yup.object().shape({
       })
     );
   }),
-  events: yup
-    .array()
-    .min(1, translatedErrors.min)
-    .required(translatedErrors.required),
+  events: yup.array(),
 });
 export default schema;