Skip to content

Commit be831d6

Browse files
tylerauerbecktylerauerbeck
committed
feat: update pages
Signed-off-by: Tyler Auerbeck <tylerauerbeck@users.noreply.github.com>
1 parent d4d7225 commit be831d6

11 files changed

Lines changed: 96 additions & 215 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
dist/*
12
node_modules/

‎src/pages/BackupList.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import { Tooltip } from '@mui/material';
21
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
3-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
2+
import { Tooltip } from '@mui/material';
43
import { CnpgBackup } from '../resources/cluster';
54

65
export function BackupListPage() {
76
return (
87
<ResourceListView
98
title="CloudNativePG Backups"
10-
resourceClass={CnpgBackup as unknown as KubeObjectClass}
9+
resourceClass={CnpgBackup}
1110
columns={[
1211
{ label: 'Name', getter: (c: any) => c.metadata.name },
1312
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },

‎src/pages/ClusterList.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgCluster } from '../resources/cluster';
43

54
export function ClusterListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Clusters"
9-
resourceClass={CnpgCluster as unknown as KubeObjectClass}
8+
resourceClass={CnpgCluster}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },

‎src/pages/DatabaseList.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgDatabase } from '../resources/cluster';
43

54
export function DatabaseListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Databases"
9-
resourceClass={CnpgDatabase as unknown as KubeObjectClass}
8+
resourceClass={CnpgDatabase}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },
1312
{ label: 'Cluster', getter: (c: any) => c.jsonData.spec?.cluster?.name },
14-
{ label: 'DB Name', getter: (c: any) => c.jsonData.spec?.name },
15-
{ label: 'Owner', getter: (c: any) => c.jsonData.spec?.owner },
13+
{ label: 'DB Name', getter: (c: any) => c.jsonData.spec?.name ?? '-' },
14+
{ label: 'Owner', getter: (c: any) => c.jsonData.spec?.owner ?? '-' },
1615
{ label: 'Ready', getter: (c: any) => (c.jsonData.status?.ready ? 'Yes' : 'No') },
1716
{ label: 'Age', getter: (c: any) => c.getAge() },
1817
]}

‎src/pages/FailoverQuorumList.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgFailoverQuorum } from '../resources/cluster';
43

54
export function FailoverQuorumListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Failover Quorums"
9-
resourceClass={CnpgFailoverQuorum as unknown as KubeObjectClass}
8+
resourceClass={CnpgFailoverQuorum}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },

‎src/pages/ImageCatalogList.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgClusterImageCatalog, CnpgImageCatalog } from '../resources/cluster';
43

54
export function ImageCatalogListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Image Catalogs"
9-
resourceClass={CnpgImageCatalog as unknown as KubeObjectClass}
8+
resourceClass={CnpgImageCatalog}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },
@@ -29,7 +28,7 @@ export function ClusterImageCatalogListPage() {
2928
return (
3029
<ResourceListView
3130
title="CloudNativePG Cluster Image Catalogs"
32-
resourceClass={CnpgClusterImageCatalog as unknown as KubeObjectClass}
31+
resourceClass={CnpgClusterImageCatalog}
3332
columns={[
3433
{ label: 'Name', getter: (c: any) => c.metadata.name },
3534
{

‎src/pages/PoolerList.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { K8s } from '@kinvolk/headlamp-plugin/lib';
12
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
33
import { CnpgPooler } from '../resources/cluster';
44

5-
const Pod = (window as any).pluginLib.K8s.ResourceClasses.Pod;
5+
// const Pod = (window as any).pluginLib.K8s.ResourceClasses.Pod;
6+
const Pod = K8s.ResourceClasses.Pod;
67

78
function useRunningPodCount(poolerName: string, namespace: string) {
89
const [pods] = Pod.useList({ namespace, labelSelector: `cnpg.io/poolerName=${poolerName}` });
@@ -53,7 +54,7 @@ export function PoolerListPage() {
5354
return (
5455
<ResourceListView
5556
title="CloudNativePG Poolers"
56-
resourceClass={CnpgPooler as unknown as KubeObjectClass}
57+
resourceClass={CnpgPooler}
5758
columns={[
5859
{ label: 'Name', getter: (c: any) => c.metadata.name },
5960
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },

‎src/pages/PublicationList.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgPublication } from '../resources/cluster';
43

54
export function PublicationListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Publications"
9-
resourceClass={CnpgPublication as unknown as KubeObjectClass}
8+
resourceClass={CnpgPublication}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },
1312
{ label: 'Cluster', getter: (c: any) => c.jsonData.spec?.cluster?.name },
14-
{ label: 'Publication Name', getter: (c: any) => c.jsonData.spec?.name },
15-
{ label: 'DB Name', getter: (c: any) => c.jsonData.spec?.dbname },
16-
{ label: 'Applied', getter: (c: any) => (c.jsonData.status?.applied ? 'Yes' : 'No') },
13+
{ label: 'PG Publication Name', getter: (c: any) => c.jsonData.spec?.name ?? '-' },
14+
{ label: 'Database', getter: (c: any) => c.jsonData.spec?.dbname ?? '-' },
15+
{ label: 'Ready', getter: (c: any) => (c.jsonData.status?.applied ? 'Yes' : 'No') },
1716
{ label: 'Age', getter: (c: any) => c.getAge() },
1817
]}
1918
/>

‎src/pages/ScheduledBackupList.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Chip, Tooltip } from '@mui/material';
21
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
3-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
2+
import { Tooltip } from '@mui/material';
43
import { CnpgBackup, CnpgScheduledBackup } from '../resources/cluster';
54

65
function useLastBackup(scheduledBackupName: string, namespace: string) {
@@ -94,7 +93,7 @@ export function ScheduledBackupListPage() {
9493
return (
9594
<ResourceListView
9695
title="CloudNativePG Scheduled Backups"
97-
resourceClass={CnpgScheduledBackup as unknown as KubeObjectClass}
96+
resourceClass={CnpgScheduledBackup}
9897
columns={[
9998
{ label: 'Name', getter: (c: any) => c.metadata.name },
10099
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },

‎src/pages/SubscriptionList.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import { ResourceListView } from '@kinvolk/headlamp-plugin/lib/CommonComponents';
2-
import { KubeObjectClass } from '@kinvolk/headlamp-plugin/lib/lib/k8s/KubeObject';
32
import { CnpgSubscription } from '../resources/cluster';
43

54
export function SubscriptionListPage() {
65
return (
76
<ResourceListView
87
title="CloudNativePG Subscriptions"
9-
resourceClass={CnpgSubscription as unknown as KubeObjectClass}
8+
resourceClass={CnpgSubscription}
109
columns={[
1110
{ label: 'Name', getter: (c: any) => c.metadata.name },
1211
{ label: 'Namespace', getter: (c: any) => c.metadata.namespace },
1312
{ label: 'Cluster', getter: (c: any) => c.jsonData.spec?.cluster?.name },
14-
{ label: 'DB Name', getter: (c: any) => c.jsonData.spec?.dbname },
15-
{ label: 'Publication', getter: (c: any) => c.jsonData.spec?.publicationName },
13+
{ label: 'DB Name', getter: (c: any) => c.jsonData.spec?.dbname ?? '-' },
14+
{ label: 'Publication', getter: (c: any) => c.jsonData.spec?.publicationName ?? '-' },
1615
{ label: 'Ready', getter: (c: any) => (c.jsonData.status?.applied ? 'Yes' : 'No') },
1716
{ label: 'Age', getter: (c: any) => c.getAge() },
1817
]}

0 commit comments

Comments
 (0)