]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Pool read/write OPS shows too many decimal places 34039/head
authoranurag <anurag@localhost.localdomain>
Wed, 11 Mar 2020 14:17:05 +0000 (19:47 +0530)
committerErnesto Puerta <epuertat@redhat.com>
Fri, 20 Mar 2020 18:18:28 +0000 (19:18 +0100)
Fixes: https://tracker.ceph.com/issues/39714
Signed-off-by: anurag <anurag@localhost.localdomain>
(cherry picked from commit 27a2bbb12614b7aba0561c027346d9b5427f2405)
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Conflicts:
        src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts,
        src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table-key-value/table-key-value.component.spec.ts:
    added import of PipesModule to Angular unit tests

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts

index f5b2397bd454df249e45ec3258c7aef82e346633..c0e719d87ecb2094abc499cd2b85e2f0eeaf871d 100644 (file)
@@ -9,6 +9,7 @@ import { ComponentsModule } from '../../components/components.module';
 import { CellTemplate } from '../../enum/cell-template.enum';
 import { CdTableColumn } from '../../models/cd-table-column';
 import { CdDatePipe } from '../../pipes/cd-date.pipe';
+import { PipesModule } from '../../pipes/pipes.module';
 import { TableComponent } from '../table/table.component';
 import { TableKeyValueComponent } from './table-key-value.component';
 
@@ -18,7 +19,7 @@ describe('TableKeyValueComponent', () => {
 
   configureTestBed({
     declarations: [TableComponent, TableKeyValueComponent],
-    imports: [FormsModule, NgxDatatableModule, ComponentsModule, RouterTestingModule]
+    imports: [FormsModule, NgxDatatableModule, ComponentsModule, PipesModule, RouterTestingModule]
   });
 
   beforeEach(() => {
index 2998a686ed6d6ffadb6a90e208dc0714917649af..88c72b34a3f25b479071c5c2f8ae6ec3a41b8ed1 100644 (file)
 <ng-template #perSecondTpl
              let-row="row"
              let-value="value">
-  {{ value }} /s
+  {{ value | dimless }} /s
 </ng-template>
 
 <ng-template #executingTpl
index 780192b0b9e9c0cca6a8638f95b484300f3b2e48..b38dffc61ffa1d42190e9d9b8ca183ab3e20e745 100644 (file)
@@ -8,6 +8,7 @@ import * as _ from 'lodash';
 import { configureTestBed } from '../../../../testing/unit-test-helper';
 import { ComponentsModule } from '../../components/components.module';
 import { CdTableFetchDataContext } from '../../models/cd-table-fetch-data-context';
+import { PipesModule } from '../../pipes/pipes.module';
 import { TableComponent } from './table.component';
 
 describe('TableComponent', () => {
@@ -33,7 +34,7 @@ describe('TableComponent', () => {
 
   configureTestBed({
     declarations: [TableComponent],
-    imports: [NgxDatatableModule, FormsModule, ComponentsModule, RouterTestingModule]
+    imports: [NgxDatatableModule, FormsModule, ComponentsModule, PipesModule, RouterTestingModule]
   });
 
   beforeEach(() => {