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

[ACA-4361] should be able to change permission if search service is down (#6948)

Browse Source 
* should be able to change permission if search service is down

* Update node-permission.service.ts

* Update node-permission.service.spec.ts

* Update node-permission.service.spec.ts
This commit is contained in:
Dharan
2021-04-26 22:14:11 +05:30
committed by GitHub
parent 504c0b825a
commit 534c013754
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts
View File

@@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing';
import { NodePermissionService } from './node-permission.service'; import { NodePermissionService } from './node-permission.service';
import { SearchService, NodesApiService, setupTestBed } from '@alfresco/adf-core'; import { SearchService, NodesApiService, setupTestBed } from '@alfresco/adf-core';
import { Node, PermissionElement } from '@alfresco/js-api'; import { Node, PermissionElement } from '@alfresco/js-api';
import { of } from 'rxjs'; import { of, throwError } from 'rxjs';
import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse, import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse,
fakeNodeToRemovePermission, fakeNodeWithoutPermissions } from '../../mock/permission-list.component.mock'; fakeNodeToRemovePermission, fakeNodeWithoutPermissions } from '../../mock/permission-list.component.mock';
import { fakeAuthorityResults } from '../../mock/add-permission.component.mock'; import { fakeAuthorityResults } from '../../mock/add-permission.component.mock';
@@ -232,4 +232,15 @@ describe('NodePermissionService', () => {
expect(roles[0].role).toBe('SiteCollaborator'); expect(roles[0].role).toBe('SiteCollaborator');
}); });
})); }));
it('should provide node and default role if search API failed', async(() => {
const fakeNodeCopy = JSON.parse(JSON.stringify(fakeNodeWithOnlyLocally));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeCopy));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(throwError('search service down'));
service.getNodeWithRoles('node-id').subscribe(({ node, roles }) => {
expect(node).toBe(fakeNodeCopy);
expect(roles.length).toBe(5);
expect(roles[0].role).toBe('Contributor');
});
}));
}); });

3
lib/content-services/src/lib/permission-manager/services/node-permission.service.ts
View File

@@ -19,7 +19,7 @@ import { AlfrescoApiService, NodesApiService, SearchService, TranslationService
import { Group, GroupMemberEntry, GroupMemberPaging, Node, PathElement, PermissionElement, Person, QueryBody } from '@alfresco/js-api'; import { Group, GroupMemberEntry, GroupMemberPaging, Node, PathElement, PermissionElement, Person, QueryBody } from '@alfresco/js-api';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { forkJoin, from, Observable, of, throwError } from 'rxjs'; import { forkJoin, from, Observable, of, throwError } from 'rxjs';
import { map, switchMap } from 'rxjs/operators'; import { catchError, map, switchMap } from 'rxjs/operators';
import { PermissionDisplayModel } from '../models/permission.model'; import { PermissionDisplayModel } from '../models/permission.model';
import { RoleModel } from '../models/role.model'; import { RoleModel } from '../models/role.model';
@@ -278,6 +278,7 @@ export class NodePermissionService {
node: of(node), node: of(node),
roles: this.getNodeRoles(node) roles: this.getNodeRoles(node)
.pipe( .pipe(
catchError(() => of(node.permissions?.settable)),
map(_roles => _roles.map(role => ({ role, label: role })) map(_roles => _roles.map(role => ({ role, label: role }))
) )
) )