Merge branch 'subsetter_front_clean' into develop_v2

CUAHSI · Nov 28, 2023 · f261939 · f261939
2 parents dc23f87 + ef244c2
commit f261939
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/app/frontend/src/components/AlertPopup.vue b/app/frontend/src/components/AlertPopup.vue
@@ -3,7 +3,6 @@
 </template>
 
 <script setup>
-import { defineProps } from 'vue';
 const props = defineProps({ text: { type: String, default: "" }, title: { default: "Alert" } })
 </script>
 

diff --git a/app/frontend/src/components/SnackBar.vue b/app/frontend/src/components/SnackBar.vue
@@ -12,7 +12,6 @@
 </template>
 
 <script setup>
-import { defineProps } from 'vue';
 const props = defineProps({ message: { type: String, default: "" }, show: { default: true }, timeout: { type: Number, default: 2000 } })
 
 </script>

diff --git a/app/frontend/src/components/SubmitButton.vue b/app/frontend/src/components/SubmitButton.vue
@@ -15,8 +15,13 @@ const modelsStore = useModelsStore();
 
 function submit() {
   const model = modelsStore.selectedModel
-  const hucsArray = Map.selected_hucs
-  submitHucs(hucsArray, model.shortName)
+  if (model.input === "hucs") {
+    const hucsArray = Map.selected_hucs
+    submitHucs(hucsArray, model.shortName)
+  } else {
+    const bbox = Map.bbox
+    submitBbox(bbox, model.shortName)
+  }
 }
 async function submitHucs(selected_hucs, model) {
   selected_hucs = selected_hucs.map(a => a.hucid);
@@ -27,4 +32,13 @@ async function submitHucs(selected_hucs, model) {
   const parJson = await fetchWrapper.post(`${ENDPOINTS.submit}/${model}?hucs=${hucs}`)
   alert(`Submitted ${parJson.workflow_name} workflow. Workflow_id: ${parJson.workflow_id}`)
 }
+
+async function submitBbox(bbox, model) {
+  const [xmin, ymin, xmax, ymax] = bbox
+  const params = `y_south=${ymin}&y_north=${ymax}&x_west=${xmin}&x_east=${xmax}`
+  alert(`Submitting bbox: ${bbox} for ${model} subsetting`)
+
+  const parJson = await fetchWrapper.post(`${ENDPOINTS.submit}/${model}?${params}`)
+  alert(`Submitted ${parJson.workflow_name} workflow. Workflow_id: ${parJson.workflow_id}`)
+}
 </script>
diff --git a/app/frontend/src/components/UserLogin.vue b/app/frontend/src/components/UserLogin.vue
@@ -67,8 +67,9 @@ function onLogOut() {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .v-card__text img {
+/* ::v-deep .v-card__text img {
     max-width: 12rem;
 }
+*/
 </style>