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

[ACS-8914] Fix error on manage rules page open (#4228)

Browse Source 
* [ACS-8914] fix error on manage rules page open

* [ACS-8914] sonar issue
This commit is contained in:
Mykyta Maliarchuk 2024-11-07 10:09:47 +01:00 committed by GitHub
parent 8d78a408b1
commit df6fdb38b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,12 @@ describe('FolderRuleSetsService', () => {
.and.returnValue(of(getOtherFolderEntryMock)); .and.returnValue(of(getOtherFolderEntryMock));
}); });
it('should have an initial value of null for selectedRuleSet$', async () => {
const selectedRuleSetPromise = folderRuleSetsService.selectedRuleSet$.pipe(take(1)).toPromise();
const selectedRuleSet = await selectedRuleSetPromise;
expect(selectedRuleSet).toBeNull();
});
it(`should load node info when loading the node's rule sets`, async () => { it(`should load node info when loading the node's rule sets`, async () => {
// take(2), because: 1 = init of the BehaviourSubject, 2 = in subscribe // take(2), because: 1 = init of the BehaviourSubject, 2 = in subscribe
const folderInfoPromise = folderRuleSetsService.folderInfo$.pipe(take(2)).toPromise(); const folderInfoPromise = folderRuleSetsService.folderInfo$.pipe(take(2)).toPromise();

34
projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
View File

@ -24,7 +24,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AlfrescoApiService } from '@alfresco/adf-content-services'; import { AlfrescoApiService } from '@alfresco/adf-content-services';
import { BehaviorSubject, combineLatest, from, Observable, of } from 'rxjs'; import { BehaviorSubject, combineLatest, from, Observable, of, startWith } from 'rxjs';
import { NodeInfo } from '@alfresco/aca-shared/store'; import { NodeInfo } from '@alfresco/aca-shared/store';
import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators'; import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators';
import { RuleSet } from '../model/rule-set.model'; import { RuleSet } from '../model/rule-set.model';
@ -68,20 +68,26 @@ export class FolderRuleSetsService {
hasMoreRuleSets$: Observable<boolean> = this.hasMoreRuleSetsSource.asObservable(); hasMoreRuleSets$: Observable<boolean> = this.hasMoreRuleSetsSource.asObservable();
folderInfo$: Observable<NodeInfo> = this.folderInfoSource.asObservable(); folderInfo$: Observable<NodeInfo> = this.folderInfoSource.asObservable();
isLoading$: Observable<boolean> = this.isLoadingSource.asObservable(); isLoading$: Observable<boolean> = this.isLoadingSource.asObservable();
selectedRuleSet$: Observable<RuleSet>;
selectedRuleSet$ = this.folderRulesService.selectedRule$.pipe( constructor(
map((rule: Rule) => { private readonly apiService: AlfrescoApiService,
if (rule === null) { private readonly contentApi: ContentApiService,
return null; private readonly folderRulesService: FolderRulesService
} ) {
if (this.mainRuleSet?.rules.findIndex((r: Rule) => r.id === rule.id) > -1) { this.selectedRuleSet$ = this.folderRulesService.selectedRule$.pipe(
return this.mainRuleSet; startWith(null),
} map((rule: Rule) => {
return this.inheritedRuleSets.find((ruleSet: RuleSet) => ruleSet.rules.findIndex((r: Rule) => r.id === rule.id) > -1) ?? null; if (rule === null) {
}) return null;
); }
if (this.mainRuleSet?.rules.findIndex((r: Rule) => r.id === rule.id) > -1) {
constructor(private apiService: AlfrescoApiService, private contentApi: ContentApiService, private folderRulesService: FolderRulesService) {} return this.mainRuleSet;
}
return this.inheritedRuleSets.find((ruleSet: RuleSet) => ruleSet.rules.findIndex((r: Rule) => r.id === rule.id) > -1) ?? null;
})
);
}
private callApi(path: string, httpMethod: string, body: object = {}): Promise<any> { private callApi(path: string, httpMethod: string, body: object = {}): Promise<any> {
// APIs used by this service are still private and not yet available for public use // APIs used by this service are still private and not yet available for public use