inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4627] Folder Rules - clicking on Manage Rules button does not fire the correct requests to the backend for inherited rules (#2822)

Browse Source 
* ACA-4627 - changed from parent id to the current folder id

* ACA-4627 - unit test
This commit is contained in:
Nikita Maliarchuk 2022-11-30 21:18:08 +01:00 committed by GitHub
parent bfe14f8143
commit 5d330d3e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts
View File

@ -40,6 +40,7 @@ describe('FolderRuleSetsService', () => {
let contentApiService: ContentApiService; let contentApiService: ContentApiService;
let callApiSpy: jasmine.Spy; let callApiSpy: jasmine.Spy;
let getRulesSpy: jasmine.Spy;
let getNodeSpy: jasmine.Spy; let getNodeSpy: jasmine.Spy;
beforeEach(() => { beforeEach(() => {
@ -57,7 +58,7 @@ describe('FolderRuleSetsService', () => {
.and.returnValue(of(getDefaultRuleSetResponseMock)) .and.returnValue(of(getDefaultRuleSetResponseMock))
.withArgs(`/nodes/${owningFolderIdMock}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET') .withArgs(`/nodes/${owningFolderIdMock}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET')
.and.returnValue(of(getRuleSetsResponseMock)); .and.returnValue(of(getRuleSetsResponseMock));
spyOn<any>(folderRulesService, 'getRules') getRulesSpy = spyOn<any>(folderRulesService, 'getRules')
.withArgs(jasmine.anything(), 'rule-set-no-links') .withArgs(jasmine.anything(), 'rule-set-no-links')
.and.returnValue(of({ rules: ownedRulesMock, hasMoreRules: false })) .and.returnValue(of({ rules: ownedRulesMock, hasMoreRules: false }))
.withArgs(jasmine.anything(), 'rule-set-with-link') .withArgs(jasmine.anything(), 'rule-set-with-link')
@ -108,6 +109,7 @@ describe('FolderRuleSetsService', () => {
'GET' 'GET'
); );
expect(ruleSets).toEqual([inheritedRuleSetMock]); expect(ruleSets).toEqual([inheritedRuleSetMock]);
expect(getRulesSpy).toHaveBeenCalledWith(owningFolderIdMock, jasmine.anything());
expect(hasMoreRuleSets).toEqual(false); expect(hasMoreRuleSets).toEqual(false);
}); });

2
projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts
View File

@ -186,7 +186,7 @@ export class FolderRuleSetsService {
} }
return combineLatest( return combineLatest(
this.currentFolder?.id === entry.owningFolder ? of(this.currentFolder) : this.getNodeInfo(entry.owningFolder || ''), this.currentFolder?.id === entry.owningFolder ? of(this.currentFolder) : this.getNodeInfo(entry.owningFolder || ''),
this.folderRulesService.getRules(entry.owningFolder || '', entry.id) this.folderRulesService.getRules(this.currentFolder.id || '', entry.id)
).pipe( ).pipe(
map(([owningFolderNodeInfo, getRulesRes]) => ({ map(([owningFolderNodeInfo, getRulesRes]) => ({
id: entry.id, id: entry.id,