feat: remove endpoint label in title and search with enter (#213)

* feat: remove endpoint label in title and search with enter * feat: better formatting * feat: data before message * feat: remove unnecessary comment * feat:dont highlight status code 406 or 300
AllenNeuralDynamics · Apr 3, 2024 · 36ae1ef · 36ae1ef
1 parent 52e593c
commit 36ae1ef
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/src/aind_metadata_service/server.py b/src/aind_metadata_service/server.py
@@ -17,7 +17,6 @@
     LabTracksClient,
     LabTracksSettings,
 )
-
 from aind_metadata_service.response_handler import EtlResponse
 from aind_metadata_service.sharepoint.client import (
     SharePointClient,

diff --git a/src/aind_metadata_service/tars/mapping.py b/src/aind_metadata_service/tars/mapping.py
@@ -258,12 +258,16 @@ def integrate_injection_materials(
                                     or tars_response.status_code
                                     == StatusCodes.INVALID_DATA.value
                                 ):
-                                    data = json.loads(tars_response.body)["data"]
+                                    data = json.loads(tars_response.body)[
+                                        "data"
+                                    ]
                                     new_material = ViralMaterial(**data)
-                                    new_material.titer = injection_material.titer
-                                    procedure.injection_materials[
-                                        idx
-                                    ] = new_material
+                                    new_material.titer = (
+                                        injection_material.titer
+                                    )
+                                    procedure.injection_materials[idx] = (
+                                        new_material
+                                    )
                                 elif (
                                     tars_response.status_code
                                     == StatusCodes.NO_DATA_FOUND.value

diff --git a/src/aind_metadata_service/templates/index.html b/src/aind_metadata_service/templates/index.html
@@ -55,6 +55,7 @@
       &.pending { color: darkorange; }
       &.success { color: green; }
       &.error { color: red; }
+      &.partialError { color: black; }
     }
     .path, pre {
       font-family: monospace;
@@ -101,11 +102,10 @@ <h1>{{ service_name }}</h1>
     <div>
       <div class="container">
         <div class="heading">{{ e.endpoint|title }}
-          <span class="path">{{ "/%s/{%s}"|format(e.endpoint, e.parameter) }}</span>
         </div>
         <p>{{ e.description }}</p>
         <label for="param-id-{{ e.endpoint }}">{{ e.parameter_label or e.parameter }}:</label>
-        <input type="text" id="param-id-{{ e.endpoint }}" size="6" placeholder="{{ e.parameter }}" />
+        <input type="text" id="param-id-{{ e.endpoint }}" size="6" placeholder="{{ e.parameter }}" onkeydown="searchWithEnter('{{ e.endpoint }}')" />
       </div>
       <button id="search" type="button" class="primary" onclick="queryEndpoint('{{ e.endpoint }}')">Search</button>
     </div>
@@ -114,17 +114,22 @@ <h1>{{ service_name }}</h1>
       <div id="user-message"></div>
       <div id="response" class="container" hidden>
         <div class="heading">Response</div>
-        <div>Message:<pre id="response-message"></pre></div>
         <div>Data:<pre id="response-data"></pre></div>
+        <div>Message:<pre id="response-message"></pre></div>
         <div id="response-raw-div" hidden>Raw Response:<pre id="response-raw"></pre></div>
         <button id="toggle-raw" type="button" class="secondary" onclick="toggleViewRawResponse()">View raw response</button>
       </div>
     </div>
   </div>
 
   <script>
+    searchWithEnter = function (endpoint) {
+      if(event.key === 'Enter') {
+        queryEndpoint(endpoint);
+      }
+    };
     displayPendingUI = function () {
-      $("#user-message").removeClass("success error").addClass("pending");
+      $("#user-message").removeClass("success error partialError").addClass("pending");
       $("#user-message").html("Searching.... Please do not refresh or re-submit.");
       for (let id of ["message", "data", "raw"]) {
         $(`#response-${id}`).html("");
@@ -138,7 +143,11 @@ <h1>{{ service_name }}</h1>
         "response-data"   : JSON.stringify(response?.data, null, 2),
         "response-raw"    : JSON.stringify(response, null, 2)
       }
-      $("#user-message").removeClass("pending").addClass(isError ? "error" : "success");
+      if (statusCode === 406 || statusCode === 300){
+        $("#user-message").removeClass("pending error success").addClass("partialError")
+      } else{
+        $("#user-message").removeClass("pending").addClass(isError ? "error" : "success");
+      }
       Object.keys(responseText).forEach((id) => {
         $(`#${id}`).html(responseText[id]);
       });
@@ -149,9 +158,9 @@ <h1>{{ service_name }}</h1>
       const viewOrHide = $("#response-raw-div").is(":visible") ? "Hide" : "View";
       $("#toggle-raw").text(`${viewOrHide} raw response`);
     };
-    queryEndpoint = function (endpoint) {
-      let parameter = $(`#param-id-${endpoint}`).val();
-      $.ajax({
+   queryEndpoint = function (endpoint) {
+        let parameter = $(`#param-id-${endpoint}`).val();
+        $.ajax({
         url: `/${endpoint}/${parameter}`,
         type: "GET",
         beforeSend: function () {