From 543b02436f18876a56757226c686a5c2c33c7c33 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 --- .../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 6aef3c364cbe6..588744aa6f04c 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 @@ -59,10 +59,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 bd461bceb2f9f..5aee65890a2f1 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 @@ -34,7 +34,7 @@ export class PlacementPipe implements PipeTransform { kv.push($localize`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 32d27bc1f4fd8..75ddd1c461753 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 @@ -104,7 +104,7 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI { name: $localize`Container image ID`, prop: 'status.container_image_id', - flexGrow: 3, + flexGrow: 1.5, cellTransformation: CellTemplate.truncate, customTemplateConfig: { length: 12 @@ -114,7 +114,7 @@ export class ServicesComponent extends ListWithDetails implements OnChanges, OnI name: $localize`Placement`, prop: '', pipe: new PlacementPipe(), - flexGrow: 1 + flexGrow: 2 }, { name: $localize`Running`, -- 2.39.5