Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dashboard): changed names of timestamp fields for execution #180

Merged
merged 2 commits into from
Jul 2, 2024
Merged

fix(dashboard): changed names of timestamp fields for execution #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c287f34
fix(dashboard): changed names of timestamp fields for execution
sabinem Jul 2, 2024
e8c8598
feat(dashboard executions): show start and end timestamps
sabinem Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions odtp/dashboard/page_executions/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ def ui_table_layout(executions):
return
df = pd.DataFrame(data=executions)
df["_id"] = df["_id"].astype("string")
df["timestamp"] = df["start_timestamp"]
df["createdAt"] = df["createdAt"]
df["start_timestamp"] = df["start_timestamp"].fillna('')
df["end_timestamp"] = df["end_timestamp"].fillna('')
df["steps"] = df["steps"].apply(helpers.pd_lists_to_counts).astype("string")
df = df[["timestamp", "title", "steps"]]
df = df.sort_values(by="timestamp", ascending=False)
df = df[["createdAt", "title", "steps", "start_timestamp", "end_timestamp"]]
df = df.sort_values(by="createdAt", ascending=False)
ui.table.from_pandas(df)
6 changes: 3 additions & 3 deletions odtp/dashboard/utils/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ def get_execution_select_options(digital_twin_id):
sub_collection=db.collection_executions,
item_id=digital_twin_id,
ref_name=db.collection_executions,
sort_by=[("start_timestamp", db.DESCENDING)],
sort_by=[("createdAt", db.DESCENDING)],
)
if not executions:
return {}
execution_options = {}
for execution in executions:
execution_options[str(execution["_id"])] = (
f"{execution['start_timestamp'].strftime('%d/%m/%y')} {execution.get('title')}"
f"{execution['createdAt'].strftime('%d/%m/%y')} {execution.get('title')}"
)
return execution_options

Expand Down Expand Up @@ -103,7 +103,7 @@ def build_execution_with_steps(execution_id):
execution_with_steps = {
"execution_id": execution_id,
"title": execution.get("title"),
"timestamp": execution.get("start_timestamp").strftime("%m/%d/%Y, %H:%M:%S"),
"createdAt": execution.get("createdAt").strftime("%m/%d/%Y, %H:%M:%S"),
"versions": execution["workflowSchema"]["component_versions"],
"version_tags": version_tags,
"steps": step_ids,
Expand Down