Merge branch '28177-uve-dot-wizard-component-is-rendering-behind-prim…

…eng-dialog' of https://github.com/dotCMS/core into 28177-uve-dot-wizard-component-is-rendering-behind-primeng-dialog
dotCMS · Aug 8, 2024 · 2f7336a · 2f7336a
2 parents 8478369 + 5b159a4
commit 2f7336a
Show file tree

Hide file tree

Showing 67 changed files with 1,602 additions and 742 deletions.
diff --git a/.github/workflows/publish-starter.yml b/.github/workflows/publish-starter.yml
@@ -73,8 +73,9 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: ${{ vars.ARTIFACTORY_URL }}
-          JF_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN }}      
-
+          JF_USER: ${{ secrets.EE_REPO_USERNAME }}
+          JF_PASSWORD: ${{ secrets.EE_REPO_PASSWORD }}          
+
       - name: 'JFrog CLI context'
         run: |
           echo "::group::JFrog CLI context"

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions>
+   <extension>
+       <groupId>org.apache.maven.extensions</groupId>
+       <artifactId>maven-build-cache-extension</artifactId>
+       <version>1.2.0</version>
+   </extension>
+</extensions>
diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
@@ -0,0 +1,34 @@
+<!--
+Opted for a simple configuration to cache the build output of the project.
+
+For a full featured example, see:
+
+https://maven.apache.org/extensions/maven-build-cache-extension/maven-build-cache-config.xml
+
+
+-->
+
+<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
+    <configuration>
+        <enabled>true</enabled>
+        <hashAlgorithm>SHA-256</hashAlgorithm>
+        <validateXml>true</validateXml>
+        <local>
+            <maxBuildsCached>3</maxBuildsCached>
+        </local>
+        <projectVersioning adjustMetaInf="true"/>
+    </configuration>
+    <input>
+        <global>
+            <glob> {*.java,*.yaml,*.properties,*.js,*.ts,*.json,*.xml,*.mjs,*.jsp} </glob>
+            <includes>
+                <include>src/</include>
+            </includes>
+            <excludes>
+                <exclude>temp.out</exclude>
+            </excludes>
+        </global>
+    </input>
+</cache>
diff --git a/...i/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.spec.ts b/...i/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.spec.ts
@@ -215,8 +215,29 @@ describe('DotEditLayoutComponent', () => {
                 fixture.detectChanges();
             });
 
+            it('should change pageState', () => {
+                const res: DotPageRender = new DotPageRender({
+                    ...mockDotRenderedPage(),
+                    layout: fakeLayout
+                });
+
+                spyOn(dotPageLayoutService, 'save').and.returnValue(of(res));
+
+                layoutDesignerDe.triggerEventHandler('save', {
+                    themeId: '123',
+                    layout: fakeLayout,
+                    title: null
+                });
+
+                // The initial value
+                expect(component.pageState).not.toEqual(PAGE_STATE);
+            });
+
             it('should save the layout', () => {
-                const res: DotPageRender = new DotPageRender(mockDotRenderedPage());
+                const res: DotPageRender = new DotPageRender({
+                    ...mockDotRenderedPage(),
+                    layout: fakeLayout
+                });
                 spyOn(dotPageLayoutService, 'save').and.returnValue(of(res));
 
                 layoutDesignerDe.triggerEventHandler('save', {
@@ -238,11 +259,15 @@ describe('DotEditLayoutComponent', () => {
                     '/default/': processedContainers[0].container,
                     '/banner/': processedContainers[1].container
                 });
-                expect(component.pageState).toEqual(new DotPageRender(mockDotRenderedPage()));
+
+                expect(component.pageState).toEqual(res);
             });
 
             it(`should save the layout after ${DEBOUNCE_TIME}`, fakeAsync(() => {
-                const res: DotPageRender = new DotPageRender(mockDotRenderedPage());
+                const res: DotPageRender = new DotPageRender({
+                    ...mockDotRenderedPage(),
+                    layout: fakeLayout
+                });
                 spyOn(dotPageLayoutService, 'save').and.returnValue(of(res));
 
                 layoutDesignerDe.triggerEventHandler('updateTemplate', {
@@ -265,11 +290,14 @@ describe('DotEditLayoutComponent', () => {
                     '/default/': processedContainers[0].container,
                     '/banner/': processedContainers[1].container
                 });
-                expect(component.pageState).toEqual(new DotPageRender(mockDotRenderedPage()));
+                expect(component.pageState).toEqual(res);
             }));
 
             it('should save the layout instantly when closeEditLayout is true', () => {
-                const res: DotPageRender = new DotPageRender(mockDotRenderedPage());
+                const res: DotPageRender = new DotPageRender({
+                    ...mockDotRenderedPage(),
+                    layout: fakeLayout
+                });
                 spyOn(dotPageLayoutService, 'save').and.returnValue(of(res));
 
                 layoutDesignerDe.triggerEventHandler('updateTemplate', {
@@ -293,11 +321,14 @@ describe('DotEditLayoutComponent', () => {
                     '/default/': processedContainers[0].container,
                     '/banner/': processedContainers[1].container
                 });
-                expect(component.pageState).toEqual(new DotPageRender(mockDotRenderedPage()));
+                expect(component.pageState).toEqual(res);
             });
 
             it('should not save the layout when observable is destroy', fakeAsync(() => {
-                const res: DotPageRender = new DotPageRender(mockDotRenderedPage());
+                const res: DotPageRender = new DotPageRender({
+                    ...mockDotRenderedPage(),
+                    layout: fakeLayout
+                });
                 spyOn(dotPageLayoutService, 'save').and.returnValue(of(res));
 
                 // Destroy should be true.

diff --git a/...cms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.ts b/...cms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.ts
@@ -72,8 +72,6 @@ export class DotEditLayoutComponent implements OnInit, OnDestroy {
             .subscribe((state: DotPageRenderState) => {
                 this.updatePageState(state);
 
-                this.containerMap = this.pageState.containerMap; // containerMap from pageState is a get property, which causes to trigger a function everytime the Angular change detection runs.
-
                 const mappedContainers = this.getRemappedContainers(state.containers);
                 this.templateContainersCacheService.set(mappedContainers);
             });
@@ -102,9 +100,10 @@ export class DotEditLayoutComponent implements OnInit, OnDestroy {
      * @param {DotPageRenderState} newState
      * @memberof DotEditLayoutComponent
      */
-    updatePageState(newState: DotPageRenderState) {
+    updatePageState(newState: DotPageRenderState | DotPageRender) {
         this.pageState = newState;
         this.templateIdentifier.set(newState.template.identifier);
+        this.containerMap = newState.containerMap;
     }
 
     /**
@@ -204,7 +203,8 @@ export class DotEditLayoutComponent implements OnInit, OnDestroy {
             this.dotMessageService.get('dot.common.message.saved')
         );
         this.templateIdentifier.set(updatedPage.template.identifier);
-        this.containerMap = updatedPage.containerMap; // containerMap from pageState is a get property, which causes to trigger a function everytime the Angular change detection runs.
+        // We need to pass the new layout to the template builder to sync the value with the backend
+        this.updatePageState(updatedPage);
     }
 
     /**

diff --git a/...-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/dot-ema-shell.component.spec.ts b/...-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/dot-ema-shell.component.spec.ts
@@ -137,6 +137,9 @@ describe('DotEmaShellComponent', () => {
                     get({ language_id }) {
                         return PAGE_RESPONSE_BY_LANGUAGE_ID[language_id];
                     },
+                    getClientPage({ language_id }, _clientConfig) {
+                        return PAGE_RESPONSE_BY_LANGUAGE_ID[language_id];
+                    },
                     save() {
                         return of({});
                     },

diff --git a/...portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.ts b/...portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.ts
@@ -27,6 +27,7 @@ import { DotMessagePipe } from '@dotcms/ui';
 
 import { DEFAULT_PERSONA } from '../../../shared/consts';
 import { UVEStore } from '../../../store/dot-uve.store';
+import { compareUrlPaths } from '../../../utils';
 import { DotEditEmaWorkflowActionsComponent } from '../dot-edit-ema-workflow-actions/dot-edit-ema-workflow-actions.component';
 import { DotEmaBookmarksComponent } from '../dot-ema-bookmarks/dot-ema-bookmarks.component';
 import { DotEmaInfoDisplayComponent } from '../dot-ema-info-display/dot-ema-info-display.component';
@@ -202,8 +203,10 @@ export class EditEmaToolbarComponent {
             language_id: languageId?.toString()
         };
 
-        if (this.shouldReload(params)) {
+        if (this.shouldNavigateToNewPage(params)) {
             this.updateQueryParams(params);
+        } else {
+            this.uveStore.reload();
         }
     }
 
@@ -250,10 +253,10 @@ export class EditEmaToolbarComponent {
         });
     }
 
-    private shouldReload(params: Params): boolean {
+    private shouldNavigateToNewPage(params: Params): boolean {
         const { url: newUrl, language_id: newLanguageId } = params;
         const { url, language_id } = this.uveStore.params();
 
-        return newUrl != url || newLanguageId != language_id;
+        return !compareUrlPaths(newUrl, url) || newLanguageId != language_id;
     }
 }