airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [airavata-sandbox] 06/19: UI improvements
Date Wed, 06 Dec 2017 03:13:50 GMT
This is an automated email from the ASF dual-hosted git repository.

smarru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git

commit a1c411553ae8076f3b9cf27467a146ac55b75e68
Author: dimuthu.upeksha2@gmail.com <Dimu@1234>
AuthorDate: Mon Nov 20 13:06:16 2017 +0530

    UI improvements
---
 .../airavata/helix/tasks/datain/DataInputTask.java |   2 +-
 .../helix/tasks/dataout/DataOutputTask.java        |   2 +-
 .../src/app/components/workflow/create/create.html |  50 ++++++++++++---------
 .../src/app/components/workflow/detail/detail.html |   2 +-
 .../components/workflow/detail/workflow.detail.ts  |  43 ++++++++++++------
 .../web-console/src/assets/icons/datain.png        | Bin 0 -> 4095 bytes
 .../web-console/src/assets/icons/dataout.png       | Bin 0 -> 4110 bytes
 7 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/datain/DataInputTask.java
b/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/datain/DataInputTask.java
index 41d6aa4..9d4a27e 100644
--- a/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/datain/DataInputTask.java
+++ b/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/datain/DataInputTask.java
@@ -86,7 +86,7 @@ public class DataInputTask extends AbstractTask {
         TaskTypeResource taskTypeResource = new TaskTypeResource();
         taskTypeResource.setName(NAME);
         taskTypeResource.setTopicName("airavata-data-collect");
-        taskTypeResource.setIcon("assets/icons/copy.png");
+        taskTypeResource.setIcon("assets/icons/datain.png");
         taskTypeResource.getInputTypes().addAll(
                 Arrays.asList(
                         new TaskInputTypeResource()
diff --git a/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/dataout/DataOutputTask.java
b/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/dataout/DataOutputTask.java
index 62a6712..fb696b2 100644
--- a/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/dataout/DataOutputTask.java
+++ b/airavata-kubernetes/modules/helix-tasks/src/main/java/org/apache/airavata/helix/tasks/dataout/DataOutputTask.java
@@ -98,7 +98,7 @@ public class DataOutputTask extends AbstractTask {
         TaskTypeResource taskTypeResource = new TaskTypeResource();
         taskTypeResource.setName(NAME);
         taskTypeResource.setTopicName("airavata-data-collect");
-        taskTypeResource.setIcon("assets/icons/copy.png");
+        taskTypeResource.setIcon("assets/icons/dataout.png");
         taskTypeResource.getInputTypes().addAll(
                 Arrays.asList(
                         new TaskInputTypeResource()
diff --git a/airavata-kubernetes/web-console/src/app/components/workflow/create/create.html
b/airavata-kubernetes/web-console/src/app/components/workflow/create/create.html
index 22723d1..1a3ba79 100644
--- a/airavata-kubernetes/web-console/src/app/components/workflow/create/create.html
+++ b/airavata-kubernetes/web-console/src/app/components/workflow/create/create.html
@@ -1,27 +1,33 @@
-<label for="worklow-name">Workflow Name</label>
-<input [(ngModel)]="workFlowName" name="worklow-name" id="worklow-name"/>
+<div class="container">
 
-<table style="position:relative;">
-  <tr>
-    <td>
-      <div id="toolContainer" style="border: solid 1px black; width: 80px; cursor: default">
+  <div class="row" style="margin-bottom: 20px; margin-top: 20px">
 
-      </div>
-    </td>
-    <td>
+    <div class="col-8">
+      <label for="worklow-name">Workflow Name</label>
+      <input [(ngModel)]="workFlowName" name="worklow-name" id="worklow-name"/>
+    </div>
+
+    <div class="col-4">
+      <button (click)="onShowWorkflowXMLClicked()" class="btn btn-info">Show XML</button>
+      <button (click)="onCreateWorkflowClicked()" class="btn btn-success">Create Workflow</button>
+    </div>
+
+  </div>
+
+  <div class="row">
+
+    <div class="col-1" id="toolContainer" style="border: solid 1px black; cursor: default"></div>
+
+    <div class="col-7">
       <div id="graphContainer"
            style="border: solid 1px black;overflow:hidden;width:321px; cursor:default;">
       </div>
-    </td>
-    <td valign="top">
-      <div id="properties"
-           style="border: solid 1px black; padding: 10px;">
-      </div>
-    </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><button (click)="onShowWorkflowXMLClicked()">Show XML</button></td>
-    <td><button (click)="onCreateWorkflowClicked()">Create Workflow</button></td>
-  </tr>
-</table>
+    </div>
+
+    <div class="col-4">
+      <div id="properties" style="border: solid 1px black; padding: 10px;"></div>
+    </div>
+
+  </div>
+
+</div>
diff --git a/airavata-kubernetes/web-console/src/app/components/workflow/detail/detail.html
b/airavata-kubernetes/web-console/src/app/components/workflow/detail/detail.html
index 011b36a..a4add70 100644
--- a/airavata-kubernetes/web-console/src/app/components/workflow/detail/detail.html
+++ b/airavata-kubernetes/web-console/src/app/components/workflow/detail/detail.html
@@ -23,7 +23,7 @@
 <ng-template #processContent let-c="close" let-d="dismiss">
 
   <div class="modal-header">
-    <h4 class="modal-title">Experiment Processes</h4>
+    <h4 class="modal-title">Workflow Processes</h4>
     <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/airavata-kubernetes/web-console/src/app/components/workflow/detail/workflow.detail.ts
b/airavata-kubernetes/web-console/src/app/components/workflow/detail/workflow.detail.ts
index 99482f7..6f184b6 100644
--- a/airavata-kubernetes/web-console/src/app/components/workflow/detail/workflow.detail.ts
+++ b/airavata-kubernetes/web-console/src/app/components/workflow/detail/workflow.detail.ts
@@ -22,14 +22,14 @@ export class WorkflowDetailComponent {
   processes: Array<Process> = [];
   processLastState: ProcessStatus = new ProcessStatus();
   processListModel: NgbModalRef;
+  workflowId: number;
 
   constructor(private modalService: NgbModal,private activatedRoute: ActivatedRoute,
               private workflowService: WorkflowService, private processService: ProcessService,
               private router: Router) {
 
-    let workflowId = this.activatedRoute.snapshot.params["id"];
-    this.workflowService.getWorkflowById(workflowId)
-      .subscribe(data => {this.selectedWorkflow = data}, err => {console.log(err)});
+    this.workflowId = this.activatedRoute.snapshot.params["id"];
+    this.fetchWorkflow(this.workflowId);
   }
 
   launchWorkflow() {
@@ -54,15 +54,32 @@ export class WorkflowDetailComponent {
 
   openProcessesAsModel(content) {
     this.processes = [];
-    this.selectedWorkflow.processIds.forEach(id => {
-      this.processService.getProcessById(id).subscribe(data => {
-        this.processes.push(data);
-        this.processes.sort((p1, p2) => {return p1.id - p2.id;})
-      }, err => {
-        console.log(err);
-      });
-    });
-    this.processListModel = this.modalService.open(content, {size: "lg"});
-    this.processListModel.result.then((result) => {}, (reason) => {});
+
+    this.workflowService.getWorkflowById(this.workflowId)
+      .subscribe(data => {
+
+        this.selectedWorkflow = data;
+        this.selectedWorkflow.processIds.forEach(id => {
+
+          this.processService.getProcessById(id).subscribe(data => {
+            this.processes.push(data);
+            this.processes.sort((p1, p2) => {return p1.id - p2.id;})
+
+          }, err => {
+            console.log(err);
+          });
+
+        });
+
+        this.processListModel = this.modalService.open(content, {size: "lg"});
+        this.processListModel.result.then((result) => {}, (reason) => {});
+
+      }, err => {console.log(err)});
+
+  }
+
+  fetchWorkflow(id: number) {
+    this.workflowService.getWorkflowById(id)
+      .subscribe(data => {this.selectedWorkflow = data}, err => {console.log(err)});
   }
 }
diff --git a/airavata-kubernetes/web-console/src/assets/icons/datain.png b/airavata-kubernetes/web-console/src/assets/icons/datain.png
new file mode 100755
index 0000000..102009a
Binary files /dev/null and b/airavata-kubernetes/web-console/src/assets/icons/datain.png differ
diff --git a/airavata-kubernetes/web-console/src/assets/icons/dataout.png b/airavata-kubernetes/web-console/src/assets/icons/dataout.png
new file mode 100755
index 0000000..6aae639
Binary files /dev/null and b/airavata-kubernetes/web-console/src/assets/icons/dataout.png
differ

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <commits@airavata.apache.org>.

Mime
View raw message