diff --git a/src/js/components/Provenance/DatasetProvenance.tsx b/src/js/components/Provenance/DatasetProvenance.tsx
index 65949796..390530c1 100644
--- a/src/js/components/Provenance/DatasetProvenance.tsx
+++ b/src/js/components/Provenance/DatasetProvenance.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { Card, Descriptions, Tag, Typography } from 'antd';
-import { useTranslation } from 'react-i18next';
import DistributionsTable from './Tables/DistributionsTable';
import IsAboutTable from './Tables/IsAboutTable';
@@ -10,7 +9,7 @@ import ExtraPropertiesTable from './Tables/ExtraPropertiesTable';
import PublicationsTable from './Tables/PublicationsTable';
import CreatedByTable from './Tables/CreatedByTable';
import DownloadDats from './DownloadDats';
-import { DEFAULT_TRANSLATION, NON_DEFAULT_TRANSLATION } from '@/constants/configConstants';
+import { useTranslationCustom, useTranslationDefault } from '@/hooks';
import { ProvenanceStoreDataset } from '@/types/provenance';
const { Item } = Descriptions;
@@ -18,8 +17,8 @@ const { Text, Title } = Typography;
const { Meta } = Card;
const DatasetProvenance = ({ metadata, loading }: DatasetProvenanceProps) => {
- const { t } = useTranslation(NON_DEFAULT_TRANSLATION);
- const { t: td } = useTranslation(DEFAULT_TRANSLATION);
+ const t = useTranslationCustom();
+ const td = useTranslationDefault();
return (
@@ -137,7 +136,7 @@ export type DatasetProvenanceProps = {
export default DatasetProvenance;
const TableTitleWithTranslation = ({ title }: { title: string }) => {
- const { t } = useTranslation(DEFAULT_TRANSLATION);
+ const t = useTranslationCustom();
return (
diff --git a/src/js/components/Provenance/DownloadDats.tsx b/src/js/components/Provenance/DownloadDats.tsx
index 3f2589d1..73cdea65 100644
--- a/src/js/components/Provenance/DownloadDats.tsx
+++ b/src/js/components/Provenance/DownloadDats.tsx
@@ -2,11 +2,11 @@ import React, { useCallback } from 'react';
import PropTypes from 'prop-types';
import { Button, Space } from 'antd';
import { DownloadOutlined } from '@ant-design/icons';
-import { useTranslation } from 'react-i18next';
+import { useTranslationDefault } from '@/hooks';
import { ProvenanceStoreDataset } from '@/types/provenance';
const DownloadDats = ({ metadata }: { metadata: ProvenanceStoreDataset }) => {
- const { t } = useTranslation();
+ const t = useTranslationDefault();
const exportData = useCallback(() => {
window.location.href = `/datasets/${metadata.identifier}/dats`;
diff --git a/src/js/components/Search/MakeQueryOption.tsx b/src/js/components/Search/MakeQueryOption.tsx
index 1f341276..63d46b97 100644
--- a/src/js/components/Search/MakeQueryOption.tsx
+++ b/src/js/components/Search/MakeQueryOption.tsx
@@ -1,18 +1,16 @@
import React from 'react';
import { Row, Col, Checkbox } from 'antd';
-import { useTranslation } from 'react-i18next';
import OptionDescription from './OptionDescription';
import { addQueryParam, makeGetKatsuPublic, removeQueryParam } from '@/features/search/query.store';
import SelectOption from './SelectOption';
-import { DEFAULT_TRANSLATION, NON_DEFAULT_TRANSLATION } from '@/constants/configConstants';
-import { useAppDispatch, useAppSelector } from '@/hooks';
+import { useAppDispatch, useAppSelector, useTranslationCustom, useTranslationDefault } from '@/hooks';
import { Field } from '@/types/search';
const MakeQueryOption = ({ queryField }: MakeQueryOptionProps) => {
- const { t } = useTranslation(NON_DEFAULT_TRANSLATION);
- const { t: td } = useTranslation(DEFAULT_TRANSLATION);
+ const t = useTranslationCustom();
+ const td = useTranslationDefault();
const dispatch = useAppDispatch();
const { title, id, description, config, options } = queryField;
diff --git a/src/js/components/Search/Search.tsx b/src/js/components/Search/Search.tsx
index 31080908..f7c696a3 100644
--- a/src/js/components/Search/Search.tsx
+++ b/src/js/components/Search/Search.tsx
@@ -1,14 +1,12 @@
import React, { useEffect, useMemo } from 'react';
import { Row, Typography, Space, FloatButton } from 'antd';
-import { useTranslation } from 'react-i18next';
import { useLocation, useNavigate } from 'react-router-dom';
import SearchFieldsStack from './SearchFieldsStack';
import SearchResults from './SearchResults';
-import { NON_DEFAULT_TRANSLATION } from '@/constants/configConstants';
import { makeGetKatsuPublic, setQueryParams } from '@/features/search/query.store';
-import { useAppDispatch, useAppSelector } from '@/hooks';
+import { useAppDispatch, useAppSelector, useTranslationCustom } from '@/hooks';
import { buildQueryParamsUrl } from '@/utils/search';
import type { QueryParams } from '@/types/search';
@@ -95,7 +93,7 @@ const SEARCH_SECTION_SPACE_ITEM_STYLE = { item: { display: 'flex', justifyConten
const SEARCH_SECTION_STYLE = { maxWidth: 1200 };
const Search: React.FC = () => {
- const { t } = useTranslation(NON_DEFAULT_TRANSLATION);
+ const t = useTranslationCustom();
const searchSections = useAppSelector((state) => state.query.querySections);
diff --git a/src/js/components/Search/SelectOption.tsx b/src/js/components/Search/SelectOption.tsx
index cd3662c4..8a9c0688 100644
--- a/src/js/components/Search/SelectOption.tsx
+++ b/src/js/components/Search/SelectOption.tsx
@@ -1,14 +1,12 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import React from 'react';
import { Select } from 'antd';
-import { useTranslation } from 'react-i18next';
import { addQueryParam, makeGetKatsuPublic } from '@/features/search/query.store';
-import { NON_DEFAULT_TRANSLATION } from '@/constants/configConstants';
-import { useAppDispatch, useAppSelector } from '@/hooks';
+import { useAppDispatch, useAppSelector, useTranslationCustom } from '@/hooks';
const SelectOption = ({ id, isChecked, options }: SelectOptionProps) => {
- const { t } = useTranslation(NON_DEFAULT_TRANSLATION);
+ const t = useTranslationCustom();
const dispatch = useAppDispatch();
const queryParams = useAppSelector((state) => state.query.queryParams);
diff --git a/src/js/components/SiteFooter.tsx b/src/js/components/SiteFooter.tsx
index ce57dd80..7bff03a2 100644
--- a/src/js/components/SiteFooter.tsx
+++ b/src/js/components/SiteFooter.tsx
@@ -1,13 +1,13 @@
import React from 'react';
-import { useTranslation } from 'react-i18next';
import { Layout, Row, Typography, Space } from 'antd';
const { Footer } = Layout;
const { Title, Text, Link } = Typography;
+import { useTranslationDefault } from '@/hooks';
import bentoLogo from '@public/assets/bento.svg';
const SiteFooter = () => {
- const { t } = useTranslation();
+ const td = useTranslationDefault();
return (
<Footer>
@@ -22,7 +22,7 @@ const SiteFooter = () => {
<div>
<Text type="secondary">
Copyright © 2019-2023 the{' '}
- <Link href="http://computationalgenomics.ca" target="_blank">
+ <Link href="https://computationalgenomics.ca" target="_blank">
Canadian Centre for Computational Genomics
</Link>
.
@@ -42,7 +42,7 @@ const SiteFooter = () => {
</div>
<div>
<Link href="/public/terms.html" target="_blank">
- {t('Terms of Use')}
+ {td('Terms of Use')}
</Link>
</div>
</Space>
diff --git a/src/js/components/TabbedDashboard.tsx b/src/js/components/TabbedDashboard.tsx
index 3a1f8a6e..fc9c0f00 100644
--- a/src/js/components/TabbedDashboard.tsx
+++ b/src/js/components/TabbedDashboard.tsx
@@ -1,5 +1,4 @@
import React, { useEffect, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
import { useNavigate, useLocation, useParams } from 'react-router-dom';
import { Tabs, Typography } from 'antd';
@@ -10,21 +9,20 @@ import { makeGetAboutRequest } from '@/features/content/content.store';
import { makeGetDataRequestThunk } from '@/features/data/data.store';
import { makeGetSearchFields } from '@/features/search/query.store';
import { makeGetProvenanceRequest } from '@/features/provenance/provenance.store';
-import { makeGetIngestionDataRequest } from '@/features/ingestion/ingestion.store';
import { getBeaconConfig } from '@/features/beacon/beaconConfig.store';
+import { fetchGohanData, fetchKatsuData } from '@/features/ingestion/lastIngestion.store';
import Loader from './Loader';
import PublicOverview from './Overview/PublicOverview';
import Search from './Search/Search';
import ProvenanceTab from './Provenance/ProvenanceTab';
import BeaconQueryUi from './Beacon/BeaconQueryUi';
-import { DEFAULT_TRANSLATION } from '@/constants/configConstants';
-import { useAppDispatch, useAppSelector } from '@/hooks';
+import { useAppDispatch, useAppSelector, useTranslationDefault } from '@/hooks';
import { buildQueryParamsUrl } from '@/utils/search';
const TabbedDashboard = () => {
const dispatch = useAppDispatch();
- const { t } = useTranslation(DEFAULT_TRANSLATION);
+ const td = useTranslationDefault();
const navigate = useNavigate();
const location = useLocation();
const { page } = useParams<{ page?: string }>();
@@ -35,7 +33,9 @@ const TabbedDashboard = () => {
dispatch(makeGetDataRequestThunk());
dispatch(makeGetSearchFields());
dispatch(makeGetProvenanceRequest());
- dispatch(makeGetIngestionDataRequest());
+ dispatch(fetchKatsuData());
+ dispatch(fetchGohanData());
+ //TODO: Dispatch makeGetDataTypes to get the data types from service-registry
}, []);
const isFetchingOverviewData = useAppSelector((state) => state.data.isFetchingData);
@@ -98,7 +98,7 @@ const TabbedDashboard = () => {
const mappedTabPanes = tabPanes
.filter((t) => t.active)
.map(({ title, content, loading, key }) => ({
- label: <TabTitle title={t(title)} />,
+ label: <TabTitle title={td(title)} />,
children: loading ? <Loader /> : content,
key,
}));
diff --git a/src/js/components/Util/CustomEmpty.js b/src/js/components/Util/CustomEmpty.js
index 640e14bc..8e0192c9 100644
--- a/src/js/components/Util/CustomEmpty.js
+++ b/src/js/components/Util/CustomEmpty.js
@@ -1,12 +1,11 @@
import React from 'react';
import { Empty } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { DEFAULT_TRANSLATION } from '../../constants/configConstants';
+import { useTranslationDefault } from '@/hooks';
const CustomEmpty = ({ text }) => {
- const { t } = useTranslation(DEFAULT_TRANSLATION);
+ const td = useTranslationDefault();
- return <Empty description={t(text)} />;
+ return <Empty description={td(text)} />;
};
export default CustomEmpty;
diff --git a/src/js/constants/configConstants.ts b/src/js/constants/configConstants.ts
index b59e6650..02425459 100644
--- a/src/js/constants/configConstants.ts
+++ b/src/js/constants/configConstants.ts
@@ -5,7 +5,8 @@ export const publicOverviewUrl = '/overview';
export const searchFieldsUrl = '/fields';
export const katsuUrl = '/katsu';
export const provenanceUrl = '/provenance';
-export const lastIngestionsUrl = '/wes-runs';
+export const katsuLastIngestionsUrl = '/katsu/data-types';
+export const gohanLastIngestionsUrl = '/gohan/data-types';
export const DEFAULT_TRANSLATION = 'default_translation';
export const NON_DEFAULT_TRANSLATION = 'translation';
diff --git a/src/js/features/data/data.store.ts b/src/js/features/data/data.store.ts
index 34c697c8..45d3f966 100644
--- a/src/js/features/data/data.store.ts
+++ b/src/js/features/data/data.store.ts
@@ -47,6 +47,28 @@ const data = createSlice({
const chartObj = state.sections.find((e) => e.sectionTitle === section)!.charts.find((c) => c.id === chart)!;
chartObj.width = width;
},
+ setAllDisplayedCharts: (state, { payload }: PayloadAction<{ section?: string }>) => {
+ if (payload.section) {
+ state.sections
+ .find((e) => e.sectionTitle === payload.section)!
+ .charts.forEach((_, ind, arr) => {
+ arr[ind].isDisplayed = true;
+ });
+ } else {
+ state.sections.forEach((section) => {
+ section.charts.forEach((val, ind, arr) => {
+ arr[ind].isDisplayed = true;
+ });
+ });
+ }
+ },
+ hideAllSectionCharts: (state, { payload }: PayloadAction<{ section: string }>) => {
+ state.sections
+ .find((e) => e.sectionTitle === payload.section)!
+ .charts.forEach((_, ind, arr) => {
+ arr[ind].isDisplayed = false;
+ });
+ },
},
extraReducers: (builder) => {
builder
@@ -64,6 +86,13 @@ const data = createSlice({
},
});
-export const { rearrange, disableChart, setDisplayedCharts, setChartWidth } = data.actions;
+export const {
+ rearrange,
+ disableChart,
+ setDisplayedCharts,
+ setChartWidth,
+ setAllDisplayedCharts,
+ hideAllSectionCharts,
+} = data.actions;
export { makeGetDataRequestThunk };
export default data.reducer;
diff --git a/src/js/features/ingestion/ingestion.store.ts b/src/js/features/ingestion/ingestion.store.ts
deleted file mode 100644
index 2ce4d686..00000000
--- a/src/js/features/ingestion/ingestion.store.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
-import axios from 'axios';
-import { lastIngestionsUrl } from '@/constants/configConstants';
-import { printAPIError } from '@/utils/error.util';
-import { IngestionData, LastIngestionResponse } from '@/types/lastIngestionResponse';
-
-export const makeGetIngestionDataRequest = createAsyncThunk<LastIngestionResponse, void, { rejectValue: string }>(
- 'ingestionData/getIngestionData',
- (_, { rejectWithValue }) =>
- axios
- .get(lastIngestionsUrl)
- .then((res) => res.data)
- .catch(printAPIError(rejectWithValue))
-);
-
-export interface IngestionDataState {
- isFetchingIngestionData: boolean;
- ingestionData: IngestionData[];
- lastEndTimesByDataType: { [dataType: string]: string };
-}
-
-const initialState: IngestionDataState = {
- isFetchingIngestionData: false,
- ingestionData: [],
- lastEndTimesByDataType: {},
-};
-
-const IngestionDataStore = createSlice({
- name: 'ingestionData',
- initialState,
- reducers: {},
- extraReducers: (builder) => {
- builder.addCase(makeGetIngestionDataRequest.pending, (state) => {
- state.isFetchingIngestionData = true;
- });
- builder.addCase(
- makeGetIngestionDataRequest.fulfilled,
- (state, { payload }: PayloadAction<LastIngestionResponse>) => {
- state.ingestionData = payload;
- payload.forEach((ingestion) => {
- const dataType = ingestion.details.request.tags.workflow_metadata.data_type;
- const endTime = ingestion.details.run_log.end_time;
- const previousEndTime = state.lastEndTimesByDataType[dataType];
- if (!previousEndTime || new Date(endTime) > new Date(previousEndTime)) {
- state.lastEndTimesByDataType[dataType] = endTime;
- }
- });
- state.isFetchingIngestionData = false;
- }
- );
- builder.addCase(makeGetIngestionDataRequest.rejected, (state) => {
- state.isFetchingIngestionData = false;
- });
- },
-});
-
-export default IngestionDataStore.reducer;
diff --git a/src/js/features/ingestion/lastIngestion.store.ts b/src/js/features/ingestion/lastIngestion.store.ts
new file mode 100644
index 00000000..09146e2e
--- /dev/null
+++ b/src/js/features/ingestion/lastIngestion.store.ts
@@ -0,0 +1,73 @@
+import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
+import axios from 'axios';
+import { katsuLastIngestionsUrl, gohanLastIngestionsUrl } from '@/constants/configConstants';
+import { printAPIError } from '@/utils/error.util';
+
+import { LastIngestionDataTypeResponse, DataTypeMap } from '@/types/lastIngestionDataTypeResponse';
+
+// Async thunks to fetch data from the two endpoints
+export const fetchKatsuData = createAsyncThunk('dataTypes/fetchKatsuData', (_, { rejectWithValue }) =>
+ axios
+ .get(katsuLastIngestionsUrl)
+ .then((res) => res.data)
+ .catch(printAPIError(rejectWithValue))
+);
+
+export const fetchGohanData = createAsyncThunk('dataTypes/fetchGohanData', (_, { rejectWithValue }) =>
+ axios
+ .get(gohanLastIngestionsUrl)
+ .then((res) => res.data)
+ .catch(printAPIError(rejectWithValue))
+);
+
+// Define the state structure
+export interface DataTypeState {
+ isFetchingKatsuData: boolean;
+ isFetchingGohanData: boolean;
+ dataTypes: DataTypeMap;
+}
+
+// Initialize the state
+const initialDataTypeState: DataTypeState = {
+ isFetchingKatsuData: false,
+ isFetchingGohanData: false,
+ dataTypes: {},
+};
+
+const reduceServiceDataTypes = (state: DataTypeState, { payload }: PayloadAction<LastIngestionDataTypeResponse[]>) => {
+ state.dataTypes = {
+ ...state.dataTypes,
+ ...Object.fromEntries(payload.map((data) => [data.id, data])),
+ };
+};
+
+// Create a slice to manage the state
+const DataTypeStore = createSlice({
+ name: 'dataTypes',
+ initialState: initialDataTypeState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder.addCase(fetchKatsuData.pending, (state) => {
+ state.isFetchingKatsuData = true;
+ });
+ builder.addCase(fetchGohanData.pending, (state) => {
+ state.isFetchingGohanData = true;
+ });
+ builder.addCase(fetchKatsuData.fulfilled, (state, action) => {
+ reduceServiceDataTypes(state, action);
+ state.isFetchingKatsuData = false;
+ });
+ builder.addCase(fetchGohanData.fulfilled, (state, action) => {
+ reduceServiceDataTypes(state, action);
+ state.isFetchingGohanData = false;
+ });
+ builder.addCase(fetchKatsuData.rejected, (state) => {
+ state.isFetchingKatsuData = false;
+ });
+ builder.addCase(fetchGohanData.rejected, (state) => {
+ state.isFetchingGohanData = false;
+ });
+ },
+});
+
+export default DataTypeStore.reducer;
diff --git a/src/js/store.ts b/src/js/store.ts
index 313180b1..921821a8 100644
--- a/src/js/store.ts
+++ b/src/js/store.ts
@@ -4,7 +4,7 @@ import configReducer from '@/features/config/config.store';
import contentReducer from '@/features/content/content.store';
import dataReducer from '@/features/data/data.store';
import queryReducer from '@/features/search/query.store';
-import ingestionDataReducer from '@/features/ingestion/ingestion.store';
+import lastIngestionDataReducer from '@/features/ingestion/lastIngestion.store';
import provenanceReducer from '@/features/provenance/provenance.store';
import beaconConfigReducer from './features/beacon/beaconConfig.store';
import beaconQueryReducer from './features/beacon/beaconQuery.store';
@@ -16,7 +16,7 @@ export const store = configureStore({
data: dataReducer,
query: queryReducer,
provenance: provenanceReducer,
- ingestionData: ingestionDataReducer,
+ lastIngestionData: lastIngestionDataReducer,
beaconConfig: beaconConfigReducer,
beaconQuery: beaconQueryReducer,
},
diff --git a/src/js/types/lastIngestionDataTypeResponse.ts b/src/js/types/lastIngestionDataTypeResponse.ts
new file mode 100644
index 00000000..617bd148
--- /dev/null
+++ b/src/js/types/lastIngestionDataTypeResponse.ts
@@ -0,0 +1,9 @@
+export interface LastIngestionDataTypeResponse {
+ count: number | null;
+ id: string;
+ label: string;
+ last_ingested: string | null;
+ queryable: boolean;
+}
+
+export type DataTypeMap = { [id: string]: LastIngestionDataTypeResponse };
diff --git a/src/js/types/lastIngestionResponse.ts b/src/js/types/lastIngestionResponse.ts
deleted file mode 100644
index 22357371..00000000
--- a/src/js/types/lastIngestionResponse.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-interface Tags {
- table_id: string;
- workflow_id: string;
- workflow_metadata: {
- data_type: string;
- id: string;
- };
-}
-
-interface Request {
- tags: Tags;
- workflow_type: string;
-}
-
-interface RunLog {
- end_time: string;
- id: string;
- start_time: string;
-}
-
-export interface IngestionDetails {
- end_time: string;
- request: Request;
- run_id: string;
- run_log: RunLog;
- state: string;
- task_logs: null;
-}
-
-export interface IngestionData {
- details: IngestionDetails;
- run_id: string;
- state: string;
-}
-
-export type LastIngestionResponse = IngestionData[];
diff --git a/src/public/locales/en/default_translation_en.json b/src/public/locales/en/default_translation_en.json
index b3587487..ce7fcdde 100644
--- a/src/public/locales/en/default_translation_en.json
+++ b/src/public/locales/en/default_translation_en.json
@@ -42,8 +42,10 @@
"Date": "Date",
"Dates": "Dates",
"Description": "Description",
+ "Download DATS File": "Download DATS File",
"Manage Charts": "Manage Charts",
"Remove this chart": "Remove this chart",
+ "Width": "Width",
"Insufficient data available.": "Insufficient data available.",
"Terms of Use": "Terms of Use",
"No Data": "No Data",
@@ -68,11 +70,12 @@
"maximum of": "maximum of",
"filters permitted": "filters permitted",
"Enter a chromosome name, e.g.: \"17\" or \"X\"": "Enter a chromosome name, e.g.: \"17\" or \"X\"",
- "enter a position number, e.g. \"100\"": "enter a position number, e.g. \"100\"",
- "enter a position number, e.g. \"200\"": "enter a position number, e.g. \"200\"",
- "enter any combination of A, C, G, T, or N": "enter any combination of A, C, G, T, or N",
+ "Enter a position number, e.g. \"100\"": "Enter a position number, e.g. \"100\"",
+ "Enter a position number, e.g. \"200\"": "Enter a position number, e.g. \"200\"",
+ "Enter any combination of A, C, G, T, or N": "Enter any combination of A, C, G, T, or N",
"e.g.": "e.g.",
"or": "or",
"Ingestion History Is Empty": "Ingestion History Is Empty",
- "Latest Data Ingestion": "Latest Data Ingestion"
+ "Latest Data Ingestion": "Latest Data Ingestion",
+ "Clinical Data": "Clinical Data"
}
\ No newline at end of file
diff --git a/src/public/locales/en/translation_en.json b/src/public/locales/en/translation_en.json
index 3b8c08a5..8fc8615e 100644
--- a/src/public/locales/en/translation_en.json
+++ b/src/public/locales/en/translation_en.json
@@ -9,6 +9,5 @@
"MALE": "MALE",
"FEMALE": "FEMALE",
"I have no problems in walking about": "I have no problems in walking about",
- "Results": "Results",
- "Download DATS File": "Download DATS File"
-}
\ No newline at end of file
+ "Results": "Results"
+}
diff --git a/src/public/locales/fr/default_translation_fr.json b/src/public/locales/fr/default_translation_fr.json
index b5e11373..b2525969 100644
--- a/src/public/locales/fr/default_translation_fr.json
+++ b/src/public/locales/fr/default_translation_fr.json
@@ -42,8 +42,10 @@
"Date": "Date",
"Dates": "Dates",
"Description": "Description",
+ "Download DATS File": "Télécharcher le fichier DATS",
"Manage Charts": "Gestion des tableaux",
"Remove this chart": "Supprimer ce tableau",
+ "Width": "Largeur",
"Insufficient data available.": "Pas suffisamment de données.",
"Terms of Use": "Conditions d'utilisation (en anglais)",
"No Data": "Pas de données",
@@ -68,11 +70,12 @@
"maximum of": "maximum de",
"filters permitted": "filtres autorisés",
"Enter a chromosome name, e.g.: \"17\" or \"X\"": "Entrer un nom de chromosome, par exemple : \"17\" ou \"X\"",
- "enter a position number, e.g. \"100\"": "entrer un numéro de position, par exemple \"100\"",
- "enter a position number, e.g. \"200\"": "entrer un numéro de position, par exemple \"200\"",
- "enter any combination of A, C, G, T, or N": "entrer une combinaison quelconque de A, C, G, T, ou N",
+ "Enter a position number, e.g. \"100\"": "Entrer un numéro de position, par exemple \"100\"",
+ "Enter a position number, e.g. \"200\"": "Entrer un numéro de position, par exemple \"200\"",
+ "Enter any combination of A, C, G, T, or N": "Entrer une combinaison quelconque de A, C, G, T, ou N",
"e.g.": "par exemple",
"or": "ou",
"Ingestion History Is Empty": "L'historique d'ingestion est vide",
- "Latest Data Ingestion": "Dernière ingestion de données"
+ "Latest Data Ingestion": "Dernière ingestion de données",
+ "Clinical Data": "Données cliniques"
}
\ No newline at end of file
diff --git a/src/public/locales/fr/translation_fr.json b/src/public/locales/fr/translation_fr.json
index 68448c6b..97d12d8f 100644
--- a/src/public/locales/fr/translation_fr.json
+++ b/src/public/locales/fr/translation_fr.json
@@ -9,6 +9,5 @@
"Lab Test Result": "Résultats des tests de laboratoire",
"Experiment Types": "Types d'expériences",
"I have no problems in walking about": "Je n’ai aucun problème à marcher",
- "Results": "Résultats",
- "Download DATS File": "Télécharger le fichier DATS"
+ "Results": "Résultats"
}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index ed4d4081..c3e81ebd 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -32,10 +32,11 @@ const config = {
},
devServer: {
static: './dist',
- contentBase: './distgetuk',
+ contentBase: './dist',
},
watchOptions: {
poll: 1000,
+ ignored: /node_modules/,
},
plugins: [
new HtmlWebpackPlugin({