From 656727a3159ccae7aaaf3ce027b41ad36e3a21d4 Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Fri, 3 Jul 2020 16:09:42 +0200 Subject: [PATCH] mgr/dashboard: Fix bugs in a unit test and i18n translation * SKIP: Unknown argument type: 'BinaryExpression' NodeObject { ... text: 'You can activate the module on the Telemetry configuration ' * WARNING: /ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts:39:32 - get is deprecated: from v9.0.0 use TestBed.inject Fixes: https://tracker.ceph.com/issues/46371 Signed-off-by: Volker Theile --- .../ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts | 2 +- .../telemetry-notification/telemetry-notification.component.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts index 51bb131eb84..b3ea48a0935 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts @@ -36,7 +36,7 @@ describe('RgwBucketListComponent', () => { }); beforeEach(() => { - rgwBucketService = TestBed.get(RgwBucketService); + rgwBucketService = TestBed.inject(RgwBucketService); rgwBucketServiceListSpy = spyOn(rgwBucketService, 'list'); rgwBucketServiceListSpy.and.returnValue(of(null)); fixture = TestBed.createComponent(RgwBucketListComponent); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts index 974f625e1c6..4b881e2f8e0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts @@ -61,8 +61,7 @@ export class TelemetryNotificationComponent implements OnInit, OnDestroy { NotificationType.success, this.i18n('Telemetry activation reminder muted'), this.i18n( - 'You can activate the module on the Telemetry configuration ' + - 'page (Dashboard Settings -> Telemetry configuration) at any time.' + 'You can activate the module on the Telemetry configuration page (Dashboard Settings -> Telemetry configuration) at any time.' ) ); } -- 2.39.5