inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5563] Fixed incorrect initial loading of security marks (#3405)

Browse Source 
* [ACS-5563] fixed incorrect initial loading of security marks

* [ACS-5563] added DoneFn
This commit is contained in:
Mykyta Maliarchuk
2023-09-01 16:44:24 +02:00
committed by GitHub
parent e2ddd81cbc
commit deba28c8e0
4 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
projects/aca-shared/src/lib/services/app.extension.service.spec.ts
View File

@@ -174,7 +174,7 @@ describe('AppExtensionService', () => {
});
});
it('should support column orders', () => {
it('should support column orders', (done) => {
applyConfig({
$id: 'test',
$name: 'test',
@@ -228,19 +228,23 @@ describe('AppExtensionService', () => {
}
});
const { files, libraries } = service.documentListPresets;
const { libraries } = service.documentListPresets;
const files = service.filesDocumentListPreset$;
expect(files.length).toBe(3);
expect(files[0].id).toBe('app.files.thumbnail');
expect(files[1].id).toBe('app.files.name');
expect(files[2].id).toBe('app.files.securityMarks');
files.subscribe((columns) => {
expect(columns.length).toBe(3);
expect(columns[0].id).toBe('app.files.thumbnail');
expect(columns[1].id).toBe('app.files.name');
expect(columns[2].id).toBe('app.files.securityMarks');
done();
});
expect(libraries.length).toBe(2);
expect(libraries[0].id).toBe('app.libraries.name');
expect(libraries[1].id).toBe('app.libraries.thumbnail');
});
it('should ignore column if visibility in rules is false', () => {
it('should ignore column if visibility in rules is false', (done) => {
applyConfig({
$id: 'test',
$name: 'test',
@@ -279,11 +283,14 @@ describe('AppExtensionService', () => {
}
});
const { files } = service.documentListPresets;
const files = service.filesDocumentListPreset$;
expect(files.length).toBe(2);
expect(files[0].id).toBe('app.files.thumbnail');
expect(files[1].id).toBe('app.files.name');
files.subscribe((columns) => {
expect(columns.length).toBe(2);
expect(columns[0].id).toBe('app.files.thumbnail');
expect(columns[1].id).toBe('app.files.name');
done();
});
});
});

6
projects/aca-shared/src/lib/services/app.extension.service.ts
View File

@@ -80,9 +80,9 @@ export class AppExtensionService implements RuleContext {
private _createActions = new BehaviorSubject<Array<ContentActionRef>>([]);
private _mainActions = new BehaviorSubject<ContentActionRef>(null);
private _sidebarActions = new BehaviorSubject<Array<ContentActionRef>>([]);
private _filesDocumentListPreset = new BehaviorSubject<Array<DocumentListPresetRef>>([]);
documentListPresets: {
files: Array<DocumentListPresetRef>;
libraries: Array<DocumentListPresetRef>;
favoriteLibraries: Array<DocumentListPresetRef>;
shared: Array<DocumentListPresetRef>;
@@ -91,7 +91,6 @@ export class AppExtensionService implements RuleContext {
trashcan: Array<DocumentListPresetRef>;
searchLibraries: Array<DocumentListPresetRef>;
} = {
files: [],
libraries: [],
favoriteLibraries: [],
shared: [],
@@ -108,6 +107,7 @@ export class AppExtensionService implements RuleContext {
withCredentials: boolean;
references$: Observable<ExtensionRef[]>;
filesDocumentListPreset$: Observable<DocumentListPresetRef[]> = this._filesDocumentListPreset.asObservable();
config: ExtensionConfig;
@@ -158,6 +158,7 @@ export class AppExtensionService implements RuleContext {
this._openWithActions.next(this.loader.getContentActions(config, 'features.viewer.openWith'));
this._createActions.next(this.loader.getElements<ContentActionRef>(config, 'features.create'));
this._mainActions.next(this.loader.getFeatures(config).mainAction);
this._filesDocumentListPreset.next(this.getDocumentListPreset(config, 'files'));
this.navbar = this.loadNavBar(config);
this.sidebarTabs = this.loader.getElements<SidebarTabRef>(config, 'features.sidebar.tabs');
@@ -165,7 +166,6 @@ export class AppExtensionService implements RuleContext {
this.search = this.loadSearchForms(config);
this.documentListPresets = {
files: this.getDocumentListPreset(config, 'files'),
libraries: this.getDocumentListPreset(config, 'libraries'),
favoriteLibraries: this.getDocumentListPreset(config, 'favoriteLibraries'),
shared: this.getDocumentListPreset(config, 'shared'),