Merge pull request #64 from LCOGT/dev

merge dev to prod
LCOGT · Jun 30, 2023 · 67675a5 · 67675a5
2 parents b8f96b9 + 23fb070
commit 67675a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/components/message-composition/HermesMessage.vue b/src/components/message-composition/HermesMessage.vue
@@ -7,7 +7,7 @@
           </template>
           <show-wrapper id="main-fields">
             <ocs-custom-alert v-for="error in errors.non_field_errors" :key="error" alert-class="danger" :dismissible="false">
-              {{ error }}
+              <span v-html="error"></span>
             </ocs-custom-alert>
             <b-container class="p-0">
               <b-form>

diff --git a/src/components/message-composition/MessageCompositionForm.vue b/src/components/message-composition/MessageCompositionForm.vue
@@ -8,13 +8,16 @@
       </b-col>
     </b-row>
     <b-row class="mt-2">
-      <b-col>
-        <div class="submit-container">
-          <b-button class="submit-button shadow" variant="success" @click="submitToHop"
-            :disabled="!readyToSubmit">Submit</b-button> to {{this.hermesMessage.topic}}
+      <b-col sm="1" class="submit-container">
+        <b-button class="submit-button shadow" variant="success" @click="submitToHop"
+          :disabled="!readyToSubmit">Submit</b-button>
+      </b-col>
+      <b-col sm="5"> to {{this.hermesMessage.topic}}
+        <div v-if="this.hermesMessage.submit_to_gcn">
+          and {{getGCNDestination()}}
         </div>
       </b-col>
-      <b-col>
+      <b-col sm="6">
         <b-button class="clear-button shadow mb-2" variant="outline-primary" @click="clearForm">Clear Form</b-button>
       </b-col>
     </b-row>
@@ -112,6 +115,13 @@ export default {
         this.logout();
       }
     },
+    getGCNDestination: function() {
+      // This should probably pull from an API endopoint on the backend, but is hopefully sufficient for now.
+      if (this.getHermesUrl == "https://hermes.lco.global/") {
+        return "circulars@gcn.nasa.gov"
+      }
+      return "circulars@dev.gcn.nasa.gov"
+    },
     generatePlainText: function() {
       let payload = this.sanitizedMessageData();
       // Post message via axios

diff --git a/src/views/MessageDetail.vue b/src/views/MessageDetail.vue
@@ -64,7 +64,7 @@
           <b-row sm="3" v-b-toggle:[field] class="text-sm-right mx-2">
             <h4 class="collapse-table-head">{{ field.toUpperCase().replace("_", " ") }} KEYPAIRS &#9776;</h4>
           </b-row>
-          <b-collapse :id="field">
+          <b-collapse visible :id="field" >
             <b-row class="mx-2">
               <b-table small reactive class="kv-b-table" :items="getKVItems(dictvalue)" :fields="KVdataFields">
                 <template #cell(value)="data">