inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[REPO-5552] more filtering capabilities for aspect/type api (#6713)

Browse Source 
* [REPO-5552] more filtering capabilities for aspect/type api

* * fix BC
This commit is contained in:
dhrn
2021-02-26 03:20:14 +05:30
committed by GitHub
parent 42a5102e66
commit c932cb0964
4 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/content-services/src/lib/aspect-list/aspect-list.service.ts
View File

@@ -45,27 +45,35 @@ export class AspectListService {
} }
getStandardAspects(whiteList: string[]): Observable<AspectEntry[]> { getStandardAspects(whiteList: string[]): Observable<AspectEntry[]> {
const where = `(modelIds in ('cm:contentmodel', 'emailserver:emailserverModel', 'smf:smartFolder', 'app:applicationmodel' ))`; const where = `(modelId in ('cm:contentmodel', 'emailserver:emailserverModel', 'smf:smartFolder', 'app:applicationmodel' ))`;
return from(this.alfrescoApiService.aspectsApi.listAspects({where})) const opts: any = {
.pipe( where,
map((result: AspectPaging) => this.filterAspectByConfig(whiteList, result?.list?.entries)), include: ['properties']
catchError((error) => { };
this.logService.error(error); return from(this.alfrescoApiService.aspectsApi.listAspects(opts))
return of([]); .pipe(
}) map((result: AspectPaging) => this.filterAspectByConfig(whiteList, result?.list?.entries)),
); catchError((error) => {
this.logService.error(error);
return of([]);
})
);
} }
getCustomAspects(): Observable<AspectEntry[]> { getCustomAspects(): Observable<AspectEntry[]> {
const where = `(not namespaceUri matches('http://www.alfresco.*'))`; const where = `(not namespaceUri matches('http://www.alfresco.*'))`;
return from(this.alfrescoApiService.aspectsApi.listAspects({where})) const opts: any = {
.pipe( where,
map((result: AspectPaging) => result?.list?.entries), include: ['properties']
catchError((error) => { };
this.logService.error(error); return from(this.alfrescoApiService.aspectsApi.listAspects(opts))
return of([]); .pipe(
}) map((result: AspectPaging) => result?.list?.entries),
); catchError((error) => {
this.logService.error(error);
return of([]);
})
);
} }
private filterAspectByConfig(visibleAspectList: string[], aspectEntries: AspectEntry[]): AspectEntry[] { private filterAspectByConfig(visibleAspectList: string[], aspectEntries: AspectEntry[]): AspectEntry[] {

4
lib/content-services/src/lib/content-metadata/services/content-type-property.service.ts
View File

@@ -38,7 +38,7 @@ export class ContentTypePropertiesService {
pipe( pipe(
map((contentType) => { map((contentType) => {
const contentTypesOptions$ = this.getContentTypesAsSelectOption(contentType); const contentTypesOptions$ = this.getContentTypesAsSelectOption(contentType);
const contentTypeCard = this.buildContentTypeSelectCardModel(contentType.entry.id, contentTypesOptions$); const contentTypeCard = this.buildContentTypeSelectCardModel(contentType.entry.id, contentTypesOptions$);
return [contentTypeCard]; return [contentTypeCard];
})); }));
} }
@@ -61,7 +61,7 @@ export class ContentTypePropertiesService {
distinctUntilChanged(), distinctUntilChanged(),
map(([contentTypesEntries, currentContentType]) => { map(([contentTypesEntries, currentContentType]) => {
const updatedTypes = this.appendCurrentType(currentContentType, contentTypesEntries); const updatedTypes = this.appendCurrentType(currentContentType, contentTypesEntries);
return updatedTypes.map((contentType) => <CardViewSelectItemOption<string>> { key: contentType.entry.id, label: contentType.entry.title ?? contentType.entry.id}); return updatedTypes.map((contentType) => <CardViewSelectItemOption<string>> { key: contentType.entry.id, label: contentType.entry.title ?? contentType.entry.id });
})); }));
} }

5
lib/content-services/src/lib/content-type/content-type.service.spec.ts
View File

@@ -58,7 +58,10 @@ describe('ContentTypeService', () => {
expect(results).not.toBeNull(); expect(results).not.toBeNull();
expect(results.length).toBe(1); expect(results.length).toBe(1);
expect(results[0].entry.id).toBe('fake-type-id'); expect(results[0].entry.id).toBe('fake-type-id');
expect(mockTypesApi.listTypes).toHaveBeenCalledWith({ where: '(parentIds in (\'whatever-whenever\') and not namespaceUri matches(\'http://www.alfresco.org/model.*\'))' }); expect(mockTypesApi.listTypes).toHaveBeenCalledWith({
where: '(parentId in (\'whatever-whenever\') and not namespaceUri matches(\'http://www.alfresco.*\'))',
include: [ 'properties']
});
done(); done();
}); });
}); });

6
lib/content-services/src/lib/content-type/content-type.service.ts
View File

@@ -33,7 +33,11 @@ export class ContentTypeService {
} }
getContentTypeChildren(nodeType: string): Observable<TypeEntry[]> { getContentTypeChildren(nodeType: string): Observable<TypeEntry[]> {
const opts = {where : `(parentIds in ('${nodeType}') and not namespaceUri matches('http://www.alfresco.org/model.*'))`}; const where = `(parentId in ('${nodeType}') and not namespaceUri matches('http://www.alfresco.*'))`;
const opts: any = {
where,
include: ['properties']
};
return from(this.alfrescoApiService.typesApi.listTypes(opts)).pipe( return from(this.alfrescoApiService.typesApi.listTypes(opts)).pipe(
map((result: TypePaging) => result.list.entries) map((result: TypePaging) => result.list.entries)
); );