From: Volker Theile <vtheile@suse.com>
Date: Mon, 25 Nov 2019 09:30:07 +0000 (+0100)
Subject: mgr/dashboard: Rename pipe list -> join
X-Git-Tag: v15.1.0~730^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31843%2Fhead;p=ceph.git

mgr/dashboard: Rename pipe list -> join

Signed-off-by: Volker Theile <vtheile@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts
index c7d533c186dd..528f0a77a4f8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts
@@ -8,7 +8,6 @@ import { IscsiService } from '../../../shared/api/iscsi.service';
 import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe';
 import { DimlessPipe } from '../../../shared/pipes/dimless.pipe';
 import { IscsiBackstorePipe } from '../../../shared/pipes/iscsi-backstore.pipe';
-import { ListPipe } from '../../../shared/pipes/list.pipe';
 import { RelativeDatePipe } from '../../../shared/pipes/relative-date.pipe';
 import { FormatterService } from '../../../shared/services/formatter.service';
 import { SharedModule } from '../../../shared/shared.module';
@@ -38,7 +37,6 @@ describe('IscsiComponent', () => {
       FormatterService,
       RelativeDatePipe,
       IscsiBackstorePipe,
-      ListPipe,
       { provide: IscsiService, useValue: fakeService },
       i18nProviders
     ]
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
index 2d5d8c426d7c..45c488fb1bff 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
@@ -59,7 +59,7 @@
 
 <ng-template #markOsdConfirmationTpl
              let-markActionDescription="markActionDescription">
-  <ng-container i18n><strong>OSD(s) {{  getSelectedOsdIds() | list }}</strong> will be marked
+  <ng-container i18n><strong>OSD(s) {{  getSelectedOsdIds() | join }}</strong> will be marked
 <strong>{{ markActionDescription }}</strong> if you proceed.</ng-container>
 </ng-template>
 
@@ -71,6 +71,6 @@
     <cd-alert-panel type="warning"
                     i18n>The {selection.hasSingleSelection, select, 1 {OSD is} 0 {OSDs are}} not safe to destroy!</cd-alert-panel>
   </div>
-  <ng-container i18n><strong>OSD {{ getSelectedOsdIds() | list }}</strong> will be
+  <ng-container i18n><strong>OSD {{ getSelectedOsdIds() | join }}</strong> will be
 <strong>{{ actionDescription }}</strong> if you proceed.</ng-container>
 </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html
index f02a04afd0dc..f5a5bb2f1ced 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.html
@@ -9,7 +9,7 @@
           novalidate>
       <div class="modal-body">
         <p i18n>You are about to apply a {deep, select, 1 {deep }}scrub to
-          the OSD(s): <strong>{{ selected | list }}</strong>.</p>
+          the OSD(s): <strong>{{ selected | join }}</strong>.</p>
       </div>
 
       <div class="modal-footer">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts
index bf8a553ba50b..319e86645694 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts
@@ -5,7 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { configureTestBed, i18nProviders } from '../../../../../testing/unit-test-helper';
 import { OsdService } from '../../../../shared/api/osd.service';
-import { ListPipe } from '../../../../shared/pipes/list.pipe';
+import { JoinPipe } from '../../../../shared/pipes/join.pipe';
 import { NotificationService } from '../../../../shared/services/notification.service';
 import { OsdScrubModalComponent } from './osd-scrub-modal.component';
 
@@ -27,11 +27,11 @@ describe('OsdScrubModalComponent', () => {
 
   configureTestBed({
     imports: [ReactiveFormsModule],
-    declarations: [OsdScrubModalComponent, ListPipe],
+    declarations: [OsdScrubModalComponent, JoinPipe],
     schemas: [NO_ERRORS_SCHEMA],
     providers: [
       BsModalRef,
-      ListPipe,
+      JoinPipe,
       { provide: OsdService, useValue: fakeService },
       { provide: NotificationService, useValue: fakeService },
       i18nProviders
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts
index 7b859b7398f1..340dff9e615c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts
@@ -7,7 +7,7 @@ import { forkJoin } from 'rxjs';
 
 import { OsdService } from '../../../../shared/api/osd.service';
 import { NotificationType } from '../../../../shared/enum/notification-type.enum';
-import { ListPipe } from '../../../../shared/pipes/list.pipe';
+import { JoinPipe } from '../../../../shared/pipes/join.pipe';
 import { NotificationService } from '../../../../shared/services/notification.service';
 
 @Component({
@@ -25,7 +25,7 @@ export class OsdScrubModalComponent implements OnInit {
     private osdService: OsdService,
     private notificationService: NotificationService,
     private i18n: I18n,
-    private listPipe: ListPipe
+    private joinPipe: JoinPipe
   ) {}
 
   ngOnInit() {
@@ -41,7 +41,7 @@ export class OsdScrubModalComponent implements OnInit {
           NotificationType.success,
           this.i18n('{{operation}} was initialized in the following OSD(s): {{id}}', {
             operation: operation,
-            id: this.listPipe.transform(this.selected)
+            id: this.joinPipe.transform(this.selected)
           })
         );
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.spec.ts
new file mode 100644
index 000000000000..01bccbc2d15b
--- /dev/null
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.spec.ts
@@ -0,0 +1,13 @@
+import { JoinPipe } from './join.pipe';
+
+describe('ListPipe', () => {
+  const pipe = new JoinPipe();
+
+  it('create an instance', () => {
+    expect(pipe).toBeTruthy();
+  });
+
+  it('transforms "[1,2,3]"', () => {
+    expect(pipe.transform([1, 2, 3])).toBe('1, 2, 3');
+  });
+});
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.ts
new file mode 100644
index 000000000000..68610846ea1c
--- /dev/null
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/join.pipe.ts
@@ -0,0 +1,10 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'join'
+})
+export class JoinPipe implements PipeTransform {
+  transform(value: Array<any>): string {
+    return value.join(', ');
+  }
+}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.spec.ts
deleted file mode 100644
index d26fd65ec5e1..000000000000
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ListPipe } from './list.pipe';
-
-describe('ListPipe', () => {
-  const pipe = new ListPipe();
-
-  it('create an instance', () => {
-    expect(pipe).toBeTruthy();
-  });
-
-  it('transforms "[1,2,3]"', () => {
-    expect(pipe.transform([1, 2, 3])).toBe('1, 2, 3');
-  });
-});
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts
deleted file mode 100644
index 9a044c1b0f69..000000000000
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-
-@Pipe({
-  name: 'list'
-})
-export class ListPipe implements PipeTransform {
-  transform(value: any): any {
-    return value.join(', ');
-  }
-}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts
index 89e68489dc17..898316892d06 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts
@@ -15,7 +15,7 @@ import { FilterPipe } from './filter.pipe';
 import { HealthColorPipe } from './health-color.pipe';
 import { IopsPipe } from './iops.pipe';
 import { IscsiBackstorePipe } from './iscsi-backstore.pipe';
-import { ListPipe } from './list.pipe';
+import { JoinPipe } from './join.pipe';
 import { LogPriorityPipe } from './log-priority.pipe';
 import { MillisecondsPipe } from './milliseconds.pipe';
 import { OrdinalPipe } from './ordinal.pipe';
@@ -36,7 +36,7 @@ import { UpperFirstPipe } from './upper-first.pipe';
     CephReleaseNamePipe,
     RelativeDatePipe,
     IscsiBackstorePipe,
-    ListPipe,
+    JoinPipe,
     LogPriorityPipe,
     FilterPipe,
     CdDatePipe,
@@ -60,7 +60,7 @@ import { UpperFirstPipe } from './upper-first.pipe';
     CephReleaseNamePipe,
     RelativeDatePipe,
     IscsiBackstorePipe,
-    ListPipe,
+    JoinPipe,
     LogPriorityPipe,
     FilterPipe,
     CdDatePipe,
@@ -84,7 +84,7 @@ import { UpperFirstPipe } from './upper-first.pipe';
     DimlessPipe,
     RelativeDatePipe,
     IscsiBackstorePipe,
-    ListPipe,
+    JoinPipe,
     LogPriorityPipe,
     CdDatePipe,
     EmptyPipe,