mgr/dashboard: remove the remaining master tags

This actually broke the doc service when the developer environment is of
main branch

Resolves: rhbz#2062456

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit be5ab2f7bc82007e3f5feb2f4cf0511ad4c160c8)
(cherry picked from commit 19712bf6866113b2c4925318e0b36695570e22d8)

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 7b7c5e05318ee4ead90f0b39de8099895e250a92..3e1f1f7ca2deea0fd3634d944b757e90df7cd7f4 100644 (file)
--- 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 c7c1e1d7423db5b7e9ef34e6e81d9384bb204747..c63c794a9188b2bf2b7678cb3face3a8be30051d 100644 (file)
--- 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];