mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-05-19 17:14:45 +00:00
MNT-21595- Fetch all the groups (#1527)
* Fix constructor * Use latest of ADF * Call the groupService to fetch all
This commit is contained in:
parent
b0a4ec3841
commit
cd3e0012ff
3577
package-lock.json
generated
3577
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@ -32,10 +32,10 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@alfresco/adf-content-services": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
|
||||
"@alfresco/adf-core": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
|
||||
"@alfresco/adf-extensions": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011",
|
||||
"@alfresco/js-api": "3.10.0-1deb4e85760f96f550a7d6d894e4002ecd4a4c18",
|
||||
"@alfresco/adf-content-services": "3.10.0-44c5472fa25d6c22226c8a86a332c3ea5bcfa359",
|
||||
"@alfresco/adf-core": "3.10.0-44c5472fa25d6c22226c8a86a332c3ea5bcfa359",
|
||||
"@alfresco/adf-extensions": "3.10.0-44c5472fa25d6c22226c8a86a332c3ea5bcfa359",
|
||||
"@alfresco/js-api": "3.10.0-c1ad5d79a257f31a52ffd327022458da7926c211",
|
||||
"@angular-custom-builders/lite-serve": "0.2.2",
|
||||
"@angular/animations": "10.0.4",
|
||||
"@angular/cdk": "^10.0.2",
|
||||
@ -66,8 +66,8 @@
|
||||
"zone.js": "~0.10.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@alfresco/adf-cli": "3.10.0-270020f56129a0dab3b9461df1e1f01dde75760f",
|
||||
"@alfresco/adf-testing": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9",
|
||||
"@alfresco/adf-cli": "3.10.0-44c5472fa25d6c22226c8a86a332c3ea5bcfa359",
|
||||
"@alfresco/adf-testing": "3.10.0-44c5472fa25d6c22226c8a86a332c3ea5bcfa359",
|
||||
"@angular-devkit/build-angular": "~0.1000.3",
|
||||
"@angular-devkit/build-ng-packagr": "~0.1000.3",
|
||||
"@angular/cli": "^10.0.3",
|
||||
|
@ -60,7 +60,7 @@ describe('AppComponent', () => {
|
||||
|
||||
router = TestBed.inject(Router);
|
||||
|
||||
component = new AppComponent(null, router, null, storeMock, configMock, null, null, null, null, null, null, null, storageMock);
|
||||
component = new AppComponent(null, router, null, storeMock, configMock, null, null, null, null, null, null, null, storageMock, null);
|
||||
|
||||
storeMock.dispatch = jasmine.createSpy('dispatch');
|
||||
});
|
||||
|
@ -33,6 +33,7 @@ import {
|
||||
SharedLinksApiService,
|
||||
StorageService
|
||||
} from '@alfresco/adf-core';
|
||||
import { GroupService } from '@alfresco/adf-content-services';
|
||||
import { Component, OnInit, OnDestroy } from '@angular/core';
|
||||
import { ActivatedRoute, Router, ActivationEnd } from '@angular/router';
|
||||
import { Store } from '@ngrx/store';
|
||||
@ -48,7 +49,7 @@ import {
|
||||
} from '@alfresco/aca-shared/store';
|
||||
import { filter, takeUntil } from 'rxjs/operators';
|
||||
import { AppExtensionService, AppService, ContentApiService, ExtensionRoute } from '@alfresco/aca-shared';
|
||||
import { DiscoveryEntry, GroupsApi, Group } from '@alfresco/js-api';
|
||||
import { DiscoveryEntry, GroupEntry, Group } from '@alfresco/js-api';
|
||||
import { Subject } from 'rxjs';
|
||||
import { INITIAL_APP_STATE } from './store/initial-state';
|
||||
|
||||
@ -74,7 +75,8 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||
private contentApi: ContentApiService,
|
||||
private appService: AppService,
|
||||
private sharedLinksApiService: SharedLinksApiService,
|
||||
private storage: StorageService
|
||||
private storage: StorageService,
|
||||
private groupService: GroupService
|
||||
) {}
|
||||
|
||||
ngOnInit() {
|
||||
@ -163,12 +165,12 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
private async loadUserProfile() {
|
||||
const groupsApi = new GroupsApi(this.alfrescoApiService.getInstance());
|
||||
const paging = await groupsApi.listGroupMembershipsForPerson('-me-');
|
||||
const groupsEntries: GroupEntry[] = await this.groupService.listAllGroupMembershipsForPerson('-me-', { maxItems: 250 });
|
||||
|
||||
const groups: Group[] = [];
|
||||
|
||||
if (paging && paging.list && paging.list.entries) {
|
||||
groups.push(...paging.list.entries.map((obj) => obj.entry));
|
||||
if (groupsEntries) {
|
||||
groups.push(...groupsEntries.map((obj) => obj.entry));
|
||||
}
|
||||
|
||||
this.contentApi.getPerson('-me-').subscribe((person) => {
|
||||
|
Loading…
x
Reference in New Issue
Block a user