Make empty regions resolving independent of content api #6548

enonic · Jul 18, 2023 · 2020955 · 2020955
1 parent 8686c9a
commit 2020955
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/lib/src/main/resources/assets/js/app/page/region/Regions.ts b/modules/lib/src/main/resources/assets/js/app/page/region/Regions.ts
@@ -123,8 +123,8 @@ export class Regions
 
         let other = <Regions>o;
 
-        let thisRegions = this.getRegions();
-        let otherRegions = other.getRegions();
+        let thisRegions = this.getRegions()?.filter((region: Region) => !region.isEmpty());
+        let otherRegions = other.getRegions()?.filter((region: Region) => !region.isEmpty());
 
         if (!ObjectHelper.arrayEquals(thisRegions, otherRegions)) {
             return false;

diff --git a/modules/lib/src/main/resources/assets/js/app/wizard/ContentWizardPanel.ts b/modules/lib/src/main/resources/assets/js/app/wizard/ContentWizardPanel.ts
@@ -2282,7 +2282,7 @@ export class ContentWizardPanel
 
     private assembleViewedPage(): Page {
         return (this.getPersistedItem().getPage() && !this.isRenderable()) ?
-               this.getPersistedItem().getPage() : PageHelper.getPageWithoutEmptyRegions(this.getLivePanel()?.getPage());
+               this.getPersistedItem().getPage() : this.getLivePanel()?.getPage();
     }
 
     private resolveContentNameForUpdateRequest(): ContentName {