diff --git a/ui/apps/everest/src/hooks/api/db-clusters/useDbClusters.ts b/ui/apps/everest/src/hooks/api/db-clusters/useDbClusters.ts index 74012e0ef..4d1369ea8 100644 --- 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 index 14699ca96..24336a88e 100644 --- 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({ 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 index 15e6ec840..f10f35c7d 100644 --- 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 = () => { 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 index 1b666375e..738d8e045 100644 --- 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 = () => { )}
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 index 48d3ae070..81b0802b7 100644 --- 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} >
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 index 24f3d8613..8b704d8a4 100644 --- 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 (
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 index e108f7c7b..b27f4f694 100644 --- 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 }) => { }} >
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 index 84eed3408..5d1145a40 100644 --- 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 = () => { {DbDetailsMessages.pitrError} )}
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 index d47fc7daf..a7e1a1940 100644 --- 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 ( <>
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 index f4f71b03a..bc89d46af 100644 --- 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 ( <>
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 index 803256e46..3b6375b4f 100644 --- 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 ( <>
row.name} tableName="namespaces" noDataMessage={Messages.noDataMessage} emptyState={} 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 index 225906d6d..62f484e34 100644 --- 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 ( <>
row.name} tableName="storageLocations" noDataMessage={Messages.noData} hideExpandAllIcon