Modified user-self-reporting form submission on front-end to point to…

… differing API endpoints depending on Report Type.
hujambo-dunia · Apr 10, 2024 · e42aa5a · e42aa5a
1 parent 394c5ba
commit e42aa5a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 41 deletions.
diff --git a/client/src/components/Common/UserReportingError.vue b/client/src/components/Common/UserReportingError.vue
@@ -61,7 +61,7 @@
                 variant="primary"
                 class="mt-3"
                 :disabled="disableSubmit"
-                @click="submit({}, currentUser?.email)">
+                @click="submit(currentUser?.email)">
                 <FontAwesomeIcon icon="bug" class="mr-1" />Report
             </BButton>
         </div>
@@ -79,7 +79,6 @@ import { useMarkdown } from "@/composables/markdown";
 import { useUserStore } from "@/stores/userStore";
 
 import { sendErrorReport } from "../DatasetInformation/services";
-import { sendErrorReportTool } from "../ToolInformation/services";
 
 export default {
     components: {
@@ -140,28 +139,18 @@ export default {
         onError(err) {
             this.errorMessage = err;
         },
-        submit(dataset, userEmailJob) {
+        submit(userEmailJob) {
             const email = userEmailJob || this.currentUserEmail;
             const message = this.message;
-            if (this.transcript) {
-                sendErrorReportTool(dataset, message, email, this.transcript).then(
-                    (resultMessages) => {
-                        this.resultMessages = resultMessages;
-                    },
-                    (errorMessage) => {
-                        this.errorMessage = errorMessage;
-                    }
-                );
-            } else {
-                sendErrorReport(dataset, message, email, this.transcript).then(
-                    (resultMessages) => {
-                        this.resultMessages = resultMessages;
-                    },
-                    (errorMessage) => {
-                        this.errorMessage = errorMessage;
-                    }
-                );
-            }
+            const report_type = this.transcript ? "tool" : "dataset";
+            sendErrorReport(email, message, report_type, this.dataset, this.transcript).then(
+                (resultMessages) => {
+                    this.resultMessages = resultMessages;
+                },
+                (errorMessage) => {
+                    this.errorMessage = errorMessage;
+                }
+            );
         },
         hasDetails(outputs) {
             return (

diff --git a/client/src/components/DatasetInformation/DatasetError.vue b/client/src/components/DatasetInformation/DatasetError.vue
@@ -15,7 +15,6 @@
                         :result-messages="resultMessages"
                         :show-form="showForm"
                         :message="message"
-                        :submit="submit"
                         :dataset="dataset"
                         :command-outputs="buildCommandOutputs(jobDetails)"
                         :notifications="buildNotifications(jobDetails.tool_id)" />
@@ -35,8 +34,6 @@ import { mapState } from "pinia";
 import { useMarkdown } from "@/composables/markdown";
 import { useUserStore } from "@/stores/userStore";
 
-import { sendErrorReport } from "./services";
-
 import UserReportingError from "../Common/UserReportingError.vue";
 
 library.add(faBug);
@@ -99,18 +96,6 @@ export default {
                 },
             ];
         },
-        submit(dataset, userEmailJob) {
-            const email = userEmailJob || this.currentUserEmail;
-            const message = this.message;
-            sendErrorReport(dataset, message, email).then(
-                (resultMessages) => {
-                    this.resultMessages = resultMessages;
-                },
-                (errorMessage) => {
-                    this.errorMessage = errorMessage;
-                }
-            );
-        },
     },
 };
 </script>
diff --git a/client/src/components/DatasetInformation/services.js b/client/src/components/DatasetInformation/services.js
@@ -2,13 +2,19 @@ import axios from "axios";
 import { getAppRoot } from "onload/loadConfig";
 import { rethrowSimple } from "utils/simple-error";
 
-export async function sendErrorReport(dataset, message, email) {
+export async function sendErrorReport(email, message, report_type = "dataset", dataset = {}, transcript = null) {
+    let url = "";
     const payload = {
         dataset_id: dataset.id,
         message,
         email,
+        transcript,
     };
-    const url = `${getAppRoot()}api/jobs/${dataset.creating_job}/error`;
+    if (report_type == "tool") {
+        url = `${getAppRoot()}api/user-reporting/error`;
+    } else {
+        url = `${getAppRoot()}api/jobs/${dataset.creating_job}/error`;
+    }
     try {
         const { data } = await axios.post(url, payload);
         return data.messages;

diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
@@ -8,12 +8,10 @@
             <ToolEntryPoints v-for="job in entryPoints" :key="job.id" :job-id="job.id" />
         </div>
         <b-modal v-model="showError" size="sm" :title="errorTitle | l" scrollable ok-only>
-            {{ /* TODO integrate submit-prop into larger form */ }}
             <UserReportingError
                 :result-messages="[]"
                 :show-form="'true'"
                 :message="''"
-                :submit="submit"
                 :transcript="errorContentPretty"
                 :command-outputs="buildCommandOutputs(errorMessage)"
                 :notifications="buildNotifications(formConfig.id)" />