Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

dotCMS/core#21552 Add forms from content palette error #1868

Merged
merged 6 commits into from
Feb 7, 2022
Merged

dotCMS/core#21552 Add forms from content palette error #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a859910
initial progress
hmoreras Feb 3, 2022
30014ad
cleanup
hmoreras Feb 3, 2022
78efa8e
test updates
hmoreras Feb 3, 2022
e90e677
test updates
hmoreras Feb 3, 2022
f9f0ccd
feedback
hmoreras Feb 4, 2022
fdf1479
rename functions
hmoreras Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 55 additions & 36 deletions apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ import { of as observableOf, of, throwError } from 'rxjs';
import { ActivatedRoute } from '@angular/router';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { By } from '@angular/platform-browser';
import { ComponentFixture, tick, fakeAsync, TestBed, discardPeriodicTasks, flush } from '@angular/core/testing';
import {
ComponentFixture,
tick,
fakeAsync,
TestBed,
discardPeriodicTasks,
flush
} from '@angular/core/testing';
import {
Component,
DebugElement,
Expand Down Expand Up @@ -382,15 +389,14 @@ describe('DotEditContentComponent', () => {
it('select > should add form', () => {
dotFormSelector.triggerEventHandler('select', {
baseType: 'string',
clazz: 'string'
clazz: 'string',
id: '123'
});
fixture.detectChanges();

expect<any>(dotEditContentHtmlService.renderAddedForm).toHaveBeenCalledWith({
baseType: 'string',
clazz: 'string'
});

expect<any>(dotEditContentHtmlService.renderAddedForm).toHaveBeenCalledWith(
'123'
);
expect(dotEditPageService.save).toHaveBeenCalledWith('123', [
{ identifier: '123', uuid: 'uui-1' }
]);
Expand Down Expand Up @@ -658,7 +664,9 @@ describe('DotEditContentComponent', () => {
jasmine.any(ElementRef)
);
expect(dotEditContentHtmlService.initEditMode).not.toHaveBeenCalled();
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(mockRenderedPageState.page);
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(
mockRenderedPageState.page
);
}));

it('should render in edit mode', fakeAsync(() => {
Expand All @@ -685,7 +693,9 @@ describe('DotEditContentComponent', () => {
jasmine.any(ElementRef)
);
expect(dotEditContentHtmlService.renderPage).not.toHaveBeenCalled();
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(state.page);
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(
state.page
);
}));

it('should show/hide content palette in edit mode with correct content', fakeAsync(() => {
Expand All @@ -710,21 +720,24 @@ describe('DotEditContentComponent', () => {
detectChangesForIframeRender(fixture);
fixture.detectChanges();
const contentPaletteWrapper = de.query(By.css('.dot-edit-content__palette'));
const contentPalette: DotPaletteComponent = de.query(
By.css('dot-palette')
).componentInstance;
const contentPalette: DotPaletteComponent = de.query(By.css('dot-palette'))
.componentInstance;
const paletteController = de.query(
By.css('.dot-edit-content__palette-visibility')
);
const classList = contentPaletteWrapper.nativeElement.classList;
expect(contentPalette.items).toEqual(responseData.slice(0, 3));
expect(parseInt(contentPalette.languageId)).toEqual(mockDotRenderedPage().page.languageId);
expect(parseInt(contentPalette.languageId)).toEqual(
mockDotRenderedPage().page.languageId
);
expect(classList.contains('editMode')).toEqual(true);
paletteController.triggerEventHandler('click', '');
fixture.detectChanges();
expect(classList.contains('collapsed')).toEqual(true);

expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(state.page);
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(
state.page
);
}));

it('should not display palette when is not enterprise', fakeAsync(() => {
Expand All @@ -750,7 +763,9 @@ describe('DotEditContentComponent', () => {
fixture.detectChanges();
const contentPaletteWrapper = de.query(By.css('.dot-edit-content__palette'));
expect(contentPaletteWrapper).toBeNull();
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(state.page);
expect(dotEditContentHtmlService.setCurrentPage).toHaveBeenCalledWith(
state.page
);
}));

it('should reload the page because of EMA', fakeAsync(() => {
Expand Down Expand Up @@ -784,7 +799,7 @@ describe('DotEditContentComponent', () => {
expect(dotPageStateService.reload).toHaveBeenCalledTimes(1);

flush();
}))
}));

it('should NOT reload the page', fakeAsync(() => {
spyOn(dotLicenseService, 'isEnterprise').and.returnValue(of(false));
Expand All @@ -795,7 +810,7 @@ describe('DotEditContentComponent', () => {
...mockDotRenderedPage(),
page: {
...mockDotRenderedPage().page,
lockedBy: null,
lockedBy: null
},
viewAs: {
mode: DotPageMode.EDIT,
Expand All @@ -820,7 +835,7 @@ describe('DotEditContentComponent', () => {
expect(dotPageStateService.reload).toHaveBeenCalledTimes(0);

flush();
}))
}));
});

describe('events', () => {
Expand All @@ -847,8 +862,6 @@ describe('DotEditContentComponent', () => {
expect(dotUiColorsService.setColors).toHaveBeenCalled();
}));



describe('custom', () => {
it('should handle remote-render-edit', fakeAsync(() => {
detectChangesForIframeRender(fixture);
Expand Down Expand Up @@ -1185,10 +1198,15 @@ describe('DotEditContentComponent', () => {
});

it('should display Form Selector when handle add content event of form Type', () => {

spyOn( dotEditContentHtmlService, 'setContainterToAppendContentlet' ).and.callFake(() => {});
spyOn( dotEditContentHtmlService, 'removeContentletPlaceholder' ).and.callFake(() => {});
spyOn( component, 'addFormContentType' ).and.callThrough();
spyOn(
dotEditContentHtmlService,
'setContainterToAppendContentlet'
).and.callFake(() => {});
spyOn(
dotEditContentHtmlService,
'removeContentletPlaceholder'
).and.callFake(() => {});
spyOn(component, 'addFormContentType').and.callThrough();

fixture.detectChanges();

Expand All @@ -1210,10 +1228,14 @@ describe('DotEditContentComponent', () => {
uuid: data.container.dotUuid
};

expect( dotEditContentHtmlService.setContainterToAppendContentlet ).toHaveBeenCalledWith(container);
expect( dotEditContentHtmlService.removeContentletPlaceholder ).toHaveBeenCalled();
expect( component.addFormContentType ).toHaveBeenCalled();
expect( component.editForm ).toBeTruthy();
expect(
dotEditContentHtmlService.setContainterToAppendContentlet
).toHaveBeenCalledWith(container);
expect(
dotEditContentHtmlService.removeContentletPlaceholder
).toHaveBeenCalled();
expect(component.addFormContentType).toHaveBeenCalled();
expect(component.editForm).toBeTruthy();
});

it('should handle remove event', (done) => {
Expand Down Expand Up @@ -1342,14 +1364,12 @@ describe('DotEditContentComponent', () => {
it('should save form', () => {
dotFormSelector.triggerEventHandler('select', {
baseType: 'string',
clazz: 'string'
clazz: 'string',
id: '123'
});
fixture.detectChanges();

expect<any>(dotEditContentHtmlService.renderAddedForm).toHaveBeenCalledWith({
baseType: 'string',
clazz: 'string'
});
expect<any>(dotEditContentHtmlService.renderAddedForm).toHaveBeenCalledWith('123');

expect<any>(dotEditPageService.save).toHaveBeenCalledWith('123', [
{ identifier: '123', uuid: 'uui-1', personaTag: 'SuperPersona' }
Expand Down Expand Up @@ -1426,9 +1446,8 @@ describe('DotEditContentComponent', () => {
detectChangesForIframeRender(fixture);
fixture.detectChanges();
const contentPaletteWrapper = de.query(By.css('.dot-edit-content__palette'));
const contentPalette: DotPaletteComponent = de.query(
By.css('dot-palette')
).componentInstance;
const contentPalette: DotPaletteComponent = de.query(By.css('dot-palette'))
.componentInstance;
expect(contentPalette.items).toEqual(responseData.slice(0, 5));
}));
});
Expand Down
2 changes: 1 addition & 1 deletion apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export class DotEditContentComponent implements OnInit, OnDestroy {
*/
onFormSelected(item: DotCMSContentType): void {
this.dotEditContentHtmlService
.renderAddedForm(item)
.renderAddedForm(item.id)
.subscribe((model: DotPageContainer[]) => {
if (model) {
this.saveToPage(model)
Expand Down
3 changes: 1 addition & 2 deletions .../src/app/portlets/dot-edit-page/content/services/dot-container-contentlet.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ describe('DotContainerContentletService', () => {
id: formId
};


dotContainerContentletService.getFormToContainer(pageContainer, form).subscribe();
dotContainerContentletService.getFormToContainer(pageContainer, form.id).subscribe();
httpMock.expectOne(`v1/containers/form/2?containerId=1`);
});

Expand Down
6 changes: 3 additions & 3 deletions ...ms-ui/src/app/portlets/dot-edit-page/content/services/dot-container-contentlet.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ export class DotContainerContentletService {
* Get the HTML of a form inside a container
*
* @param DotPageContainer container
* @param ContentType form
* @param string formId
* @returns Observable<string>
* @memberof DotContainerContentletService
*/
getFormToContainer(
container: DotPageContainer,
form: DotCMSContentType
formId: string
): Observable<{ render: string; content: any }> {
return this.coreWebService
.requestView({
url: `v1/containers/form/${form.id}?containerId=${container.identifier}`
url: `v1/containers/form/${formId}?containerId=${container.identifier}`
})
.pipe(pluck('entity'));
}
Expand Down
4 changes: 2 additions & 2 deletions ...ot-edit-page/content/services/dot-edit-content-html/dot-edit-content-html.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ xdescribe('DotEditContentHtmlService', () => {
})
);

service.renderAddedForm({ ...form, id: '4' }).subscribe((model) => {
service.renderAddedForm('4').subscribe((model) => {
expect(model).toEqual(
[
{
Expand Down Expand Up @@ -1265,7 +1265,7 @@ xdescribe('DotEditContentHtmlService', () => {
})
);

service.renderAddedForm(form).subscribe((model) => {
service.renderAddedForm(form.id).subscribe((model) => {
expect(model).toBeNull();
});

Expand Down
Loading