@@ -375,10 +376,8 @@ export function CloudPanel() {
-
Station: ID-12345678
-
Operator: {user ? user.name.substring(0, 20) : "Unknow"}
Sequencer: {"TS-" + packageJson.version}
-
+
Integrity:{" "}
{getIntegrity(sequences) ? (
Pass
diff --git a/src/renderer/routes/test_sequencer_panel/components/CyclePanel.tsx b/src/renderer/routes/test_sequencer_panel/components/CyclePanel.tsx
index 4b8635bd9..f19d9f3c2 100644
--- a/src/renderer/routes/test_sequencer_panel/components/CyclePanel.tsx
+++ b/src/renderer/routes/test_sequencer_panel/components/CyclePanel.tsx
@@ -3,15 +3,15 @@ import { Input } from "@/renderer/components/ui/input";
import { useDisplayedSequenceState } from "@/renderer/hooks/useTestSequencerState";
import LockableButton from "./lockable/LockedButtons";
import { Checkbox } from "@/renderer/components/ui/checkbox";
-import {
- HoverCard,
- HoverCardContent,
- HoverCardTrigger,
-} from "@radix-ui/react-hover-card";
import { Button } from "@/renderer/components/ui/button";
import { CycleConfig } from "@/renderer/types/test-sequencer";
import { useShallow } from "zustand/react/shallow";
import { useSequencerStore } from "@/renderer/stores/sequencer";
+import {
+ HoverCard,
+ HoverCardContent,
+ HoverCardTrigger,
+} from "@/renderer/components/ui/hover-card";
export function CyclePanel() {
const { tree, isLocked } = useDisplayedSequenceState();
@@ -51,9 +51,9 @@ export function CyclePanel() {
-
+
-
+
Cycle Configuration
@@ -85,7 +85,7 @@ export function CyclePanel() {
-
+
({
- numberOfTestRun: 0,
- numberOfTest: 0,
- numberOfSequenceRun: 0,
- numberOfSequence: 0,
- successRate: 0,
- status: "pending",
- });
- useMemo(() => {
- setSummary({
- numberOfTestRun: getNumberOfTestRun(elems),
- numberOfTest: getNumberOfTest(elems),
+ const {
+ numberOfTestRunInSeq,
+ numberOfTestInSeq,
+ numberOfTestRunInTotal,
+ numberOfTestInTotal,
+ numberOfSequenceRun,
+ numberOfSequence,
+ status,
+ } = useMemo(() => {
+ return {
+ numberOfTestRunInSeq: getNumberOfTestRunInSeq(elems),
+ numberOfTestInSeq: getNumberOfTestInSeq(elems),
+ numberOfTestRunInTotal: getNumberOfTestRunInTotal(sequences),
+ numberOfTestInTotal: getNumberOfTestInTotal(sequences),
numberOfSequence: getNumberOfSequence(sequences),
numberOfSequenceRun: getNumberOfSequenceRun(sequences),
- successRate: getSuccessRate(elems),
status: getGlobalStatus(cycleRuns, sequences, elems),
- });
+ };
}, [elems, sequences, cycleRuns]);
+ const [displayTotal, setDisplayTotal] = useState(false);
+
return (
@@ -135,14 +133,52 @@ export function DesignBar() {
+ {sequences.length <= 1 ? (
+
+ Test {numberOfTestRunInSeq + "/" + numberOfTestInSeq}
+
+ ) : (
+
+
+
+
+
+
+
+ Display by
+
+
+
+
+
+
+ )}
+
- {" "}
- Test {summary.numberOfTestRun + "/" + summary.numberOfTest}
-
-
- {" "}
- Sequence{" "}
- {summary.numberOfSequenceRun + "/" + summary.numberOfSequence}
+ Sequence {numberOfSequenceRun + "/" + numberOfSequence}
@@ -152,7 +188,7 @@ export function DesignBar() {
id="app-status"
className="text-md m-1 inline-flex h-8 w-40 items-center justify-center rounded-md border font-semibold text-primary transition-colors"
>
- {mapStatusToDisplay[summary.status]}
+ {mapStatusToDisplay[status]}
@@ -165,11 +201,11 @@ export function countWhere
(arr: T[], predicate: (t: T) => boolean): number {
return arr.reduce((acc, t) => (predicate(t) ? acc + 1 : acc), 0);
}
-const getNumberOfTest = (data: TestSequenceElement[]): number => {
+const getNumberOfTestInSeq = (data: TestSequenceElement[]): number => {
return countWhere(data, (elem) => elem.type === "test");
};
-const getNumberOfTestRun = (data: TestSequenceElement[]): number => {
+const getNumberOfTestRunInSeq = (data: TestSequenceElement[]): number => {
return countWhere(
data,
(elem) =>
@@ -179,6 +215,16 @@ const getNumberOfTestRun = (data: TestSequenceElement[]): number => {
);
};
+const getNumberOfTestRunInTotal = (
+ sequences: TestSequenceContainer[],
+): number => {
+ return _.sum(sequences.map((seq) => getNumberOfTestRunInSeq(seq.elements)));
+};
+
+const getNumberOfTestInTotal = (sequences: TestSequenceContainer[]): number => {
+ return _.sum(sequences.map((seq) => getNumberOfTestInSeq(seq.elements)));
+};
+
const getNumberOfSequence = (data: TestSequenceContainer[]): number => {
return countWhere(data, (elem) => elem.runable);
};
@@ -200,6 +246,7 @@ export const getGlobalStatus = (
interface WithStatus {
status: string;
}
+
const priority = {
pending: 0,
pass: 1,
@@ -208,6 +255,7 @@ export const getGlobalStatus = (
paused: 4,
running: 5,
};
+
// Find highest priority in cycle
const highestCycle =
cycleRuns.length > 0
@@ -217,15 +265,20 @@ export const getGlobalStatus = (
priority[prev] > priority[curr] ? prev : curr,
)
: "pending";
+
if (sequences.length === 0 && data.length === 0) return highestCycle;
+
// Highest in the view
const tests = data.filter((el) => el.type === "test") as Test[];
const iter = sequences.length > 0 ? sequences : tests;
+
const status = iter
.map((el: WithStatus) => el.status)
.reduce((prev, curr) => (priority[prev] > priority[curr] ? prev : curr));
+
const highestGlobal =
priority[highestCycle] > priority[status] ? highestCycle : status;
+
return StatusType.parse(highestGlobal);
};
@@ -261,11 +314,3 @@ const mapStatusToDisplay: { [k in StatusType] } = {
),
};
-
-const getSuccessRate = (data: TestSequenceElement[]): number => {
- const tests = getOnlyCompletedTests(data);
- if (tests.length == 0) return 0;
- return (
- (filter(tests, (elem) => elem.status == "pass").length / tests.length) * 100
- );
-};
diff --git a/src/renderer/routes/test_sequencer_panel/components/data-table/SequenceTable.tsx b/src/renderer/routes/test_sequencer_panel/components/data-table/SequenceTable.tsx
index 7a89bd261..7ddd1466c 100644
--- a/src/renderer/routes/test_sequencer_panel/components/data-table/SequenceTable.tsx
+++ b/src/renderer/routes/test_sequencer_panel/components/data-table/SequenceTable.tsx
@@ -102,26 +102,28 @@ export function SequenceTable() {
{
accessorKey: "run",
- header: "Run",
+ header: () => Run
,
cell: ({ row }) => {
return (
- onToggleSequence([row.index])}
- aria-label="Select row"
- />
+
+ onToggleSequence([row.index])}
+ aria-label="Select row"
+ />
+
);
},
},
{
accessorKey: "status",
- header: "Status",
+ header: () => Status
,
cell: ({ row }) => {
return (
-
+
{typeof mapStatusToDisplay[row.original.status] === "function"
? mapStatusToDisplay[row.original.status](null)
: mapStatusToDisplay[row.original.status]}
@@ -132,10 +134,10 @@ export function SequenceTable() {
{
accessorKey: "success_rate",
- header: "Success Rate",
+ header: () =>
Success Rate
,
cell: ({ row }) => {
return (
-
+
{getSuccessRate(row.original.elements).toFixed(2)}%
@@ -146,11 +148,11 @@ export function SequenceTable() {
{
accessorKey: "completion_time",
- header: "Completion Time",
+ header: () =>
Completion Time
,
cell: ({ row }) => {
const time = getCompletionTime(row.original.elements);
return (
-
+
);
diff --git a/src/renderer/routes/test_sequencer_panel/components/data-table/TestTable.tsx b/src/renderer/routes/test_sequencer_panel/components/data-table/TestTable.tsx
index 4d2ee95c6..6ffec7d78 100644
--- a/src/renderer/routes/test_sequencer_panel/components/data-table/TestTable.tsx
+++ b/src/renderer/routes/test_sequencer_panel/components/data-table/TestTable.tsx
@@ -56,6 +56,7 @@ import { mapStatusToDisplay } from "./utils";
import useWithPermission from "@/renderer/hooks/useWithPermission";
import { useImportSequences } from "@/renderer/hooks/useTestSequencerProject";
import { useSequencerModalStore } from "@/renderer/stores/modal";
+import { WriteMinMaxModal } from "../modals/WriteMinMaxModal";
export function TestTable() {
const { elems, setElems } = useDisplayedSequenceState();
@@ -132,30 +133,91 @@ export function TestTable() {
// },
{
+ id: "Test Type",
accessorFn: (elem) => {
return elem.type === "test" ? "type" : null;
},
- header: "Test Type",
+ header: () =>
Type
,
cell: ({ row }) => {
return row.original.type === "test" ? (
-
{row.original.testType}
+
{row.original.testType}
) : null;
},
},
{
+ id: "Min",
+ accessorFn: (elem) => {
+ return elem.type === "test" ? "min" : null;
+ },
+ header: () =>
Min
,
+ cell: ({ row }) => {
+ return row.original.type === "test" &&
+ row.original.minValue !== undefined ? (
+
+
+ {row.original.minValue}
+ {row.original.unit}
+
+
+ ) : null;
+ },
+ },
+
+ {
+ id: "Max",
+ accessorFn: (elem) => {
+ return elem.type === "test" ? "max" : null;
+ },
+ header: () =>
Max
,
+ cell: ({ row }) => {
+ return row.original.type === "test" &&
+ row.original.maxValue !== undefined ? (
+
+
+ {row.original.maxValue}
+ {row.original.unit}
+
+
+ ) : null;
+ },
+ },
+
+ {
+ id: "Measured",
+ accessorFn: (elem) => {
+ return elem.type === "test" ? "measured_value" : null;
+ },
+ header: () =>
Measured
,
+ cell: ({ row }) => {
+ return row.original.type === "test" &&
+ row.original.measuredValue !== undefined ? (
+
+
+ {row.original.measuredValue}
+ {row.original.unit}
+
+
+ ) : null;
+ },
+ },
+
+ {
+ id: "Export",
accessorFn: (elem) => {
return elem.type === "test" ? "isSavedToCloud" : null;
},
- header: "Export to Cloud",
+ header: () =>
Export
,
cell: ({ row }) => {
if (row.original.type === "test") {
return (
-
toggleExportToCloud(row.original.id)}
- />
+
+ toggleExportToCloud(row.original.id)}
+ />
+
);
}
return null;
@@ -163,13 +225,14 @@ export function TestTable() {
},
{
+ id: "Status",
accessorFn: (elem) => {
return elem.type === "test" ? "status" : null;
},
- header: "Status",
+ header: () => Status
,
cell: ({ row }) => {
return row.original.type === "test" ? (
-
+
{typeof mapStatusToDisplay[row.original.status] === "function"
? mapStatusToDisplay[row.original.status](row.original.error)
: mapStatusToDisplay[row.original.status]}
@@ -179,15 +242,17 @@ export function TestTable() {
},
{
+ id: "Completion Time",
accessorFn: (elem) => {
return elem.type === "test" ? "completionTime" : null;
},
- header: "Completion Time",
+ header: () =>
Time
,
cell: ({ row }) => {
return row.original.type === "test" ? (
-
- {row.original.completionTime &&
- row.original.completionTime.toFixed(2)}
+
+ {row.original.completionTime
+ ? `${row.original.completionTime.toFixed(2)}s`
+ : "0.00s"}
) : null;
},
@@ -282,6 +347,9 @@ export function TestTable() {
useState(false);
const writeConditionalForIdx = useRef(-1);
+ const [showWriteMinMaxModal, setShowWriteMinMaxModal] = useState(false);
+ const writeMinMaxForIdx = useRef(-1);
+
const handleWriteConditionalModal = (input: string) => {
setElems((data) => {
const new_data = [...data];
@@ -318,6 +386,29 @@ export function TestTable() {
setShowWriteConditionalModal(true);
};
+ const onClickWriteMinMax = (idx: number) => {
+ writeMinMaxForIdx.current = idx;
+ setShowWriteMinMaxModal(true);
+ };
+
+ const onSubmitWriteMinMax = (
+ minValue: number,
+ maxValue: number,
+ unit: string,
+ ) => {
+ setElems((data) => {
+ const new_data = [...data];
+ const test = new_data[writeMinMaxForIdx.current] as Test;
+ new_data[writeMinMaxForIdx.current] = {
+ ...test,
+ minValue: isNaN(minValue) ? undefined : minValue,
+ maxValue: isNaN(maxValue) ? undefined : maxValue,
+ unit,
+ };
+ return new_data;
+ });
+ };
+
const getSpecificContextMenuItems = (row: Row
) => {
switch (row.original.type) {
case "test":
@@ -349,6 +440,11 @@ export function TestTable() {
handleWriteConditionalModalOpen={setShowWriteConditionalModal}
handleWrite={handleWriteConditionalModal}
/>
+
{openPyTestFileModal && (
Add Conditional
- {row.original.type === "test" && (
- {
- openRenameTestModal(row.original.id);
- }}
- >
- Rename Test
-
- )}
onRemoveTest([parseInt(row.id)])}
>
@@ -470,25 +557,39 @@ export function TestTable() {
: "Remove Conditional"}
{row.original.type === "test" && (
- {
- setOpenPyTestFileModal(true);
- setTestToDisplay(row.original as Test);
- }}
- >
- Consult Code
-
- )}
- {row.original.type === "test" && (
- {
- toggleExportToCloud(row.original.id);
- }}
- >
- {row.original.exportToCloud
- ? "Disable export to Cloud"
- : "Enable export to Cloud"}
-
+ <>
+ {
+ openRenameTestModal(row.original.id);
+ }}
+ >
+ Rename Test
+
+ {
+ onClickWriteMinMax(parseInt(row.id));
+ }}
+ >
+ Edit Expected Value
+
+ {
+ setOpenPyTestFileModal(true);
+ setTestToDisplay(row.original as Test);
+ }}
+ >
+ Consult Code
+
+ {
+ toggleExportToCloud(row.original.id);
+ }}
+ >
+ {row.original.exportToCloud
+ ? "Disable export to Cloud"
+ : "Enable export to Cloud"}
+
+
)}
diff --git a/src/renderer/routes/test_sequencer_panel/components/dnd/DraggableRowStep.tsx b/src/renderer/routes/test_sequencer_panel/components/dnd/DraggableRowStep.tsx
index f359f478e..697caacb7 100644
--- a/src/renderer/routes/test_sequencer_panel/components/dnd/DraggableRowStep.tsx
+++ b/src/renderer/routes/test_sequencer_panel/components/dnd/DraggableRowStep.tsx
@@ -5,7 +5,10 @@ import {
TestSequenceDropResult,
} from "@/renderer/routes/test_sequencer_panel/models/drag_and_drop";
import { TableCell, TableRow } from "@/renderer/components/ui/table";
-import { TestSequenceElement } from "@/renderer/types/test-sequencer";
+import {
+ StatusType,
+ TestSequenceElement,
+} from "@/renderer/types/test-sequencer";
import { Row, flexRender } from "@tanstack/react-table";
import { parseInt } from "lodash";
import { useDisplayedSequenceState } from "@/renderer/hooks/useTestSequencerState";
@@ -71,10 +74,19 @@ export const DraggableRowStep = ({
useConfigureDropRef(parseInt(row.id));
const isActiveAbove = isOverAbove && canDropAbove;
+ type Variant = Exclude | "default";
+ let variant: Variant = "default";
+ if (row.original.type === "test") {
+ if (row.original.status !== "pending") {
+ variant = row.original.status;
+ }
+ }
+
return (
diff --git a/src/renderer/routes/test_sequencer_panel/components/modals/WriteMinMaxModal.tsx b/src/renderer/routes/test_sequencer_panel/components/modals/WriteMinMaxModal.tsx
new file mode 100644
index 000000000..c8ea15442
--- /dev/null
+++ b/src/renderer/routes/test_sequencer_panel/components/modals/WriteMinMaxModal.tsx
@@ -0,0 +1,74 @@
+import { Dialog, DialogContent } from "@/renderer/components/ui/dialog";
+import { Button } from "@/renderer/components/ui/button";
+import { useState } from "react";
+import { Input } from "@/renderer/components/ui/input";
+
+export const WriteMinMaxModal = ({
+ isModalOpen,
+ setModalOpen,
+ handleWrite,
+}: {
+ isModalOpen: boolean;
+ setModalOpen: (value: boolean) => void;
+ handleWrite: (min: number, max: number, unit: string) => void;
+}) => {
+ const [min, setMin] = useState(0);
+ const [max, setMax] = useState(0);
+ const [unit, setUnit] = useState("");
+
+ return (
+
+ );
+};
diff --git a/src/renderer/routes/test_sequencer_panel/utils/SequenceHandler.ts b/src/renderer/routes/test_sequencer_panel/utils/SequenceHandler.ts
index fdfefffc6..8f827b39f 100644
--- a/src/renderer/routes/test_sequencer_panel/utils/SequenceHandler.ts
+++ b/src/renderer/routes/test_sequencer_panel/utils/SequenceHandler.ts
@@ -263,6 +263,9 @@ async function createExportableSequenceElementsFromTestSequencerElements(
elem.exportToCloud,
elem.id,
elem.groupId,
+ elem.minValue,
+ elem.maxValue,
+ elem.unit,
)
: {
...elem,
@@ -286,6 +289,9 @@ async function createTestSequencerElementsFromSequenceElements(
elem.exportToCloud,
elem.id,
elem.groupId,
+ elem.minValue,
+ elem.maxValue,
+ elem.unit,
)
: {
...elem,
diff --git a/src/renderer/types/test-sequencer.ts b/src/renderer/types/test-sequencer.ts
index 7b7bdaf14..a711fdf3e 100644
--- a/src/renderer/types/test-sequencer.ts
+++ b/src/renderer/types/test-sequencer.ts
@@ -50,6 +50,7 @@ export const BackendMsg = z.object({
created_at: z.string(),
is_saved_to_cloud: z.boolean(),
error: z.string().nullable(),
+ value: z.number().nullable(),
});
export type BackendMsg = z.infer;
@@ -67,6 +68,10 @@ export const Test = z.object({
createdAt: z.string().optional(),
isSavedToCloud: z.boolean(),
exportToCloud: z.boolean(),
+ minValue: z.number().optional(),
+ maxValue: z.number().optional(),
+ measuredValue: z.number().optional(),
+ unit: z.string().optional(),
});
export type Test = z.infer;
diff --git a/tailwind.config.js b/tailwind.config.js
index edc6630f5..ad33cff1f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -53,6 +53,26 @@ export default {
DEFAULT: "hsl(var(--card))",
foreground: "hsl(var(--card-foreground))",
},
+ error: {
+ DEFAULT: "hsl(var(--error))",
+ text: "hsl(var(--error-text))",
+ foregrond: "hsl(var(--error-foreground))",
+ },
+ warning: {
+ DEFAULT: "hsl(var(--warning))",
+ text: "hsl(var(--warning-text))",
+ foregrond: "hsl(var(--warning-foreground))",
+ },
+ info: {
+ DEFAULT: "hsl(var(--info))",
+ text: "hsl(var(--info-text))",
+ foreground: "hsl(var(--info-foreground))",
+ },
+ success: {
+ DEFAULT: "hsl(var(--success))",
+ text: "hsl(var(--success-text))",
+ foreground: "hsl(var(--success-foreground))",
+ },
modal: "rgb(var(--color-modal) / )",
accent1: {