@akemona-org/strapi-plugin-content-type-builder 3.7.0 → 3.7.1

package/admin/src/containers/DataManagerProvider/index.js

@@ -94,18 +94,15 @@ const DataManagerProvider = ({
 
   getDataRef.current = async () => {
     try {
-      const [
-        { data: componentsArray },
-        { data: contentTypesArray },
-        reservedNames,
-      ] = await Promise.all(
-        ['components', 'content-types', 'reserved-names'].map(endPoint => {
-          return request(`/${pluginId}/${endPoint}`, {
-            method: 'GET',
-            signal,
-          });
-        })
-      );
+      const [{ data: componentsArray }, { data: contentTypesArray }, reservedNames] =
+        await Promise.all(
+          ['components', 'content-types', 'reserved-names'].map((endPoint) => {
+            return request(`/${pluginId}/${endPoint}`, {
+              method: 'GET',
+              signal,
+            });
+          })
+        );
 
       const components = createDataObject(componentsArray);
       const contentTypes = createDataObject(contentTypesArray);
@@ -232,7 +229,7 @@ const DataManagerProvider = ({
     });
   };
 
-  const deleteCategory = async categoryUid => {
+  const deleteCategory = async (categoryUid) => {
     try {
       const requestURL = `/${pluginId}/component-categories/${categoryUid}`;
       // eslint-disable-next-line no-alert
@@ -419,7 +416,7 @@ const DataManagerProvider = ({
 
   const redirectEndpoint = useMemo(() => {
     const allowedEndpoints = Object.keys(contentTypes)
-      .filter(uid => get(contentTypes, [uid, 'schema', 'visible'], true))
+      .filter((uid) => get(contentTypes, [uid, 'schema', 'visible'], true))
       .sort();
 
     return get(allowedEndpoints, '0', '');
@@ -429,7 +426,7 @@ const DataManagerProvider = ({
     return <Redirect to={`/plugins/${pluginId}/content-types/${redirectEndpoint}`} />;
   }
 
-  const submitData = async additionalContentTypeData => {
+  const submitData = async (additionalContentTypeData) => {
     try {
       const isCreating = get(modifiedData, [firstKeyToMainSchema, 'isTemporary'], false);
       const body = {
@@ -506,7 +503,7 @@ const DataManagerProvider = ({
 
   // Open the modal warning cancel changes
   const toggleModalCancel = () => {
-    toggleInfoModal(prev => ({ ...prev, cancel: !prev.cancel }));
+    toggleInfoModal((prev) => ({ ...prev, cancel: !prev.cancel }));
   };
 
   const updatePermissions = async () => {
@@ -536,7 +533,8 @@ const DataManagerProvider = ({
         changeDynamicZoneComponents,
         components,
         componentsGroupedByCategory: groupBy(components, 'category'),
-        componentsThatHaveOtherComponentInTheirAttributes: getAllComponentsThatHaveAComponentInTheirAttributes(),
+        componentsThatHaveOtherComponentInTheirAttributes:
+          getAllComponentsThatHaveAComponentInTheirAttributes(),
         contentTypes,
         createSchema,
         deleteCategory,

package/admin/src/containers/DataManagerProvider/reducer.js

@@ -18,7 +18,7 @@ const initialState = fromJS({
 
 const ONE_SIDE_RELATIONS = ['oneWay', 'manyWay'];
 
-const getOppositeNature = originalNature => {
+const getOppositeNature = (originalNature) => {
   if (originalNature === 'manyToOne') {
     return 'oneToMany';
   }
@@ -52,7 +52,7 @@ const addComponentsToState = (state, componentToAddUid, objToUpdate) => {
   );
 
   // We need to add the nested components to the modifiedData.components as well
-  nestedComponents.forEach(componentUid => {
+  nestedComponents.forEach((componentUid) => {
     const isTemporary = state.getIn(['components', componentUid, 'isTemporary']) || false;
     const hasNestedComponentAlreadyBeenAdded =
       state.getIn(['modifiedData', 'components', componentUid]) !== undefined;
@@ -84,7 +84,7 @@ const reducer = (state = initialState, action) => {
         .updateIn(['modifiedData', ...pathToDataToEdit, 'schema', 'attributes', name], () => {
           return fromJS(rest);
         })
-        .updateIn(['modifiedData', ...pathToDataToEdit, 'schema', 'attributes'], obj => {
+        .updateIn(['modifiedData', ...pathToDataToEdit, 'schema', 'attributes'], (obj) => {
           const type = get(rest, 'type', 'relation');
           const target = get(rest, 'target', null);
           const nature = get(rest, 'nature', null);
@@ -117,7 +117,7 @@ const reducer = (state = initialState, action) => {
 
           return obj;
         })
-        .updateIn(['modifiedData', 'components'], existingCompos => {
+        .updateIn(['modifiedData', 'components'], (existingCompos) => {
           if (action.shouldAddComponentToData) {
             return addComponentsToState(state, rest.component, existingCompos);
           }
@@ -130,7 +130,7 @@ const reducer = (state = initialState, action) => {
 
       return state.updateIn(
         ['modifiedData', 'contentType', 'schema', 'attributes', dynamicZoneTarget, 'components'],
-        list => {
+        (list) => {
           return list.concat(componentsToAdd);
         }
       );
@@ -146,11 +146,11 @@ const reducer = (state = initialState, action) => {
       return state
         .updateIn(
           ['modifiedData', 'contentType', 'schema', 'attributes', dynamicZoneTarget, 'components'],
-          list => {
+          (list) => {
             return fromJS(makeUnique([...list.toJS(), ...newComponents]));
           }
         )
-        .updateIn(['modifiedData', 'components'], old => {
+        .updateIn(['modifiedData', 'components'], (old) => {
           const componentsSchema = newComponents.reduce((acc, current) => {
             return addComponentsToState(state, current, acc);
           }, old);
@@ -210,7 +210,7 @@ const reducer = (state = initialState, action) => {
         ? [forTarget]
         : [forTarget, targetUid];
 
-      return newState.updateIn(['modifiedData', ...pathToDataToEdit, 'schema'], obj => {
+      return newState.updateIn(['modifiedData', ...pathToDataToEdit, 'schema'], (obj) => {
         let oppositeAttributeNameToRemove = null;
         let oppositeAttributeNameToUpdate = null;
         let oppositeAttributeNameToCreateBecauseOfNatureChange = null;
@@ -298,9 +298,8 @@ const reducer = (state = initialState, action) => {
                     shouldCreateOppositeAttributeBecauseOfNatureChange ||
                     shouldCreateOppositeAttributeBecauseOfTargetChange
                   ) {
-                    acc[oppositeAttributeNameToCreateBecauseOfNatureChange] = fromJS(
-                      oppositeAttributeToCreate
-                    );
+                    acc[oppositeAttributeNameToCreateBecauseOfNatureChange] =
+                      fromJS(oppositeAttributeToCreate);
 
                     oppositeAttributeToCreate = null;
                     oppositeAttributeNameToCreateBecauseOfNatureChange = null;
@@ -311,9 +310,8 @@ const reducer = (state = initialState, action) => {
 
                 acc[name] = fromJS(rest);
               } else if (current === oppositeAttributeNameToUpdate) {
-                acc[oppositeAttributeNameToCreateBecauseOfNatureChange] = fromJS(
-                  oppositeAttributeToCreate
-                );
+                acc[oppositeAttributeNameToCreateBecauseOfNatureChange] =
+                  fromJS(oppositeAttributeToCreate);
               } else {
                 acc[current] = obj.getIn(['attributes', current]);
               }
@@ -394,15 +392,17 @@ const reducer = (state = initialState, action) => {
         }
       }
 
-      return state.removeIn(pathToAttributeToRemove).updateIn([...pathToAttributes], attributes => {
-        return attributes.keySeq().reduce((acc, current) => {
-          if (acc.getIn([current, 'targetField']) === attributeToRemoveName) {
-            return acc.removeIn([current, 'targetField']);
-          }
-
-          return acc;
-        }, attributes);
-      });
+      return state
+        .removeIn(pathToAttributeToRemove)
+        .updateIn([...pathToAttributes], (attributes) => {
+          return attributes.keySeq().reduce((acc, current) => {
+            if (acc.getIn([current, 'targetField']) === attributeToRemoveName) {
+              return acc.removeIn([current, 'targetField']);
+            }
+
+            return acc;
+          }, attributes);
+        });
     }
     case actions.SET_MODIFIED_DATA: {
       let newState = state
@@ -427,7 +427,7 @@ const reducer = (state = initialState, action) => {
         uid,
       } = action;
 
-      let newState = state.updateIn(['modifiedData', schemaType], obj => {
+      let newState = state.updateIn(['modifiedData', schemaType], (obj) => {
         let updatedObj = obj
           .updateIn(['schema', 'name'], () => name)
           .updateIn(['schema', 'collectionName'], () => collectionName);
@@ -445,7 +445,7 @@ const reducer = (state = initialState, action) => {
       });
 
       if (schemaType === 'component') {
-        newState = newState.updateIn(['components'], obj => {
+        newState = newState.updateIn(['components'], (obj) => {
           return obj.update(uid, () => newState.getIn(['modifiedData', 'component']));
         });
       }

package/admin/src/containers/DataManagerProvider/selectors.js

@@ -5,7 +5,7 @@ import { initialState } from './reducer';
 /**
  * Direct selector to the dataManagerProvider state domain
  */
-const dataManagerProviderDomain = () => state =>
+const dataManagerProviderDomain = () => (state) =>
   state.get(`${pluginId}_dataManagerProvider`) || initialState;
 
 /**
@@ -17,7 +17,7 @@ const dataManagerProviderDomain = () => state =>
  */
 
 const makeSelectDataManagerProvider = () =>
-  createSelector(dataManagerProviderDomain(), substate => {
+  createSelector(dataManagerProviderDomain(), (substate) => {
     return substate.toJS();
   });
 

package/admin/src/containers/DataManagerProvider/utils/cleanData.js

@@ -4,7 +4,7 @@ import pluginId from '../../../pluginId';
 import makeUnique from '../../../utils/makeUnique';
 
 const getCreatedAndModifiedComponents = (allComponents, initialComponents) => {
-  const componentUIDsToReturn = Object.keys(allComponents).filter(compoUid => {
+  const componentUIDsToReturn = Object.keys(allComponents).filter((compoUid) => {
     const currentCompo = get(allComponents, compoUid, {});
     const initialCompo = get(initialComponents, compoUid, {});
     const hasComponentBeenCreated = get(currentCompo, ['isTemporary'], false);
@@ -112,10 +112,10 @@ const formatAttributes = (attributes, mainDataUID, isCreatingMainData, isCompone
   }, {});
 };
 
-const formatRelationTargetAttribute = targetAttribute =>
+const formatRelationTargetAttribute = (targetAttribute) =>
   targetAttribute === '-' ? null : targetAttribute;
 
-const removeNullKeys = obj =>
+const removeNullKeys = (obj) =>
   Object.keys(obj).reduce((acc, current) => {
     if (obj[current] !== null && current !== 'plugin') {
       acc[current] = obj[current];
@@ -131,7 +131,7 @@ const getComponentsToPost = (
   isCreatingData = false
 ) => {
   const componentsToFormat = getCreatedAndModifiedComponents(allComponents, initialComponents);
-  const formattedComponents = componentsToFormat.map(compoUID => {
+  const formattedComponents = componentsToFormat.map((compoUID) => {
     const currentCompo = get(allComponents, compoUID, {});
     const formattedComponent = formatComponent(currentCompo, mainDataUID, isCreatingData);
 
@@ -141,10 +141,10 @@ const getComponentsToPost = (
   return formattedComponents;
 };
 
-const sortContentType = types =>
+const sortContentType = (types) =>
   sortBy(
     Object.keys(types)
-      .map(uid => ({
+      .map((uid) => ({
         visible: types[uid].schema.visible,
         name: uid,
         title: types[uid].schema.name,
@@ -154,8 +154,8 @@ const sortContentType = types =>
         kind: types[uid].schema.kind,
         restrictRelationsTo: types[uid].schema.restrictRelationsTo,
       }))
-      .filter(obj => obj !== null),
-    obj => camelCase(obj.title)
+      .filter((obj) => obj !== null),
+    (obj) => camelCase(obj.title)
   );
 
 export {

package/admin/src/containers/DataManagerProvider/utils/createDataObject.js

@@ -1,4 +1,4 @@
-const createDataObject = arr =>
+const createDataObject = (arr) =>
   arr.reduce((acc, current) => {
     acc[current.uid] = current;
 

package/admin/src/containers/DataManagerProvider/utils/createModifiedDataSchema.js

@@ -7,16 +7,13 @@ const createModifiedDataSchema = (
   allComponentsSchema,
   isInContentTypeView
 ) => {
-  const componentsAssociatedToContentType = retrievedComponents.reduce(
-    (acc, current) => {
-      const componentSchema = get(allComponentsSchema, current, {});
+  const componentsAssociatedToContentType = retrievedComponents.reduce((acc, current) => {
+    const componentSchema = get(allComponentsSchema, current, {});
 
-      acc[current] = componentSchema;
+    acc[current] = componentSchema;
 
-      return acc;
-    },
-    {}
-  );
+    return acc;
+  }, {});
   const keyName = isInContentTypeView ? 'contentType' : 'component';
   const schema = {
     [keyName]: contentTypeSchema,
@@ -26,55 +23,41 @@ const createModifiedDataSchema = (
   return schema;
 };
 
-const orderAllDataAttributesWithImmutable = (
-  allDataSchema,
-  isInContentTypeView
-) => {
+const orderAllDataAttributesWithImmutable = (allDataSchema, isInContentTypeView) => {
   const attributesPath = ['schema', 'attributes'];
   const componentsSchema = allDataSchema.components;
-  const componentsWithImmutableSchema = Object.keys(componentsSchema).reduce(
-    (acc, current) => {
-      const currentSchema = get(componentsSchema, [current], {});
+  const componentsWithImmutableSchema = Object.keys(componentsSchema).reduce((acc, current) => {
+    const currentSchema = get(componentsSchema, [current], {});
 
-      const currentAttributes = get(currentSchema, attributesPath, {});
+    const currentAttributes = get(currentSchema, attributesPath, {});
 
-      const fromJSAttributes = Object.keys(currentAttributes).reduce(
-        (acc, current) => {
-          acc[current] = fromJS(currentAttributes[current]);
+    const fromJSAttributes = Object.keys(currentAttributes).reduce((acc, current) => {
+      acc[current] = fromJS(currentAttributes[current]);
 
-          return acc;
-        },
-        {}
-      );
+      return acc;
+    }, {});
 
-      // TODO refacto
-      const currentImmutableSchemas = fromJS(currentSchema).setIn(
-        ['schema', 'attributes'],
-        fromJS(OrderedMap(fromJSAttributes))
-      );
+    // TODO refacto
+    const currentImmutableSchemas = fromJS(currentSchema).setIn(
+      ['schema', 'attributes'],
+      fromJS(OrderedMap(fromJSAttributes))
+    );
 
-      acc[current] = fromJS(currentImmutableSchemas);
+    acc[current] = fromJS(currentImmutableSchemas);
 
-      return acc;
-    },
-    {}
-  );
+    return acc;
+  }, {});
   const keyName = isInContentTypeView ? 'contentType' : 'component';
   const mainSchema = get(allDataSchema, [keyName], {});
   const mainImmutableSchema = fromJS(mainSchema).setIn(
     attributesPath,
     fromJS(
       OrderedMap(
-        Object.keys(get(mainSchema, attributesPath, {})).reduce(
-          (acc, current) => {
-            acc[current] = fromJS(
-              get(mainSchema, [...attributesPath, current], {})
-            );
+        Object.keys(get(mainSchema, attributesPath, {})).reduce((acc, current) => {
+          acc[current] = fromJS(get(mainSchema, [...attributesPath, current], {}));
 
-            return acc;
-          },
-          {}
-        )
+          return acc;
+        }, {})
       )
     )
   );

package/admin/src/containers/DataManagerProvider/utils/retrieveComponentsFromSchema.js

@@ -17,31 +17,16 @@ const retrieveComponentsFromSchema = (attributes, allComponentsData) => {
       );
 
       // Retrieve the nested ones
-      acc.push(
-        ...retrieveComponentsFromSchema(
-          currentComponentAttributes,
-          allComponentsData
-        )
-      );
+      acc.push(...retrieveComponentsFromSchema(currentComponentAttributes, allComponentsData));
     }
 
     if (type === 'dynamiczone') {
       const dynamicZoneComponents = attributes[current].components;
-      const componentsFromDZComponents = dynamicZoneComponents.reduce(
-        (acc2, currentUid) => {
-          const compoAttrs = get(
-            allComponentsData,
-            [currentUid, 'schema', 'attributes'],
-            {}
-          );
-
-          return [
-            ...acc2,
-            ...retrieveComponentsFromSchema(compoAttrs, allComponentsData),
-          ];
-        },
-        []
-      );
+      const componentsFromDZComponents = dynamicZoneComponents.reduce((acc2, currentUid) => {
+        const compoAttrs = get(allComponentsData, [currentUid, 'schema', 'attributes'], {});
+
+        return [...acc2, ...retrieveComponentsFromSchema(compoAttrs, allComponentsData)];
+      }, []);
 
       return [...acc, ...dynamicZoneComponents, ...componentsFromDZComponents];
     }

package/admin/src/containers/DataManagerProvider/utils/retrieveComponentsThatHaveComponents.js

@@ -1,35 +1,29 @@
 import { get } from 'lodash';
 import makeUnique from '../../../utils/makeUnique';
 
-const retrieveComponentsThatHaveComponents = allComponents => {
-  const componentsThatHaveNestedComponents = Object.keys(allComponents).reduce(
-    (acc, current) => {
-      const currentComponent = get(allComponents, [current], {});
-      const uid = currentComponent.uid;
+const retrieveComponentsThatHaveComponents = (allComponents) => {
+  const componentsThatHaveNestedComponents = Object.keys(allComponents).reduce((acc, current) => {
+    const currentComponent = get(allComponents, [current], {});
+    const uid = currentComponent.uid;
 
-      if (doesComponentHaveAComponentField(currentComponent)) {
-        acc.push(uid);
-      }
+    if (doesComponentHaveAComponentField(currentComponent)) {
+      acc.push(uid);
+    }
 
-      return acc;
-    },
-    []
-  );
+    return acc;
+  }, []);
 
   return makeUnique(componentsThatHaveNestedComponents);
 };
 
-const doesComponentHaveAComponentField = component => {
+const doesComponentHaveAComponentField = (component) => {
   const attributes = get(component, ['schema', 'attributes'], {});
 
-  return Object.keys(attributes).some(attributeName => {
+  return Object.keys(attributes).some((attributeName) => {
     const type = get(attributes, [attributeName, 'type'], '');
 
     return type === 'component';
   });
 };
 
-export {
-  doesComponentHaveAComponentField,
-  retrieveComponentsThatHaveComponents,
-};
+export { doesComponentHaveAComponentField, retrieveComponentsThatHaveComponents };

package/admin/src/containers/DataManagerProvider/utils/retrieveNestedComponents.js

@@ -1,16 +1,10 @@
 import { get } from 'lodash';
 import makeUnique from '../../../utils/makeUnique';
 
-const retrieveNestedComponents = appComponents => {
+const retrieveNestedComponents = (appComponents) => {
   const nestedComponents = Object.keys(appComponents).reduce((acc, current) => {
-    const componentAttributes = get(
-      appComponents,
-      [current, 'schema', 'attributes'],
-      {}
-    );
-    const currentComponentNestedCompos = getComponentsFromComponent(
-      componentAttributes
-    );
+    const componentAttributes = get(appComponents, [current, 'schema', 'attributes'], {});
+    const currentComponentNestedCompos = getComponentsFromComponent(componentAttributes);
 
     return [...acc, ...currentComponentNestedCompos];
   }, []);
@@ -18,7 +12,7 @@ const retrieveNestedComponents = appComponents => {
   return makeUnique(nestedComponents);
 };
 
-const getComponentsFromComponent = componentAttributes => {
+const getComponentsFromComponent = (componentAttributes) => {
   return Object.keys(componentAttributes).reduce((acc, current) => {
     const attribute = get(componentAttributes, current, {});
     const { type, component } = attribute;

package/admin/src/containers/DataManagerProvider/utils/retrieveSpecificInfoFromComponents.js

@@ -2,7 +2,7 @@ import { get } from 'lodash';
 import makeUnique from '../../../utils/makeUnique';
 
 const retrieveSpecificInfoFromComponents = (allComponents, keysToRetrieve) => {
-  const allData = Object.keys(allComponents).map(compo => {
+  const allData = Object.keys(allComponents).map((compo) => {
     return get(allComponents, [compo, ...keysToRetrieve], '');
   });
 

package/admin/src/containers/FormModal/attributes/advancedForm.js

@@ -85,7 +85,7 @@ const advancedForm = {
       ],
     };
   },
-  enumeration: data => {
+  enumeration: (data) => {
     return {
       items: [
         [
@@ -102,13 +102,13 @@ const advancedForm = {
                 key="hidden___value__placeholder"
                 id="components.InputSelect.option.placeholder"
               >
-                {msg => <option value="">{msg}</option>}
+                {(msg) => <option value="">{msg}</option>}
               </FormattedMessage>,
             ].concat(
               data.enum
                 ? data.enum
                     .filter((val, index) => data.enum.indexOf(val) === index && !isEmpty(val))
-                    .map(val => (
+                    .map((val) => (
                       <option key={val} value={val}>
                         {val}
                       </option>
@@ -159,7 +159,7 @@ const advancedForm = {
       ],
     };
   },
-  number: data => {
+  number: (data) => {
     const inputStep = data.type === 'decimal' || data.type === 'float' ? 'any' : '1';
 
     return {
@@ -194,7 +194,7 @@ const advancedForm = {
       ],
     };
   },
-  relation: data => {
+  relation: (data) => {
     const targetAttributeValue = get(data, 'targetAttribute', null);
     const nameValue = get(data, 'name', null);
 
@@ -253,7 +253,7 @@ const advancedForm = {
       ],
     };
   },
-  uid: data => {
+  uid: (data) => {
     return {
       items: [
         [{ ...options.default, disabled: Boolean(data.targetField), type: 'text' }],

package/admin/src/containers/FormModal/attributes/baseForm.js

@@ -91,7 +91,7 @@ const baseForm = {
 
               return (
                 <FormattedMessage id={tradId} key={id}>
-                  {msg => (
+                  {(msg) => (
                     <option disabled={disabled} hidden={disabled} value={value}>
                       {msg}
                     </option>
@@ -192,7 +192,7 @@ const baseForm = {
 
               return (
                 <FormattedMessage id={tradId} key={id}>
-                  {msg => (
+                  {(msg) => (
                     <option disabled={disabled} hidden={disabled} value={value}>
                       {msg}
                     </option>
@@ -279,8 +279,8 @@ const baseForm = {
   },
   uid: (data, step, attributes) => {
     const options = Object.keys(attributes)
-      .filter(key => ['string', 'text'].includes(attributes[key].type))
-      .map(key => ({ id: key, value: key }));
+      .filter((key) => ['string', 'text'].includes(attributes[key].type))
+      .map((key) => ({ id: key, value: key }));
 
     return {
       items: [
@@ -302,7 +302,7 @@ const baseForm = {
               <Fragment key={index}>
                 {index === 0 ? (
                   <FormattedMessage id={option.id}>
-                    {msg => <option value={option.value}>{msg}</option>}
+                    {(msg) => <option value={option.value}>{msg}</option>}
                   </FormattedMessage>
                 ) : (
                   <option value={option.value}>{option.value}</option>