Skip to content

Commit

Permalink
Fix Status in some columns
Browse files Browse the repository at this point in the history
  • Loading branch information
sebt3 committed May 5, 2024
1 parent e3aac6b commit 698af8f
Show file tree
Hide file tree
Showing 21 changed files with 104 additions and 104 deletions.
12 changes: 6 additions & 6 deletions front/libs/argoproj/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ export const extraAppProjectColumns:Array<QTableColumn> = [
// {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
];
export const extraApplicationColumns:Array<QTableColumn> = [
{name: 'SyncStatus', label: `${i18n.global.t('argoproj.SyncStatus')}`, field: row => row.status.sync.status, sortable: true, align: tableColumnAlign.left},
{name: 'HealthStatus', label: `${i18n.global.t('argoproj.HealthStatus')}`, field: row => row.status.health.status, sortable: true, align: tableColumnAlign.left},
{name: 'Revision', label: `${i18n.global.t('argoproj.Revision')}`, field: row => row.status.sync.revision, sortable: true, align: tableColumnAlign.left},
{name: 'SyncStatus', label: `${i18n.global.t('argoproj.SyncStatus')}`, field: row => row.status?.sync.status, sortable: true, align: tableColumnAlign.left},
{name: 'HealthStatus', label: `${i18n.global.t('argoproj.HealthStatus')}`, field: row => row.status?.health.status, sortable: true, align: tableColumnAlign.left},
{name: 'Revision', label: `${i18n.global.t('argoproj.Revision')}`, field: row => row.status?.sync.revision, sortable: true, align: tableColumnAlign.left},
];
export const extraApplicationSetColumns:Array<QTableColumn> = [
// {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
Expand All @@ -88,9 +88,9 @@ export const extraSensorColumns:Array<QTableColumn> = [
// {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
];
export const extraWorkflowColumns:Array<QTableColumn> = [
{name: 'Status', label: `${i18n.global.t('core.status')}`, field: row => row.status.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => row.status.startedAt, sortable: true, align: tableColumnAlign.left},
{name: 'Message', label: `${i18n.global.t('argoproj.Message')}`, field: row => row.status.message, sortable: true, align: tableColumnAlign.left},
{name: 'Status', label: `${i18n.global.t('core.status')}`, field: row => row.status?.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => row.status?.startedAt, sortable: true, align: tableColumnAlign.left},
{name: 'Message', label: `${i18n.global.t('argoproj.Message')}`, field: row => row.status?.message, sortable: true, align: tableColumnAlign.left},
];
export const extraWorkflowArtifactGCTaskColumns:Array<QTableColumn> = [
// {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
Expand Down
6 changes: 3 additions & 3 deletions front/libs/cattle/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const colorETCDSnapshotFile = installColor;
export const descriptionETCDSnapshotFile = '';
export const shortETCDSnapshotFile = 'ETCDSnapshotFile';
export const extraHelmChartColumns:Array<QTableColumn> = [
{name: 'Job', label: `${i18n.global.t('cattle.Job')}`, field: row => row.status.jobName, sortable: true, align: tableColumnAlign.left},
{name: 'Job', label: `${i18n.global.t('cattle.Job')}`, field: row => row.status?.jobName, sortable: true, align: tableColumnAlign.left},
{name: 'Chart', label: `${i18n.global.t('cattle.Chart')}`, field: row => row.spec.chart, sortable: true, align: tableColumnAlign.left},
{name: 'TargetNamespace', label: `${i18n.global.t('cattle.TargetNamespace')}`, field: row => row.spec.targetNamespace, sortable: true, align: tableColumnAlign.left},
{name: 'Version', label: `${i18n.global.t('cattle.Version')}`, field: row => row.spec.version, sortable: true, align: tableColumnAlign.left},
Expand All @@ -41,8 +41,8 @@ export const extraETCDSnapshotFileColumns:Array<QTableColumn> = [
{name: 'SnapshotName', label: `${i18n.global.t('cattle.SnapshotName')}`, field: row => row.spec.snapshotName, sortable: true, align: tableColumnAlign.left},
{name: 'Node', label: `${i18n.global.t('cattle.Node')}`, field: row => row.spec.nodeName, sortable: true, align: tableColumnAlign.left},
{name: 'Location', label: `${i18n.global.t('cattle.Location')}`, field: row => row.spec.location, sortable: true, align: tableColumnAlign.left},
{name: 'Size', label: `${i18n.global.t('cattle.Size')}`, field: row => row.status.size, sortable: true, align: tableColumnAlign.left},
{name: 'CreationTime', label: `${i18n.global.t('cattle.CreationTime')}`, field: row => row.status.creationTime, sortable: true, align: tableColumnAlign.left},
{name: 'Size', label: `${i18n.global.t('cattle.Size')}`, field: row => row.status?.size, sortable: true, align: tableColumnAlign.left},
{name: 'CreationTime', label: `${i18n.global.t('cattle.CreationTime')}`, field: row => row.status?.creationTime, sortable: true, align: tableColumnAlign.left},
];
export const HelmChartListExcludes = [
{ path: 'status/jobName', include: true },
Expand Down
4 changes: 2 additions & 2 deletions front/libs/certmanager/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ export const descriptionIssuer = '';
export const shortIssuer = 'Issuer';
export const extraChallengeColumns:Array<QTableColumn> = [
{name: 'Domain', label: i18n.global.t('certmanager.Domain'), field: row => row.spec.dnsName, sortable: true, align: tableColumnAlign.left},
{name: 'Reason', label: i18n.global.t('certmanager.Reason'), field: row => row.status.reason, sortable: true, align: tableColumnAlign.left},
{name: 'Reason', label: i18n.global.t('certmanager.Reason'), field: row => row.status?.reason, sortable: true, align: tableColumnAlign.left},
{name: 'Age', label: i18n.global.t('meta.age'), field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
];
export const extraOrderColumns:Array<QTableColumn> = [
{name: 'Issuer', label: i18n.global.t('certmanager.Issuer'), field: row => row.spec.issuerRef.name, sortable: true, align: tableColumnAlign.left},
{name: 'Reason', label: i18n.global.t('certmanager.Reason'), field: row => row.status.reason, sortable: true, align: tableColumnAlign.left},
{name: 'Reason', label: i18n.global.t('certmanager.Reason'), field: row => row.status?.reason, sortable: true, align: tableColumnAlign.left},
{name: 'Age', label: i18n.global.t('meta.age'), field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
];
export const extraCertificateColumns:Array<QTableColumn> = [
Expand Down
14 changes: 7 additions & 7 deletions front/libs/cilium/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ export const extraCiliumClusterwideNetworkPolicyColumns:Array<QTableColumn> = [
// {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
];
export const extraCiliumEndpointColumns:Array<QTableColumn> = [
{name: 'Endpoint ID', label: `${i18n.global.t('cilium.endpointID')}`, field: row => row.status.id, sortable: true, align: tableColumnAlign.left},
{name: 'Identity ID', label: `${i18n.global.t('cilium.identityID')}`, field: row => row.status.identity.id, sortable: true, align: tableColumnAlign.left},
{name: 'Ingress Enforcement', label: `${i18n.global.t('cilium.ingressEnforcement')}`, field: row => row.status.policy.ingress.state, sortable: true, align: tableColumnAlign.left},
{name: 'Egress Enforcement', label: `${i18n.global.t('cilium.egressEnforcement')}`, field: row => row.status.policy.egress.state, sortable: true, align: tableColumnAlign.left},
{name: 'Endpoint ID', label: `${i18n.global.t('cilium.endpointID')}`, field: row => row.status?.id, sortable: true, align: tableColumnAlign.left},
{name: 'Identity ID', label: `${i18n.global.t('cilium.identityID')}`, field: row => row.status?.identity.id, sortable: true, align: tableColumnAlign.left},
{name: 'Ingress Enforcement', label: `${i18n.global.t('cilium.ingressEnforcement')}`, field: row => row.status?.policy.ingress.state, sortable: true, align: tableColumnAlign.left},
{name: 'Egress Enforcement', label: `${i18n.global.t('cilium.egressEnforcement')}`, field: row => row.status?.policy.egress.state, sortable: true, align: tableColumnAlign.left},
{name: 'Visibility Policy', label: `${i18n.global.t('cilium.visibilityPolicy')}`, field: row => row.status['visibility-policy-status'], sortable: true, align: tableColumnAlign.left},
{name: 'Endpoint State', label: `${i18n.global.t('cilium.endpointState')}`, field: row => row.status.state, sortable: true, align: tableColumnAlign.left},
{name: 'Endpoint State', label: `${i18n.global.t('cilium.endpointState')}`, field: row => row.status?.state, sortable: true, align: tableColumnAlign.left},
];
export const extraCiliumExternalWorkloadColumns:Array<QTableColumn> = [
{name: 'ciliumID', label: `${i18n.global.t('cilium.ciliumID')}`, field: row => row.status.id, sortable: true, align: tableColumnAlign.left},
{name: 'IP', label: `${i18n.global.t('core.ip')}`, field: row => row.status.ip, sortable: true, align: tableColumnAlign.left},
{name: 'ciliumID', label: `${i18n.global.t('cilium.ciliumID')}`, field: row => row.status?.id, sortable: true, align: tableColumnAlign.left},
{name: 'IP', label: `${i18n.global.t('core.ip')}`, field: row => row.status?.ip, sortable: true, align: tableColumnAlign.left},
];
export const extraCiliumIdentityColumns:Array<QTableColumn> = [
{name: 'Namespace', label: `${i18n.global.t('meta.namespace')}`, field: row => row.metadata.labels['io.kubernetes.pod.namespace'], sortable: true, align: tableColumnAlign.left},
Expand Down
14 changes: 7 additions & 7 deletions front/libs/cnpg/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ export const shortScheduledBackup = 'ScheduledBackup';
export const extraBackupColumns:Array<QTableColumn> = [
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
{name: 'Cluster', label: `${i18n.global.t('cnpg.Cluster')}`, field: row => row.spec.cluster.name, sortable: true, align: tableColumnAlign.left},
{name: 'Phase', label: `${i18n.global.t('cnpg.Phase')}`, field: row => row.status.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Error', label: `${i18n.global.t('core.error')}`, field: row => row.status.error, sortable: true, align: tableColumnAlign.left},
{name: 'Phase', label: `${i18n.global.t('cnpg.Phase')}`, field: row => row.status?.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Error', label: `${i18n.global.t('core.error')}`, field: row => row.status?.error, sortable: true, align: tableColumnAlign.left},
];
export const extraClusterColumns:Array<QTableColumn> = [
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
{name: 'Instances', label: `${i18n.global.t('cnpg.Instances')}`, field: row => row.status.instances, sortable: true, align: tableColumnAlign.left},
{name: 'Ready', label: `${i18n.global.t('core.ready')}`, field: row => row.status.readyInstances, sortable: true, align: tableColumnAlign.left},
{name: 'Status', label: `${i18n.global.t('core.status')}`, field: row => row.status.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Primary', label: `${i18n.global.t('cnpg.Primary')}`, field: row => row.status.currentPrimary, sortable: true, align: tableColumnAlign.left},
{name: 'Instances', label: `${i18n.global.t('cnpg.Instances')}`, field: row => row.status?.instances, sortable: true, align: tableColumnAlign.left},
{name: 'Ready', label: `${i18n.global.t('core.ready')}`, field: row => row.status?.readyInstances, sortable: true, align: tableColumnAlign.left},
{name: 'Status', label: `${i18n.global.t('core.status')}`, field: row => row.status?.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Primary', label: `${i18n.global.t('cnpg.Primary')}`, field: row => row.status?.currentPrimary, sortable: true, align: tableColumnAlign.left},
];
export const extraPoolerColumns:Array<QTableColumn> = [
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
Expand All @@ -43,7 +43,7 @@ export const extraPoolerColumns:Array<QTableColumn> = [
export const extraScheduledBackupColumns:Array<QTableColumn> = [
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
{name: 'Cluster', label: `${i18n.global.t('cnpg.Cluster')}`, field: row => row.spec.cluster.name, sortable: true, align: tableColumnAlign.left},
{name: 'Last Backup', label: `${i18n.global.t('cnpg.lastBackup')}`, field: row => row.status.lastScheduleTime, sortable: true, align: tableColumnAlign.left},
{name: 'Last Backup', label: `${i18n.global.t('cnpg.lastBackup')}`, field: row => row.status?.lastScheduleTime, sortable: true, align: tableColumnAlign.left},
];
export const BackupListExcludes = [
{ path: 'metadata/creationTimestamp', include: true },
Expand Down
2 changes: 1 addition & 1 deletion front/libs/fluxcd/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const extraImagePolicyColumns:Array<QTableColumn> = [
{name: 'LastChange', label: `${i18n.global.t('fluxcd.LastChange')}`, field: row => timeAgo(row.status?.conditions[0].lastTransitionTime), sortable: true, align: tableColumnAlign.left},
];
export const extraImageRepositoryColumns:Array<QTableColumn> = [
{name: 'LastScan', label: `${i18n.global.t('fluxcd.LastScan')}`, field: row => timeAgo(row.status.lastScanResult?.scanTime), sortable: true, align: tableColumnAlign.left},
{name: 'LastScan', label: `${i18n.global.t('fluxcd.LastScan')}`, field: row => timeAgo(row.status?.lastScanResult?.scanTime), sortable: true, align: tableColumnAlign.left},
{name: 'Tags', label: `${i18n.global.t('fluxcd.Tags')}`, field: row => row.status?.lastScanResult?.tagCount, sortable: true, align: tableColumnAlign.left},
];
export const extraHelmReleaseColumns:Array<QTableColumn> = [
Expand Down
4 changes: 2 additions & 2 deletions front/libs/jaegertracing/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export const colorJaeger = systemColor;
export const descriptionJaeger = '';
export const shortJaeger = 'Jaeger';
export const extraJaegerColumns:Array<QTableColumn> = [
{name: 'Status', label: `${i18n.global.t('jaeger.Status')}`, field: row => row.status.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Version', label: `${i18n.global.t('core.version')}`, field: row => row.status.version, sortable: true, align: tableColumnAlign.left},
{name: 'Status', label: `${i18n.global.t('jaeger.Status')}`, field: row => row.status?.phase, sortable: true, align: tableColumnAlign.left},
{name: 'Version', label: `${i18n.global.t('core.version')}`, field: row => row.status?.version, sortable: true, align: tableColumnAlign.left},
{name: 'Strategy', label: `${i18n.global.t('jaeger.Strategy')}`, field: row => row.spec.strategy, sortable: true, align: tableColumnAlign.left},
{name: 'Storage', label: `${i18n.global.t('jaeger.Storage')}`, field: row => row.spec.storage.type, sortable: true, align: tableColumnAlign.left},
{name: 'Age', label: `${i18n.global.t('meta.age')}`, field: row => timeAgo(row.metadata.creationTimestamp), sortable: true, align: tableColumnAlign.left},
Expand Down
Loading

0 comments on commit 698af8f

Please sign in to comment.