From e0f317a41942d0ea0d93e4f2f247d11b4c24b116 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Wed, 13 Feb 2019 15:31:27 +0000 Subject: [PATCH] mgr/dashboard: Allow create and edit of pools with "/" in the name Fixes: http://tracker.ceph.com/issues/38302 Signed-off-by: Tiago Melo --- .../pool/pool-form/pool-form.component.html | 14 +++++- .../pool-form/pool-form.component.spec.ts | 1 + .../pool/pool-form/pool-form.component.ts | 18 ++++++- .../pool/pool-list/pool-list.component.ts | 2 +- .../src/app/shared/api/pool.service.ts | 4 +- .../select-badges.component.html | 3 +- .../select-badges/select-badges.component.ts | 5 +- .../frontend/src/locale/messages.xlf | 50 ++++++++++++------- 8 files changed, 71 insertions(+), 26 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html index 3493b3d9a29a..ba85d2a000e1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html @@ -297,7 +297,8 @@ [messages]="data.applications.messages" [data]="data.applications.selected" [options]="data.applications.available" - [selectionLimit]="4"> + [selectionLimit]="4" + (selection)="appSelection()"> @@ -435,6 +436,17 @@ (changes)="currentConfigurationValues = $event()"> + +
+
+
+ It's not possible to create an RBD pool with '/' in the name. + Please change the name or remove 'rbd' from the applications list. +
+
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts index eab7387b9963..2c861cb26062 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts @@ -228,6 +228,7 @@ describe('PoolFormComponent', () => { expect(component.editing).toBeFalsy(); formHelper.expectError('name', 'required'); formHelper.expectValidChange('name', 'some-name'); + formHelper.expectValidChange('name', 'name/with/slash'); component.info.pool_names.push('someExistingPoolName'); formHelper.expectErrorChange('name', 'someExistingPoolName', 'uniqueName'); formHelper.expectErrorChange('name', 'wrong format with spaces', 'pattern'); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts index 7e2bf84106bd..0353855cab62 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts @@ -109,7 +109,7 @@ export class PoolFormComponent implements OnInit { this.form = new CdFormGroup( { name: new FormControl('', { - validators: [Validators.pattern('[\\.A-Za-z0-9_-]+'), Validators.required] + validators: [Validators.pattern(/^[\.A-Za-z0-9_/-]+$/), Validators.required] }), poolType: new FormControl('', { validators: [Validators.required] @@ -132,7 +132,17 @@ export class PoolFormComponent implements OnInit { ecOverwrites: new FormControl(false), compression: compressionForm }, - CdValidators.custom('form', () => null) + [ + CdValidators.custom('form', () => null), + CdValidators.custom('rbdPool', () => { + return ( + this.form && + this.form.getValue('name').includes('/') && + this.data && + this.data.applications.selected.indexOf('rbd') !== -1 + ); + }) + ] ); } @@ -660,4 +670,8 @@ export class PoolFormComponent implements OnInit { () => this.router.navigate(['/pool']) ); } + + appSelection() { + this.form.updateValueAndValidity({ emitEvent: false, onlySelf: true }); + } } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts index fc1bbb0e5f89..9ddc9a8391aa 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts @@ -68,7 +68,7 @@ export class PoolListComponent implements OnInit { { permission: 'update', icon: 'fa-pencil', - routerLink: () => '/pool/edit/' + this.selection.first().pool_name, + routerLink: () => '/pool/edit/' + encodeURIComponent(this.selection.first().pool_name), name: this.i18n('Edit') }, { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.ts index 0b70dbda73a9..8d81b3167afb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.ts @@ -31,7 +31,9 @@ export class PoolService { name = pool.pool; delete pool.pool; } - return this.http.put(`${this.apiPath}/${name}`, pool, { observe: 'response' }); + return this.http.put(`${this.apiPath}/${encodeURIComponent(name)}`, pool, { + observe: 'response' + }); } delete(name) { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html index 8d65bda260e0..d7f5517955de 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html @@ -5,7 +5,8 @@ [selectionLimit]="selectionLimit" [customBadges]="customBadges" [customBadgeValidators]="customBadgeValidators" - elemClass="margin-right-sm select-menu-edit"> + elemClass="margin-right-sm select-menu-edit" + (selection)="selection.emit($event)"> diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts index ee364092a203..c275095eaec3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { ValidatorFn } from '@angular/forms'; import { I18n } from '@ngx-translate/i18n-polyfill'; @@ -26,6 +26,9 @@ export class SelectBadgesComponent { @Input() customBadgeValidators: ValidatorFn[] = []; + @Output() + selection = new EventEmitter(); + @ViewChild('cdSelect') cdSelect; diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf index ac024409677d..d4e6329740ce 100644 --- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf +++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf @@ -260,7 +260,7 @@ app/ceph/pool/pool-form/pool-form.component.html - 449 + 461 app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html @@ -1070,7 +1070,7 @@ app/ceph/pool/pool-form/pool-form.component.html - 342 + 343 app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html @@ -2394,13 +2394,13 @@ Compression app/ceph/pool/pool-form/pool-form.component.html - 309 + 310 Mode app/ceph/pool/pool-form/pool-form.component.html - 315 + 316 app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.html @@ -2410,89 +2410,101 @@ Algorithm app/ceph/pool/pool-form/pool-form.component.html - 334 + 335 -- No erasure compression algorithm available -- app/ceph/pool/pool-form/pool-form.component.html - 345 + 346 Minimum blob size app/ceph/pool/pool-form/pool-form.component.html - 359 + 360 e.g., 128KiB app/ceph/pool/pool-form/pool-form.component.html - 368 + 369 Value should be greater than 0 app/ceph/pool/pool-form/pool-form.component.html - 373 + 374 app/ceph/pool/pool-form/pool-form.component.html - 398 + 399 Value should be greater than the maximum blob size app/ceph/pool/pool-form/pool-form.component.html - 376 + 377 Maximum blob size app/ceph/pool/pool-form/pool-form.component.html - 385 + 386 e.g., 512KiB app/ceph/pool/pool-form/pool-form.component.html - 393 + 394 Value should be greater than the minimum blob size app/ceph/pool/pool-form/pool-form.component.html - 401 + 402 Ratio app/ceph/pool/pool-form/pool-form.component.html - 410 + 411 Compression ratio app/ceph/pool/pool-form/pool-form.component.html - 421 + 422 Value should be between 0.0 and 1.0 app/ceph/pool/pool-form/pool-form.component.html - 424 + 425 + + + It's not possible to create an RBD pool with '/' in the name. + + app/ceph/pool/pool-form/pool-form.component.html + 445 + + + Please change the name or remove 'rbd' from the applications list. + + app/ceph/pool/pool-form/pool-form.component.html + 447 pool app/ceph/pool/pool-form/pool-form.component.html - 444 + 456 {VAR_SELECT, select, 1 {Edit} other {Create} } app/ceph/pool/pool-form/pool-form.component.html - 444 + 456 Pools List -- 2.47.3