add series type

src/components/ChoosePlot.tsx

@@ -4,9 +4,14 @@ import React from "react";
 interface Props {
     selectedPlot: string;
     selectPlot: (name: string) => void
+    seriesType: "surveillance" | "post-exposure"
 }
 
-export default function ChoosePlot({selectedPlot, selectPlot}: Props) {
+export default function ChoosePlot({
+                                       selectedPlot,
+                                       selectPlot,
+                                       seriesType
+                                   }: Props) {
 
     const onSelectPlot = (event: any) => {
         selectPlot(event.target.value);
@@ -17,8 +22,11 @@ export default function ChoosePlot({selectedPlot, selectPlot}: Props) {
             plot</Form.Label>
         <Form.Select id="plot" onChange={onSelectPlot}
                      value={selectedPlot}>
-            <option value={"population"}>Population</option>
-            <option value={"individual"}>Individual</option>
+            <option value={"population"}>Population trajectories</option>
+            {seriesType === "post-exposure" &&
+                <option value={"histogram"}>Population histogram</option>
+            }
+            <option value={"individual"}>Individual trajectories</option>
         </Form.Select>
     </Form.Group>
 }

src/components/ChooseSeriesType.tsx

@@ -0,0 +1,24 @@
+import Form from "react-bootstrap/Form";
+import React from "react";
+
+interface Props {
+    selectedType: "surveillance" | "post-exposure";
+    selectType: (name:  "surveillance" | "post-exposure") => void
+}
+
+export default function ChooseSeriesType({selectedType, selectType}: Props) {
+
+    const onSelectType = (event: any) => {
+        selectType(event.target.value);
+    }
+
+    return <Form.Group key="choose-dataset" className={"mb-3"}>
+        <Form.Label htmlFor="data">Choose
+            dataset</Form.Label>
+        <Form.Select id="data" onChange={onSelectType}
+                     value={selectedType}>
+            <option value={"surveillance"}>Surveillance</option>
+            <option value={"post-exposure"}>Post-exposure</option>
+        </Form.Select>
+    </Form.Group>
+}

src/components/SideBar.tsx

@@ -33,14 +33,21 @@ export default function SideBar() {
             <fieldset>
                 <ChooseDataset selectedDataset={state.selectedDataset}
                                selectDataset={selectDataset}/>
-                <ChoosePlot selectedPlot={state.selectedPlot}
-                            selectPlot={selectPlot}/>
+                <Row className={"mb-3"}>
+                    <Col>
+                        Time series type <br/><span
+                        className={"text-secondary"}>{state.datasetMetadata?.type}</span>
+                    </Col>
+                </Row>
                 <Row className={"mb-3"}>
                     <Col>
                         Detected biomarkers <br/><span
                         className={"text-secondary"}>{state.datasetMetadata?.biomarkers.join(", ")}</span>
                     </Col>
                 </Row>
+                <ChoosePlot selectedPlot={state.selectedPlot}
+                            selectPlot={selectPlot}
+                            seriesType={state.datasetMetadata?.type || "surveillance"}/>
                 <ChooseScale/>
                 <hr/>
                 <PopulationOptions/>

src/components/UploadDataset.tsx

@@ -12,12 +12,14 @@ export default function UploadDataset() {
     const apiService = api(state.language, dispatch);
 
     const [timeColumnHeader, setTimeColumnHeader] = useState("day");
+    const [dataType, setDataType] = useState("surveillance");
     const [datasetName, setDatasetName] = useState("");
     const [validName, setValidName] = useState(true);
     const [selectedFile, selectFile] = useState("");
     const [isUploading, setIsUploading] = useState(false);
 
     const onSelectTimeColumnHeader = (e: any) => setTimeColumnHeader(e.target.value);
+    const onSelectDataType = (e: any) => setDataType(e.target.value);
     const onSelectDatasetName = (e: any) => {
         setDatasetName(e.target.value);
         setValidName(isAlphaNumeric(e.target.value));
@@ -52,6 +54,7 @@ export default function UploadDataset() {
         formData.append('file', selectedFile);
         formData.append('xcol', timeColumnHeader);
         formData.append('name', datasetName);
+        formData.append('series_type', dataType);
 
         const dataService = new DataService(apiService);
 
@@ -118,6 +121,20 @@ export default function UploadDataset() {
                 </Form.Text>
             </Col>
         </Form.Group>
+        <Form.Group className={"row mb-3"}>
+            <Form.Label column sm={3}>Time series type</Form.Label>
+            <Col sm={6}>
+                <Form.Select onChange={onSelectDataType}
+                             value={dataType}>
+                    <option value={"surveillance"}>Surveillance</option>
+                    <option value={"post-exposure"}>Post-exposure</option>
+                </Form.Select>
+                <Form.Text>
+                Is this an absolute (surveillance) or a relative
+                    (post-exposure) time series?
+                </Form.Text>
+            </Col>
+        </Form.Group>
         <div
             className={state.uploadError ? "invalid-feedback d-block" : "d-none"}>
             {state.uploadError && state.uploadError.detail}

src/generated.d.ts

@@ -20,6 +20,7 @@ export interface DatasetMetadata {
   variables: VariableSchema[];
   biomarkers: string[];
   xcol: string;
+  type: "surveillance" | "post-exposure";
 }
 export interface VariableSchema {
   name: string;
@@ -29,7 +30,6 @@ export type DatasetNames = string[];
 export interface ErrorDetail {
   error: string;
   detail: string | null;
-  [k: string]: unknown;
 }
 export interface Plotly {
   data: {
@@ -48,12 +48,10 @@ export interface ResponseFailure {
   status: "failure";
   data: null;
   errors: ErrorDetailSchema[];
-  [k: string]: unknown;
 }
 export interface ErrorDetailSchema {
   error: string;
   detail: string | null;
-  [k: string]: unknown;
 }
 export interface ResponseSuccess {
   status: "success";

test/mocks.ts

@@ -36,6 +36,7 @@ export function mockDatasetMetadata(datasetMetadata: Partial<DatasetMetadata> =
         variables: [mockVariable()],
         xcol: "day",
         biomarkers: ["ab"],
+        type: "surveillance",
         ...datasetMetadata
     }
 }