wip

dqualizer · Jul 25, 2024 · ec7038c · ec7038c
1 parent 8b26ead
commit ec7038c
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 109 deletions.
diff --git a/src/components/monitoring/MonitoringSpecifier.tsx b/src/components/monitoring/MonitoringSpecifier.tsx
@@ -17,9 +17,9 @@ export default function ShowMonitoringSpecifier() {
   const handleSubmit = (rqa) => {
     const monitoringDefinition: MonitoringDefinition = {
       target: target,
-      measurementName: measurementName,
-      measurementType: measurementType,
-      measurementUnit: measurementUnit,
+      measurement_name: measurementName,
+      measurement_type: measurementType,
+      measurement_unit: measurementUnit,
     };
 
     updateRqaMonitoring(rqa, monitoringDefinition);

diff --git a/src/components/monitoring/action.tsx b/src/components/monitoring/action.tsx
@@ -10,11 +10,11 @@ const backendUrl = new URL(
 
 export const updateRqaMonitoring = async (
   rqa_id: string,
-  loadtest: MonitoringDefinition
+  monitoringDefinition: MonitoringDefinition
 ) => {
   const res = await fetch(`${backendUrl}/${rqa_id}/monitoring`, {
     method: "PATCH",
-    body: JSON.stringify(loadtest),
+    body: JSON.stringify(monitoringDefinition),
     headers: {
       "Content-Type": "application/json",
     },

diff --git a/src/components/rqaExplorer/rqaTree/MonitoringDefinitionList.tsx b/src/components/rqaExplorer/rqaTree/MonitoringDefinitionList.tsx
@@ -0,0 +1,27 @@
+import { MonitoringDefinition } from "@/types/rqa/definition/monitoring/MonitoringDefinition";
+
+interface MonitoringDefinitionListProps {
+  monitoringDefinitions: MonitoringDefinition[];
+}
+
+export default function MonitoringDefinitionList({
+  monitoringDefinitions,
+}: MonitoringDefinitionListProps) {
+  return (
+    <details>
+      <summary>Monitoring Definitions</summary>
+      <ul>
+        {monitoringDefinitions?.map((monitoringDefinition, index) => {
+          return (
+            <li key={index}>
+              {monitoringDefinition.target} -{" "}
+              {monitoringDefinition.measurement_name} -{" "}
+              {monitoringDefinition.measurement_type} -{" "}
+              {monitoringDefinition.measurement_unit}
+            </li>
+          );
+        })}
+      </ul>
+    </details>
+  );
+}
diff --git a/src/components/rqaExplorer/rqaTree/ResilienceTestList.tsx b/src/components/rqaExplorer/rqaTree/ResilienceTestList.tsx
@@ -3,36 +3,36 @@ import { useRef } from "react";
 import { ResilienceTestDetail } from "./ResilienceTestDetail";
 
 interface ResilienceTestListProps {
-	resilienceTestDefinition: ResilienceTestDefinition[];
-	rqaId?: string;
-	resilienceTestSpecifier: any;
+  resilienceTestDefinition: ResilienceTestDefinition[];
+  rqaId?: string;
+  resilienceTestSpecifier: any;
 }
 
 export function ResilienceTestList({
-	resilienceTestDefinition,
-	rqaId,
-	resilienceTestSpecifier,
+  resilienceTestDefinition,
+  rqaId,
+  resilienceTestSpecifier,
 }: ResilienceTestListProps) {
-	const detailsRef = useRef(null);
-	return (
-		<details ref={detailsRef}>
-			<summary>
-				<span>Resilience Tests</span>
-			</summary>
-			<ul>
-				{resilienceTestDefinition.map((resilienceTest, index) => {
-					return (
-						<li key={index}>
-							<ResilienceTestDetail
-								resilienceTestDefinition={resilienceTest}
-								parentMenuRef={detailsRef}
-								rqaId={rqaId}
-								resilienceTestSpecifier={resilienceTestSpecifier}
-							/>
-						</li>
-					);
-				})}
-			</ul>
-		</details>
-	);
+  const detailsRef = useRef(null);
+  return (
+    <details ref={detailsRef}>
+      <summary>
+        <span>Resilience Tests</span>
+      </summary>
+      <ul>
+        {resilienceTestDefinition?.map((resilienceTest, index) => {
+          return (
+            <li key={index}>
+              <ResilienceTestDetail
+                resilienceTestDefinition={resilienceTest}
+                parentMenuRef={detailsRef}
+                rqaId={rqaId}
+                resilienceTestSpecifier={resilienceTestSpecifier}
+              />
+            </li>
+          );
+        })}
+      </ul>
+    </details>
+  );
 }
diff --git a/src/components/rqaExplorer/rqaTree/RqaDefinition.tsx b/src/components/rqaExplorer/rqaTree/RqaDefinition.tsx
@@ -3,69 +3,77 @@ import { useState } from "react";
 import { LoadTestList } from "./LoadTestList";
 import { ResilienceTestList } from "./ResilienceTestList";
 import { startRQA } from "./action";
+import MonitoringDefinitionList from "./MonitoringDefinitionList";
 
 interface RqaDefinitionProps {
-	rqa: RuntimeQualityAnalysisDefinition;
-	loadTestSpecifier: any;
-	resilienceTestSpecifier: any;
+  rqa: RuntimeQualityAnalysisDefinition;
+  loadTestSpecifier: any;
+  resilienceTestSpecifier: any;
 }
 
 export function RqaDefinition({
-	rqa,
-	loadTestSpecifier,
-	resilienceTestSpecifier,
+  rqa,
+  loadTestSpecifier,
+  resilienceTestSpecifier,
 }: RqaDefinitionProps) {
-	const [data, setData] = useState(null);
-	const startRQAWithRQA = startRQA.bind(null, rqa);
+  const [data, setData] = useState(null);
+  const startRQAWithRQA = startRQA.bind(null, rqa);
 
-	return (
-		<ul>
-			<li>
-				<LoadTestList
-					loadTestDefinition={rqa.runtime_quality_analysis.load_test_definition}
-					rqaId={rqa.id}
-					loadTestSpecifier={loadTestSpecifier}
-				/>
-			</li>
-			<li>
-				<ResilienceTestList
-					resilienceTestDefinition={
-						rqa.runtime_quality_analysis.resilience_definition
-					}
-					rqaId={rqa.id}
-					resilienceTestSpecifier={resilienceTestSpecifier}
-				/>
-			</li>
-			<li>
-				<details>
-					<summary>Details</summary>
-					<ul>
-						{Object.keys(rqa).map((key, i) => {
-							return (
-								key in rqa &&
-								typeof rqa[key] === "string" &&
-								key !== "name" &&
-								key !== "id" && (
-									// biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-									<li key={i}>
-										<span>
-											{key}: {rqa[key]}
-										</span>
-									</li>
-								)
-							);
-						})}{" "}
-					</ul>
-				</details>
-			</li>
-			<li>
-				<form action={startRQAWithRQA}>
-					<button type="submit" className="btn btn-sm btn-primary">
-						{data ? "Re-Execute" : "Execute"}
-					</button>
-					{data && <pre className="mt-2">{JSON.stringify(data, null, 2)}</pre>}
-				</form>
-			</li>
-		</ul>
-	);
+  return (
+    <ul>
+      <li>
+        <LoadTestList
+          loadTestDefinition={rqa.runtime_quality_analysis.load_test_definition}
+          rqaId={rqa.id}
+          loadTestSpecifier={loadTestSpecifier}
+        />
+      </li>
+      <li>
+        <ResilienceTestList
+          resilienceTestDefinition={
+            rqa.runtime_quality_analysis.resilience_definition
+          }
+          rqaId={rqa.id}
+          resilienceTestSpecifier={resilienceTestSpecifier}
+        />
+      </li>
+      <li>
+        <MonitoringDefinitionList
+          monitoringDefinitions={
+            rqa.runtime_quality_analysis.monitoring_definition
+          }
+        />
+      </li>
+      <li>
+        <details>
+          <summary>Details</summary>
+          <ul>
+            {Object.keys(rqa).map((key, i) => {
+              return (
+                key in rqa &&
+                typeof rqa[key] === "string" &&
+                key !== "name" &&
+                key !== "id" && (
+                  // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+                  <li key={i}>
+                    <span>
+                      {key}: {rqa[key]}
+                    </span>
+                  </li>
+                )
+              );
+            })}{" "}
+          </ul>
+        </details>
+      </li>
+      <li>
+        <form action={startRQAWithRQA}>
+          <button type="submit" className="btn btn-sm btn-primary">
+            {data ? "Re-Execute" : "Execute"}
+          </button>
+          {data && <pre className="mt-2">{JSON.stringify(data, null, 2)}</pre>}
+        </form>
+      </li>
+    </ul>
+  );
 }
diff --git a/src/components/rqaExplorer/rqaTree/action.ts b/src/components/rqaExplorer/rqaTree/action.ts
@@ -3,20 +3,20 @@
 import type { RuntimeQualityAnalysisDefinition } from "@/types/rqa/definition/RuntimeQualityAnalysisDefinition";
 
 const backendUrl = new URL(
-	"/translate",
-	`http://${process.env.DQTRANSLATOR_HOST}` || "http://localhost:8080",
+  "/translate",
+  `http://${process.env.DQTRANSLATOR_HOST}` || "http://localhost:8080"
 );
 
 export const startRQA = async (rqa: RuntimeQualityAnalysisDefinition) => {
-	const res = await fetch(`${backendUrl}/${rqa.id}`, {
-		method: "POST",
-		body: JSON.stringify(rqa),
-		headers: {
-			"Content-Type": "application/json",
-		},
-	});
+  console.log(rqa.runtime_quality_analysis.monitoring_definition);
+  const res = await fetch(`${backendUrl}/${rqa.id}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+  });
 
-	if (!res.ok) {
-		throw new Error("Failed to start RQA");
-	}
+  if (!res.ok) {
+    throw new Error("Failed to start RQA");
+  }
 };
diff --git a/src/types/rqa/definition/RuntimeQualityAnalysis.ts b/src/types/rqa/definition/RuntimeQualityAnalysis.ts
@@ -1,8 +1,10 @@
 import type { LoadTestDefinition } from "@/types/rqa/definition/loadtest/LoadTestDefinition";
 import type { ResilienceTestDefinition } from "@/types/rqa/definition/resiliencetest/ResilienceTestDefinition";
+import { MonitoringDefinition } from "./monitoring/MonitoringDefinition";
 
 export interface RuntimeQualityAnalysis {
-	load_test_definition: LoadTestDefinition[];
-	// monitoringDefinition: Set<MonitoringDefinition>;
-	resilience_definition: ResilienceTestDefinition[];
+  load_test_definition: LoadTestDefinition[];
+  // monitoringDefinition: Set<MonitoringDefinition>;
+  resilience_definition: ResilienceTestDefinition[];
+  monitoring_definition: MonitoringDefinition[];
 }
diff --git a/src/types/rqa/definition/monitoring/MonitoringDefinition.ts b/src/types/rqa/definition/monitoring/MonitoringDefinition.ts
@@ -5,9 +5,9 @@ export interface MonitoringDefinition {
   target: string;
   // The name of the measurement
   // Motly some business name, like "Time to submit order" or "Executed orders"
-  measurementName: string;
+  measurement_name: string;
   // The unit of the measurement
-  measurementUnit: string;
+  measurement_unit: string;
   // The type of the measurement
-  measurementType: MeasurementType;
+  measurement_type: MeasurementType;
 }