From 7126afa972e5fd325498001c46d23b0ca2ea0c24 Mon Sep 17 00:00:00 2001 From: Benjamin Capodanno Date: Wed, 5 Aug 2026 13:57:26 -0700 Subject: [PATCH 1/4] refactor(ui): move error-response helpers into src/lib/errors - Extract `getErrorResponse` out of `api/mavedb/index.ts` and add `describeRequestError` alongside it in the new `src/lib/errors.ts`, replacing the ad hoc `extractErrorDetail` in ScoreSetCalibrationsView - Update all call sites to import from `@/lib/errors` instead of `@/api/mavedb` - Add unit tests covering both exported functions --- src/api/mavedb/index.ts | 15 ----- .../collection/CollectionDataSetEditor.vue | 2 +- src/components/screens/CollectionView.vue | 2 +- src/components/screens/ExperimentCreator.vue | 3 +- src/components/screens/ExperimentEditor.vue | 3 +- .../screens/ScoreSetCalibrationsView.vue | 23 ++----- src/components/screens/ScoreSetCreator.vue | 3 +- src/components/screens/ScoreSetEditor.vue | 3 +- .../screens/SearchVariantsScreen.vue | 3 +- src/components/screens/SettingsScreen.vue | 11 +--- src/lib/errors.test.ts | 65 +++++++++++++++++++ src/lib/errors.ts | 43 ++++++++++++ src/lib/genes.ts | 3 +- src/lib/orcid.ts | 2 +- 14 files changed, 131 insertions(+), 50 deletions(-) create mode 100644 src/lib/errors.test.ts create mode 100644 src/lib/errors.ts diff --git a/src/api/mavedb/index.ts b/src/api/mavedb/index.ts index c097c748..3a92e5cf 100644 --- a/src/api/mavedb/index.ts +++ b/src/api/mavedb/index.ts @@ -1,18 +1,3 @@ -import {isAxiosError} from 'axios' - -export interface ErrorResponse { - status: number - data?: Record -} - -/** Extract a normalized response from a caught Axios error. */ -export function getErrorResponse(e: unknown): ErrorResponse { - if (isAxiosError(e) && e.response) { - return {status: e.response.status, data: e.response.data as Record} - } - return {status: 500} -} - export * from './access-keys' export * from './calibrations' export * from './collections' diff --git a/src/components/collection/CollectionDataSetEditor.vue b/src/components/collection/CollectionDataSetEditor.vue index 5e962885..9a4c997f 100644 --- a/src/components/collection/CollectionDataSetEditor.vue +++ b/src/components/collection/CollectionDataSetEditor.vue @@ -101,7 +101,7 @@ import useItem from '@/composition/item.ts' import {addCollectionScoreSet, addCollectionExperiment} from '@/api/mavedb/collections' import {getScoreSet} from '@/api/mavedb/variants' import {getExperiment} from '@/api/mavedb/experiments' -import {getErrorResponse} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import {type DataSetType, DATA_SET_TYPE_LABELS} from '@/lib/collections' import MvEmailPrompt from '@/components/common/MvEmailPrompt.vue' import {components} from '@/schema/openapi' diff --git a/src/components/screens/CollectionView.vue b/src/components/screens/CollectionView.vue index e5f9afa7..78bfd8fa 100644 --- a/src/components/screens/CollectionView.vue +++ b/src/components/screens/CollectionView.vue @@ -258,7 +258,7 @@ import {deleteCollection, removeCollectionEntity, updateCollection} from '@/api/ import {useDatasetPermissions} from '@/composables/use-dataset-permissions' import type {RowAction} from '@/components/common/MvRowActionMenu.vue' import {components} from '@/schema/openapi' -import {getErrorResponse} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' type Collection = components['schemas']['Collection'] type User = components['schemas']['User'] diff --git a/src/components/screens/ExperimentCreator.vue b/src/components/screens/ExperimentCreator.vue index 4d11926d..407d70a0 100644 --- a/src/components/screens/ExperimentCreator.vue +++ b/src/components/screens/ExperimentCreator.vue @@ -172,7 +172,8 @@ import useScopedId from '@/composables/scoped-id' import {useExperimentKeywords} from '@/composables/use-experiment-keywords' import {useJsonFileField} from '@/composables/use-json-file-field' import {usePublicationIdentifiers} from '@/composables/use-publication-identifiers' -import {createExperiment, getErrorResponse} from '@/api/mavedb' +import {createExperiment} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import useAuth from '@/composition/auth' import {useKeywordOptions} from '@/composables/use-keyword-options' import {normalizeDoiArray, normalizeRawReadArray, normalizeContributorArray} from '@/lib/form-helpers' diff --git a/src/components/screens/ExperimentEditor.vue b/src/components/screens/ExperimentEditor.vue index 590165a9..940cb461 100644 --- a/src/components/screens/ExperimentEditor.vue +++ b/src/components/screens/ExperimentEditor.vue @@ -111,7 +111,8 @@ import {useExperimentKeywords} from '@/composables/use-experiment-keywords' import {useJsonFileField} from '@/composables/use-json-file-field' import {usePublicationIdentifiers, type PublicationIdentifier} from '@/composables/use-publication-identifiers' import useAuth from '@/composition/auth' -import {updateExperiment, getErrorResponse} from '@/api/mavedb' +import {updateExperiment} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import useItem from '@/composition/item.ts' import {useKeywordOptions} from '@/composables/use-keyword-options' import {normalizeDoiArray, normalizeRawReadArray, normalizeContributorArray} from '@/lib/form-helpers' diff --git a/src/components/screens/ScoreSetCalibrationsView.vue b/src/components/screens/ScoreSetCalibrationsView.vue index 983695a3..373c2be7 100644 --- a/src/components/screens/ScoreSetCalibrationsView.vue +++ b/src/components/screens/ScoreSetCalibrationsView.vue @@ -232,7 +232,6 @@ import { getScoreSetCalibrations } from '@/api/mavedb' import {useDatasetPermissions} from '@/composables/use-dataset-permissions' -import axios from 'axios' import Button from 'primevue/button' import Column from 'primevue/column' import DataTable from 'primevue/datatable' @@ -242,6 +241,7 @@ import useAuth from '@/composition/auth' import {useCalibrationDialog} from '@/composables/use-calibration-dialog' import MvPageLoading from '@/components/common/MvPageLoading.vue' import CalibrationTable from '@/components/calibration/CalibrationTable.vue' +import {describeRequestError} from '@/lib/errors' import {getScoreSetShortName} from '@/lib/score-sets' import {useConfirm} from 'primevue/useconfirm' import CalibrationEditor from '@/components/calibration/CalibrationEditor.vue' @@ -258,17 +258,6 @@ type ScoreSet = components['schemas']['ScoreSet'] const CALIBRATION_ACTIONS = ['update', 'delete', 'publish', 'change_rank'] as const type CalibrationAuthorizations = Record<(typeof CALIBRATION_ACTIONS)[number], boolean> -function extractErrorDetail(error: unknown): string { - if ( - axios.isAxiosError(error) && - error.response?.data?.detail && - (typeof error.response.data.detail === 'string' || error.response.data.detail instanceof String) - ) { - return error.response.data.detail as string - } - return String(error) -} - export default { name: 'ScoreSetCalibrationsView', components: { @@ -510,7 +499,7 @@ export default { this.$toast.add({ severity: 'error', summary: 'Calibration Not Published', - detail: `An error occurred while publishing the calibration: ${extractErrorDetail(error)}. Please try again later.`, + detail: `An error occurred while publishing the calibration: ${describeRequestError(error)}. Please try again later.`, life: 4000 }) } @@ -534,7 +523,7 @@ export default { this.$toast.add({ severity: 'error', summary: 'Calibration Not Demoted', - detail: `An error occurred while demoting the calibration: ${extractErrorDetail(error)}. Please try again later.`, + detail: `An error occurred while demoting the calibration: ${describeRequestError(error)}. Please try again later.`, life: 4000 }) } @@ -555,7 +544,7 @@ export default { this.$toast.add({ severity: 'error', summary: 'Calibration Not Promoted', - detail: `An error occurred while promoting the calibration: ${extractErrorDetail(error)}. Please try again later.`, + detail: `An error occurred while promoting the calibration: ${describeRequestError(error)}. Please try again later.`, life: 4000 }) } @@ -583,7 +572,7 @@ export default { this.$toast.add({ severity: 'error', summary: 'Calibration Not Deleted', - detail: `An error occurred while deleting the calibration: ${extractErrorDetail(error)}. Please try again later.`, + detail: `An error occurred while deleting the calibration: ${describeRequestError(error)}. Please try again later.`, life: 4000 }) } @@ -610,7 +599,7 @@ export default { this.$toast.add({ severity: 'error', summary: 'Download Failed', - detail: `An error occurred while downloading the calibrations: ${extractErrorDetail(error)}. Please try again later.`, + detail: `An error occurred while downloading the calibrations: ${describeRequestError(error)}. Please try again later.`, life: 4000 }) } diff --git a/src/components/screens/ScoreSetCreator.vue b/src/components/screens/ScoreSetCreator.vue index 9d65a6cc..7a87d88e 100644 --- a/src/components/screens/ScoreSetCreator.vue +++ b/src/components/screens/ScoreSetCreator.vue @@ -405,7 +405,8 @@ import ToggleSwitch from 'primevue/toggleswitch' import {ref} from 'vue' import {useHead} from '@unhead/vue' -import {getExperiment, searchMyExperiments, createScoreSet, uploadVariantData, getErrorResponse} from '@/api/mavedb' +import {getExperiment, searchMyExperiments, createScoreSet, uploadVariantData} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import CalibrationEditor from '@/components/calibration/CalibrationEditor.vue' import MvEmailPrompt from '@/components/common/MvEmailPrompt.vue' import ScoreSetContextFields from '@/components/forms/ScoreSetContextFields.vue' diff --git a/src/components/screens/ScoreSetEditor.vue b/src/components/screens/ScoreSetEditor.vue index 02762aee..49fbf953 100644 --- a/src/components/screens/ScoreSetEditor.vue +++ b/src/components/screens/ScoreSetEditor.vue @@ -257,7 +257,8 @@ import {useHead} from '@unhead/vue' import ToggleSwitch from 'primevue/toggleswitch' -import {searchMyExperiments, updateScoreSetWithVariants, getErrorResponse} from '@/api/mavedb' +import {searchMyExperiments, updateScoreSetWithVariants} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import MvEmailPrompt from '@/components/common/MvEmailPrompt.vue' import MvEmptyState from '@/components/common/MvEmptyState.vue' import ScoreSetContextFields from '@/components/forms/ScoreSetContextFields.vue' diff --git a/src/components/screens/SearchVariantsScreen.vue b/src/components/screens/SearchVariantsScreen.vue index aba122a6..6678fc13 100644 --- a/src/components/screens/SearchVariantsScreen.vue +++ b/src/components/screens/SearchVariantsScreen.vue @@ -778,7 +778,8 @@ import { getAlleleByGnomad, getGeneBySymbol } from '@/api/clingen' -import {getCollection, getErrorResponse, lookupVariantsByClingenId} from '@/api/mavedb' +import {getCollection, lookupVariantsByClingenId} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import {lookupVariantsByVrsDigest} from '@/api/mavedb/variants' import {useEntityCache} from '@/composables/entity-cache' import MvLoader from '@/components/common/MvLoader.vue' diff --git a/src/components/screens/SettingsScreen.vue b/src/components/screens/SettingsScreen.vue index ccd13d48..cade549b 100644 --- a/src/components/screens/SettingsScreen.vue +++ b/src/components/screens/SettingsScreen.vue @@ -153,15 +153,8 @@ import {defineComponent} from 'vue' import {useHead} from '@unhead/vue' import {useRouter} from 'vue-router' -import { - createAccessKey, - createRoleAccessKey, - deleteAccessKey, - getErrorResponse, - getMyCollections, - searchMyExperiments, - searchMyScoreSets -} from '@/api/mavedb' +import {createAccessKey, createRoleAccessKey, deleteAccessKey, getMyCollections, searchMyExperiments, searchMyScoreSets} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' import MvAccessKeyRow from '@/components/common/MvAccessKeyRow.vue' import MvOrcidLink from '@/components/common/MvOrcidLink.vue' import MvFloatField from '@/components/forms/MvFloatField.vue' diff --git a/src/lib/errors.test.ts b/src/lib/errors.test.ts new file mode 100644 index 00000000..e258023a --- /dev/null +++ b/src/lib/errors.test.ts @@ -0,0 +1,65 @@ +import {describe, expect, it, vi} from 'vitest' + +import {describeRequestError, getErrorResponse} from './errors' + +vi.mock('axios', () => { + const isAxiosError = (error: unknown) => Boolean((error as {isAxiosError?: boolean})?.isAxiosError) + return {default: {isAxiosError}, isAxiosError} +}) + +function axiosError(data: unknown): unknown { + return {isAxiosError: true, response: {status: 400, data}, message: 'Request failed'} +} + +describe('describeRequestError', () => { + it('prefers a string detail from the server', () => { + expect(describeRequestError(axiosError({detail: 'Score set is private.'}))).toBe('Score set is private.') + }) + + it('serializes a non-string detail rather than losing it', () => { + const detail = [{loc: ['query', 'namespaces', 0], msg: 'Value error, must be one of ...'}] + + const message = describeRequestError(axiosError({detail})) + + expect(message).toContain('namespaces') + expect(message).toContain('Value error') + }) + + it('returns a plain string body as-is', () => { + expect(describeRequestError(axiosError('Gateway timeout'))).toBe('Gateway timeout') + }) + + it('serializes a response body with no detail field', () => { + expect(describeRequestError(axiosError({error: 'nope'}))).toBe('{"error":"nope"}') + }) + + it('falls back to the exception message for non-request failures', () => { + expect(describeRequestError(new Error('Network down'))).toBe('Network down') + }) + + it('falls back to the exception message when there is no response body', () => { + expect(describeRequestError({isAxiosError: true, message: 'Request failed'})).toBe('Unknown error.') + }) + + it('always returns something renderable', () => { + expect(describeRequestError(undefined)).toBe('Unknown error.') + expect(describeRequestError('a bare string')).toBe('Unknown error.') + }) +}) + +describe('getErrorResponse', () => { + it('extracts the status and body from an Axios error', () => { + expect(getErrorResponse(axiosError({detail: 'Score set is private.'}))).toEqual({ + status: 400, + data: {detail: 'Score set is private.'} + }) + }) + + it('falls back to a 500 for non-Axios errors', () => { + expect(getErrorResponse(new Error('Network down'))).toEqual({status: 500}) + }) + + it('falls back to a 500 when the Axios error has no response', () => { + expect(getErrorResponse({isAxiosError: true, message: 'Request failed'})).toEqual({status: 500}) + }) +}) diff --git a/src/lib/errors.ts b/src/lib/errors.ts new file mode 100644 index 00000000..db0f50e1 --- /dev/null +++ b/src/lib/errors.ts @@ -0,0 +1,43 @@ +import axios, {isAxiosError} from 'axios' + +/** + * Extract a message worth showing a user from a failed request. + * + * Prefers the server's own `detail`, which is where FastAPI puts the human-readable reason, and falls + * back through the raw response body to the exception message. Always returns something renderable, so + * callers can drop it straight into a toast. + * + * For the status code rather than the message, see `getErrorResponse` in `@/api/mavedb`. + */ +export function describeRequestError(error: unknown): string { + if (axios.isAxiosError(error) && error.response?.data) { + const data = error.response.data + if (typeof data === 'string') return data + if (typeof data === 'object' && data !== null && 'detail' in data) { + const detail = (data as {detail: unknown}).detail + // A string detail is the common case. A validation error is an array of objects; JSON is more use + // to a reader than "AxiosError: Request failed with status code 422". + return typeof detail === 'string' ? detail : JSON.stringify(detail) + } + return JSON.stringify(data) + } + return error instanceof Error ? error.message : 'Unknown error.' +} + +export interface ErrorResponse { + status: number + data?: Record +} + +/** + * Extract a normalized status and body from a caught Axios error. + * + * The counterpart to `describeRequestError`: use this when the caller branches on the status code, and + * that one when it just needs something to show the user. + */ +export function getErrorResponse(e: unknown): ErrorResponse { + if (isAxiosError(e) && e.response) { + return {status: e.response.status, data: e.response.data as Record} + } + return {status: 500} +} diff --git a/src/lib/genes.ts b/src/lib/genes.ts index 4b711a76..88d7d4aa 100644 --- a/src/lib/genes.ts +++ b/src/lib/genes.ts @@ -1,4 +1,5 @@ -import {getErrorResponse, type GeneResponse, type GeneScoreSet} from '@/api/mavedb' +import {type GeneResponse, type GeneScoreSet} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' export type GeneErrorState = 'not-found' | 'retryable' diff --git a/src/lib/orcid.ts b/src/lib/orcid.ts index 615ac72c..15405599 100644 --- a/src/lib/orcid.ts +++ b/src/lib/orcid.ts @@ -33,7 +33,7 @@ import {v4 as uuidv4} from 'uuid' import {computed, ref, Ref} from 'vue' import config from '../config' -import {getErrorResponse} from '@/api/mavedb' +import {getErrorResponse} from '@/lib/errors' export interface OidcUserProfileBase { auth_time: number From 2d9b4e820c80789eaf3c9cb78e0a950d602bca33 Mon Sep 17 00:00:00 2001 From: Benjamin Capodanno Date: Thu, 6 Aug 2026 10:38:37 -0700 Subject: [PATCH 2/4] feat(ui): add a shared CSV column picker driven by namespace discovery Add use-csv-namespaces.ts and MvCsvColumnDialog.vue: a composable and dialog that fetch a score set's or variant's available CSV column namespaces from the new discovery endpoints and let a user pick which to include, replacing the score-set custom-download dialog's hand-picked checkbox list (scores/counts/mappedHgvs/etc.) that mapped to query params the API never actually read. Sections are grouped and labeled by the server (Measurements, Annotations, Clinical interpretation, Provenance) rather than hand-maintained client-side, and split by owning score set when a variant's calibrations span more than one. Defaults come from the API's selectedByDefault flag, so a research-use-only or rangeless calibration is offered but opts in explicitly. Wire it up in two places: - MvVariantPreview.vue's "Custom Data" dialog now uses it for score-set downloads instead of the old checkbox dialog - VariantScreen.vue gets a new "Download variant CSV" control backed by the variant-level CSV endpoint, split from the existing VA-Spec annotation downloads since they're a different kind of artifact (flat table vs. nested standard objects); use-variant-lookup.ts gains downloadVariantCsvFile and a shared downloadInProgressLabel Update openapi.d.ts for the new AvailableCsvNamespace / CsvNamespaceGroup schemas and endpoints, and switch score-sets.ts / variants.ts's CSV requests from drop_na_columns and include_post_mapped_hgvs to drop_unused_hgvs_columns and the namespace list, matching the API's new parameter names. --- src/api/mavedb/score-sets.ts | 39 +- src/api/mavedb/variants.ts | 22 + src/components/common/MvCsvColumnDialog.vue | 129 +++++ src/components/common/MvVariantPreview.vue | 59 +-- src/components/screens/VariantScreen.vue | 189 ++++--- src/composables/use-csv-namespaces.test.ts | 559 ++++++++++++++++++++ src/composables/use-csv-namespaces.ts | 220 ++++++++ src/composables/use-variant-lookup.ts | 51 +- src/schema/openapi.d.ts | 378 ++++++++++++- 9 files changed, 1511 insertions(+), 135 deletions(-) create mode 100644 src/components/common/MvCsvColumnDialog.vue create mode 100644 src/composables/use-csv-namespaces.test.ts create mode 100644 src/composables/use-csv-namespaces.ts diff --git a/src/api/mavedb/score-sets.ts b/src/api/mavedb/score-sets.ts index f2211a84..24ef5517 100644 --- a/src/api/mavedb/score-sets.ts +++ b/src/api/mavedb/score-sets.ts @@ -7,13 +7,10 @@ type ScoreSetSearch = components['schemas']['ScoreSetsSearch'] type ScoreSetsSearchResponse = components['schemas']['ScoreSetsSearchResponse'] export type ScoreSetsSearchFilterOptionsResponse = components['schemas']['ScoreSetsSearchFilterOptionsResponse'] -const HISTOGRAM_VARIANT_DATA_NAMESPACES = ['vep', 'scores', 'clingen'] +const HISTOGRAM_VARIANT_DATA_NAMESPACES = ['vep', 'scores', 'clingen', 'mavedb'] -function scoreSetVariantDataParams( - options: {includePostMappedHgvs?: boolean; namespaces?: string[]} = {} -): URLSearchParams { +function scoreSetVariantDataParams(options: {namespaces?: string[]} = {}): URLSearchParams { const params = new URLSearchParams() - if (options.includePostMappedHgvs) params.append('include_post_mapped_hgvs', 'true') for (const namespace of options.namespaces ?? []) params.append('namespaces', namespace) return params } @@ -25,10 +22,7 @@ function scoreSetVariantDataUrl(urn: string, params: URLSearchParams = new URLSe } export function histogramScoreSetVariantDataUrl(urn: string): string { - return scoreSetVariantDataUrl( - urn, - scoreSetVariantDataParams({includePostMappedHgvs: true, namespaces: HISTOGRAM_VARIANT_DATA_NAMESPACES}) - ) + return scoreSetVariantDataUrl(urn, scoreSetVariantDataParams({namespaces: HISTOGRAM_VARIANT_DATA_NAMESPACES})) } // --------------------------------------------------------------------------- @@ -103,17 +97,32 @@ export async function publishScoreSet(urn: string) { } export async function getScoreSetClinicalControlOptions(urn: string) { - const response = await axios.get(`${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/clinical-controls/options`) + const response = await axios.get( + `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/clinical-controls/options` + ) return response.data } export async function downloadScoreSetFile(urn: string, type: 'scores' | 'counts'): Promise { const response = await axios.get( - `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/${type}?drop_na_columns=true` + `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/${type}?drop_unused_hgvs_columns=true` ) return response.data } +/** + * Fetch the CSV column namespaces this score set has data for. + */ +export async function getScoreSetCsvNamespaces( + urn: string, + signal?: AbortSignal +): Promise { + const response = await axios.get(`${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/csv-namespaces`, { + signal + }) + return response.data +} + export async function downloadScoreSetVariantData(urn: string, params: URLSearchParams): Promise { const response = await axios.get(scoreSetVariantDataUrl(urn, params)) return response.data @@ -121,14 +130,14 @@ export async function downloadScoreSetVariantData(urn: string, params: URLSearch export async function getScoreSetScoresPreview(urn: string): Promise { const response = await axios.get( - `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/scores?drop_na_columns=true` + `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/scores?drop_unused_hgvs_columns=true` ) return response.data } export async function getScoreSetCountsPreview(urn: string): Promise { const response = await axios.get( - `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/counts?drop_na_columns=true` + `${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}/counts?drop_unused_hgvs_columns=true` ) return response.data } @@ -138,7 +147,9 @@ export async function downloadMappedVariants(urn: string) { return response.data } -export async function getRecentlyPublishedScoreSets(signal?: AbortSignal): Promise { +export async function getRecentlyPublishedScoreSets( + signal?: AbortSignal +): Promise { const response = await axios.get(`${config.apiBaseUrl}/score-sets/recently-published`, { headers: {accept: 'application/json'}, signal diff --git a/src/api/mavedb/variants.ts b/src/api/mavedb/variants.ts index f0db95a4..24f5a31c 100644 --- a/src/api/mavedb/variants.ts +++ b/src/api/mavedb/variants.ts @@ -8,6 +8,7 @@ type ScoreSet = components['schemas']['ScoreSet'] type VariantEffectMeasurementWithScoreSet = components['schemas']['VariantEffectMeasurementWithScoreSet'] type ClingenAlleleIdVariantLookupResponse = components['schemas']['ClingenAlleleIdVariantLookupResponse'] type MappedVariant = components['schemas']['MappedVariant'] +type AvailableCsvNamespace = components['schemas']['AvailableCsvNamespace'] export async function lookupVariantsByClingenId( clingenAlleleIds: string[] @@ -47,3 +48,24 @@ export async function getScoreSet(urn: string): Promise { const response = await axios.get(`${config.apiBaseUrl}/score-sets/${encodeURIComponent(urn)}`) return response.data } + +/** + * Fetch the CSV column namespaces this variant has data for. + */ +export async function getVariantCsvNamespaces(urn: string, signal?: AbortSignal): Promise { + const response = await axios.get(`${config.apiBaseUrl}/variants/${encodeURIComponent(urn)}/csv-namespaces`, {signal}) + return response.data +} + +export function variantCsvUrl(urn: string, namespaces?: string[]): string { + const params = new URLSearchParams() + for (const namespace of namespaces ?? []) params.append('namespaces', namespace) + const query = params.toString() + const baseUrl = `${config.apiBaseUrl}/variants/${encodeURIComponent(urn)}/csv` + return query ? `${baseUrl}?${query}` : baseUrl +} + +export async function downloadVariantCsv(urn: string, namespaces?: string[]): Promise { + const response = await axios.get(variantCsvUrl(urn, namespaces)) + return response.data +} diff --git a/src/components/common/MvCsvColumnDialog.vue b/src/components/common/MvCsvColumnDialog.vue new file mode 100644 index 00000000..afc2e983 --- /dev/null +++ b/src/components/common/MvCsvColumnDialog.vue @@ -0,0 +1,129 @@ + + + diff --git a/src/components/common/MvVariantPreview.vue b/src/components/common/MvVariantPreview.vue index 85fd7762..e0d2c4b0 100644 --- a/src/components/common/MvVariantPreview.vue +++ b/src/components/common/MvVariantPreview.vue @@ -10,28 +10,32 @@
+ @click="downloadFile('scores')" /> + @click="downloadFile('counts')" /> + @click="customDialogVisible = true" /> + +