@aehrc/smart-forms-renderer 0.9.2 → 0.10.0

package/src/theme/overrides/Table.ts

@@ -23,7 +23,8 @@ export default function Table(theme: Theme) {
       styleOverrides: {
         head: {
           color: theme.palette.text.secondary,
-          backgroundColor: theme.palette.customBackground.neutral
+          backgroundColor: theme.palette.customBackground.neutral,
+          borderBottom: '1px solid #e5e7eb'
         }
       }
     }

package/src/utils/calculatedExpression.ts

@@ -34,7 +34,6 @@ import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
 import { updateQrItemsInGroup } from './qrItem';
 import cloneDeep from 'lodash.clonedeep';
 import dayjs from 'dayjs';
-import moment from 'moment';
 
 interface EvaluateInitialCalculatedExpressionsParams {
   initialResponse: QuestionnaireResponse;
@@ -354,7 +353,7 @@ function parseValueToAnswer(qItem: QuestionnaireItem, value: any): Questionnaire
 export function checkIsDateTime(value: string): boolean {
   const acceptedFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD', 'YYYY-MM-DDTHH:mm:ssZ'];
   const formattedDate = dayjs(value).format();
-  return moment(formattedDate, acceptedFormats, true).isValid();
+  return dayjs(formattedDate, acceptedFormats, true).isValid();
 }
 
 /**

package/src/utils/groupTable.ts

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { GroupTableRowModel } from '../interfaces/groupTable.interface';
+import cloneDeep from 'lodash.clonedeep';
+
+export function reorderRows(
+  rows: GroupTableRowModel[],
+  sourceIndex: number,
+  destinationIndex: number
+) {
+  const result = Array.from(rows);
+  const [removed] = result.splice(sourceIndex, 1);
+  result.splice(destinationIndex, 0, removed);
+
+  return result;
+}
+
+export function getGroupTableItemsToUpdate(tableRows: GroupTableRowModel[], selectedIds: string[]) {
+  return tableRows
+    .filter((row) => selectedIds.includes(row.nanoId))
+    .flatMap((singleRow) => (singleRow.qrItem ? [cloneDeep(singleRow.qrItem)] : []));
+}

package/src/stores/useQuestionnaireResponseStore.ts

@@ -1,63 +0,0 @@
-import { create } from 'zustand';
-import type { QuestionnaireResponse } from 'fhir/r4';
-import { emptyResponse } from '../utils/emptyResource';
-import cloneDeep from 'lodash.clonedeep';
-import type { Diff } from 'deep-diff';
-import { diff } from 'deep-diff';
-
-export interface UseQuestionnaireResponseStoreType {
-  sourceResponse: QuestionnaireResponse;
-  updatableResponse: QuestionnaireResponse;
-  formChangesHistory: (Diff<QuestionnaireResponse, QuestionnaireResponse>[] | null)[];
-  buildSourceResponse: (response: QuestionnaireResponse) => void;
-  setUpdatableResponseAsPopulated: (populatedResponse: QuestionnaireResponse) => void;
-  updateResponse: (updatedResponse: QuestionnaireResponse) => void;
-  setUpdatableResponseAsSaved: (savedResponse: QuestionnaireResponse) => void;
-  setUpdatableResponseAsEmpty: (clearedResponse: QuestionnaireResponse) => void;
-  destroySourceResponse: () => void;
-}
-
-const useQuestionnaireResponseStore = create<UseQuestionnaireResponseStoreType>()((set, get) => ({
-  sourceResponse: cloneDeep(emptyResponse),
-  updatableResponse: cloneDeep(emptyResponse),
-  formChangesHistory: [],
-  buildSourceResponse: (questionnaireResponse: QuestionnaireResponse) => {
-    set(() => ({
-      sourceResponse: questionnaireResponse,
-      updatableResponse: questionnaireResponse
-    }));
-  },
-  setUpdatableResponseAsPopulated: (populatedResponse: QuestionnaireResponse) => {
-    const formChanges = diff(get().updatableResponse, populatedResponse) ?? null;
-    set(() => ({
-      updatableResponse: populatedResponse,
-      formChangesHistory: [...get().formChangesHistory, formChanges]
-    }));
-  },
-  updateResponse: (updatedResponse: QuestionnaireResponse) => {
-    const formChanges = diff(get().updatableResponse, updatedResponse) ?? null;
-    set(() => ({
-      updatableResponse: updatedResponse,
-      formChangesHistory: [...get().formChangesHistory, formChanges]
-    }));
-  },
-  setUpdatableResponseAsSaved: (savedResponse: QuestionnaireResponse) =>
-    set(() => ({
-      sourceResponse: savedResponse,
-      updatableResponse: savedResponse,
-      formChangesHistory: []
-    })),
-  setUpdatableResponseAsEmpty: (clearedResponse: QuestionnaireResponse) =>
-    set(() => ({
-      updatableResponse: clearedResponse,
-      formChangesHistory: []
-    })),
-  destroySourceResponse: () =>
-    set(() => ({
-      sourceResponse: cloneDeep(emptyResponse),
-      updatableResponse: cloneDeep(emptyResponse),
-      formChangesHistory: []
-    }))
-}));
-
-export default useQuestionnaireResponseStore;

package/src/stores/useSmartConfigStore.ts

@@ -1,27 +0,0 @@
-import { create } from 'zustand';
-import type { Encounter, Patient, Practitioner } from 'fhir/r4';
-import type Client from 'fhirclient/lib/Client';
-
-export interface UseSmartConfigStoreType {
-  client: Client | null;
-  patient: Patient | null;
-  user: Practitioner | null;
-  encounter: Encounter | null;
-  setClient: (client: Client) => void;
-  setPatient: (patient: Patient) => void;
-  setUser: (user: Practitioner) => void;
-  setEncounter: (encounter: Encounter) => void;
-}
-
-const useSmartConfigStore = create<UseSmartConfigStoreType>()((set) => ({
-  client: null,
-  patient: null,
-  user: null,
-  encounter: null,
-  setClient: (client: Client) => set(() => ({ client: client })),
-  setPatient: (patient: Patient) => set(() => ({ patient: patient })),
-  setUser: (user: Practitioner) => set(() => ({ user: user })),
-  setEncounter: (encounter: Encounter) => set(() => ({ encounter: encounter }))
-}));
-
-export default useSmartConfigStore;