mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-24 17:31:52 +00:00
Rollback visibility rules cleanup (#4426)
* Revert "[ACS-9369] Updated rule-migration-guide.md to include missed rule (#4420)" This reverts commitb3e2af7f0f
. * Revert "[ACS-9369] Resolved issues where visibility rules with a single element array would log errors (#4416)" This reverts commit4e33f1126d
. * Revert "[ACS-8694] Cleanup of visibility rules for extensions in ACA (#4140)" This reverts commitf1c4dcf45d
.
This commit is contained in:
@@ -1087,16 +1087,6 @@ describe('AppExtensionService', () => {
|
||||
expect(service.evaluateRule('rule1')).toBeTrue();
|
||||
});
|
||||
|
||||
it('should evaluate list of rules', () => {
|
||||
extensions.setEvaluators({
|
||||
rule1: () => true,
|
||||
rule2: () => true,
|
||||
rule3: () => true
|
||||
});
|
||||
|
||||
expect(service.evaluateRule(['rule1', 'rule2', 'rule3'])).toBeTrue();
|
||||
});
|
||||
|
||||
it('should not evaluate missing rule and return [false] by default', () => {
|
||||
expect(service.evaluateRule('missing')).toBeFalse();
|
||||
});
|
||||
|
@@ -532,18 +532,11 @@ export class AppExtensionService implements RuleContext {
|
||||
}
|
||||
|
||||
// todo: move to ADF/RuleService
|
||||
evaluateRule(ruleId: string | string[], ...args: any[]): boolean {
|
||||
let evaluatorList: RuleEvaluator[] = [];
|
||||
if (Array.isArray(ruleId)) {
|
||||
evaluatorList = ruleId.filter((rule) => !!this.getEvaluator(rule)).map((rule) => this.getEvaluator(rule));
|
||||
} else {
|
||||
const evaluator = this.getEvaluator(ruleId);
|
||||
if (evaluator) {
|
||||
evaluatorList.push(evaluator);
|
||||
}
|
||||
}
|
||||
if (evaluatorList?.length > 0) {
|
||||
return evaluatorList.every((evaluator) => evaluator(this, ...args));
|
||||
evaluateRule(ruleId: string, ...args: any[]): boolean {
|
||||
const evaluator = this.getEvaluator(ruleId);
|
||||
|
||||
if (evaluator) {
|
||||
return evaluator(this, ...args);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user