Merge branch 'dev' into dependabot/npm_and_yarn/npm_and_yarn-511caccbb4

Author: smalho01

src/components/DisplayBox/DisplayBox.jsx

@@ -355,10 +355,13 @@ const DisplayBox = props => {
                       {summarySection}
                     </Typography>
 
+                    <div>
+                      <Typography variant="div">{detailSection}</Typography>
+                    </div>
+
                     {/* Forms */}
                     {linksSection.length !== 0 ? (
                       <div>
-                        <Typography variant="div">{detailSection}</Typography>
                         <Typography color="text.secondary">Required Forms</Typography>
                         <List className={'links-section'}>{linksSection}</List>
                       </div>

src/util/buildScript.2017071.js

@@ -227,20 +227,29 @@ function buildNewRxMedication(doc, medicationRequestResource) {
   // loop through the coding values and find the ndc code and the rxnorm code
   let medicationCodingList =
     getDrugCodeableConceptFromMedicationRequest(medicationRequestResource)?.coding;
+
+  var drugDisplay = 'undefined';
   for (let i = 0; i < medicationCodingList.length; i++) {
     const coding = medicationCodingList[i];
     const system = coding.system.toLowerCase();
 
+    // get the display from first drug coding that contains a display value
+    if (coding.display && drugDisplay == 'undefined') {
+      drugDisplay = coding.display;
+    }
+
     if (system.endsWith('ndc')) {
       //     Medication Drug Code
-      xmlAddTextNode(doc, medicationPrescribed, 'DrugDescription', coding.display);
       var productCode = doc.createElement('ProductCode');
       xmlAddTextNode(doc, productCode, 'Code', coding.code);
       xmlAddTextNode(doc, productCode, 'Qualifier', 'ND'); // National Drug Code (NDC)
       drugCoded.appendChild(productCode);
     }
   }
 
+  // set the drug description
+  xmlAddTextNode(doc, medicationPrescribed, 'DrugDescription', drugDisplay);
+
   medicationPrescribed.appendChild(drugCoded);
 
   //     Medication Quantity

vite.config.ts

@@ -10,7 +10,7 @@ export default defineConfig({
     base: '',
     plugins: [react(), viteTsconfigPaths(), nodePolyfills()],
     preview: {
-      allowedHosts: ['.mitre.org', '.us-east-1.elb.amazonaws.com'],
+      allowedHosts: ['.mitre.org', '.elb.us-east-1.amazonaws.com']
     },
     define: {
         'process.env': process.env
@@ -22,7 +22,9 @@ export default defineConfig({
         // this sets a default port to 3000  
         port: 3000, 
         open: false,
-        host: true
+        host: true,
+        allowedHosts: ['.mitre.org', '.elb.us-east-1.amazonaws.com']
+
     },
     build: {
         outDir: 'build',