From e2b8bb12003ef49794f8fb105c4e19f92e8d3d10 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 25 Jul 2019 11:11:47 -0400 Subject: [PATCH] mgr/dashboard: Explicitly type page variables Explicitly gives a type to page variables. Helps make better use of Typescript's static type checking. Undoes mistake from #29070. Fixes: https://tracker.ceph.com/issues/40961 Signed-off-by: Adam King Signed-off-by: Rafael Quintero --- src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts | 2 +- .../dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts | 2 +- .../mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts | 2 +- .../dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts | 2 +- src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) 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 8af22236410e2..44c97415e344d 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,7 +1,7 @@ import { Helper } from '../helper.po'; describe('Images page', () => { - let images; + let images: Helper['images']; 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 f088eeac63da8..523ab2e9f56df 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,7 @@ import { Helper } from '../helper.po'; describe('Iscsi Page', () => { - let iscsi; + let iscsi: Helper['iscsi']; 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 60dd992bc53b4..b0108f0cb5c4a 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,7 +1,7 @@ import { Helper } from '../helper.po'; describe('Mirroring page', () => { - let mirroring; + let mirroring: Helper['mirroring']; 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 038453a06be3f..963f32eefe627 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,7 @@ import { Helper } from '../helper.po'; describe('Alerts page', () => { - let alerts; + let alerts: Helper['alerts']; 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 29a348f453488..b2c7ae9a802b3 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,7 @@ import { Helper } from '../helper.po'; describe('Configuration page', () => { - let configuration; + let configuration: Helper['configuration']; 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 47d5493ea95fe..d58fa9bc6b31f 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,7 +1,7 @@ import { Helper } from '../helper.po'; describe('CRUSH map page', () => { - let crushmap; + let crushmap: Helper['crushmap']; 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 094c7771d2935..a04ca3c05dbba 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,7 @@ import { Helper } from '../helper.po'; describe('Hosts page', () => { - let hosts; + let hosts: Helper['hosts']; 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 8202744c5146e..0cf6433a2ca01 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,7 +1,7 @@ import { Helper } from '../helper.po'; describe('Logs page', () => { - let logs; + let logs: Helper['logs']; beforeAll(() => { logs = new Helper().logs; 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 5f786b08eceb2..2dc916b0ba43f 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,7 @@ import { Helper } from '../helper.po'; describe('Manager modules page', () => { - let mgrmodules; + let mgrmodules: Helper['mgrmodules']; 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 596b449218080..9c7f9635f5d4f 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,7 @@ import { Helper } from '../helper.po'; describe('Monitors page', () => { - let monitors; + let monitors: Helper['monitors']; 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 bb8216e434f2e..391e8f111148c 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,7 @@ import { Helper } from '../helper.po'; describe('OSDs page', () => { - let osds; + let osds: Helper['osds']; beforeAll(() => { osds = new Helper().osds; 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 1146dad357162..9a90c8585806f 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,7 @@ import { Helper } from '../helper.po'; describe('Filesystems page', () => { - let filesystems; + let filesystems: Helper['filesystems']; 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 803c8ea5abca1..ea6ac7df74dfd 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,7 @@ import { Helper } from '../helper.po'; describe('Nfs page', () => { - let nfs; + let nfs: Helper['nfs']; 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 e30a872912553..26166fa2775e4 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,7 @@ import { Helper } from '../helper.po'; describe('Pools page', () => { - let pools; + let pools: Helper['pools']; const poolName = 'pool_e2e_pool_test'; beforeAll(() => { 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 d3d87b9cf6c93..c141589912860 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,7 +1,7 @@ import { Helper } from '../helper.po'; describe('RGW buckets page', () => { - let buckets; + let buckets: Helper['buckets']; beforeAll(() => { buckets = new Helper().buckets; 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 484379309246e..b8e00e41c9265 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,7 @@ import { Helper } from '../helper.po'; describe('RGW daemons page', () => { - let daemons; + let daemons: Helper['daemons']; 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 d096a8fc940f9..1791e4974f8e7 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,7 @@ import { Helper } from '../helper.po'; describe('RGW users page', () => { - let users; + let users: Helper['users']; const user_name = '000user_create_edit_delete'; beforeAll(() => { -- 2.39.5