Merge remote-tracking branch 'origin/develop' into feature/crit_app_f…

…rame # Conflicts: # src/app/services/editorial-conventions.service.ts
evt-project · Sep 19, 2023 · 4faaaec · 4faaaec
2 parents e6ea535 + 0da0773
commit 4faaaec
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/app/services/editorial-conventions.service.ts b/src/app/services/editorial-conventions.service.ts
@@ -177,15 +177,9 @@ export class EditorialConventionsService {
         Object.keys(c.attributes)).every((k) => attributes[k] === c.attributes[k])))?.layouts ?? undefined;
 
     if (externalLayouts) {
-      Object.keys(externalLayouts).forEach((editionLevel) => {
-        layouts = {
-          ...defaultKeys || {},
-          [editionLevel]: {
-            ...defaultKeys ? defaultKeys[editionLevel] : {},
-            ...externalLayouts[editionLevel],
-          },
-        }
-      });
+      layouts = {
+        ...externalLayouts || {},
+      }
     }
 
     return layouts;