added popover for details and global inputs

main
alex 2023-05-06 23:37:46 +02:00
parent ee46f1ec7c
commit 4b39f2686f
3 changed files with 87 additions and 17 deletions

View File

@ -87,7 +87,7 @@ export default function GroupTaskTableList({
endedAt: endedAt:
groupTask.EndedAt !== "0001-01-01T00:00:00Z" groupTask.EndedAt !== "0001-01-01T00:00:00Z"
? FormatDatetime(groupTask.EndedAt) ? FormatDatetime(groupTask.EndedAt)
: "-/-", : Constants.TEXT_EMPTY_PLACEHOLDER,
}); });
} }
}); });

View File

@ -1,4 +1,4 @@
import { Alert, Button, Input, Modal, Result, Steps } from "antd"; import { Alert, Button, Modal, Popover, Result, Steps } from "antd";
import { useContext } from "react"; import { useContext } from "react";
import { useNavigate, useParams } from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom";
import { import {
@ -145,11 +145,9 @@ export default function GroupTasksViewModal({ isOpen }) {
<b>Ended at:</b>{" "} <b>Ended at:</b>{" "}
{groupTaskSteps[index].EndedAt !== "0001-01-01T00:00:00Z" {groupTaskSteps[index].EndedAt !== "0001-01-01T00:00:00Z"
? FormatDatetime(groupTaskSteps[index].EndedAt) ? FormatDatetime(groupTaskSteps[index].EndedAt)
: "-/-"} : Constants.TEXT_EMPTY_PLACEHOLDER}
</p> </p>
<Input placeholder="hello" />
<Alert <Alert
message={<b>{getAlertMessage(groupTaskSteps[index].Status)}</b>} message={<b>{getAlertMessage(groupTaskSteps[index].Status)}</b>}
description={groupTaskSteps[index].Log} description={groupTaskSteps[index].Log}
@ -196,20 +194,87 @@ export default function GroupTasksViewModal({ isOpen }) {
if (groupTask.Id === paramGroupTaskId) { if (groupTask.Id === paramGroupTaskId) {
let currentGroupTask = groupTask; let currentGroupTask = groupTask;
console.log(currentGroupTask);
return ( return (
<div key={paramGroupTaskId}> <div key={paramGroupTaskId}>
<h1 style={{ color: "#e67e22", fontWeight: "bold" }}> <Popover
{currentGroupTask.GroupName} key={"test1"}
</h1> placement="bottomLeft"
title={
<h2
key={"test"}
style={{
fontWeight: "bold",
color: Constants.COLORS.SECONDARY,
}}
>
Details
</h2>
}
content={
<>
<p> <p>
<span style={{ fontWeight: "bold" }}>ID:</span>{" "} <span style={{ fontWeight: "bold" }}>ID:</span>{" "}
{paramGroupTaskId} <br /> {paramGroupTaskId} <br />
<span style={{ fontWeight: "bold" }}>Category:</span>{" "} <span style={{ fontWeight: "bold" }}>Category:</span>{" "}
{currentGroupTask.Category} {currentGroupTask.Category}
<br /> <br />
<span style={{ fontWeight: "bold" }}>Started at:</span>{" "} <span style={{ fontWeight: "bold" }}>
Started at:
</span>{" "}
{FormatDatetime(currentGroupTask.StartedAt)} {FormatDatetime(currentGroupTask.StartedAt)}
</p> </p>
{currentGroupTask.GlobalInputs !== "[]" ? (
<>
<h2
style={{
fontWeight: "bold",
color: Constants.COLORS.SECONDARY,
}}
>
Specified Global Inputs
</h2>
<p>
{JSON.parse(currentGroupTask.GlobalInputs).map(
(globalInput) => {
return (
<span
key={
globalInput.parameterName +
globalInput.value
}
>
<span style={{ fontWeight: "bold" }}>
{globalInput.parameterName}:{" "}
</span>
<span>
{globalInput.value !== ""
? globalInput.value
: Constants.TEXT_EMPTY_PLACEHOLDER}
</span>
<br />
</span>
);
}
)}
</p>
</>
) : null}
</>
}
trigger="click"
>
<h1
style={{
color: Constants.COLORS.PRIMARY,
fontWeight: "bold",
}}
>
{currentGroupTask.GroupName}
</h1>
</Popover>
<Steps direction="vertical" items={stepsItemHandler()} /> <Steps direction="vertical" items={stepsItemHandler()} />
</div> </div>

View File

@ -5,6 +5,11 @@ import { useNavigate } from "react-router-dom";
* constants * constants
*/ */
export const Constants = { export const Constants = {
COLORS: {
PRIMARY: "#e67e22",
SECONDARY: "#9b59b6",
},
TEXT_EMPTY_PLACEHOLDER: "-/-",
API_ADDRESS: "http://localhost:8080/v1", API_ADDRESS: "http://localhost:8080/v1",
WS_ADDRESS: "ws://localhost:8080/ws", WS_ADDRESS: "ws://localhost:8080/ws",
ROUTE_PATHS: { ROUTE_PATHS: {