@aehrc/smart-forms-renderer 0.32.1 → 0.33.0

package/lib/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.js

@@ -88,7 +88,7 @@ function CustomDateTimeItem(props) {
             onQrItemChange(createEmptyQrItem(qItem));
         }
         const { timeIsValid, is24HourNotation } = validateTimeInput(newTimeInput, newPeriodInput);
-        if (!validateDateInput(dateInput) && !timeIsValid) {
+        if (!validateDateInput(dateInput) || !timeIsValid) {
             return;
         }
         updateQRDateTime(dateInput, newTimeInput, newPeriodInput, is24HourNotation);

package/lib/globals.d.ts

@@ -0,0 +1 @@
+export declare const TERMINOLOGY_SERVER_URL = "https://tx.ontoserver.csiro.au/fhir";

package/lib/globals.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 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.
+ */
+export const TERMINOLOGY_SERVER_URL = 'https://tx.ontoserver.csiro.au/fhir';
+//# sourceMappingURL=globals.js.map

package/lib/globals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"globals.js","sourceRoot":"","sources":["../src/globals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,qCAAqC,CAAC"}

package/lib/stores/terminologyServerStore.d.ts

@@ -16,7 +16,7 @@ export interface TerminologyServerStoreType {
 }
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the vanilla version of the store which can be used in non-React environments.
  * @see TerminologyServerStoreType for available properties and methods.
  *
@@ -25,7 +25,7 @@ export interface TerminologyServerStoreType {
 export declare const terminologyServerStore: import("zustand/vanilla").StoreApi<TerminologyServerStoreType>;
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the React version of the store which can be used as React hooks in React functional components.
  * @see TerminologyServerStoreType for available properties and methods.
  *

package/lib/stores/terminologyServerStore.js

@@ -16,23 +16,23 @@
  */
 import { createStore } from 'zustand/vanilla';
 import { createSelectors } from './selector';
-const ONTOSERVER_R4 = 'https://r4.ontoserver.csiro.au/fhir';
+import { TERMINOLOGY_SERVER_URL } from '../globals';
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the vanilla version of the store which can be used in non-React environments.
  * @see TerminologyServerStoreType for available properties and methods.
  *
  * @author Sean Fong
  */
 export const terminologyServerStore = createStore()((set) => ({
-    url: ONTOSERVER_R4,
+    url: TERMINOLOGY_SERVER_URL,
     setUrl: (newUrl) => set(() => ({ url: newUrl })),
-    resetUrl: () => set(() => ({ url: ONTOSERVER_R4 }))
+    resetUrl: () => set(() => ({ url: TERMINOLOGY_SERVER_URL }))
 }));
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the React version of the store which can be used as React hooks in React functional components.
  * @see TerminologyServerStoreType for available properties and methods.
  *

package/lib/stores/terminologyServerStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminologyServerStore.js","sourceRoot":"","sources":["../../src/stores/terminologyServerStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,aAAa,GAAG,qCAAqC,CAAC;AAmB5D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,EAA8B,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACxF,GAAG,EAAE,aAAa;IAClB,MAAM,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACxD,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;CACpD,CAAC,CAAC,CAAC;AAEJ;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,eAAe,CAAC,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"terminologyServerStore.js","sourceRoot":"","sources":["../../src/stores/terminologyServerStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAmBpD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,EAA8B,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACxF,GAAG,EAAE,sBAAsB;IAC3B,MAAM,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IACxD,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,sBAAsB,EAAE,CAAC,CAAC;CAC7D,CAAC,CAAC,CAAC;AAEJ;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,eAAe,CAAC,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/aehrc/smart-forms#readme",
   "dependencies": {
-    "@aehrc/sdc-populate": "^2.0.3",
+    "@aehrc/sdc-populate": "^2.1.0",
     "@iconify/react": "^4.1.1",
     "dayjs": "^1.11.10",
     "deep-diff": "^1.0.2",

package/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx

@@ -130,7 +130,7 @@ function CustomDateTimeItem(props: CustomDateTimeItemProps) {
     }
 
     const { timeIsValid, is24HourNotation } = validateTimeInput(newTimeInput, newPeriodInput);
-    if (!validateDateInput(dateInput) && !timeIsValid) {
+    if (!validateDateInput(dateInput) || !timeIsValid) {
       return;
     }
 

package/src/globals.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 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.
+ */
+
+export const TERMINOLOGY_SERVER_URL = 'https://tx.ontoserver.csiro.au/fhir';

package/src/stores/terminologyServerStore.ts

@@ -17,8 +17,7 @@
 
 import { createStore } from 'zustand/vanilla';
 import { createSelectors } from './selector';
-
-const ONTOSERVER_R4 = 'https://r4.ontoserver.csiro.au/fhir';
+import { TERMINOLOGY_SERVER_URL } from '../globals';
 
 /**
  * TerminologyServerStore properties and methods
@@ -39,21 +38,21 @@ export interface TerminologyServerStoreType {
 
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the vanilla version of the store which can be used in non-React environments.
  * @see TerminologyServerStoreType for available properties and methods.
  *
  * @author Sean Fong
  */
 export const terminologyServerStore = createStore<TerminologyServerStoreType>()((set) => ({
-  url: ONTOSERVER_R4,
+  url: TERMINOLOGY_SERVER_URL,
   setUrl: (newUrl: string) => set(() => ({ url: newUrl })),
-  resetUrl: () => set(() => ({ url: ONTOSERVER_R4 }))
+  resetUrl: () => set(() => ({ url: TERMINOLOGY_SERVER_URL }))
 }));
 
 /**
  * Terminology server state management store. This is used for resolving valueSets externally.
- * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * Defaults to use https://tx.ontoserver.csiro.au/fhir.
  * This is the React version of the store which can be used as React hooks in React functional components.
  * @see TerminologyServerStoreType for available properties and methods.
  *