From 53f32f2cbb72e78f814cdd2b39ea0ebffedb0275 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Fri, 8 Dec 2023 15:05:29 +0100 Subject: [PATCH] Revert tf changes --- .../user-guide/vcluster-capi-template.yaml | 1 - .../Terraform/TerraformListTable.tsx | 11 +--- .../__tests__/TerraformListTable.tsx | 62 ------------------- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 ui/src/components/Terraform/__tests__/TerraformListTable.tsx diff --git a/tools/dev-resources/user-guide/vcluster-capi-template.yaml b/tools/dev-resources/user-guide/vcluster-capi-template.yaml index 7ec2c6ba8..678be90a9 100644 --- a/tools/dev-resources/user-guide/vcluster-capi-template.yaml +++ b/tools/dev-resources/user-guide/vcluster-capi-template.yaml @@ -6,7 +6,6 @@ metadata: annotations: templates.weave.works/profiles-enabled: "true" templates.weave.works/add-common-bases: "true" - templates.weave.works/credentials-enabled: "true" labels: weave.works/template-type: cluster spec: diff --git a/ui/src/components/Terraform/TerraformListTable.tsx b/ui/src/components/Terraform/TerraformListTable.tsx index 41cc82c2b..5355a3464 100644 --- a/ui/src/components/Terraform/TerraformListTable.tsx +++ b/ui/src/components/Terraform/TerraformListTable.tsx @@ -21,15 +21,8 @@ type Props = { export const getLastApplied = (tf: TerraformObject) => { const timestamp = _.find(tf?.conditions, { type: 'Apply' })?.timestamp; - if (!timestamp) { - return '-'; - } - - try { - return new Date(timestamp).toISOString(); - } catch (e) { - return '-'; - } + if (!timestamp) return '-'; + return new Date(timestamp).toISOString(); }; function TerraformListTable({ className, rows }: Props) { diff --git a/ui/src/components/Terraform/__tests__/TerraformListTable.tsx b/ui/src/components/Terraform/__tests__/TerraformListTable.tsx deleted file mode 100644 index f50b2c9c5..000000000 --- a/ui/src/components/Terraform/__tests__/TerraformListTable.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import { TerraformObject } from '../../../api/terraform/types.pb'; -import { getLastApplied } from '../TerraformListTable'; - -describe('getLastApplied', () => { - const obj: TerraformObject = { - conditions: [ - { - type: 'Apply', - status: 'True', - timestamp: '2021-08-11T14:23:39Z', - }, - ], - }; - - it('should return the timestamp', () => { - expect(getLastApplied(obj)).toBe('2021-08-11T14:23:39.000Z'); - }); - - it('should return "-" if no timestamp', () => { - const obj2: TerraformObject = { - conditions: [ - { - type: 'Apply', - status: 'True', - }, - ], - }; - expect(getLastApplied(obj2)).toBe('-'); - }); - - it('should return "-" if no conditions', () => { - const obj3: TerraformObject = {}; - expect(getLastApplied(obj3)).toBe('-'); - }); - - it('should return "-" if no conditions with type Apply', () => { - const obj4: TerraformObject = { - conditions: [ - { - type: 'Apply1', - status: 'True', - timestamp: '2021-08-11T14:23:39Z', - }, - ], - }; - expect(getLastApplied(obj4)).toBe('-'); - }); - - it('should return "-" if the timestamp is not valid', () => { - const obj5: TerraformObject = { - conditions: [ - { - type: 'Apply', - status: 'True', - timestamp: 'foo', - }, - ], - }; - - expect(getLastApplied(obj5)).toBe('-'); - }); -});