Merge pull request #64 from dqualizer/ak-ms-devops

Ak ms devops
dqualizer · Oct 13, 2023 · 7fd9842 · 7fd9842
2 parents 06383cc + 10828bf
commit 7fd9842
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 40 deletions.
diff --git a/src/components/rqaExplorer/RqaInput.jsx b/src/components/rqaExplorer/RqaInput.jsx
@@ -4,7 +4,10 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import { useRef } from "react";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { createRqa } from "../../queries/rqa";
+import { useMatch } from "react-router-dom";
+
 export default function RqaInput({ setInputOpen }) {
+  const match = useMatch("/analyzer/:domainId");
   const [value, setValue] = useState();
   const queryClient = useQueryClient();
 
@@ -36,7 +39,7 @@ export default function RqaInput({ setInputOpen }) {
     if (e.key == "Enter" || e.type == "blur") {
       createRqaMutation.mutate({
         name: value,
-        domain_id: 1,
+        domain_id: match.params.domainId,
         environment: "TEST",
         context: "Werkstatt",
       });

diff --git a/src/components/rqaExplorer/rqaTree/ResultMetrics.jsx b/src/components/rqaExplorer/rqaTree/ResultMetrics.jsx
@@ -9,7 +9,6 @@ export default function ResultMetrics({ data }) {
     formattedData.push(toHumanCasing(metric));
   });
 
-  console.log(formattedData);
   return (
     <details>
       <summary>

diff --git a/src/components/rqaExplorer/rqaTree/RqaDefinition.jsx b/src/components/rqaExplorer/rqaTree/RqaDefinition.jsx
@@ -5,30 +5,20 @@ export default function RqaDefinition({ data, loadtestSpecifier }) {
   console.log(data);
   const handleExecute = () => {
     var data_copy = data; // The other components call the system_id and activity_id "object" and "activity"
-    data_copy.runtime_quality_analysis.loadtests.forEach((loadtest) => {
-      delete loadtest.name;
-      loadtest.artifact.object = loadtest.artifact.system_id;
-      delete loadtest.artifact.system_id;
-    });
     const call = axios
       .post(`http://localhost:8080/translate/${data_copy.id}`)
       .then((res) => console.log(res.data));
   };
   return (
     <ul>
-      {Object.keys(data).map((key, index) => {
-        if (typeof data[key] == "object") {
-          return (
-            <li>
-              <Loadtests
-                data={data.runtime_quality_analysis.loadtests}
-                rqaId={data.id}
-                loadtestSpecifier={loadtestSpecifier}
-              />
-            </li>
-          );
-        }
-      })}
+      <li>
+        <Loadtests
+          data={data.runtime_quality_analysis.loadtests}
+          rqaId={data.id}
+          loadtestSpecifier={loadtestSpecifier}
+        />
+      </li>
+
       <li>
         <details>
           <summary>Details</summary>

diff --git a/src/data/werkstattdamDTO.json b/src/data/werkstattdamDTO.json
@@ -10,12 +10,14 @@
     "actors": [
      {
       "_id": "1",      
-      "actor_name": "Kunde"
+      "actor_name": "Kunde",
+      "is_group": false
 
      },
      {
       "_id": "2",   
-      "actor_name": "Händler"
+      "actor_name": "Händler",
+      "is_group": false
 
      }
     ],
@@ -44,18 +46,10 @@
          "path_variables": [
           {
            "name": "auftragsnummer",
-           "szenarios": [
+           "scenarios": [
             {
-             "path": "auftrag/auftragsnummern/nicht_angelegt.json"
-            }
-           ]
-          },
-          {
-           "name": "customer",
-           "szenarios": [
-            {
-             "name": "Valide Customer",
-             "path": "auftrag/auftragsnummern/angelegt.json"
+                "name": "valide AUftragsnummern",
+                "path": "auftrag/auftragsnummern/angelegt.json"
             }
            ]
           }
@@ -90,7 +84,7 @@
          "request_parameter": [
           {
            "name": "headers",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "valid headers",
              "path": "auftrag/allgemein/headers.json"
@@ -99,7 +93,7 @@
           },
           {
            "name": "authorization",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "valid authorization",
              "path": "auftrag/allgemein/authorization.json"
@@ -110,7 +104,7 @@
          "payload": [
           {
            "name": "auftraggeber",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "auftraggeber_2022",
              "path": "auftrag/auftraggeber/2022/auftraggeber.json"
@@ -119,7 +113,7 @@
           },
           {
            "name": "auftraggeber",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "auftraggeber_2023",
              "path": "auftrag/auftraggeber/2023/auftraggeber.json"
@@ -151,7 +145,7 @@
          "path_variables": [
           {
            "name": "auftragsnummer",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "Valide Auftragsnummern",
              "path": "auftrag/auftragsnummern/angelegt.json"
@@ -163,7 +157,7 @@
          "request_parameter": [
           {
            "name": "headers",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "valid headers",
              "path": "auftrag/allgemein/headers.json"
@@ -174,7 +168,7 @@
          "payload": [
           {
            "name": "auftragsstatus",
-           "szenarios": [
+           "scenarios": [
             {
              "name": "Mixed Status",
              "path": "auftrag/auftragsstatus/auftragsstatus.json"