From 4b39f2686f18083724cba55b4fcf39b2dcd28dfd Mon Sep 17 00:00:00 2001
From: alex
Date: Sat, 6 May 2023 23:37:46 +0200
Subject: [PATCH] added popover for details and global inputs
---
src/Pages/GroupTasks/GroupTasksTableList.js | 2 +-
src/Pages/GroupTasks/GroupTasksViewModal.js | 97 +++++++++++++++++----
src/utils.js | 5 ++
3 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/src/Pages/GroupTasks/GroupTasksTableList.js b/src/Pages/GroupTasks/GroupTasksTableList.js
index cfccc6f..be4eb4b 100644
--- a/src/Pages/GroupTasks/GroupTasksTableList.js
+++ b/src/Pages/GroupTasks/GroupTasksTableList.js
@@ -87,7 +87,7 @@ export default function GroupTaskTableList({
endedAt:
groupTask.EndedAt !== "0001-01-01T00:00:00Z"
? FormatDatetime(groupTask.EndedAt)
- : "-/-",
+ : Constants.TEXT_EMPTY_PLACEHOLDER,
});
}
});
diff --git a/src/Pages/GroupTasks/GroupTasksViewModal.js b/src/Pages/GroupTasks/GroupTasksViewModal.js
index bc31ad0..741da09 100644
--- a/src/Pages/GroupTasks/GroupTasksViewModal.js
+++ b/src/Pages/GroupTasks/GroupTasksViewModal.js
@@ -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 { useNavigate, useParams } from "react-router-dom";
import {
@@ -145,11 +145,9 @@ export default function GroupTasksViewModal({ isOpen }) {
Ended at:{" "}
{groupTaskSteps[index].EndedAt !== "0001-01-01T00:00:00Z"
? FormatDatetime(groupTaskSteps[index].EndedAt)
- : "-/-"}
+ : Constants.TEXT_EMPTY_PLACEHOLDER}
-
-
{getAlertMessage(groupTaskSteps[index].Status)}}
description={groupTaskSteps[index].Log}
@@ -196,20 +194,87 @@ export default function GroupTasksViewModal({ isOpen }) {
if (groupTask.Id === paramGroupTaskId) {
let currentGroupTask = groupTask;
+ console.log(currentGroupTask);
+
return (
-
- {currentGroupTask.GroupName}
-
-
- ID:{" "}
- {paramGroupTaskId}
- Category:{" "}
- {currentGroupTask.Category}
-
- Started at:{" "}
- {FormatDatetime(currentGroupTask.StartedAt)}
-
+
+ Details
+
+ }
+ content={
+ <>
+
+ ID:{" "}
+ {paramGroupTaskId}
+ Category:{" "}
+ {currentGroupTask.Category}
+
+
+ Started at:
+ {" "}
+ {FormatDatetime(currentGroupTask.StartedAt)}
+
+ {currentGroupTask.GlobalInputs !== "[]" ? (
+ <>
+
+ Specified Global Inputs
+
+
+
+ {JSON.parse(currentGroupTask.GlobalInputs).map(
+ (globalInput) => {
+ return (
+
+
+ {globalInput.parameterName}:{" "}
+
+
+ {globalInput.value !== ""
+ ? globalInput.value
+ : Constants.TEXT_EMPTY_PLACEHOLDER}
+
+
+
+ );
+ }
+ )}
+
+ >
+ ) : null}
+ >
+ }
+ trigger="click"
+ >
+
+ {currentGroupTask.GroupName}
+
+
diff --git a/src/utils.js b/src/utils.js
index c8e9105..81d870c 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -5,6 +5,11 @@ import { useNavigate } from "react-router-dom";
* constants
*/
export const Constants = {
+ COLORS: {
+ PRIMARY: "#e67e22",
+ SECONDARY: "#9b59b6",
+ },
+ TEXT_EMPTY_PLACEHOLDER: "-/-",
API_ADDRESS: "http://localhost:8080/v1",
WS_ADDRESS: "ws://localhost:8080/ws",
ROUTE_PATHS: {