From be5ab2f7bc82007e3f5feb2f4cf0511ad4c160c8 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 12 Aug 2022 16:22:26 +0530 Subject: [PATCH] mgr/dashboard: remove the remaining master tags This actually broke the doc service when the developer environment is of main branch Signed-off-by: Nizamudeen A --- .../src/app/shared/pipes/ceph-release-name.pipe.spec.ts | 4 ++-- .../frontend/src/app/shared/pipes/ceph-release-name.pipe.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.spec.ts index 7b7c5e05318e..3e1f1f7ca2de 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.spec.ts @@ -14,11 +14,11 @@ describe('CephReleaseNamePipe', () => { expect(pipe.transform(value)).toBe('mimic'); }); - it('recognizes a development release as the master branch', () => { + it('recognizes a development release as the main branch', () => { const value = 'ceph version 13.1.0-534-g23d3751b89 \ (23d3751b897b31d2bda57aeaf01acb5ff3c4a9cd) nautilus (dev)'; - expect(pipe.transform(value)).toBe('master'); + expect(pipe.transform(value)).toBe('main'); }); it('transforms with wrong version format', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.ts index c7c1e1d7423d..c63c794a9188 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/ceph-release-name.pipe.ts @@ -10,8 +10,8 @@ export class CephReleaseNamePipe implements PipeTransform { const result = /ceph version\s+[^ ]+\s+\(.+\)\s+(.+)\s+\((.+)\)/.exec(value); if (result) { if (result[2] === 'dev') { - // Assume this is actually master - return 'master'; + // Assume this is actually main + return 'main'; } else { // Return the "nautilus" part return result[1]; -- 2.47.3