From 60ba8eb6cebc48da85dd47a133c22bbf0982b3ac Mon Sep 17 00:00:00 2001 From: Nikita Maliarchuk <84377976+nikita-web-ua@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:07:21 +0100 Subject: [PATCH] [ACS-3895] ACA - Folder Rules: inherit rule sets toggle (#2808) * ACS-3895 - initial layout * ACS-3895 - finished functionality * ACS-3895 - unit tests * ACS-3895 - deleted comments * ACS-3895 - small fixes * ACS-3895 - renamed ruleSettings to ruleSettingsMock * ACS-3895 - rebase --- projects/aca-folder-rules/assets/i18n/en.json | 3 +- .../manage-rules.smart-component.html | 11 +++++ .../manage-rules.smart-component.scss | 13 +++++- .../manage-rules.smart-component.spec.ts | 41 ++++++++++++++++++- .../manage-rules.smart-component.ts | 15 +++++++ .../src/lib/mock/rules.mock.ts | 7 +++- .../src/lib/model/rule.model.ts | 5 +++ .../lib/services/folder-rule-sets.service.ts | 2 +- .../lib/services/folder-rules.service.spec.ts | 26 +++++++++++- .../src/lib/services/folder-rules.service.ts | 12 +++++- 10 files changed, 128 insertions(+), 7 deletions(-) diff --git a/projects/aca-folder-rules/assets/i18n/en.json b/projects/aca-folder-rules/assets/i18n/en.json index 18b93d403..e78462cf9 100644 --- a/projects/aca-folder-rules/assets/i18n/en.json +++ b/projects/aca-folder-rules/assets/i18n/en.json @@ -95,7 +95,8 @@ "CREATE_RULE": "Create rule", "LINK_RULES": "Link rules", "EDIT_RULE": "Edit", - "SEE_IN_FOLDER": "See in folder" + "SEE_IN_FOLDER": "See in folder", + "INHERIT_RULES": "Inherit rules" } }, "EMPTY_RULES_LIST": { diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html index 9c8607b62..83ea528e3 100644 --- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html +++ b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html @@ -26,6 +26,17 @@ class="aca-manage-rules__actions-bar__title__breadcrumb"> + + {{ 'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.ACTIONS.INHERIT_RULES' | translate }} + + + +