Merge branch 'main' into EVEREST-107-fix-tiltfile

percona · Feb 26, 2025 · 6f458e4 · 6f458e4
2 parents 7b12c5f + c7165d7
commit 6f458e4
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 19 deletions.
diff --git a/ui/apps/everest/src/hooks/api/db-clusters/useDbClusters.ts b/ui/apps/everest/src/hooks/api/db-clusters/useDbClusters.ts
@@ -34,25 +34,27 @@ export const DB_CLUSTERS_QUERY_KEY = 'dbClusters';
 export const dbClustersQuerySelect = ({
   items,
 }: GetDbClusterPayload): DbCluster[] =>
-  items.map(({ ...props }) => ({
-    ...props,
-    spec: {
-      ...props.spec,
-      ...(props.spec?.backup?.schedules && {
-        backup: {
-          ...props.spec.backup,
-          schedules: props.spec.backup.schedules.map((schedule) => ({
-            ...schedule,
-            schedule: cronConverter(
-              schedule.schedule,
-              'UTC',
-              Intl.DateTimeFormat().resolvedOptions().timeZone
-            ),
-          })),
-        },
-      }),
-    },
-  }));
+  items
+    .map(({ ...props }) => ({
+      ...props,
+      spec: {
+        ...props.spec,
+        ...(props.spec?.backup?.schedules && {
+          backup: {
+            ...props.spec.backup,
+            schedules: props.spec.backup.schedules.map((schedule) => ({
+              ...schedule,
+              schedule: cronConverter(
+                schedule.schedule,
+                'UTC',
+                Intl.DateTimeFormat().resolvedOptions().timeZone
+              ),
+            })),
+          },
+        }),
+      },
+    }))
+    .sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
 
 export const useDbClusters = (
   namespace: string,

diff --git a/ui/apps/everest/src/hooks/api/namespaces/useNamespaces.ts b/ui/apps/everest/src/hooks/api/namespaces/useNamespaces.ts
@@ -31,6 +31,7 @@ export const useNamespaces = (
   useQuery<GetNamespacesPayload, unknown, string[]>({
     queryKey: [NAMESPACES_QUERY_KEY],
     queryFn: getNamespacesFn,
+    select: (namespaces) => namespaces.sort((a, b) => a.localeCompare(b)),
     ...options,
   });
 

diff --git a/ui/apps/everest/src/pages/databases/DbClusterView.tsx b/ui/apps/everest/src/pages/databases/DbClusterView.tsx
@@ -158,6 +158,7 @@ export const DbClusterView = () => {
     <Stack direction="column" alignItems="center">
       <Box sx={{ width: '100%' }}>
         <Table
+          getRowId={(row) => row.databaseName}
           tableName="dbClusterView"
           emptyState={
             namespaces.length > 0 ? (

diff --git a/ui/apps/everest/src/pages/db-cluster-details/backups/backups-list/backups-list.tsx b/ui/apps/everest/src/pages/db-cluster-details/backups/backups-list/backups-list.tsx
@@ -205,6 +205,7 @@ export const BackupsList = () => {
         </Typography>
       )}
       <Table
+        getRowId={(row) => row.name}
         tableName="backupList"
         noDataMessage={Messages.noData}
         data={backups}

diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/backups-details.tsx b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/backups-details.tsx
@@ -159,6 +159,7 @@ export const BackupsDetails = ({
           loading={loading}
         >
           <Table
+            getRowId={(row) => row.name}
             muiTopToolbarProps={{ sx: { display: 'none' } }}
             muiTableHeadCellProps={{ sx: { display: 'none' } }}
             initialState={{

diff --git a/ui/apps/everest/src/pages/db-cluster-details/components/components.tsx b/ui/apps/everest/src/pages/db-cluster-details/components/components.tsx
@@ -98,6 +98,7 @@ const Components = () => {
 
   return (
     <Table
+      getRowId={(row) => row.name}
       initialState={{
         sorting: [
           {

diff --git a/ui/apps/everest/src/pages/db-cluster-details/components/expanded-row/expanded-row.tsx b/ui/apps/everest/src/pages/db-cluster-details/components/expanded-row/expanded-row.tsx
@@ -136,6 +136,7 @@ const ExpandedRow = ({ row }: { row: MRT_Row<DBClusterComponent> }) => {
       }}
     >
       <Table
+        getRowId={(row) => row.name}
         state={{ isLoading: false }}
         tableName={`${name}-containers`}
         columns={columns}

diff --git a/ui/apps/everest/src/pages/db-cluster-details/restores/restores.tsx b/ui/apps/everest/src/pages/db-cluster-details/restores/restores.tsx
@@ -109,6 +109,7 @@ const Restores = () => {
         <Alert severity="error">{DbDetailsMessages.pitrError}</Alert>
       )}
       <Table
+        getRowId={(row) => row.name}
         state={{ isLoading: loadingRestores }}
         tableName={`${dbClusterName}-restore`}
         columns={columns}

diff --git a/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx b/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx
@@ -175,6 +175,7 @@ export const MonitoringEndpoints = () => {
   return (
     <>
       <Table
+        getRowId={(row) => row.name}
         tableName="monitoringEndpoints"
         hideExpandAllIcon
         data={tableData}

diff --git a/ui/apps/everest/src/pages/settings/namespaces/namespace-details/cluster-status-table.tsx b/ui/apps/everest/src/pages/settings/namespaces/namespace-details/cluster-status-table.tsx
@@ -186,6 +186,7 @@ const ClusterStatusTable = ({
   return (
     <>
       <Table
+        getRowId={(row) => row.name}
         tableName={`${namespace}-upgrade-pending-actions`}
         noDataMessage="No pending actions"
         columns={columns}

diff --git a/ui/apps/everest/src/pages/settings/namespaces/namespaces.tsx b/ui/apps/everest/src/pages/settings/namespaces/namespaces.tsx
@@ -80,6 +80,7 @@ export const Namespaces = () => {
   return (
     <>
       <Table
+        getRowId={(row) => row.name}
         tableName="namespaces"
         noDataMessage={Messages.noDataMessage}
         emptyState={<EmptyStateNamespaces />}

diff --git a/ui/apps/everest/src/pages/settings/storage-locations/storage-locations.tsx b/ui/apps/everest/src/pages/settings/storage-locations/storage-locations.tsx
@@ -174,6 +174,7 @@ export const StorageLocations = () => {
   return (
     <>
       <Table
+        getRowId={(row) => row.name}
         tableName="storageLocations"
         noDataMessage={Messages.noData}
         hideExpandAllIcon