Merge remote-tracking branch 'origin/feature/table' into andreasn/rem…

…ove-form
helsenorge · Feb 15, 2024 · 792ed90 · 792ed90
2 parents b7379a7 + 6dcfa16
commit 792ed90
Show file tree

Hide file tree

Showing 38 changed files with 3,085 additions and 250,702 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,14 +1,40 @@
-## 14.0.1
+## 14.1.0-beta02
+
+---
+
+- Bugfix: fix calculated scoring fields being showed in tables, also added a linebreak after each table
+
+## 14.1.0-beta01
+
+---
+
+- fixed the sorting for tables and also changed logic for standardtable
+
+## 14.0.7
+
+---
+
+- Bugfix: Attachment Validation based on props max value, questionnaire item max attachment size rules and refero constant
+
+## 14.0.5
 
 ---
 
 - fixed slidercomponent not showing children
 
+## 14.0.1-beta01
+
+- removing singlequoutes from units on quantity in table
+- change the date output to norwegian format
+
+---
+
 ## 14.0.0-beta02
 
 - Added table feature to new major version
 
 ---
+
 ## 14.0.0-beta01
 
 - Added table feature to new major version

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "14.0.1",
+  "version": "14.1.0-beta02",
   "engines": {
     "node": "^18.0.0",
     "npm": ">=9.0.0"

diff --git a/src/components/formcomponents/date/date.tsx b/src/components/formcomponents/date/date.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from 'fhir/r4';
 import moment, { Moment } from 'moment';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from '../../../types/fhir';
 import { Resources } from '../../../types/resources';
 
 import { LanguageLocales } from '@helsenorge/core-utils/constants/languages';

diff --git a/src/components/formcomponents/group/helpers.ts b/src/components/formcomponents/group/helpers.ts
@@ -1,11 +1,12 @@
-import { Questionnaire, QuestionnaireItem } from '../../../types/fhir';
+import { Questionnaire, QuestionnaireItem } from 'fhir/r4';
+
+import { Resources } from '../../../types/resources';
 
 import { RenderContextType } from '../../../constants/renderContextType';
 import { getText, renderPrefix } from '../../../util';
 import { getGroupItemControl } from '../../../util/group-item-control';
 import { Path } from '../../../util/refero-core';
 import { RenderContext } from '../../../util/renderContext';
-import { Resources } from '../../../types/resources';
 
 export const getColumns = (item: QuestionnaireItem): Array<string> => {
   const seenColumns = {};

diff --git a/src/components/formcomponents/table/TableContainer.tsx b/src/components/formcomponents/table/TableContainer.tsx
@@ -1,8 +1,5 @@
 import React from 'react';
 
-import { connect } from 'react-redux';
-import { ThunkDispatch } from 'redux-thunk';
-
 import {
   Coding,
   Questionnaire,
@@ -11,7 +8,9 @@ import {
   QuestionnaireResponseItem,
   QuestionnaireResponseItemAnswer,
   Resource,
-} from '../../../types/fhir';
+} from 'fhir/r4';
+import { connect } from 'react-redux';
+import { ThunkDispatch } from 'redux-thunk';
 
 import LanguageLocales from '@helsenorge/core-utils/constants/languages';
 
@@ -75,20 +74,23 @@ const TableContainer = ({
           <>
             <h3>{headline}</h3>
             <TableHn1 items={items} questionnaireResponse={questionnaireResponse} />
+            <br />
           </>
         );
       case TableCodes.tableHn2:
         return (
           <>
             <h3>{headline}</h3>
             <TableHn2 items={items} tableCodesCoding={tableCodesCoding} questionnaireResponse={questionnaireResponse} />
+            <br />
           </>
         );
       case TableCodes.gtable:
         return (
           <>
             <h3>{headline}</h3>
             <GTable items={items} questionnaireResponse={questionnaireResponse} tableCodesCoding={tableCodesCoding} />
+            <br />
           </>
         );
       case TableCodes.table:
@@ -101,10 +103,11 @@ const TableContainer = ({
               resource={resource}
               tableCodesCoding={tableCodesCoding}
             />
+            <br />
           </>
         );
       default:
-        return <>{'Nothing found'}</>;
+        return <></>;
     }
   }
 };
@@ -113,7 +116,6 @@ const mapStateToProps = (state: GlobalState, props: Props): EnhancedProps => {
   const group = props.item;
   const tableType = getCodingTextTableValues(group)[0];
   const resource = getFormDefinition(state)?.Content?.contained;
-
   return {
     headline: group.text ?? '',
     tableCodesCoding: group.code ?? [],

diff --git a/src/components/formcomponents/table/tables/__tests__/utils-spec.ts b/src/components/formcomponents/table/tables/__tests__/utils-spec.ts
@@ -1,15 +1,10 @@
-import {
-  QuestionnaireResponseItemAnswer,
-  QuestionnaireItemEnableWhen,
-  QuestionnaireItemEnableBehaviorCodes,
-  QuestionnaireItem,
-  QuestionnaireResponse,
-} from '../../../../../types/fhir';
+import { QuestionnaireResponseItemAnswer, QuestionnaireItemEnableWhen, QuestionnaireItem, QuestionnaireResponse } from 'fhir/r4';
 import ItemType from '../../../../../constants/itemType';
 import { extractValuesFromAnswer, getPrimitiveValueFromItemType, getQuestionnaireResponseItemAnswer, isConditionEnabled } from '../utils';
 import * as questionnaireFunctions from '../utils';
 
 import * as fhirUtils from '../../../../../util/refero-core';
+import { QuestionnaireItemEnableBehaviorCodes } from '../../../../../types/fhirEnums';
 
 jest.mock('../../../../../util/refero-core');
 

diff --git a/src/components/formcomponents/table/tables/constants.ts b/src/components/formcomponents/table/tables/constants.ts
@@ -1,4 +1,5 @@
 export const DATEFORMATS = {
   DATE: 'DD.MM.YYYY',
   DATETIME: 'DD MM YYYY HH:mm',
+  TIME: 'HH:mm',
 };
diff --git a/src/components/formcomponents/table/tables/gtable/GTable.tsx b/src/components/formcomponents/table/tables/gtable/GTable.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 
-import { Coding, QuestionnaireItem, QuestionnaireResponse } from '../../../../../types/fhir';
+import { Coding, QuestionnaireItem, QuestionnaireResponse } from 'fhir/r4';
 
 import { TableBody, Table as HnTable, TableRow, TableCell, SortDirection } from '@helsenorge/designsystem-react/components/Table';
 

diff --git a/src/components/formcomponents/table/tables/gtable/__tests__/gtable-utils-spec.ts b/src/components/formcomponents/table/tables/gtable/__tests__/gtable-utils-spec.ts
@@ -125,8 +125,8 @@ describe('gtable-utils-spec', () => {
       ];
       const columns = columnsForRowIndex(answerItems, 0);
       expect(columns).toEqual([
-        { id: 'default-question-linkId', index: 0, value: 'Answer 1' },
-        { id: 'default-question-linkId', index: 1, value: 'Another Answer 1' },
+        { id: 'default-question-linkId', index: 0, value: 'Answer 1', type: ItemType.TEXT },
+        { id: 'default-question-linkId', index: 1, value: 'Another Answer 1', type: ItemType.TEXT },
       ]);
     });
 
@@ -137,8 +137,8 @@ describe('gtable-utils-spec', () => {
       ];
       const columns = columnsForRowIndex(answerItems, 1);
       expect(columns).toEqual([
-        { id: 'default-question-linkId', index: 0, value: '' },
-        { id: 'default-question-linkId', index: 1, value: '' },
+        { id: 'default-question-linkId', index: 0, value: '', type: ItemType.TEXT },
+        { id: 'default-question-linkId', index: 1, value: '', type: ItemType.TEXT },
       ]);
     });
 

diff --git a/src/components/formcomponents/table/tables/gtable/interface.ts b/src/components/formcomponents/table/tables/gtable/interface.ts
@@ -1,3 +1,5 @@
+import { IItemType } from '../../../../../constants/itemType';
+
 export interface IGTable {
   id: string;
   headerRow: IGTableHeaderItem[];
@@ -17,5 +19,6 @@ export interface IGTableRow {
 export interface IGTableColumn {
   id: string;
   index: number;
+  type?: IItemType;
   value: string;
 }
diff --git a/src/components/formcomponents/table/tables/gtable/utils.ts b/src/components/formcomponents/table/tables/gtable/utils.ts
@@ -1,13 +1,12 @@
+import { Coding, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 import * as uuid from 'uuid';
 
-import { Coding, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from '../../../../../types/fhir';
-
 import { SortDirection } from '@helsenorge/designsystem-react/components/Table';
 
 import { IGTable, IGTableColumn, IGTableHeaderItem, IGTableRow } from './interface';
 import codeSystems from '../../../../../constants/codingsystems';
 import { QuestionnaireItemWithAnswers } from '../interface';
-import { getCodeFromCodingSystem, getEnabledQuestionnaireItemsWithAnswers, getPrimitiveValueFromItemType } from '../utils';
+import { getCodeFromCodingSystem, getEnabledQuestionnaireItemsWithAnswers, getPrimitiveValueFromItemType, sortByItemType } from '../utils';
 
 export const getNumberOfRowsGTable = (items: QuestionnaireResponseItem[]): number => {
   if (items.length === 0) {
@@ -31,16 +30,19 @@ export const getValueFromAnswer = (rowIdx: number, item?: QuestionnaireItemWithA
 export const columnsForRowIndex = (answerItems: QuestionnaireItemWithAnswers[], rowIdx: number): IGTableColumn[] => {
   return Array.from({ length: answerItems.length }, (_, colIdx) => {
     const item = answerItems[colIdx];
+
     if (!item) {
       return {
         id: `empty-${rowIdx}-${colIdx}`,
         index: colIdx,
+        type: undefined,
         value: '',
       };
     }
     return {
       id: item.linkId,
       index: colIdx,
+      type: item.type,
       value: getValueFromAnswer(rowIdx, item),
     };
   });
@@ -96,10 +98,16 @@ export const sortTableRows = (table: IGTable, columnIndex: number, sortOrder: So
     headerRow: table.headerRow,
     id: table.id,
     rows: table.rows.sort((a, b) => {
-      const aValue = a?.columns.length > columnIndex ? a?.columns[columnIndex]?.value || '' : '';
-      const bValue = b?.columns.length > columnIndex ? b?.columns[columnIndex]?.value || '' : '';
+      if (a.columns.length <= columnIndex || b.columns.length <= columnIndex) {
+        return 0;
+      }
+
+      const aColumn = a.columns[columnIndex];
+      const bColumn = b.columns[columnIndex];
+      const aValue = aColumn.value || '';
+      const bValue = bColumn.value || '';
 
-      return sortOrder === SortDirection.asc ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+      return sortByItemType(aValue, bValue, sortOrder, aColumn.type);
     }),
   };
   return sortedTable;

diff --git a/src/components/formcomponents/table/tables/interface.ts b/src/components/formcomponents/table/tables/interface.ts
@@ -1,4 +1,4 @@
-import { QuestionnaireItem, QuestionnaireResponseItem } from '../../../../types/fhir';
+import { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 
 export type QuestionnaireItemWithAnswers = QuestionnaireItem & {
   answer?: QuestionnaireResponseItem['answer'];

diff --git a/src/components/formcomponents/table/tables/table-hn1/TableHn1.tsx b/src/components/formcomponents/table/tables/table-hn1/TableHn1.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { QuestionnaireItem, QuestionnaireResponse } from '../../../../../types/fhir';
+import { QuestionnaireItem, QuestionnaireResponse } from 'fhir/r4';
 
 import { Table as HnTable, TableBody, TableCell, TableRow } from '@helsenorge/designsystem-react/components/Table';
 

diff --git a/src/components/formcomponents/table/tables/table-hn1/utils.ts b/src/components/formcomponents/table/tables/table-hn1/utils.ts
@@ -1,4 +1,4 @@
-import { QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from '../../../../../types/fhir';
+import { QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 
 import { ITableH1, ITableH1Column, ITableH1Row, TABLE_HN1_TABLE_TYPES } from './interface';
 import ItemType from '../../../../../constants/itemType';
@@ -28,7 +28,6 @@ export const getTableHN1bodyObject = (
 
 export const createColumnsFromAnswers = (item: QuestionnaireResponseItem): ITableH1Column[] => {
   const combinedAnswer = transformAnswersToListOfStrings((item as QuestionnaireItem).type, item.answer || []).join(', ');
-
   const columns: ITableH1Column[] = [
     {
       id: `${item.linkId}-question`,

diff --git a/src/components/formcomponents/table/tables/table-hn2/TableHeadHn2.tsx b/src/components/formcomponents/table/tables/table-hn2/TableHeadHn2.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Coding } from '../../../../../types/fhir';
+import { Coding } from 'fhir/r4';
 
 import { HeaderCategory, SortDirection, TableHead, TableHeadCell, TableRow } from '@helsenorge/designsystem-react/components/Table';
 

diff --git a/src/components/formcomponents/table/tables/table-hn2/TableHn2.tsx b/src/components/formcomponents/table/tables/table-hn2/TableHn2.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
-import { Coding, QuestionnaireItem, QuestionnaireResponse } from '../../../../../types/fhir';
+import { Coding, QuestionnaireItem, QuestionnaireResponse } from 'fhir/r4';
 
 import { Table as HnTable, SortDirection, TableBody, TableCell, TableRow } from '@helsenorge/designsystem-react/components/Table';
 

diff --git a/src/components/formcomponents/table/tables/table-hn2/interface.ts b/src/components/formcomponents/table/tables/table-hn2/interface.ts
@@ -1,6 +1,9 @@
+import { IItemType } from '../../../../../constants/itemType';
+
 export interface ITableH2Column {
   id: string;
   text: string;
+  type?: IItemType;
   index: number;
 }
 

diff --git a/src/components/formcomponents/table/tables/table-hn2/utils.ts b/src/components/formcomponents/table/tables/table-hn2/utils.ts
@@ -1,4 +1,4 @@
-import { Coding, QuestionnaireItem, QuestionnaireResponse } from '../../../../../types/fhir';
+import { Coding, QuestionnaireItem, QuestionnaireResponse } from 'fhir/r4';
 
 import { SortDirection } from '@helsenorge/designsystem-react/components/Table';
 
@@ -12,6 +12,7 @@ import {
   findIndexByCode,
   getCodeFromCodingSystem,
   getEnabledQuestionnaireItemsWithAnswers,
+  sortByItemType,
   transformAnswersToListOfStrings,
 } from '../utils';
 
@@ -56,6 +57,7 @@ export const createColumnsForRow = (
     return {
       id: item.linkId,
       index: findIndexByCode(item, codeSystems.TableColumn),
+      type: item.type,
       text: getValueFromItemsToShow(item, itemsToShow),
     };
   });
@@ -101,8 +103,9 @@ export const sortTableRows = (table: ITableH2Row[], columnIndex: number, sortOrd
   return table.sort((a, b) => {
     const aValue = a?.columns.length > columnIndex ? a?.columns[columnIndex]?.text || '' : '';
     const bValue = b?.columns.length > columnIndex ? b?.columns[columnIndex]?.text || '' : '';
-
-    return sortOrder === SortDirection.asc ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+    const aColumn = a.columns[columnIndex];
+    const type = aColumn?.type;
+    return sortByItemType(aValue, bValue, sortOrder, type);
   });
 };
 export const findCodeForColumnToSortBy = (coding: Coding[]): Coding | undefined => {

diff --git a/src/components/formcomponents/table/tables/table/StandardTable.tsx b/src/components/formcomponents/table/tables/table/StandardTable.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
-import { Coding, QuestionnaireItem, QuestionnaireResponse, Resource } from '../../../../../types/fhir';
+import { Coding, QuestionnaireItem, QuestionnaireResponse, Resource } from 'fhir/r4';
 
 import { Table as HnTable, ModeType, SortDirection, TableBody, TableCell, TableRow } from '@helsenorge/designsystem-react/components/Table';
 
@@ -18,6 +18,7 @@ interface Props {
 
 export const StandardTable = ({ items, questionnaireResponse, resource, tableCodesCoding }: Props): JSX.Element => {
   const displayToSortBy = getDisplayToSortBy(tableCodesCoding);
+
   const [sortDir, setSortDir] = useState<SortDirection | undefined>(transformCodingToSortDirection(tableCodesCoding));
   const [table, setTable] = useState<IStandardTable>(
     getStandardTableObject(items, questionnaireResponse, resource, sortDir, displayToSortBy)