30 add comment to case (#31)

* reorder fields * working comment for curator * Fix Eslint
globaldothealth · Oct 4, 2023 · 6b71209 · 6b71209
1 parent ab3d75f
commit 6b71209
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 65 deletions.
diff --git a/data-serving/data-service/api/openapi.yaml b/data-serving/data-service/api/openapi.yaml
@@ -684,6 +684,8 @@ components:
                         - suspected
                         - discarded
                         - omit_error
+                comment:
+                    type: string
                 caseReference:
                     type: object
                     properties:

diff --git a/data-serving/data-service/src/controllers/case.ts b/data-serving/data-service/src/controllers/case.ts
@@ -316,6 +316,7 @@ export class CasesController {
                 while (doc != null) {
                     delete doc.caseReference.sourceEntryId;
                     const caseDTO = await dtoFromCase(doc);
+                    delete caseDTO.comment;
                     const stringifiedCase = stringify([caseDTO], {
                         header: false,
                         columns: this.csvHeaders,

diff --git a/data-serving/data-service/src/model/day0-case.ts b/data-serving/data-service/src/model/day0-case.ts
@@ -80,6 +80,7 @@ export const caseSchema = new mongoose.Schema(
             enum: CaseStatus,
             required: true,
         },
+        comment: String,
         pathogen: {
             type: String,
             required: true,
@@ -149,6 +150,7 @@ caseSchema.methods.equalsJSON = function (jsonCase: any): boolean {
 
     return (
         _.isEqual(thisJson.caseStatus, other.caseStatus) &&
+        _.isEqual(thisJson.comment, other.comment) &&
         _.isEqual(thisJson.demographics, other.demographics) &&
         _.isEqual(thisJson.events, other.events) &&
         _.isEqual(thisJson.genomeSequences, other.genomeSequences) &&
@@ -179,6 +181,7 @@ export interface ISource {
 
 export type ICase = {
     caseStatus: CaseStatus;
+    comment?: string;
     pathogen: string;
     symptoms: string;
     dateLastModified: string;

diff --git a/data-serving/data-service/src/model/fields.json b/data-serving/data-service/src/model/fields.json
@@ -1,6 +1,7 @@
 [
     "_id",
     "caseStatus",
+    "comment",
     "pathogen",
     "caseReference.additionalSources",
     "caseReference.sourceEntryId",

diff --git a/verification/curator-service/api/openapi/openapi.yaml b/verification/curator-service/api/openapi/openapi.yaml
@@ -1423,6 +1423,8 @@ components:
                         - suspected
                         - discarded
                         - omit_error
+                comment:
+                    type: string
                 caseReference:
                     type: object
                     properties:

diff --git a/verification/curator-service/ui/cypress/e2e/components/Curator.spec.ts b/verification/curator-service/ui/cypress/e2e/components/Curator.spec.ts
@@ -56,6 +56,7 @@ describe('Curator', function () {
         // GENERAL
         cy.get('div[data-testid="caseStatus"]').click();
         cy.get('li[data-value="confirmed"').click();
+        cy.get('div[data-testid="comment"]').type('This case should be consulted with Supervisor.');
 
         // DATA SOURCE
 
@@ -426,6 +427,8 @@ describe('Curator', function () {
             // TODO UI for demographics.age needs redesigning
             // View full details about the case
             cy.contains('td', 'www.example.com').click({ force: true });
+            // Curator's comment.
+            cy.contains('This case should be consulted with Supervisor.');
             // Case data.
             cy.contains('www.example.com');
             // Demographics.

diff --git a/verification/curator-service/ui/src/api/models/Day0Case.ts b/verification/curator-service/ui/src/api/models/Day0Case.ts
@@ -174,6 +174,7 @@ export interface Curators {
 export interface Day0Case {
     _id?: string;
     caseStatus: CaseStatus | '';
+    comment?: string;
     caseReference: CaseReference;
     demographics: Demographics;
     location: Location;
@@ -224,6 +225,7 @@ interface VaccinationFormValues {
 // contains all the fields present in manual case entry form
 export interface Day0CaseFormValues {
     caseStatus: CaseStatus | '';
+    comment?: string;
     caseReference: {
         sourceId: string;
         sourceUrl: string;

diff --git a/verification/curator-service/ui/src/components/BulkCaseForm.tsx b/verification/curator-service/ui/src/components/BulkCaseForm.tsx
@@ -101,6 +101,7 @@ interface RawParsedCase {
     [key: string]: string | number | boolean | undefined;
 
     caseStatus: CaseStatus;
+    comment?: string;
     pathogen: string;
 
     // CaseReference
@@ -255,6 +256,7 @@ const BulkCaseForm = (props: BulkCaseFormProps) => {
     ): CompleteParsedCase => {
         return {
             caseStatus: c.caseStatus,
+            comment: c.comment,
             pathogen: c.pathogen,
             caseReference: {
                 sourceId: caseReference.sourceId,

diff --git a/verification/curator-service/ui/src/components/CaseForm.tsx b/verification/curator-service/ui/src/components/CaseForm.tsx
@@ -65,6 +65,7 @@ const initialValuesFromCase = (
         // return minimal viable case
         return {
             caseStatus: '',
+            comment: '',
             caseReference: {
                 sourceId: '',
                 sourceUrl: '',
@@ -255,6 +256,7 @@ const NewCaseValidation = Yup.object().shape(
         caseStatus: Yup.string()
             .oneOf(['confirmed', 'suspected', 'discarded', 'omit_error'])
             .required('Required'),
+        comment: Yup.string(),
         caseReference: Yup.object().shape({
             sourceUrl: Yup.string()
                 .required('Required')
@@ -670,65 +672,64 @@ export default function CaseForm(props: Props): JSX.Element {
                                     </TableOfContentsRow>
                                     <TableOfContentsRow
                                         onClick={(): void =>
-                                            scrollTo('demographics')
+                                            scrollTo('location')
                                         }
                                     >
                                         {tableOfContentsIcon({
                                             isChecked: isChecked({
-                                                optionalValues: [
-                                                    values.demographics.gender,
-                                                    values.demographics.age,
-                                                    values.demographics
-                                                        .occupation,
-                                                    values.demographics
-                                                        .healthcareWorker,
+                                                requiredValues: [
+                                                    values.location.countryISO3,
                                                 ],
                                             }),
                                             hasError: hasErrors(
-                                                ['demographics'],
+                                                ['location'],
                                                 errors,
                                                 touched,
                                             ),
                                         })}
-                                        {'Demographics'.toLocaleUpperCase()}
+                                        {'Location'.toLocaleUpperCase()}
                                     </TableOfContentsRow>
-
                                     <TableOfContentsRow
-                                        onClick={(): void =>
-                                            scrollTo('location')
-                                        }
+                                        onClick={(): void => scrollTo('events')}
                                     >
                                         {tableOfContentsIcon({
                                             isChecked: isChecked({
                                                 requiredValues: [
-                                                    values.location.countryISO3,
+                                                    values.events.dateEntry,
+                                                    values.events.dateReported,
                                                 ],
                                             }),
                                             hasError: hasErrors(
-                                                ['location'],
+                                                ['events'],
                                                 errors,
                                                 touched,
                                             ),
                                         })}
-                                        {'Location'.toLocaleUpperCase()}
+                                        {'Events'.toLocaleUpperCase()}
                                     </TableOfContentsRow>
                                     <TableOfContentsRow
-                                        onClick={(): void => scrollTo('events')}
+                                        onClick={(): void =>
+                                            scrollTo('demographics')
+                                        }
                                     >
                                         {tableOfContentsIcon({
                                             isChecked: isChecked({
-                                                requiredValues: [
-                                                    values.events.dateEntry,
-                                                    values.events.dateReported,
+                                                optionalValues: [
+                                                    values.demographics.gender,
+                                                    values.demographics.age,
+                                                    values.demographics
+                                                        .occupation,
+                                                    values.demographics
+                                                        .healthcareWorker,
                                                 ],
                                             }),
                                             hasError: hasErrors(
-                                                ['events'],
+                                                ['demographics'],
                                                 errors,
                                                 touched,
                                             ),
                                         })}
-                                        {'Events'.toLocaleUpperCase()}
+                                        {'Demographics'.toLocaleUpperCase()}
                                     </TableOfContentsRow>
                                     <TableOfContentsRow
                                         onClick={(): void =>
@@ -949,15 +950,15 @@ export default function CaseForm(props: Props): JSX.Element {
                                             hasSourceEntryId
                                         />
                                     </FormSection>
-                                    <FormSection>
-                                        <Demographics />
-                                    </FormSection>
                                     <FormSection>
                                         <LocationForm />
                                     </FormSection>
                                     <FormSection>
                                         <Events />
                                     </FormSection>
+                                    <FormSection>
+                                        <Demographics />
+                                    </FormSection>
                                     <FormSection>
                                         <Symptoms />
                                     </FormSection>

diff --git a/verification/curator-service/ui/src/components/LinelistTable/helperFunctions.ts b/verification/curator-service/ui/src/components/LinelistTable/helperFunctions.ts
@@ -32,12 +32,14 @@ export const createData = (
     dateOnset?: string,
     source?: string,
     caseStatus?: string,
+    comment?: string,
 ) => {
     return {
         caseId: caseId || '',
         dateEntry: dateEntry || '',
         dateReported: dateReported || '',
         caseStatus: caseStatus || '',
+        comment: comment || '',
         country: country || '',
         region: region || '',
         district: district || '',

diff --git a/verification/curator-service/ui/src/components/LinelistTable/index.tsx b/verification/curator-service/ui/src/components/LinelistTable/index.tsx
@@ -128,6 +128,7 @@ const LinelistTable = () => {
                 renderDate(data.events.dateOnset) || '-',
                 data.caseReference.sourceUrl || '-',
                 data.caseStatus || '-',
+                data.comment || '',
             );
         });
 

diff --git a/verification/curator-service/ui/src/components/ViewCase.tsx b/verification/curator-service/ui/src/components/ViewCase.tsx
@@ -225,23 +225,23 @@ function CaseDetails(props: CaseDetailsProps): JSX.Element {
                     <br />
                     <Button
                         variant="text"
-                        onClick={(): void => scrollTo('demographics')}
+                        onClick={(): void => scrollTo('location')}
                     >
-                        demographics
+                        location
                     </Button>
                     <br />
                     <Button
                         variant="text"
-                        onClick={(): void => scrollTo('location')}
+                        onClick={(): void => scrollTo('event-history')}
                     >
-                        location
+                        event history
                     </Button>
                     <br />
                     <Button
                         variant="text"
-                        onClick={(): void => scrollTo('event-history')}
+                        onClick={(): void => scrollTo('demographics')}
                     >
-                        event history
+                        demographics
                     </Button>
                     <br />
                     <Button
@@ -490,43 +490,12 @@ function CaseDetails(props: CaseDetailsProps): JSX.Element {
                                     props.c.events.dateLastModified,
                                 )}
                             />
+                            <RowHeader title="Curator's comment" />
+                            <RowContent content={props.c.comment} isMultiline />
                         </Grid>
                     </Scroll.Element>
                 </Paper>
 
-                {/* DEMOGRAPHICS */}
-                <Paper className={classes.paper} variant="outlined" square>
-                    <Scroll.Element
-                        name="demographics"
-                        className={classes.casebox}
-                    />
-                    <Typography
-                        className={classes.sectionTitle}
-                        variant="overline"
-                    >
-                        Demographics
-                    </Typography>
-                    <Grid container className={classes.grid}>
-                        <RowHeader title="Age" />
-                        <RowContent
-                            content={parseAgeRange(
-                                props.c.demographics.ageRange,
-                            )}
-                        />
-
-                        <RowHeader title="Gender" />
-                        <RowContent content={props.c.demographics.gender} />
-
-                        <RowHeader title="Occupation" />
-                        <RowContent content={props.c.demographics.occupation} />
-
-                        <RowHeader title="Healthcare worker" />
-                        <RowContent
-                            content={props.c.demographics.healthcareWorker}
-                        />
-                    </Grid>
-                </Paper>
-
                 {/* LOCATION */}
                 <Paper className={classes.paper} variant="outlined" square>
                     <Scroll.Element name="location" className={classes.casebox}>
@@ -708,6 +677,39 @@ function CaseDetails(props: CaseDetailsProps): JSX.Element {
                     </Scroll.Element>
                 </Paper>
 
+                {/* DEMOGRAPHICS */}
+                <Paper className={classes.paper} variant="outlined" square>
+                    <Scroll.Element
+                        name="demographics"
+                        className={classes.casebox}
+                    />
+                    <Typography
+                        className={classes.sectionTitle}
+                        variant="overline"
+                    >
+                        Demographics
+                    </Typography>
+                    <Grid container className={classes.grid}>
+                        <RowHeader title="Age" />
+                        <RowContent
+                            content={parseAgeRange(
+                                props.c.demographics.ageRange,
+                            )}
+                        />
+
+                        <RowHeader title="Gender" />
+                        <RowContent content={props.c.demographics.gender} />
+
+                        <RowHeader title="Occupation" />
+                        <RowContent content={props.c.demographics.occupation} />
+
+                        <RowHeader title="Healthcare worker" />
+                        <RowContent
+                            content={props.c.demographics.healthcareWorker}
+                        />
+                    </Grid>
+                </Paper>
+
                 {/* SYMPTOMS */}
                 <Paper className={classes.paper} variant="outlined" square>
                     <Scroll.Element name="symptoms" className={classes.casebox}>
@@ -951,6 +953,7 @@ function RowHeader(props: { title: string }): JSX.Element {
 function RowContent(props: {
     content?: string;
     isLink?: boolean;
+    isMultiline?: boolean;
 }): JSX.Element {
     const searchQuery = useSelector(selectSearchQuery);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -984,6 +987,7 @@ function RowContent(props: {
                 </a>
             ) : (
                 <Highlighter
+                    style={{ whiteSpace: 'pre-wrap' }}
                     highlightStyle={{ fontWeight: 'bold' }}
                     className="highlighted"
                     searchWords={searchQueryArray}

diff --git a/verification/curator-service/ui/src/components/fixtures/fullCase.json b/verification/curator-service/ui/src/components/fixtures/fullCase.json
@@ -1,6 +1,7 @@
 {
     "_id": "5ef8e943dfe6e00030892d58",
     "caseStatus": "confirmed",
+    "comment": "This case might not contain valid data.\nNeeds to be checked by region supervisor.",
     "pathogen": "COVID-19",
     "events": {
         "dateEntry": "2020-01-02",