From d25ac546ef82387f20585e08b7ec5971061ff953 Mon Sep 17 00:00:00 2001 From: Jalinson Diaz Date: Mon, 23 Oct 2023 14:44:42 -0300 Subject: [PATCH 1/2] dev (dot template builder): change auto save and publish, to auto save --- .../dot-template-builder.component.html | 24 +++++++------------ .../dot-template-builder.component.spec.ts | 8 +++---- .../dot-template-builder.component.ts | 4 ++-- .../dot-template-create-edit.component.html | 6 ++--- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html index b9e4550e3bc8..c66ae04026ad 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html @@ -1,18 +1,16 @@ + [styleClass]="(featureFlagIsOn$ | async) && 'dot-template-builder__new-template-builder'"> + + data-testId="builder"> + (cancel)="cancel.emit()"> @@ -21,8 +19,7 @@ [themeId]="item.theme" [containerMap]="item.containers" (templateChange)="onTemplateItemChange($event)" - data-testId="new-template-builder" - > + data-testId="new-template-builder"> @@ -33,13 +30,11 @@ [layout]="item.layout" (saveAndPublish)="saveAndPublish.emit($event)" (updateTemplate)="onTemplateItemChange($event)" - (save)="save.emit($event)" - > + (save)="save.emit($event)"> + [ngTemplateOutlet]="enabledComponent"> @@ -56,8 +51,7 @@ #historyIframe [src]="historyUrl" (custom)="custom.emit($event)" - data-testId="historyIframe" - > + data-testId="historyIframe"> diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts index 700cc9cf3352..0dc52991083f 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts @@ -246,13 +246,13 @@ describe('DotTemplateBuilderComponent', () => { expect(component.updateTemplate.emit).toHaveBeenCalledWith(EMPTY_TEMPLATE_DESIGN); }); - it('should emit save and publish event from dot-edit-layout-designer automatically on template updates', () => { + it('should emit save event from dot-edit-layout-designer automatically on template updates', () => { fakeAsync(() => { - spyOn(component.saveAndPublish, 'emit'); + spyOn(component.save, 'emit'); const builder = de.query(By.css('dot-edit-layout-designer')); - builder.triggerEventHandler('saveAndPublish', EMPTY_TEMPLATE_DESIGN); + builder.triggerEventHandler('save', EMPTY_TEMPLATE_DESIGN); tick(AUTOSAVE_DEBOUNCE_TIME); - expect(component.saveAndPublish.emit).toHaveBeenCalledWith(EMPTY_TEMPLATE_DESIGN); + expect(component.save.emit).toHaveBeenCalledWith(EMPTY_TEMPLATE_DESIGN); }); }); }); diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.ts index 402f2960c737..5786df42ddef 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.ts +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.ts @@ -84,13 +84,13 @@ export class DotTemplateBuilderComponent implements OnInit, OnDestroy { this.templateUpdate$ .pipe(debounceTime(AUTOSAVE_DEBOUNCE_TIME), takeUntil(this.destroy$)) .subscribe((templateItem) => { - this.saveAndPublish.emit(templateItem); + this.save.emit(templateItem); }); } private subscribeOnChangeBeforeLeaveHandler(): void { this.dotRouterService.pageLeaveRequest$.pipe(takeUntil(this.destroy$)).subscribe(() => { - this.saveAndPublish.emit(this.lastTemplate); + this.save.emit(this.lastTemplate); }); } } diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.html index 7f218e79315a..09b4c9293fb0 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.html +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.html @@ -8,8 +8,7 @@ (click)="editTemplateProps()" data-testId="editTemplateButton" pButton - icon="pi pi-pencil" - > + icon="pi pi-pencil"> @@ -22,8 +21,7 @@ (saveAndPublish)="saveAndPublishTemplate($event)" (save)="saveTemplate($event)" (cancel)="cancelTemplate()" - (custom)="onCustomEvent($event)" - > + (custom)="onCustomEvent($event)"> From 5e9dc823b3c2c952f66b9ca43ffcd734a0f2c43d Mon Sep 17 00:00:00 2001 From: Jalinson Diaz Date: Mon, 23 Oct 2023 14:50:39 -0300 Subject: [PATCH 2/2] dev (dot template builder): remove comment --- .../dot-template-builder/dot-template-builder.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html index c66ae04026ad..6682d561c124 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.html @@ -1,6 +1,5 @@ -