From 1b4e5bb90036c36c060f1f0eb10f6277286acefd Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Thu, 29 Apr 2021 18:27:59 +0530 Subject: [PATCH] mgr/dashboard:OSDs placement text is unreadable While displaying the host pattern in the OSDs placement tab, it gets splited with semi-colons. Also adjusted the column size of Container Image ID and Placement columns. Fixes: https://tracker.ceph.com/issues/50580 Signed-off-by: Aashish Sharma (cherry picked from commit 543b02436f18876a56757226c686a5c2c33c7c33) Conflicts: src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts (PlacementPipe takes i18n as input param) --- .../src/app/ceph/cluster/services/placement.pipe.spec.ts | 4 ++-- .../frontend/src/app/ceph/cluster/services/placement.pipe.ts | 2 +- .../src/app/ceph/cluster/services/services.component.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.spec.ts index 7db2d14f9171..8ea3602c4a59 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.spec.ts @@ -73,10 +73,10 @@ describe('PlacementPipe', () => { expect( pipe.transform({ placement: { - host_pattern: '*' + host_pattern: 'abc.ceph.xyz.com' } }) - ).toBe('*'); + ).toBe('abc.ceph.xyz.com'); }); it('transforms placement (6)', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts index 3114b1c15ac4..79a7e8a52502 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts @@ -37,7 +37,7 @@ export class PlacementPipe implements PipeTransform { kv.push(this.i18n('label:{{label}}', { label })); } if (_.isString(hostPattern)) { - kv.push(...hostPattern); + kv.push(hostPattern); } return kv.join(';'); } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts index cd977bc714e6..43caa2cea20b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts @@ -98,7 +98,7 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI { name: this.i18n('Container image ID'), prop: 'status.container_image_id', - flexGrow: 3, + flexGrow: 1.5, cellTransformation: CellTemplate.truncate, customTemplateConfig: { length: 12 @@ -108,7 +108,7 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI name: this.i18n('Placement'), prop: '', pipe: new PlacementPipe(this.i18n), - flexGrow: 1 + flexGrow: 2 }, { name: this.i18n('Running'), -- 2.47.3