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.

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

UI - Add custom output display to Processes & History pages #162

Merged
merged 26 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cff4c06
Initial attempt (copy doesn't work)
wcgunter Jul 17, 2023
ad907bf
Update output var column css
wcgunter Jul 17, 2023
7500544
Update filteirng
wcgunter Jul 17, 2023
81263d7
Update filter for output variables
wcgunter Jul 17, 2023
d0567c9
Adjust thumbnail css
wcgunter Jul 17, 2023
6e385de
Add ability to copy images, move func. to cws.js
wcgunter Jul 17, 2023
a022637
Make images grow when hovered over
wcgunter Jul 18, 2023
616c971
Add support for hyperlink strings
wcgunter Jul 18, 2023
c866df7
Update img detection to support all image types
wcgunter Jul 18, 2023
a24228c
Update history page to use new custom input fetch
wcgunter Jul 18, 2023
35d510c
Initial output table on history page
wcgunter Jul 18, 2023
bf3697a
Update link recognition to include AWS S3 URIs
wcgunter Jul 18, 2023
10e3355
Fix JSON creation for new input/output var methods
wcgunter Jul 18, 2023
40153da
UI update, fix "show entries" overlap
wcgunter Jul 19, 2023
7406de0
Fix issue where table was not responsive
wcgunter Jul 19, 2023
5e22581
Update responsiveness, scaling on page size change
wcgunter Jul 19, 2023
abc1e80
Fix bug with download list (json)
wcgunter Jul 19, 2023
1a1968c
Add icons to processes table btns, rm. var type
wcgunter Jul 19, 2023
e519352
Update name of adv. filter btn
wcgunter Jul 19, 2023
489b94b
Move info & pagination into div, position correct
wcgunter Jul 19, 2023
6725c1d
Add comments, move css to file, fix csv export
wcgunter Jul 19, 2023
c68864e
Update deployments page to use new above/below div
wcgunter Jul 19, 2023
3196c09
Add icon to download btn
wcgunter Jul 19, 2023
2eda332
Remove variable type on history page
wcgunter Jul 20, 2023
1ce6a7e
Make images smaller, update hover behavior
wcgunter Jul 20, 2023
9e188e5
Remove size limit on history page
wcgunter Jul 20, 2023
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
305 changes: 166 additions & 139 deletions cws-service/src/main/java/jpl/cws/scheduler/CwsProcessInstance.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,143 +5,170 @@

public class CwsProcessInstance {

private String uuid; // from CWS cws_sched_worker_proc_inst table

private String procDefKey;
private String procInstId;
private String superProcInstId;
private String status;

private String initiationKey; // from CWS cws_sched_worker_proc_inst table

private Timestamp createdTimestamp; // from CWS cws_sched_worker_proc_inst table
private Timestamp updatedTimestamp; // from CWS cws_sched_worker_proc_inst table

private String claimedByWorker; // from CWS cws_sched_worker_proc_inst table
private String startedByWorker; // from CWS cws_sched_worker_proc_inst table

private Timestamp procStartTime; // from Camunda ACT_HI_PROCINST_ table
private Timestamp procEndTime; // from Camunda ACT_HI_PROCINST_ table

private Map<String, String> inputVariables;

public CwsProcessInstance(
String uuid,
String procDefKey,
String procInstId,
String superProcInstId,
String status,
String initiationKey,
Timestamp createdTimestamp,
Timestamp updatedTimestamp,
String claimedByWorker,
String startedByWorker,
Timestamp procStartTime,
Timestamp procEndTime,
Map<String, String> inputVariables) {
super();
this.uuid = uuid;
this.procDefKey = procDefKey;
this.procInstId = procInstId;
this.superProcInstId = superProcInstId;
this.status = status;
this.initiationKey = initiationKey;
this.createdTimestamp = createdTimestamp;
this.updatedTimestamp = updatedTimestamp;
this.claimedByWorker = claimedByWorker;
this.startedByWorker = startedByWorker;
this.procStartTime = procStartTime;
this.procEndTime = procEndTime;
this.inputVariables = inputVariables;
}

public String getUuid() {
return uuid;
}

public void setUuid(String uuid) {
this.uuid = uuid;
}

public String getProcDefKey() {
return procDefKey;
}
public void setProcDefKey(String procDefKey) {
this.procDefKey = procDefKey;
}
public String getProcInstId() {
return procInstId;
}
public void setProcInstId(String procInstId) {
this.procInstId = procInstId;
}
public String getSuperProcInstId() {
return superProcInstId;
}
public void setSuperProcInstId(String superProcInstId) {
this.superProcInstId = superProcInstId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public void setInputVariables(Map<String, String> input) {
this.inputVariables = input;
}

public Map<String, String> getInputVariables() {
return inputVariables;
}

public String getInitiationKey() {
return initiationKey;
}
public void setInitiationKey(String initiationKey) {
this.initiationKey = initiationKey;
}

public Timestamp getCreatedTimestamp() {
return createdTimestamp;
}
public void setCreatedTimestamp(Timestamp createdTimestamp) {
this.createdTimestamp = createdTimestamp;
}

public Timestamp getUpdatedTimestamp() {
return updatedTimestamp;
}
public void setUpdatedTimestamp(Timestamp updatedTimestamp) {
this.updatedTimestamp = updatedTimestamp;
}

public String getClaimedByWorker() {
return claimedByWorker;
}
public void setClaimedByWorker(String claimedByWorker) {
this.claimedByWorker = claimedByWorker;
}

public String getStartedByWorker() {
return startedByWorker;
}
public void setStartedByWorker(String startedByWorker) {
this.startedByWorker = startedByWorker;
}

public Timestamp getProcStartTime() {
return procStartTime;
}
public void setProcStartTime(Timestamp procStartTime) {
this.procStartTime = procStartTime;
}

public Timestamp getProcEndTime() {
return procEndTime;
}
public void setProcEndTime(Timestamp procEndTime) {
this.procEndTime = procEndTime;
}

private String uuid; // from CWS cws_sched_worker_proc_inst table

private String procDefKey;
private String procInstId;
private String superProcInstId;
private String status;

private String initiationKey; // from CWS cws_sched_worker_proc_inst table

private Timestamp createdTimestamp; // from CWS cws_sched_worker_proc_inst table
private Timestamp updatedTimestamp; // from CWS cws_sched_worker_proc_inst table

private String claimedByWorker; // from CWS cws_sched_worker_proc_inst table
private String startedByWorker; // from CWS cws_sched_worker_proc_inst table

private Timestamp procStartTime; // from Camunda ACT_HI_PROCINST_ table
private Timestamp procEndTime; // from Camunda ACT_HI_PROCINST_ table

private Map<String, String> inputVariables;

private Map<String, String> outputVariables;

public CwsProcessInstance(
String uuid,
String procDefKey,
String procInstId,
String superProcInstId,
String status,
String initiationKey,
Timestamp createdTimestamp,
Timestamp updatedTimestamp,
String claimedByWorker,
String startedByWorker,
Timestamp procStartTime,
Timestamp procEndTime,
Map<String, String> inputVariables,
Map<String, String> outputVariables) {
super();
this.uuid = uuid;
this.procDefKey = procDefKey;
this.procInstId = procInstId;
this.superProcInstId = superProcInstId;
this.status = status;
this.initiationKey = initiationKey;
this.createdTimestamp = createdTimestamp;
this.updatedTimestamp = updatedTimestamp;
this.claimedByWorker = claimedByWorker;
this.startedByWorker = startedByWorker;
this.procStartTime = procStartTime;
this.procEndTime = procEndTime;
this.inputVariables = inputVariables;
this.outputVariables = outputVariables;
}

public String getUuid() {
return uuid;
}

public void setUuid(String uuid) {
this.uuid = uuid;
}

public String getProcDefKey() {
return procDefKey;
}

public void setProcDefKey(String procDefKey) {
this.procDefKey = procDefKey;
}

public String getProcInstId() {
return procInstId;
}

public void setProcInstId(String procInstId) {
this.procInstId = procInstId;
}

public String getSuperProcInstId() {
return superProcInstId;
}

public void setSuperProcInstId(String superProcInstId) {
this.superProcInstId = superProcInstId;
}

public String getStatus() {
return status;
}

public void setStatus(String status) {
this.status = status;
}

public String getInitiationKey() {
return initiationKey;
}

public void setInitiationKey(String initiationKey) {
this.initiationKey = initiationKey;
}

public Timestamp getCreatedTimestamp() {
return createdTimestamp;
}

public void setCreatedTimestamp(Timestamp createdTimestamp) {
this.createdTimestamp = createdTimestamp;
}

public Timestamp getUpdatedTimestamp() {
return updatedTimestamp;
}

public void setUpdatedTimestamp(Timestamp updatedTimestamp) {
this.updatedTimestamp = updatedTimestamp;
}

public String getClaimedByWorker() {
return claimedByWorker;
}

public void setClaimedByWorker(String claimedByWorker) {
this.claimedByWorker = claimedByWorker;
}

public String getStartedByWorker() {
return startedByWorker;
}

public void setStartedByWorker(String startedByWorker) {
this.startedByWorker = startedByWorker;
}

public Timestamp getProcStartTime() {
return procStartTime;
}

public void setProcStartTime(Timestamp procStartTime) {
this.procStartTime = procStartTime;
}

public Timestamp getProcEndTime() {
return procEndTime;
}

public void setProcEndTime(Timestamp procEndTime) {
this.procEndTime = procEndTime;
}

public void setInputVariables(Map<String, String> input) {
this.inputVariables = input;
}

public Map<String, String> getInputVariables() {
return inputVariables;
}

public void setOutputVariables(Map<String, String> output) {
this.outputVariables = output;
}

public Map<String, String> getOutputVariables() {
return outputVariables;
}

}
4 changes: 4 additions & 0 deletions cws-service/src/main/java/jpl/cws/scheduler/LogHistory.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package jpl.cws.scheduler;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class LogHistory {

Expand All @@ -13,4 +15,6 @@ public class LogHistory {
public Long duration = 0L;

public List<HistoryDetail> details = new ArrayList<HistoryDetail>();
public Map<String, String> inputVariables = new HashMap<String, String>();
public Map<String, String> outputVariables = new HashMap<String, String>();
}
Loading