From: Patrick Seidensal <pseidensal@suse.com>
Date: Wed, 21 Aug 2019 15:13:20 +0000 (+0200)
Subject: mgr/dashboard: refactoring of references of classes to point to classes directly
X-Git-Tag: v15.1.0~1745^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5581f8b252ac4d26da0f3500da5e05ffda6b2f83;p=ceph.git

mgr/dashboard: refactoring of references of classes to point to classes directly

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
index 44c86e660bb9..a4f3c6d6d4c6 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
@@ -1,8 +1,10 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { ImagesPageHelper } from './images.po';
 
 describe('Images page', () => {
-  let images: Helper['images'];
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
+  let images: ImagesPageHelper;
 
   beforeAll(() => {
     images = new Helper().images;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
index f78cec7d7a4e..0e78102895ef 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { IscsiPageHelper } from './iscsi.po';
 
 describe('Iscsi Page', () => {
-  let iscsi: Helper['iscsi'];
+  let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
     iscsi = new Helper().iscsi;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
index 091537518d55..3e1fb764c0c8 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
@@ -1,8 +1,10 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { MirroringPageHelper } from './mirroring.po';
 
 describe('Mirroring page', () => {
-  let mirroring: Helper['mirroring'];
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
+  let mirroring: MirroringPageHelper;
 
   beforeAll(() => {
     mirroring = new Helper().mirroring;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
index 946cc36019b5..d706a3355b58 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { AlertsPageHelper } from './alerts.po';
 
 describe('Alerts page', () => {
-  let alerts: Helper['alerts'];
+  let alerts: AlertsPageHelper;
 
   beforeAll(() => {
     alerts = new Helper().alerts;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
index 6ddbafbca98f..9c1c9ad51dca 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { ConfigurationPageHelper } from './configuration.po';
 
 describe('Configuration page', () => {
-  let configuration: Helper['configuration'];
+  let configuration: ConfigurationPageHelper;
 
   beforeAll(() => {
     configuration = new Helper().configuration;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
index 6c98c0192dd8..c995b6b96620 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
@@ -1,8 +1,9 @@
 import { $, browser } from 'protractor';
 import { Helper } from '../helper.po';
+import { CrushMapPageHelper } from './crush-map.po';
 
 describe('CRUSH map page', () => {
-  let crushmap: Helper['crushMap'];
+  let crushmap: CrushMapPageHelper;
 
   beforeAll(() => {
     crushmap = new Helper().crushMap;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
index db385ed6a3e1..2b80588419df 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { HostsPageHelper } from './hosts.po';
 
 describe('Hosts page', () => {
-  let hosts: Helper['hosts'];
+  let hosts: HostsPageHelper;
 
   beforeAll(() => {
     hosts = new Helper().hosts;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
index 0d5ce553d876..54ef1bc98ac7 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
@@ -1,9 +1,12 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { ConfigurationPageHelper } from './configuration.po';
+import { LogsPageHelper } from './logs.po';
 
 describe('Logs page', () => {
-  let logs: Helper['logs'];
-  let pools: Helper['pools'];
-  let configuration: Helper['configuration'];
+  let logs: LogsPageHelper;
+  let pools: PoolPageHelper;
+  let configuration: ConfigurationPageHelper;
 
   const poolname = 'logs_e2e_test_pool';
   const configname = 'log_graylog_port';
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
index b99c1aa1ed0e..a6248c6e27e7 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { ManagerModulesPageHelper } from './mgr-modules.po';
 
 describe('Manager modules page', () => {
-  let mgrmodules: Helper['mgrmodules'];
+  let mgrmodules: ManagerModulesPageHelper;
 
   beforeAll(() => {
     mgrmodules = new Helper().mgrModules;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
index f1146b5ac325..8b91ab9c4245 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { MonitorsPageHelper } from './monitors.po';
 
 describe('Monitors page', () => {
-  let monitors: Helper['monitors'];
+  let monitors: MonitorsPageHelper;
 
   beforeAll(() => {
     monitors = new Helper().monitors;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
index 7f0201c1a52b..235412f54841 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { OSDsPageHelper } from './osds.po';
 
 describe('OSDs page', () => {
-  let osds: Helper['osds'];
+  let osds: OSDsPageHelper;
 
   beforeAll(() => {
     osds = new Helper().osds;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
index 2f3ba4c16b72..02e14ecbe890 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
@@ -1,14 +1,21 @@
 import { $$, browser, by, element } from 'protractor';
+import { IscsiPageHelper } from './block/iscsi.po';
+import { HostsPageHelper } from './cluster/hosts.po';
+import { MonitorsPageHelper } from './cluster/monitors.po';
+import { OSDsPageHelper } from './cluster/osds.po';
+import { DashboardPageHelper } from './dashboard.po';
 import { Helper } from './helper.po';
+import { PoolPageHelper } from './pools/pools.po';
+import { DaemonsPageHelper } from './rgw/daemons.po';
 
 describe('Dashboard Main Page', () => {
-  let dashboard: Helper['dashboard'];
-  let daemons: Helper['daemons'];
-  let hosts: Helper['hosts'];
-  let osds: Helper['osds'];
-  let pools: Helper['pools'];
-  let monitors: Helper['monitors'];
-  let iscsi: Helper['iscsi'];
+  let dashboard: DashboardPageHelper;
+  let daemons: DaemonsPageHelper;
+  let hosts: HostsPageHelper;
+  let osds: OSDsPageHelper;
+  let pools: PoolPageHelper;
+  let monitors: MonitorsPageHelper;
+  let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
     dashboard = new Helper().dashboard;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
index 68b0dfdda657..dc339f6df78e 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { FilesystemsPageHelper } from './filesystems.po';
 
 describe('Filesystems page', () => {
-  let filesystems: Helper['filesystems'];
+  let filesystems: FilesystemsPageHelper;
 
   beforeAll(() => {
     filesystems = new Helper().filesystems;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
index 976e9824bcad..00aaffa3bd8f 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { NfsPageHelper } from './nfs.po';
 
 describe('Nfs page', () => {
-  let nfs: Helper['nfs'];
+  let nfs: NfsPageHelper;
 
   beforeAll(() => {
     nfs = new Helper().nfs;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
index d90fdcd317d4..514b77c240d2 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from './pools.po';
 
 describe('Pools page', () => {
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
   const poolName = 'pool_e2e_pool_test';
 
   beforeAll(async () => {
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
index ce864dca847d..b8e6a6b47870 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
@@ -1,8 +1,9 @@
 import { $ } from 'protractor';
 import { Helper } from '../helper.po';
+import { BucketsPageHelper } from './buckets.po';
 
 describe('RGW buckets page', () => {
-  let buckets: Helper['buckets'];
+  let buckets: BucketsPageHelper;
 
   beforeAll(async () => {
     const helper = new Helper();
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
index e5f4bd931158..d8ed69fe777f 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { DaemonsPageHelper } from './daemons.po';
 
 describe('RGW daemons page', () => {
-  let daemons: Helper['daemons'];
+  let daemons: DaemonsPageHelper;
 
   beforeAll(() => {
     daemons = new Helper().daemons;
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
index 33870b3cb8a3..72ce100e5a20 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { UsersPageHelper } from './users.po';
 
 describe('RGW users page', () => {
-  let users: Helper['users'];
+  let users: UsersPageHelper;
   const user_name = '000user_create_edit_delete';
 
   beforeAll(() => {