From 407f2c20edc6ed4f1e5a3715c5414369a22de544 Mon Sep 17 00:00:00 2001 From: Gaelle <133775440+AltefrohneGaelle@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:24:27 -0500 Subject: [PATCH] fix(variants): SKFP-1404 add FT on export * fix(variants): SKFP-1404 add FT on export * fix(studies): SKFP-1404 remove sort on public studies columns --- .env.schema | 3 +++ src/views/PublicStudies/utils.tsx | 3 --- .../Variants/components/PageContent/VariantsTable/index.tsx | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.env.schema b/.env.schema index 4808c795a..b03964aab 100644 --- a/.env.schema +++ b/.env.schema @@ -49,6 +49,9 @@ REACT_APP_FT_DASHBOARD_BANNER=true REACT_APP_FT_DASHBOARD_BANNER_TYPE=info REACT_APP_FT_DASHBOARD_BANNER_MSG="A wonderful notification" +# FEATURE TOGGLE Variant +REACT_APP_FT_VARIANTS_EXPORT=true + # Landing Page REACT_APP_FT_LANDING_PAGE=true REACT_APP_FT_PUBLIC_STUDIES=true diff --git a/src/views/PublicStudies/utils.tsx b/src/views/PublicStudies/utils.tsx index 610d2d2f4..8fb488bdf 100644 --- a/src/views/PublicStudies/utils.tsx +++ b/src/views/PublicStudies/utils.tsx @@ -55,7 +55,6 @@ export const getColumns = ({ key: 'external_id', title: intl.get('entities.study.external_id'), dataIndex: 'external_id', - sorter: { multiple: 1 }, render: (externalId: string) => externalId ? ( { const participantCount = record.participant_count; return participantCount ? ( @@ -104,7 +102,6 @@ export const getColumns = ({ key: 'family_count', title: intl.get('entities.study.family_count'), dataIndex: 'family_count', - sorter: { multiple: 1 }, render: (family_count: number) => family_count ? numberWithCommas(family_count) : TABLE_EMPTY_PLACE_HOLDER, }, diff --git a/src/views/Variants/components/PageContent/VariantsTable/index.tsx b/src/views/Variants/components/PageContent/VariantsTable/index.tsx index 4aaaf4962..922b39bf2 100644 --- a/src/views/Variants/components/PageContent/VariantsTable/index.tsx +++ b/src/views/Variants/components/PageContent/VariantsTable/index.tsx @@ -34,6 +34,7 @@ import { IVariantInternalFrequencies, IVariantStudyEntity, } from 'graphql/variants/models'; +import { getFTEnvVarByKey } from 'helpers/EnvVariables'; import { capitalize, isEmpty } from 'lodash'; import SetsManagementDropdown from 'views/DataExploration/components/SetsManagementDropdown'; import { DATA_EXPLORATION_QB_ID, DEFAULT_PAGE_INDEX } from 'views/DataExploration/utils/constant'; @@ -464,6 +465,8 @@ const VariantsTable = ({ const [selectedRows, setSelectedRows] = useState([]); const [selectedAllResults, setSelectedAllResults] = useState(false); + const variantsExport = getFTEnvVarByKey('VARIANTS_EXPORT'); + const getCurrentSqon = (): any => selectedAllResults || !selectedKeys.length ? sqon @@ -518,7 +521,7 @@ const VariantsTable = ({ total: results.total, }, enableColumnSort: true, - enableTableExport: true, + enableTableExport: variantsExport === 'true' ? true : false, onColumnSortChange: (newState) => dispatch( updateUserConfig({