Merge pull request #91057 from maryliag/backport22.2-91055

release-22.2: test: fix error on test
cockroachdb · Nov 1, 2022 · 2d2a3c8 · 2d2a3c8
2 parents 9f6d5b4 + 06e938e
commit 2d2a3c8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.stories.tsx b/pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.stories.tsx
@@ -32,6 +32,7 @@ const history = H.createHashHistory();
 const withLoadingIndicator: DatabaseDetailsPageProps = {
   loading: true,
   loaded: false,
+  lastError: undefined,
   name: randomName(),
   tables: [],
   viewMode: ViewMode.Tables,
@@ -61,6 +62,7 @@ const withLoadingIndicator: DatabaseDetailsPageProps = {
 const withoutData: DatabaseDetailsPageProps = {
   loading: false,
   loaded: true,
+  lastError: null,
   name: randomName(),
   tables: [],
   viewMode: ViewMode.Tables,
@@ -98,6 +100,7 @@ function createTable(): DatabaseDetailsPageDataTable {
     details: {
       loading: false,
       loaded: true,
+      lastError: null,
       columnCount: _.random(5, 42),
       indexCount: _.random(1, 6),
       userCount: roles.length,
@@ -112,6 +115,7 @@ function createTable(): DatabaseDetailsPageDataTable {
     stats: {
       loading: false,
       loaded: true,
+      lastError: null,
       replicationSizeInBytes: _.random(1000.0) * 1024 ** _.random(1, 2),
       rangeCount: _.random(50, 500),
       nodesByRegionString:
@@ -123,6 +127,7 @@ function createTable(): DatabaseDetailsPageDataTable {
 const withData: DatabaseDetailsPageProps = {
   loading: false,
   loaded: true,
+  lastError: null,
   name: randomName(),
   tables: [createTable()],
   viewMode: ViewMode.Tables,

diff --git a/pkg/ui/workspaces/cluster-ui/src/databaseTablePage/databaseTablePage.stories.tsx b/pkg/ui/workspaces/cluster-ui/src/databaseTablePage/databaseTablePage.stories.tsx
@@ -29,6 +29,7 @@ const withLoadingIndicator: DatabaseTablePageProps = {
   details: {
     loading: true,
     loaded: false,
+    lastError: undefined,
     createStatement: "",
     replicaCount: 0,
     indexNames: [],
@@ -41,12 +42,14 @@ const withLoadingIndicator: DatabaseTablePageProps = {
   stats: {
     loading: true,
     loaded: false,
+    lastError: undefined,
     sizeInBytes: 0,
     rangeCount: 0,
   },
   indexStats: {
     loading: true,
     loaded: false,
+    lastError: undefined,
     stats: [],
     lastReset: moment("2021-09-04T13:55:00Z"),
   },
@@ -74,6 +77,7 @@ const withData: DatabaseTablePageProps = {
   details: {
     loading: false,
     loaded: true,
+    lastError: null,
     createStatement: `
       CREATE TABLE public.${name} (
         id UUID NOT NULL,
@@ -102,6 +106,7 @@ const withData: DatabaseTablePageProps = {
   stats: {
     loading: false,
     loaded: true,
+    lastError: null,
     sizeInBytes: 44040192,
     rangeCount: 4200,
     nodesByRegionString:
@@ -110,6 +115,7 @@ const withData: DatabaseTablePageProps = {
   indexStats: {
     loading: false,
     loaded: true,
+    lastError: null,
     stats: [
       {
         totalReads: 0,

diff --git a/pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.stories.tsx b/pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.stories.tsx
@@ -22,6 +22,7 @@ const history = H.createHashHistory();
 const withLoadingIndicator: DatabasesPageProps = {
   loading: true,
   loaded: false,
+  lastError: undefined,
   automaticStatsCollectionEnabled: true,
   databases: [],
   sortSetting: {
@@ -46,6 +47,7 @@ const withLoadingIndicator: DatabasesPageProps = {
 const withoutData: DatabasesPageProps = {
   loading: false,
   loaded: true,
+  lastError: null,
   automaticStatsCollectionEnabled: true,
   databases: [],
   sortSetting: {
@@ -70,6 +72,7 @@ const withoutData: DatabasesPageProps = {
 const withData: DatabasesPageProps = {
   loading: false,
   loaded: true,
+  lastError: null,
   showNodeRegionsColumn: true,
   automaticStatsCollectionEnabled: true,
   sortSetting: {
@@ -80,6 +83,7 @@ const withData: DatabasesPageProps = {
     return {
       loading: false,
       loaded: true,
+      lastError: null,
       name: randomName(),
       sizeInBytes: _.random(1000.0) * 1024 ** _.random(1, 2),
       tableCount: _.random(5, 100),