From c8ad8bf8434b7b1c67e8bb5d5ff5c3e6ce765032 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Thu, 20 Oct 2022 21:31:34 +0530 Subject: [PATCH] mgr/dashboard: rgw encryption modal and host component cleanup along with some additional cleanups Signed-off-by: Nizamudeen A (cherry picked from commit c31f699bd78d54b8cdab52e78bec3044c99ce4d7) --- .../ceph/cluster/hosts/hosts.component.html | 3 +- .../app/ceph/cluster/hosts/hosts.component.ts | 4 +- .../rgw-bucket-form.component.ts | 2 +- .../rgw-config-modal.component.html | 48 ++++++++++--------- .../rgw-config-modal.component.ts | 2 +- .../directives/form-loading.directive.ts | 18 +++---- .../src/styles/bootstrap-extends.scss | 1 - .../src/styles/ceph-custom/_buttons.scss | 8 +--- .../src/styles/ceph-custom/_forms.scss | 2 +- 9 files changed, 39 insertions(+), 49 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html index aef7697da2f20..160962d666f52 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html @@ -54,8 +54,7 @@ - {{ instance }} -   + {{ instance }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts index 73459a364d50e..9d5e67a897dd3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts @@ -199,7 +199,7 @@ export class HostsComponent extends ListWithDetails implements OnDestroy, OnInit { name: $localize`Service Instances`, prop: 'service_instances', - flexGrow: 1, + flexGrow: 1.5, cellTemplate: this.servicesTpl }, { @@ -214,7 +214,7 @@ export class HostsComponent extends ListWithDetails implements OnDestroy, OnInit { name: $localize`Status`, prop: 'status', - flexGrow: 1, + flexGrow: 0.8, cellTransformation: CellTemplate.badge, customTemplateConfig: { map: { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts index aecb76925ccf5..91449c7d3d888 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts @@ -332,7 +332,7 @@ export class RgwBucketFormComponent extends CdForm implements OnInit, AfterViewC } openConfigModal() { - const modalRef = this.modalService.show(RgwConfigModalComponent); + const modalRef = this.modalService.show(RgwConfigModalComponent, null, { size: 'lg' }); modalRef.componentInstance.configForm .get('encryptionType') .setValue(this.bucketForm.getValue('encryption_type')); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html index 50d1a6e9e5d8a..5ad6520e26c75 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html @@ -7,29 +7,33 @@ #frm="ngForm" [formGroup]="configForm">
- -
- - -
+
+ +
+ + +
-
- - +
+ + +
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts index bc181a7605d59..de1541a680fe0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts @@ -64,7 +64,7 @@ export class RgwConfigModalComponent implements OnInit { ] ], kms_provider: ['vault', Validators.required], - encryptionType: [null, Validators.required], + encryptionType: ['aws:kms', Validators.required], auth_method: [null, Validators.required], secret_engine: [null, Validators.required], secret_path: ['/'], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.ts index 47decd6a99b03..73b4dcb9c57f2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.ts @@ -1,9 +1,4 @@ -import { - Directive, - Input, - TemplateRef, - ViewContainerRef -} from '@angular/core'; +import { Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core'; import { AlertPanelComponent } from '../components/alert-panel/alert-panel.component'; import { LoadingPanelComponent } from '../components/loading-panel/loading-panel.component'; @@ -13,10 +8,7 @@ import { LoadingStatus } from '../forms/cd-form'; selector: '[cdFormLoading]' }) export class FormLoadingDirective { - constructor( - private templateRef: TemplateRef, - private viewContainer: ViewContainerRef - ) {} + constructor(private templateRef: TemplateRef, private viewContainer: ViewContainerRef) {} @Input('cdFormLoading') set cdFormLoading(condition: LoadingStatus) { let content: any; @@ -26,14 +18,16 @@ export class FormLoadingDirective { switch (condition) { case LoadingStatus.Loading: content = this.resolveNgContent($localize`Loading form data...`); - this.viewContainer.createComponent(LoadingPanelComponent, {projectableNodes: content}); + this.viewContainer.createComponent(LoadingPanelComponent, { projectableNodes: content }); break; case LoadingStatus.Ready: this.viewContainer.createEmbeddedView(this.templateRef); break; case LoadingStatus.Error: content = this.resolveNgContent($localize`Form data could not be loaded.`); - const componentRef = this.viewContainer.createComponent(AlertPanelComponent, {projectableNodes: content}); + const componentRef = this.viewContainer.createComponent(AlertPanelComponent, { + projectableNodes: content + }); (componentRef.instance).type = 'error'; break; } diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/bootstrap-extends.scss b/src/pybind/mgr/dashboard/frontend/src/styles/bootstrap-extends.scss index d1410e332b618..e65f2f56acfbb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/bootstrap-extends.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/bootstrap-extends.scss @@ -121,4 +121,3 @@ legend { .fa { @extend .fa-fw; } - diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_buttons.scss b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_buttons.scss index 0503c1d50019a..5b9789b3162d3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_buttons.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_buttons.scss @@ -5,7 +5,7 @@ .form-check-input.is-valid { border-color: rgba(vv.$primary, 0.8); - &:checked{ + &:checked { background-color: vv.$primary; border-color: rgba(vv.$primary, 0.8); box-shadow: 0 0 3px 2px rgba(vv.$primary, 0.5); @@ -94,9 +94,3 @@ .card-footer button.btn:not(:first-child) { margin-left: 5px; } - -button { - &.disabled { - pointer-events: none !important; - } -} diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_forms.scss b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_forms.scss index 5ca20012f5b2c..26edbd11264f0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_forms.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_forms.scss @@ -96,7 +96,7 @@ cd-modal { display: block; } -.form-group{ +.form-group { @extend .mb-3; } -- 2.39.5