From b65ed93619aa4b7ccc5dd1e70bfbf7dc933a5bda Mon Sep 17 00:00:00 2001 From: Zoe Steinkamp Date: Wed, 4 Aug 2021 10:50:01 -0600 Subject: [PATCH 1/2] fix: change from string to float --- .../components/resource_sort_dropdown/generateSortItems.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/components/resource_sort_dropdown/generateSortItems.ts b/src/shared/components/resource_sort_dropdown/generateSortItems.ts index 5afa333f21..9f7c55916d 100644 --- a/src/shared/components/resource_sort_dropdown/generateSortItems.ts +++ b/src/shared/components/resource_sort_dropdown/generateSortItems.ts @@ -241,13 +241,13 @@ export const generateSortItems = ( { label: 'Retention (Ascending)', sortKey: 'retentionRules[0].everySeconds', - sortType: SortTypes.String, + sortType: SortTypes.Float, sortDirection: Sort.Ascending, }, { label: 'Retention (Descending)', sortKey: 'retentionRules[0].everySeconds', - sortType: SortTypes.String, + sortType: SortTypes.Float, sortDirection: Sort.Descending, }, ] From e9aec939863a705f3e5acf74c68fca218dacd664 Mon Sep 17 00:00:00 2001 From: Zoe Steinkamp Date: Wed, 4 Aug 2021 18:18:34 -0600 Subject: [PATCH 2/2] fix: fix the tests --- cypress/e2e/cloud/buckets.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/cloud/buckets.test.ts b/cypress/e2e/cloud/buckets.test.ts index 6b71f5829d..367877b879 100644 --- a/cypress/e2e/cloud/buckets.test.ts +++ b/cypress/e2e/cloud/buckets.test.ts @@ -27,16 +27,16 @@ describe('Buckets', () => { monitoringBucket, ] const retentionDesc = [ + defaultBucket, monitoringBucket, demoDataBucket, tasksBucket, - defaultBucket, ] const retentionAsc = [ - defaultBucket, tasksBucket, monitoringBucket, demoDataBucket, + defaultBucket, ] // if demo data bucket doesn't exist, create a bucket with the same name