Merge pull request #8834 from tinyspeck/am_vtadmin_inclusive_naming

[vtadmin] s/master/primary in vtadmin frontend code
vitessio · Sep 17, 2021 · 6300295 · 6300295
2 parents e6a4ba2 + 18b9ffc
commit 6300295
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/web/vtadmin/src/components/routes/Tablets.test.tsx b/web/vtadmin/src/components/routes/Tablets.test.tsx
@@ -61,7 +61,7 @@ describe('Tablets', () => {
                                 cell: 'cell1',
                                 uid: 3,
                             },
-                            type: topodata.TabletType.MASTER,
+                            type: topodata.TabletType.PRIMARY,
                         },
                     }),
                     pb.Tablet.create({

diff --git a/web/vtadmin/src/components/routes/Tablets.tsx b/web/vtadmin/src/components/routes/Tablets.tsx
@@ -143,7 +143,7 @@ export const formatRows = (
             type: formatDisplayType(t),
             _raw: t,
             _keyspaceShard: `${t.tablet?.keyspace}/${t.tablet?.shard}`,
-            // Include the unformatted type so (string) filtering by "master" works
+            // Include the unformatted type so (string) filtering by "primary" works
             // even if "primary" is what we display, and what we use for key:value searches.
             _rawType: formatType(t),
             // Always sort primary tablets first, then sort alphabetically by type, etc.

diff --git a/web/vtadmin/src/components/routes/keyspace/KeyspaceShards.test.tsx b/web/vtadmin/src/components/routes/keyspace/KeyspaceShards.test.tsx
@@ -64,7 +64,7 @@ describe('KeyspaceShards', () => {
                                 },
                                 keyspace: 'keyspace1',
                                 shard: '-80',
-                                type: topodata.TabletType.MASTER,
+                                type: topodata.TabletType.PRIMARY,
                             },
                         }),
                         pb.Tablet.create({
@@ -77,7 +77,7 @@ describe('KeyspaceShards', () => {
                                 },
                                 keyspace: 'keyspace2',
                                 shard: '-',
-                                type: topodata.TabletType.MASTER,
+                                type: topodata.TabletType.PRIMARY,
                             },
                         }),
                         pb.Tablet.create({
@@ -91,7 +91,7 @@ describe('KeyspaceShards', () => {
                                 hostname: 'tablet-zone1-300-80-00',
                                 keyspace: 'keyspace1',
                                 shard: '80-',
-                                type: topodata.TabletType.MASTER,
+                                type: topodata.TabletType.PRIMARY,
                             },
                         }),
                     ],