Merge branch 'main' into rob/505-add-backend-logic-for-adding-valuesets

Author: robertandremitchell

src/app/(pages)/query/components/searchForm/SearchForm.tsx

@@ -61,15 +61,24 @@ const SearchForm: React.FC<SearchFormProps> = function SearchForm({
   const [autofilled, setAutofilled] = useState(false); // boolean indicating if the form was autofilled, changes color if true
 
   // Fills fields with sample data based on the selected
-  const fillFields = useCallback((highlightAutofilled = true) => {
-    setFirstName(hyperUnluckyPatient.FirstName);
-    setLastName(hyperUnluckyPatient.LastName);
-    setDOB(hyperUnluckyPatient.DOB);
-    setMRN(hyperUnluckyPatient.MRN);
-    setPhone(hyperUnluckyPatient.Phone);
-    setFhirServer(hyperUnluckyPatient.FhirServer as string);
-    setAutofilled(highlightAutofilled);
-  }, []);
+  const fillFields = useCallback(
+    (highlightAutofilled = true) => {
+      const defaultFhirServer = fhirServers.includes(
+        hyperUnluckyPatient.FhirServer,
+      )
+        ? hyperUnluckyPatient.FhirServer
+        : fhirServers[0];
+
+      setFirstName(hyperUnluckyPatient.FirstName);
+      setLastName(hyperUnluckyPatient.LastName);
+      setDOB(hyperUnluckyPatient.DOB);
+      setMRN(hyperUnluckyPatient.MRN);
+      setPhone(hyperUnluckyPatient.Phone);
+      setFhirServer(defaultFhirServer);
+      setAutofilled(highlightAutofilled);
+    },
+    [fhirServers],
+  );
 
   const nameRegex = "^[A-Za-z\u00C0-\u024F\u1E00-\u1EFF\\-'. ]+$";
   const nameRuleHint =

src/app/backend/dbServices/fhir-servers.ts

@@ -320,16 +320,33 @@ class FhirServerConfigService extends FhirServerConfigServiceInternal {
     }
   }
 
-  static async prepareFhirClient(fhirServer: string) {
+  static async prepareFhirClient(serverName: string) {
     if (FhirServerConfigService.cachedFhirServerConfigs === null) {
       FhirServerConfigService.cachedFhirServerConfigs =
         await super.getFhirServerConfigs();
     }
 
-    return new FHIRClient(
-      fhirServer,
-      FhirServerConfigService.cachedFhirServerConfigs,
+    let config = FhirServerConfigService.cachedFhirServerConfigs.find(
+      (c) => c.name === serverName,
     );
+
+    if (!config) {
+      // fallback retry in case we have a cache miss
+      FhirServerConfigService.cachedFhirServerConfigs =
+        await super.getFhirServerConfigs();
+      const followupConfig =
+        FhirServerConfigService.cachedFhirServerConfigs.find(
+          (c) => c.name === serverName,
+        );
+
+      if (!followupConfig)
+        throw Error(`No server config found for ${serverName}`);
+      else {
+        config = followupConfig;
+      }
+    }
+
+    return new FHIRClient(config);
   }
 }
 

src/app/shared/fhirClient.ts

@@ -4,6 +4,7 @@ import { AuthData } from "../backend/dbServices/fhir-servers";
 import { createSmartJwt } from "../backend/dbServices/smartOnFhir/lib";
 import { updateFhirServer } from "../backend/dbServices/fhir-servers";
 import { fetchWithoutSSL } from "./utils";
+import dbService from "../backend/dbServices/db-service";
 /**
  * A client for querying a FHIR server.
  * @param server The FHIR server to query.
@@ -15,14 +16,7 @@ class FHIRClient {
   private serverConfig: FhirServerConfig;
   private fetch: (url: string, options?: RequestInit) => Promise<Response>;
 
-  constructor(server: string, configurations: FhirServerConfig[]) {
-    // Find the configuration for the given server
-    const config = configurations.find((c) => c.name === server);
-
-    if (!config) {
-      throw new Error(`No configuration found for server: ${server}`);
-    }
-
+  constructor(config: FhirServerConfig) {
     this.serverConfig = config;
     this.hostname = config.hostname;
 
@@ -36,6 +30,10 @@ class FHIRClient {
     };
   }
 
+  static async refreshFhirServerConfig() {
+    dbService.query;
+  }
+
   /**
    * Creates a temporary client for testing a connection
    * @param url The FHIR server URL
@@ -79,7 +77,7 @@ class FHIRClient {
     }
 
     // Create a client with a configurations array containing only the test config
-    const client = new FHIRClient("test", [testConfig]);
+    const client = new FHIRClient(testConfig);
     return client;
   }
 

terraform/modules/oidc/_data.tf

@@ -28,6 +28,7 @@ data "aws_iam_policy_document" "github_assume_role" {
 
 # tfstate and storage policy
 # trivy:ignore:AVD-AWS-0057
+# trivy:ignore:AVD-AWS-0345
 data "aws_iam_policy_document" "storage" {
   statement {
     actions = [