Merge pull request #13676 from benderillo/fix-13675-send-components

Make updateContentTypeConfiguration endpoint return full data
strapi · Jul 12, 2022 · ed129b8 · ed129b8
2 parents d0c29fe + 89a8f91
commit ed129b8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js
@@ -68,10 +68,10 @@ const useFetchContentTypeLayout = contentTypeUID => {
   }, [contentTypeUID, getData]);
 
   const updateLayout = useCallback(
-    newLayout => {
+    data => {
       dispatch({
         type: 'UPDATE_LAYOUT',
-        newLayout: formatLayouts({ contentType: newLayout, components: {} }, schemas),
+        newLayout: formatLayouts(data, schemas),
       });
     },
     [schemas]

diff --git a/packages/core/content-manager/server/controllers/content-types.js b/packages/core/content-manager/server/controllers/content-types.js
@@ -107,6 +107,18 @@ module.exports = {
 
     await metricsService.sendDidConfigureListView(contentType, newConfiguration);
 
-    ctx.body = { data: newConfiguration };
+    const confWithUpdatedMetadata = {
+      ...newConfiguration,
+      metadatas: mapValues(assocMainField, newConfiguration.metadatas),
+    };
+
+    const components = await contentTypeService.findComponentsConfigurations(contentType);
+
+    ctx.body = {
+      data: {
+        contentType: confWithUpdatedMetadata,
+        components,
+      },
+    };
   },
 };