From 38842d83c4aa7f6c7650752414317af770b71dec Mon Sep 17 00:00:00 2001 From: Nizamudeen Date: Tue, 14 Apr 2020 12:23:09 +0530 Subject: [PATCH] mgr/dashboard: Custom Directive for verifying if user is read_only This commit introduces two new Custom Directives: `FormInputDisableDirective` and `FormScopeDirective`. By using the `cdFormScope` attribute of the directive we can customize the behaviour of the modal components. Fixes: https://tracker.ceph.com/issues/43527 Signed-off-by: Nizamudeen (cherry picked from commit f6e1ed657125e0f394e80da5dfeb51617304d091) Conflicts: src/pybind/mgr/dashboard/frontend/src/app/shared/directives/directives.module.ts - Import the FormInputDisableDirective and FormScopeDirective to the directive.module imports and exports src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts - Changed TestBed.inject(...) to TestBed.get(...) to match the syntax for the nautilus TS version src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts - Changed some of the operators to match the nautilus TS version --- .../osd-flags-modal.component.html | 3 +- .../osd-pg-scrub-modal.component.html | 3 +- .../osd-recv-speed-modal.component.html | 3 +- .../shared/directives/directives.module.ts | 13 +++- .../form-input-disable.directive.spec.ts | 75 +++++++++++++++++++ .../form-input-disable.directive.ts | 30 ++++++++ .../directives/form-scope.directive.spec.ts | 8 ++ .../shared/directives/form-scope.directive.ts | 8 ++ 8 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts create mode 100644 src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts create mode 100644 src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-scope.directive.spec.ts create mode 100644 src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-scope.directive.ts diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html index 13ed7dfea7796..3128f8201ce9f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.html @@ -6,7 +6,8 @@
+ novalidate + cdFormScope="osd">