Remove moment from validation schema

Signed-off-by: soupette <cyril@strapi.io>

examples/getstarted/src/api/restaurant/content-types/restaurant/schema.json

@@ -56,7 +56,9 @@
         "i18n": {
           "localized": true
         }
-      }
+      },
+      "repeatable": false,
+      "required": true
     },
     "contactEmail": {
       "type": "email",

examples/getstarted/src/api/temp/content-types/temp/schema.json

@@ -11,91 +11,41 @@
   "options": {
     "draftAndPublish": false
   },
-  "pluginOptions": {
+  "pluginOptions": {},
-    "i18n": {
-      "localized": true
-    }
-  },
   "attributes": {
     "name": {
       "type": "string",
-      "pluginOptions": {
+      "pluginOptions": {}
-        "i18n": {
-          "localized": true
-        }
-      }
     },
-    "temp": {
+    "simple": {
-      "type": "component",
+      "pluginOptions": {},
-      "repeatable": true,
+      "type": "uid"
-      "component": "default.temp",
-      "pluginOptions": {
-        "i18n": {
-          "localized": true
-        }
-      }
     },
-    "dz": {
+    "attached": {
-      "pluginOptions": {
+      "pluginOptions": {},
-        "i18n": {
+      "type": "uid",
-          "localized": true
+      "targetField": "name"
-        }
-      },
-      "type": "dynamiczone",
-      "components": [
-        "basic.simple",
-        "blog.test-como",
-        "default.closingperiod",
-        "default.dish",
-        "default.openingtimes",
-        "default.restaurantservice",
-        "default.temp",
-        "default.apple",
-        "default.car"
-      ],
-      "required": true,
-      "min": 2
     },
-    "dz_req": {
+    "attached_req": {
-      "type": "dynamiczone",
+      "pluginOptions": {},
-      "components": [
+      "type": "uid",
-        "default.apple",
+      "targetField": "name",
-        "default.car",
+      "required": true
-        "default.closingperiod",
-        "default.dish",
-        "default.openingtimes",
-        "default.restaurantservice",
-        "default.temp"
-      ],
-      "required": true,
-      "pluginOptions": {
-        "i18n": {
-          "localized": true
-        }
-      }
     },
-    "dz_simple": {
+    "req": {
-      "type": "dynamiczone",
+      "pluginOptions": {},
-      "components": [
+      "type": "uid",
-        "basic.simple"
+      "required": true
-      ],
-      "pluginOptions": {
-        "i18n": {
-          "localized": true
-        }
-      }
     },
-    "dz_max": {
+    "default_val": {
-      "type": "dynamiczone",
+      "pluginOptions": {},
-      "components": [
+      "type": "uid",
-        "basic.simple"
+      "default": "to",
-      ],
+      "minLength": 4
-      "max": 2,
+    },
-      "pluginOptions": {
+    "date": {
-        "i18n": {
+      "type": "date",
-          "localized": true
+      "required": true
-        }
-      }
     }
   }
 }

examples/getstarted/src/components/default/closingperiod.json

@@ -7,7 +7,8 @@
   },
   "attributes": {
     "label": {
-      "type": "string"
+      "type": "string",
+      "default": "toto"
     },
     "start_date": {
       "type": "date",
@@ -19,11 +20,15 @@
     },
     "media": {
       "type": "media",
+      "multiple": false,
       "required": false
     },
     "dish": {
       "component": "default.dish",
-      "type": "component"
+      "type": "component",
+      "repeatable": true,
+      "required": true,
+      "min": 2
     }
   }
 }

packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js

@@ -36,6 +36,7 @@ const cleanData = (retrievedData, currentSchema, componentsSchema) => {
         case 'time': {
           cleanedData = value;
 
+          // FIXME
           if (value && value.split(':').length < 3) {
             cleanedData = `${value}:00`;
           }

packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js

@@ -9,7 +9,7 @@ import {
   isNaN,
   toNumber,
 } from 'lodash';
-import moment from 'moment';
+
 import * as yup from 'yup';
 import { translatedErrors as errorsTrads } from '@strapi/helper-plugin';
 
@@ -291,10 +291,6 @@ const createYupSchemaAttribute = (type, validations, options) => {
                     return !!value;
                   }
 
-                  if (['date', 'datetime'].includes(type)) {
-                    return moment(value)._isValid === true;
-                  }
-
                   if (type === 'boolean') {
                     return value !== null;
                   }

packages/core/admin/admin/src/content-manager/components/InputUID/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, memo } from 'react';
 import PropTypes from 'prop-types';
 import { useCMEditViewDataManager } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
@@ -7,42 +7,49 @@ import { axiosInstance } from '../../../core/utils';
 import { getRequestUrl, getTrad } from '../../utils';
 import UID_REGEX from './regex';
 import { TextInput } from '@strapi/parts/TextInput';
-import { Text } from '@strapi/parts/Text'; 
+import { Text } from '@strapi/parts/Text';
 import Reload from '@strapi/icons/Reload';
 import AlertSucessIcon from '@strapi/icons/AlertSucessIcon';
 import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
 import LoadingIcon from '@strapi/icons/LoadingIcon';
 import useDebounce from './useDebounce';
-import { EndActionWrapper, FieldActionWrapper, TextValidation, LoadingWrapper } from './endActionStyle';
+import {
+  EndActionWrapper,
+  FieldActionWrapper,
+  TextValidation,
+  LoadingWrapper,
+} from './endActionStyle';
 
 // {
-  
+
-  // attribute,
+// attribute,
-  // contentTypeUID,
+// contentTypeUID,
-  // description,
+// description,
-  // error: inputError,
+// error: inputError,
-  // label: inputLabel,
+// label: inputLabel,
-  // labelIcon,
+// labelIcon,
-  // name,
+// name,
-  // onChange,
+// onChange,
-  // validations,
+// validations,
-  // value,
+// value,
-  // editable,
+// editable,
-  // ...inputProps
+// ...inputProps
 // }
-const InputUID = ({ 
+const InputUID = props => {
-  attribute, 
+  const {
-  contentTypeUID,
+    attribute,
-  description,
+    contentTypeUID,
-  disabled,
+    description,
-  error,
+    disabled,
-  intlLabel, 
+    error,
-  labelAction,
+    intlLabel,
-  name, 
+    labelAction,
-  onChange,
+    name,
-  value,
+    onChange,
-  ...rest
+    value,
-}) => {
+    ...rest
+  } = props;
+
   const { modifiedData, initialData, layout } = useCMEditViewDataManager();
   const [isLoading, setIsLoading] = useState(false);
   const [availability, setAvailability] = useState(null);
@@ -57,11 +64,11 @@ const InputUID = ({
   const [regenerateLabel, setRegenerateLabel] = useState(null);
 
   const label = intlLabel.id
-  ? formatMessage(
+    ? formatMessage(
-      { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
+        { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-      { ...intlLabel.values }
+        { ...intlLabel.values }
-    )
+      )
-  : name;
+    : name;
 
   generateUid.current = async (shouldSetInitialValue = false) => {
     setIsLoading(true);
@@ -172,36 +179,42 @@ const InputUID = ({
 
     onChange(e);
   };
-  
+
   return (
-    <TextInput 
+    <TextInput
-      label={label} 
+      label={label}
-      name={name} 
+      name={name}
       onChange={handleChange}
       value={value || ''}
       disabled={disabled}
       endAction={
         <EndActionWrapper>
-          {availability && availability.isAvailable && !regenerateLabel &&
+          {availability && availability.isAvailable && !regenerateLabel && (
-            <TextValidation alignItems='center' justifyContent='flex-end'>
+            <TextValidation alignItems="center" justifyContent="flex-end">
               <AlertSucessIcon />
-              <Text textColor='success600' small>Available</Text>
+              <Text textColor="success600" small>
-            </TextValidation>            
+                Available
-          }
+              </Text>
-          {availability && !availability.isAvailable && !regenerateLabel &&
+            </TextValidation>
-            <TextValidation notAvailable alignItems='center' justifyContent='flex-end'>
+          )}
+          {availability && !availability.isAvailable && !regenerateLabel && (
+            <TextValidation notAvailable alignItems="center" justifyContent="flex-end">
               <AlertWarningIcon />
-              <Text textColor='danger600' small>Unavailable</Text>
+              <Text textColor="danger600" small>
-            </TextValidation>            
+                Unavailable
-          }
+              </Text>
-          {regenerateLabel &&
+            </TextValidation>
-            <TextValidation alignItems='center' justifyContent='flex-end'>
+          )}
-              <Text textColor='primary600' small>{regenerateLabel}</Text>
+          {regenerateLabel && (
-            </TextValidation>   
+            <TextValidation alignItems="center" justifyContent="flex-end">
-          }
+              <Text textColor="primary600" small>
-          <FieldActionWrapper 
+                {regenerateLabel}
-            onClick={() => generateUid.current()} 
+              </Text>
-            label='regenerate'
+            </TextValidation>
+          )}
+          <FieldActionWrapper
+            onClick={() => generateUid.current()}
+            label="regenerate"
             onMouseEnter={handleGenerateMouseEnter}
             onMouseLeave={handleGenerateMouseLeave}
           >
@@ -209,9 +222,9 @@ const InputUID = ({
               <LoadingWrapper>
                 <LoadingIcon />
               </LoadingWrapper>
-            ) : 
+            ) : (
               <Reload />
-            }
+            )}
           </FieldActionWrapper>
         </EndActionWrapper>
       }
@@ -323,4 +336,5 @@ const InputUID = ({
 //   value: '',
 // };
 
+// export default memo(InputUID, isEqual);
 export default InputUID;

packages/core/admin/admin/src/content-manager/components/Inputs/index.js

@@ -15,7 +15,6 @@ import InputJSON from '../InputJSON';
 import GenericInput from './GenericInput';
 import InputUID from '../InputUID';
 // import SelectWrapper from '../SelectWrapper';
-// import WysiwygWithErrors from '../WysiwygWithErrors';
 
 import {
   connect,
@@ -54,7 +53,7 @@ function Inputs({
   const fieldName = useMemo(() => {
     return getFieldName(keys);
   }, [keys]);
-  
+
   const validations = useMemo(() => {
     const inputValidations = omit(
       fieldSchema,
@@ -204,7 +203,7 @@ function Inputs({
     //   </div>
     // );
   }
-  
+
   return (
     <GenericInput
       // {...metadatas}