Fix narrative view and dev/prod path discrepancy

Author: daniellrgn

Dockerfile

@@ -16,6 +16,8 @@ RUN ./fix-popper.sh
 COPY . .
 RUN npm run build
 
+RUN cp -r build/ips/assets build/assets
+
 RUN cp build/404.html build/index.html
 
 CMD ["npm", "run", "start"]

static/ips/assets/js/renderIPS.js

@@ -3,7 +3,7 @@ let headerLength = 0;
 
 import config from "./config.js";
 
-export { update, updateFromText, mode };
+export { update };
 
 let sectionCount = 0;
 
@@ -40,8 +40,10 @@ $(document).ready(function () {
       });
     });
   }
-  $('#FhirDropdown').attr('href', "javascript:mode='Entries'; $('#mode').html('Displaying FHIR Entries'); updateFromText();");
-  $('#NarrativeDropdown').attr('href', "javascript:mode='Text'; $('#mode').html('Displaying Narrative'); updateFromText();");
+  
+  $('#FhirDropdown').on('click', () => updateDisplayMode('Entries'));
+  $('#NarrativeDropdown').on('click', () => updateDisplayMode('Text'));
+
   if (footerLength === 1) {
     $("#footer").load(config.html_dir + "footer.html", function () {
       // no actions on footer currently
@@ -53,6 +55,21 @@ $(window).on('load', function () {
   $("#content").show();
 });
 
+const updateDisplayMode = function (displayMode) {
+  let dropdown = $('#mode');
+
+  if (displayMode == 'Entries') {
+    var newText = 'Displaying FHIR Entries';
+  } else if (displayMode == 'Text') {
+    var newText = 'Displaying Narrative';
+  }
+  if (newText) {
+    mode = displayMode
+    dropdown.html(newText);
+  }
+  updateFromText();
+};
+
 // Clear data button function. Should be called on all new data loads 
 const clearData = function () {
   // clear textbox

static/ips/index.html

@@ -21,16 +21,11 @@
     crossorigin="anonymous"></script>
   <script src="https://unpkg.com/squirrelly@7.9.2/dist/squirrelly.min.js"></script>
   <!-- IPS Specific Custom CSS-->
-  <link rel="stylesheet" href="/ips/assets/css/custom.css">
+  <link rel="stylesheet" href="./assets/css/custom.css">
 
   <!-- IPS Rendering -->
-  <script type="module" src="/ips/assets/js/renderIPS.js"></script>
-  <script type="module" src="/ips/assets/js/retreiveIPS.js"></script>
-  <script type="module">
-    import { updateFromText, mode } from "/ips/assets/js/renderIPS.js";
-    window.updateFromText = updateFromText;
-    window.mode = mode;
-  </script>
+  <script type="module" src="./assets/js/renderIPS.js"></script>
+  <script type="module" src="./assets/js/retreiveIPS.js"></script>
 
 
   <title>IPS Viewer</title>
@@ -50,17 +45,17 @@
     <!-- IPS documents have both machine-processable FHIR resources and Narrative HTML -->
     <div style="padding-left: 17px">
       <h2>Patient Summary Viewer</h2>
-      <div class="dropdown" style="display:none">
+      <div class="dropdown" style="display:inline">
         <button class="btn btn-secondary dropdown-toggle" id="mode" type="button" data-toggle="dropdown"
           aria-haspopup="true" aria-expanded="false">
-          Display FHIR Entries
+          Displaying FHIR Entries
         </button>
         <br>
         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-          <a id="FhirDropdown" class="dropdown-item"> 
+          <a id="FhirDropdown" class="dropdown-item" style="cursor:pointer"> 
             Display FHIR Entries
           </a>
-          <a id= "NarrativeDropdown" class="dropdown-item" >
+          <a id= "NarrativeDropdown" class="dropdown-item" style="cursor:pointer">
             Display Narrative
           </a>
         </div>