Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dotCMS/core#25901 Unable to reuse content inside the variants #26450

Merged
merged 3 commits into from Oct 20, 2023
Merged

dotCMS/core#25901 Unable to reuse content inside the variants #26450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a72c2
refresh the content palette when the languge change
hmoreras Oct 17, 2023
06c19e2
make a couple of less state updates
hmoreras Oct 19, 2023
e552ca3
clean up
hmoreras Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...ms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette.component.spec.ts
View file
Open in desktop
Expand Up @@ -234,4 +234,15 @@ describe('DotPaletteComponent', () => {

expect(store.setAllowedContent).toHaveBeenCalledWith(allowedContent);
});

it('should change view and load data when the lang change.', async () => {
comp.languageId = '2';

fixture.detectChanges();
await fixture.whenStable();

expect(store.setLanguageId).toHaveBeenCalledWith('2');
expect(store.switchView).toHaveBeenCalled();
expect(store.getContenttypesData).toHaveBeenCalled();
});
});
15 changes: 7 additions & 8 deletions .../dotcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette.component.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { Observable } from 'rxjs';

import { animate, AnimationEvent, state, style, transition, trigger } from '@angular/animations';
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { Component, Input, ViewChild } from '@angular/core';

import { LazyLoadEvent } from 'primeng/api';

Expand Down Expand Up @@ -32,23 +32,22 @@ import { DotPaletteState, DotPaletteStore } from './store/dot-palette.store';
])
]
})
export class DotPaletteComponent implements OnInit {
export class DotPaletteComponent {
@Input() set allowedContent(items: string[]) {
this.store.setAllowedContent(items);
}
@Input() languageId: string;
@Input() set languageId(languageId: string) {
this.store.setLanguageId(languageId);
this.store.switchView();
this.store.getContenttypesData();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can unify this in one updater because here you are updating the state 3 times and triggering changes 3 times.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch thanks. done, at least a couple less.

}
vm$: Observable<DotPaletteState> = this.store.vm$;

@ViewChild('contentlets') contentlets: DotPaletteContentletsComponent;
@ViewChild('contentTypes') contentTypes: DotPaletteContentTypeComponent;

constructor(private store: DotPaletteStore) {}

ngOnInit(): void {
this.store.setLanguageId(this.languageId);
this.store.getContenttypesData();
}

/**
* Sets value on store to show/hide components on the UI
*
Expand Down