diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts b/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts index 24736a4f8..b4f95550e 100644 --- a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts +++ b/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts @@ -40,6 +40,7 @@ describe('FolderRuleSetsService', () => { let contentApiService: ContentApiService; let callApiSpy: jasmine.Spy; + let getRulesSpy: jasmine.Spy; let getNodeSpy: jasmine.Spy; beforeEach(() => { @@ -57,7 +58,7 @@ describe('FolderRuleSetsService', () => { .and.returnValue(of(getDefaultRuleSetResponseMock)) .withArgs(`/nodes/${owningFolderIdMock}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET') .and.returnValue(of(getRuleSetsResponseMock)); - spyOn(folderRulesService, 'getRules') + getRulesSpy = spyOn(folderRulesService, 'getRules') .withArgs(jasmine.anything(), 'rule-set-no-links') .and.returnValue(of({ rules: ownedRulesMock, hasMoreRules: false })) .withArgs(jasmine.anything(), 'rule-set-with-link') @@ -108,6 +109,7 @@ describe('FolderRuleSetsService', () => { 'GET' ); expect(ruleSets).toEqual([inheritedRuleSetMock]); + expect(getRulesSpy).toHaveBeenCalledWith(owningFolderIdMock, jasmine.anything()); expect(hasMoreRuleSets).toEqual(false); }); diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts b/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts index 7c6daacaa..df7b16ed9 100644 --- a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts +++ b/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts @@ -186,7 +186,7 @@ export class FolderRuleSetsService { } return combineLatest( 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( map(([owningFolderNodeInfo, getRulesRes]) => ({ id: entry.id,