From 0dc3af215c55b7ddf9fa7861294d9e6cf7350c09 Mon Sep 17 00:00:00 2001
From: havok2063 <havok2063@hotmail.com>
Date: Fri, 24 Jan 2025 16:14:33 -0500
Subject: [PATCH] adding auth and release info to various api calls

---
 src/components/ConeSearch.vue    |  4 ++--
 src/components/ParentCatalog.vue |  8 ++++++--
 src/components/ReleaseSelect.vue |  2 +-
 src/components/Solara.vue        |  5 ++++-
 src/views/Explore.vue            |  4 ++--
 src/views/Search.vue             |  4 +++-
 src/views/Target.vue             | 12 ++++++------
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/ConeSearch.vue b/src/components/ConeSearch.vue
index bf77074..dd747cc 100644
--- a/src/components/ConeSearch.vue
+++ b/src/components/ConeSearch.vue
@@ -104,8 +104,8 @@ async function callApi(ra: string, dec: string, { radius, units }: { radius: num
 
     // turn on loading flag
     loading.value = true;
-    const endpoint = import.meta.env.VITE_API_URL + `/query/cone?ra=${ra}&dec=${dec}&radius=${radius}&units=${units}`
-    await axios.get(endpoint)
+    const endpoint = import.meta.env.VITE_API_URL + `/query/cone?ra=${ra}&dec=${dec}&radius=${radius}&units=${units}&release=${store.release}`;
+    await axios.get(endpoint, {headers: store.get_auth_hdr()})
         .then(response => {
         // Handle the response data
 
diff --git a/src/components/ParentCatalog.vue b/src/components/ParentCatalog.vue
index a3249aa..52c080e 100644
--- a/src/components/ParentCatalog.vue
+++ b/src/components/ParentCatalog.vue
@@ -92,6 +92,10 @@
 <script setup lang="ts">
   import { ref, defineProps } from 'vue';
   import axiosInstance from '@/axios'
+  import { useAppStore } from '@/store/app'
+
+// get the application state store
+const store = useAppStore()
 
 // define which properties are passed in from the parent, i.e. ":xxx"
 const props = defineProps<{
@@ -130,7 +134,7 @@ async function getParentCatalogData() {
     // Populate table data with parent catalog info for the given sdssid and catalog name
 
     // resolve the target coordinates using the valis endpoint
-    const url = `/target/parents/${selected_catalog.value}/${props.sdssid}?catalogid=${props.catalogid}`;
+    const url = `/target/parents/${selected_catalog.value}/${props.sdssid}?catalogid=${props.catalogid}&release=${store.release}`;
 
     // use local cache if available
     // temporary cache per target page load
@@ -142,7 +146,7 @@ async function getParentCatalogData() {
     }
 
     // fetch the parent catalog data
-    await axiosInstance.get(url)
+    await axiosInstance.get(url, {headers: store.get_auth_hdr()})
     .then((response) => {
         // convert response data to an array of objects for the data table; object keys match header field "key"
         let data = Object.entries(response.data[0]).map((item)=> ({parameter: item[0], value: item[1]}))
diff --git a/src/components/ReleaseSelect.vue b/src/components/ReleaseSelect.vue
index 1b40f2c..01a9f49 100644
--- a/src/components/ReleaseSelect.vue
+++ b/src/components/ReleaseSelect.vue
@@ -51,7 +51,7 @@ async function get_releases() {
             // remove the MPLs and work release
             let rels = response.data.filter((rel: string) => !rel.startsWith("M") && !rel.startsWith("W")).reverse()
             // remove the older DRs for now; update this to only DR19 once it's available
-            rels = rels.filter((rel: string) => rel.startsWith("DR") ? parseInt(rel.slice(2)) >= 18 : rel)
+            rels = rels.filter((rel: string) => rel.startsWith("DR") ? parseInt(rel.slice(2)) >= 19 : rel)
             // filter out all IPL except IPL3 from rels
             rels = rels.filter((rel: string) => rel.startsWith("IPL") ? rel.endsWith("3") : rel)
             // store the releases and check for selection
diff --git a/src/components/Solara.vue b/src/components/Solara.vue
index 0588278..2522cfe 100644
--- a/src/components/Solara.vue
+++ b/src/components/Solara.vue
@@ -10,7 +10,10 @@
 import axios from 'axios'
 import { ref, onMounted, watch } from 'vue'
 import { useTheme } from 'vuetify'
+import { useAppStore } from '@/store/app'
 
+// get the application state store
+const store = useAppStore()
 
 // define which properties are passed in from the parent, i.e. ":xxx"
 const props = defineProps<{
@@ -30,7 +33,7 @@ let valid = ref(false)
 let errmsg = ref('')
 let theme = useTheme()
 
-let url = ref(import.meta.env.VITE_API_URL + `/solara/embed/?release=IPL3&sdssid=${props.sdssid}&files=${props.files.join()}&theme=${theme.global.name.value}`)
+let url = ref(import.meta.env.VITE_API_URL + `/solara/embed/?release=${store.release}&sdssid=${props.sdssid}&files=${props.files.join()}&theme=${theme.global.name.value}`)
 console.log('url', url)
 
 async function check_solara() {
diff --git a/src/views/Explore.vue b/src/views/Explore.vue
index c222938..ffaf25f 100644
--- a/src/views/Explore.vue
+++ b/src/views/Explore.vue
@@ -320,8 +320,8 @@ function get_hipscat(item) {
 async function coneSearch(ra: string, dec: string, radius: number, units: string): Promise<void> {
     // perform the cone search API call
 
-    const endpoint = `/query/cone?ra=${ra}&dec=${dec}&radius=${radius}&units=${units}`
-    await axiosInstance.get(endpoint)
+    const endpoint = `/query/cone?ra=${ra}&dec=${dec}&radius=${radius}&units=${units}&release=${store.release}`
+    await axiosInstance.get(endpoint, {headers: store.get_auth_hdr()})
         .then(response => {
         // Handle the response data
         // if no results, do nothing
diff --git a/src/views/Search.vue b/src/views/Search.vue
index 886e1fc..c0eeb02 100644
--- a/src/views/Search.vue
+++ b/src/views/Search.vue
@@ -229,8 +229,10 @@ async function submit_form(this: any) {
     [formData.value.ra, formData.value.dec] = extract_coords(formData.value.coords)
     console.log('submitting', formData.value)
 
+    let hdr1 = {'Content-Type': 'application/json'}
+    let hdr = {...hdr1, ...store.get_auth_hdr()}
     await axiosInstance.post('/query/main',
-        formData.value, {headers: {'Content-Type': 'application/json'}})
+        formData.value, {headers: hdr })
         .then((response) => {
           // handle the initial response
             console.log(response)
diff --git a/src/views/Target.vue b/src/views/Target.vue
index 60e345b..13fd95b 100644
--- a/src/views/Target.vue
+++ b/src/views/Target.vue
@@ -194,18 +194,18 @@ let headmeta = [
 async function get_target_info() {
     console.time('Info Time');
 
-    let rel = "IPL3"
+    //let rel = "IPL3"
 
     // set up API call endpoints
     let endpoints = [
-        `/target/ids/${sdss_id}?release=${rel}`,
-        `/target/cartons/${sdss_id}?release=${rel}`,
-        `/target/catalogs/${sdss_id}?release=${rel}`,
-        `/target/pipelines/${sdss_id}?release=${rel}`
+        `/target/ids/${sdss_id}?release=${store.release}`,
+        `/target/cartons/${sdss_id}?release=${store.release}`,
+        `/target/catalogs/${sdss_id}?release=${store.release}`,
+        `/target/pipelines/${sdss_id}?release=${store.release}`
         ]
 
     // await the promises
-    await Promise.all(endpoints.map((endpoint) => axiosInstance.get(endpoint)))
+    await Promise.all(endpoints.map((endpoint) => axiosInstance.get(endpoint, {headers: store.get_auth_hdr()})))
     .then(([{data: target}, {data: cartons}, {data: catalogs}, {data: pipes}] )=> {
       console.log({ target, cartons, catalogs, pipes })
       loading.value = false