From d326f7a9ae928da9cc6daa223020afda01d0cf96 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Tue, 21 May 2024 20:32:05 +0100 Subject: [PATCH 1/3] fix sort default order --- website/src/components/SearchPage/SearchFullUI.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/components/SearchPage/SearchFullUI.tsx b/website/src/components/SearchPage/SearchFullUI.tsx index 07996ed8db..f76e6f9d37 100644 --- a/website/src/components/SearchPage/SearchFullUI.tsx +++ b/website/src/components/SearchPage/SearchFullUI.tsx @@ -82,8 +82,8 @@ export const InnerSearchFullUI = ({ const [state, setState] = useQueryAsState({}); const [page, setPage] = useState(1); - const orderByField = state.orderBy ?? schema.primaryKey; - const orderDirection = state.order ?? 'ascending'; + const orderByField = state.orderBy ?? schema.defaultOrderBy ?? schema.primaryKey; + const orderDirection = state.order ?? schema.defaultOrder ?? 'ascending'; const setOrderByField = (field: string) => { setState((prev: QueryState) => ({ From 8562aa598ce6e9798069789ef2db619ebae3b042 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Tue, 21 May 2024 20:36:11 +0100 Subject: [PATCH 2/3] fix test --- .../SequenceDetailsPage/getTableData.spec.ts | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/website/src/components/SequenceDetailsPage/getTableData.spec.ts b/website/src/components/SequenceDetailsPage/getTableData.spec.ts index 41103bc693..13c6315847 100644 --- a/website/src/components/SequenceDetailsPage/getTableData.spec.ts +++ b/website/src/components/SequenceDetailsPage/getTableData.spec.ts @@ -76,35 +76,8 @@ describe('getTableData', () => { test('should return default values when there is no data', async () => { const result = await getTableData(accessionVersion, schema, lapisClient); - const defaultList: TableDataEntry[] = [ - { - label: 'Metadata field1', - name: 'metadataField1', - value: 'N/A', - customDisplay: undefined, - header: 'testHeader1', - type: { kind: 'metadata', metadataType: 'string' }, - }, - { - label: 'Metadata field2', - name: 'metadataField2', - value: 'N/A', - customDisplay: undefined, - header: '', - type: { kind: 'metadata', metadataType: 'string' }, - }, - { - label: 'Timestamp field', - name: 'timestampField', - value: 'N/A', - customDisplay: undefined, - header: '', - type: { kind: 'metadata', metadataType: 'timestamp' }, - }, - ]; - const data = result._unsafeUnwrap().data; - expect(data).toStrictEqual(defaultList.concat(defaultMutationsInsertionsDeletionsList)); + expect(data).toStrictEqual(defaultMutationsInsertionsDeletionsList); }); test('should return details field values', async () => { From 6fefe53b5107d7f76d19a44e50e05abd11d0db52 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Tue, 21 May 2024 20:37:43 +0100 Subject: [PATCH 3/3] remove NAs --- website/src/components/SequenceDetailsPage/getTableData.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/website/src/components/SequenceDetailsPage/getTableData.ts b/website/src/components/SequenceDetailsPage/getTableData.ts index f0ea5c6626..a93c43f41c 100644 --- a/website/src/components/SequenceDetailsPage/getTableData.ts +++ b/website/src/components/SequenceDetailsPage/getTableData.ts @@ -160,6 +160,7 @@ function toTableData(config: Schema) { }): TableDataEntry[] => { const data: TableDataEntry[] = config.metadata .filter((metadata) => metadata.hideOnSequenceDetailsPage !== true) + .filter((metadata) => details[metadata.name] !== null && metadata.name in details) .map((metadata) => ({ label: metadata.displayName ?? sentenceCase(metadata.name), name: metadata.name,