Rollback visibility rules cleanup (#4426)

* Revert "[ACS-9369] Updated rule-migration-guide.md to include missed rule (#4420)"

This reverts commit b3e2af7f0f.

* Revert "[ACS-9369] Resolved issues where visibility rules with a single element array would log errors (#4416)"

This reverts commit 4e33f1126d.

* Revert "[ACS-8694] Cleanup of visibility rules for extensions in ACA (#4140)"

This reverts commit f1c4dcf45d.
This commit is contained in:
swapnil-verma-gl
2025-03-03 16:56:13 +05:30
committed by GitHub
parent 4e37f194ac
commit 2efea8c6d8
18 changed files with 1130 additions and 930 deletions

View File

@@ -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();
});

View File

@@ -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;