From 32a5fc7a69c8319a00c94701962ea5470be84f50 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 11:55:34 +0200
Subject: [PATCH 01/21] added management of other kind of message

---
 ccp/js/executionhistorycontroller.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 9c70943..666db40 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -8,7 +8,7 @@ class CCPExecutionHistory extends HTMLElement {
   #data = [];
   #pending = [];
   #filtered = [];
-  #socket = null;
+  #sockets = null;
   #interval = null;
   #searchfield = null;
   #fileupload = null;
@@ -271,6 +271,10 @@ class CCPExecutionHistory extends HTMLElement {
     this.#socket = new WebSocket(this.#broadcasturl + "/executions");
     this.#socket.onmessage = event=>{
       const data = JSON.parse(event.data)
+      if(!data.jobID){
+        console.log("New logs " + event.data)
+        return
+      }
       let exec = this.#data.filter(e=>e.id === data.jobID)[0]
       if(exec){
         this.refreshExecution(exec.id)

From e14bd30796012a773622bc306c432ac80cc1e2fe Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 12:04:53 +0200
Subject: [PATCH 02/21] fix typo

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 666db40..b94694c 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -8,7 +8,7 @@ class CCPExecutionHistory extends HTMLElement {
   #data = [];
   #pending = [];
   #filtered = [];
-  #sockets = null;
+  #socket = null;
   #interval = null;
   #searchfield = null;
   #fileupload = null;

From 7e676e6473d09e7ec80a02cb3eee4bc4621db476 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 13:10:22 +0200
Subject: [PATCH 03/21] added terminal for viewing logs

---
 ccp/js/executionhistorycontroller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index b94694c..faa01f1 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -38,6 +38,7 @@ class CCPExecutionHistory extends HTMLElement {
     this.#rootdoc.innerHTML = `
       <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+      <script src="https://cdn.dev.d4science.org/ccp-dev/js/ccp/logterminal.js"></script>
       <style>
         .lxd{
           background-color: #dd4814;
@@ -111,6 +112,7 @@ class CCPExecutionHistory extends HTMLElement {
                       <span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span>
                       <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
                     </div>
+                    <d4s-ccp-logterminal maxlines="10"/>
                     <ul>
                       <li></li>
                     </ul>

From ca00575ea87c2d388066e93207109338d73cf08d Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 13:13:00 +0200
Subject: [PATCH 04/21] added terminal for viewing logs

---
 ccp/js/logterminalcontroller.js | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 ccp/js/logterminalcontroller.js

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
new file mode 100644
index 0000000..7b2b6bb
--- /dev/null
+++ b/ccp/js/logterminalcontroller.js
@@ -0,0 +1,75 @@
+class LogTerminal extends HTMLElement {
+  
+  #maxlines = 10;
+  #rootdoc = null;
+  #lines = []
+  
+  constructor(){
+    super()
+    this.#maxlines = this.getAttribute("maxlines") 
+    this.#rootdoc = this.attachShadow({ "mode" : "open"})  
+    this.render()
+  }
+
+  connectedCallback(){
+      
+  }
+  
+  render(){
+    this.innerHTML = `
+      <link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
+      <style>
+        .terminal-container{
+          overflow: hidden;
+        }
+        .terminal{
+          background-color: black;
+          max-height: 10rem;
+          height: 10rem;
+          min-height:10rem;
+          padding: 5px;
+          overflow:auto;
+        }
+        
+        .terminal > .line {
+          font-family: 'VT323', monospace;
+          color: #88ff00;
+          text-shadow: 1px 1px 1px rgba(0, 200, 0, .6), 0 0 .5em rgba(0, 200, 0, .6)
+        }
+        
+        .terminal > .line.error {
+          color: #ff3300;
+          text-shadow: 1px 1px 1px rgba(200, 0, 0, .6), 0 0 .5em rgba(200, 0, 0, .6)
+        }
+      </style>
+      <template id="TERMINAL_TEMPLATE">
+        <div name="terminal" class="container">
+          <div class="terminal" id="t">
+            <div class="line"></div>
+          </div>
+        </div>
+      </template> 
+      <div name="terminal" class="terminal"></div>
+    `
+  }
+  
+  refresh(){
+    BSS.apply(this.#terminal_bss)
+  }
+  
+  #terminal_bss = {
+    template : "#TERMINAL_TEMPLATE",
+    target : "div[name=terminal]",
+    in : ()=>this,
+    recurse : {
+      target : "div.line",
+      in: d=>d.#lines,
+      apply: (e,d,i)=>{
+        if(d.source === "stderr") e.classList.add("error");
+        e.innerHTML = `<span>${d.line}</span>`
+      }
+    }
+  }
+}
+
+window.customElements.define('d4s-ccp-logterminal', LogTerminal);
\ No newline at end of file

From 7798657b69e3fcba31a61e9c4375a32e3a18166c Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 13:14:53 +0200
Subject: [PATCH 05/21] fix

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index faa01f1..e5fde3e 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -112,7 +112,7 @@ class CCPExecutionHistory extends HTMLElement {
                       <span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span>
                       <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
                     </div>
-                    <d4s-ccp-logterminal maxlines="10"/>
+                    <d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal>
                     <ul>
                       <li></li>
                     </ul>

From b8e9ffddefd824d4e7d23b35f3664d7ab0aef263 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:00:45 +0200
Subject: [PATCH 06/21] fix

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index e5fde3e..8cdc23e 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -38,7 +38,7 @@ class CCPExecutionHistory extends HTMLElement {
     this.#rootdoc.innerHTML = `
       <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-      <script src="https://cdn.dev.d4science.org/ccp-dev/js/ccp/logterminal.js"></script>
+      <script src="https://cdn.dev.d4science.org/ccp-dev/js/ccp/logterminalcontroller.js"></script>
       <style>
         .lxd{
           background-color: #dd4814;

From 77e29a59d7f3bcc0db70bbd0a5565818df5ed276 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:04:24 +0200
Subject: [PATCH 07/21] fix

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 8cdc23e..323b3eb 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -38,7 +38,7 @@ class CCPExecutionHistory extends HTMLElement {
     this.#rootdoc.innerHTML = `
       <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-      <script src="https://cdn.dev.d4science.org/ccp-dev/js/ccp/logterminalcontroller.js"></script>
+      <script src="https://cdn.dev.d4science.org/ccp-dev/js/logterminalcontroller.js"></script>
       <style>
         .lxd{
           background-color: #dd4814;

From ab7eda1619fc67daeecdc41d5a72399d9cad945a Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:09:45 +0200
Subject: [PATCH 08/21] fix

---
 ccp/js/logterminalcontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 7b2b6bb..8f51c8e 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -49,7 +49,7 @@ class LogTerminal extends HTMLElement {
           </div>
         </div>
       </template> 
-      <div name="terminal" class="terminal"></div>
+      <div name="terminal" class="container"></div>
     `
   }
   

From f47863011aea9c7e680c5d1c60f59f8b96401b0d Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:12:02 +0200
Subject: [PATCH 09/21] fix

---
 ccp/js/logterminalcontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 8f51c8e..eec3d34 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -54,7 +54,7 @@ class LogTerminal extends HTMLElement {
   }
   
   refresh(){
-    BSS.apply(this.#terminal_bss)
+    BSS.apply(this.#terminal_bss, this.#rootdoc)
   }
   
   #terminal_bss = {

From 448499874c7fe43a5584a7824b128b8e43aa74fb Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:15:08 +0200
Subject: [PATCH 10/21] fix

---
 ccp/js/logterminalcontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index eec3d34..b11b964 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -16,7 +16,7 @@ class LogTerminal extends HTMLElement {
   }
   
   render(){
-    this.innerHTML = `
+    this.#rootdoc.innerHTML = `
       <link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
       <style>
         .terminal-container{

From e0273618e5486eda64e4cabe4e8fa139b92ec6c6 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 14:44:08 +0200
Subject: [PATCH 11/21] added accessor for loglines, removed unuseful scritp
 and added some margin

---
 ccp/js/executionhistorycontroller.js | 5 +++--
 ccp/js/logterminalcontroller.js      | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 323b3eb..bb7fc12 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -38,7 +38,6 @@ class CCPExecutionHistory extends HTMLElement {
     this.#rootdoc.innerHTML = `
       <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-      <script src="https://cdn.dev.d4science.org/ccp-dev/js/logterminalcontroller.js"></script>
       <style>
         .lxd{
           background-color: #dd4814;
@@ -112,7 +111,9 @@ class CCPExecutionHistory extends HTMLElement {
                       <span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span>
                       <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
                     </div>
-                    <d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal>
+                    <div style="margin:5px 0 5px 0">
+                      <d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal>
+                    </div>
                     <ul>
                       <li></li>
                     </ul>
diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index b11b964..50f8418 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -15,6 +15,10 @@ class LogTerminal extends HTMLElement {
       
   }
   
+  get lines(){
+    return this.#lines
+  }
+  
   render(){
     this.#rootdoc.innerHTML = `
       <link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
@@ -63,7 +67,7 @@ class LogTerminal extends HTMLElement {
     in : ()=>this,
     recurse : {
       target : "div.line",
-      in: d=>d.#lines,
+      in: d=>d.lines,
       apply: (e,d,i)=>{
         if(d.source === "stderr") e.classList.add("error");
         e.innerHTML = `<span>${d.line}</span>`

From d095d00d7ddb1940e25aaecb20ed7d58309e5901 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 15:03:04 +0200
Subject: [PATCH 12/21] add lines to logterminal of correct execution

---
 ccp/js/executionhistorycontroller.js | 18 ++++++++++++++++--
 ccp/js/logterminalcontroller.js      |  9 ++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index bb7fc12..8cc3ee9 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -274,10 +274,13 @@ class CCPExecutionHistory extends HTMLElement {
     this.#socket = new WebSocket(this.#broadcasturl + "/executions");
     this.#socket.onmessage = event=>{
       const data = JSON.parse(event.data)
-      if(!data.jobID){
-        console.log("New logs " + event.data)
+      
+      if(data[0].source){
+        //has to be logs
+        this.appendLogs(data)
         return
       }
+      
       let exec = this.#data.filter(e=>e.id === data.jobID)[0]
       if(exec){
         this.refreshExecution(exec.id)
@@ -303,6 +306,17 @@ class CCPExecutionHistory extends HTMLElement {
     }, 30000) 
   }
   
+  appendLogs(data){
+    if(!data.length) return;
+    const exid = data[0]["attrs"]["execution"]
+    const lt = this.#rootdoc.querySelector(`li.ccp.execution-item#${exid} d4s-ccp-logterminal`)
+    if(!lt){
+      console.error("No terminal found for adding logs of " + exid)
+    }else{
+      lt.addLines(data)
+    }
+  }
+  
   download(url, name) {
     this.#boot.secureFetch(url).then(reply => {
       if (!reply.ok) {
diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 50f8418..a5e2747 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -19,6 +19,11 @@ class LogTerminal extends HTMLElement {
     return this.#lines
   }
   
+  addLines(lines){
+    this.#lines = this.#lines.concat(lines)
+    this.refresh()
+  }
+  
   render(){
     this.#rootdoc.innerHTML = `
       <link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
@@ -59,6 +64,8 @@ class LogTerminal extends HTMLElement {
   
   refresh(){
     BSS.apply(this.#terminal_bss, this.#rootdoc)
+    const lt = this.#rootdoc.querySelector("div.terminal")
+    lt.scrollTop = lt.scrollHeight;
   }
   
   #terminal_bss = {
@@ -67,7 +74,7 @@ class LogTerminal extends HTMLElement {
     in : ()=>this,
     recurse : {
       target : "div.line",
-      in: d=>d.lines,
+      in: (e,d)=>d.lines,
       apply: (e,d,i)=>{
         if(d.source === "stderr") e.classList.add("error");
         e.innerHTML = `<span>${d.line}</span>`

From 87932992e7f33b1f45a03d3f6552792d37c1639e Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 15:35:28 +0200
Subject: [PATCH 13/21] added management of line storage and limit for max
 lines

---
 ccp/js/executionhistorycontroller.js | 12 +++++++++---
 ccp/js/logterminalcontroller.js      | 24 ++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 8cc3ee9..e46267c 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -112,7 +112,7 @@ class CCPExecutionHistory extends HTMLElement {
                       <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
                     </div>
                     <div style="margin:5px 0 5px 0">
-                      <d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal>
+                      <d4s-ccp-logterminal maxstoredlines="100" maxlines="10"></d4s-ccp-logterminal>
                     </div>
                     <ul>
                       <li></li>
@@ -275,7 +275,7 @@ class CCPExecutionHistory extends HTMLElement {
     this.#socket.onmessage = event=>{
       const data = JSON.parse(event.data)
       
-      if(data[0].source){
+      if(data[0] && data[0].source){
         //has to be logs
         this.appendLogs(data)
         return
@@ -309,7 +309,7 @@ class CCPExecutionHistory extends HTMLElement {
   appendLogs(data){
     if(!data.length) return;
     const exid = data[0]["attrs"]["execution"]
-    const lt = this.#rootdoc.querySelector(`li.ccp.execution-item#${exid} d4s-ccp-logterminal`)
+    const lt = this.#rootdoc.querySelector(`d4s-ccp-logterminal[index=${exid}]`)
     if(!lt){
       console.error("No terminal found for adding logs of " + exid)
     }else{
@@ -630,6 +630,12 @@ class CCPExecutionHistory extends HTMLElement {
                   this.generateCode(id, lang, `${id}.${ext}`)
                 }
               },
+              {
+                target : "d4s-ccp-logterminal",
+                apply : (e,d)=>{
+                  e.setAttribute("index", d.id)
+                }
+              },
               {
                 target : "ul",
                 recurse : [
diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index a5e2747..0c70c8b 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -1,18 +1,22 @@
 class LogTerminal extends HTMLElement {
   
   #maxlines = 10;
+  #maxstoredlines = 100;
   #rootdoc = null;
-  #lines = []
+  #lines = [];
+  #index = null;
   
   constructor(){
     super()
     this.#maxlines = this.getAttribute("maxlines") 
     this.#rootdoc = this.attachShadow({ "mode" : "open"})  
     this.render()
+    this.#index = this.getAttribute("index")
   }
 
   connectedCallback(){
-      
+      this.reloadLines()
+      this.refresh()
   }
   
   get lines(){
@@ -22,6 +26,22 @@ class LogTerminal extends HTMLElement {
   addLines(lines){
     this.#lines = this.#lines.concat(lines)
     this.refresh()
+    this.storeLines()
+  }
+  
+  reloadLines(){
+    if(sessionStorage.getItem("logs-" + this.#index)){
+      this.#lines = sessionStorage.getItem("logs-" + this.#index)
+    }else{
+      this.#lines = []
+    }
+  }
+  
+  storeLines(){
+    if(this.#lines.length > this.#maxstoredlines){
+      this.#lines.splice(0, this.#lines.length - this.#maxstoredlines)
+    }
+    sessionStorage.setItem("logs-" + this.#index, this.#lines)
   }
   
   render(){

From c96c98c38bdfa8aa176534974e37b064dc0d54a2 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Fri, 23 Jun 2023 16:40:02 +0200
Subject: [PATCH 14/21] fixed several issues with rendering and synch

---
 ccp/js/executionhistorycontroller.js | 11 +++++------
 ccp/js/logterminalcontroller.js      | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 8acab5b..c1d3e10 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -114,8 +114,7 @@ class CCPExecutionHistory extends HTMLElement {
                       <span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span>
                       <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
                     </div>
-                    <div style="margin:5px 0 5px 0">
-                      <d4s-ccp-logterminal maxstoredlines="100" maxlines="10"></d4s-ccp-logterminal>
+                    <div name="logterminalcontainer" style="margin:5px 0 5px 0">
                     </div>
                     <ul>
                       <li></li>
@@ -312,7 +311,7 @@ class CCPExecutionHistory extends HTMLElement {
   appendLogs(data){
     if(!data.length) return;
     const exid = data[0]["attrs"]["execution"]
-    const lt = this.#rootdoc.querySelector(`d4s-ccp-logterminal[index=${exid}]`)
+    const lt = this.#rootdoc.querySelector(`d4s-ccp-logterminal[index='${exid}']`)
     if(!lt){
       console.error("No terminal found for adding logs of " + exid)
     }else{
@@ -649,9 +648,9 @@ class CCPExecutionHistory extends HTMLElement {
                 }
               },
               {
-                target : "d4s-ccp-logterminal",
+                target : "div[name=logterminalcontainer]",
                 apply : (e,d)=>{
-                  e.setAttribute("index", d.id)
+                  e.innerHTML = `<d4s-ccp-logterminal index="${d.id}" maxstoredlines="100" maxlines="10"></d4s-ccp-logterminal>`
                 }
               },
               {
@@ -682,4 +681,4 @@ class CCPExecutionHistory extends HTMLElement {
     ]
   }
 }
-window.customElements.define('d4s-ccp-executionhistory', CCPExecutionHistory);
\ No newline at end of file
+window.customElements.define('d4s-ccp-executionhistory', CCPExecutionHistory);
diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 0c70c8b..6e1a2e9 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -6,19 +6,27 @@ class LogTerminal extends HTMLElement {
   #lines = [];
   #index = null;
   
+  static get observedAttributes() { return ['index']; }
+
   constructor(){
     super()
     this.#maxlines = this.getAttribute("maxlines") 
     this.#rootdoc = this.attachShadow({ "mode" : "open"})  
     this.render()
-    this.#index = this.getAttribute("index")
   }
 
   connectedCallback(){
       this.reloadLines()
       this.refresh()
   }
-  
+ 
+  attributeChangedCallback(name, oldValue, newValue) {
+    if(name === "index"){
+      this.#index = newValue
+      this.reloadLines()
+    }
+  }
+
   get lines(){
     return this.#lines
   }
@@ -30,8 +38,9 @@ class LogTerminal extends HTMLElement {
   }
   
   reloadLines(){
+    if(this.#index == null) return;
     if(sessionStorage.getItem("logs-" + this.#index)){
-      this.#lines = sessionStorage.getItem("logs-" + this.#index)
+      this.#lines = JSON.parse(sessionStorage.getItem("logs-" + this.#index))
     }else{
       this.#lines = []
     }
@@ -41,7 +50,7 @@ class LogTerminal extends HTMLElement {
     if(this.#lines.length > this.#maxstoredlines){
       this.#lines.splice(0, this.#lines.length - this.#maxstoredlines)
     }
-    sessionStorage.setItem("logs-" + this.#index, this.#lines)
+    sessionStorage.setItem("logs-" + this.#index, JSON.stringify(this.#lines))
   }
   
   render(){
@@ -103,4 +112,4 @@ class LogTerminal extends HTMLElement {
   }
 }
 
-window.customElements.define('d4s-ccp-logterminal', LogTerminal);
\ No newline at end of file
+window.customElements.define('d4s-ccp-logterminal', LogTerminal);

From d4998222bb7a0213a5933d7fb6dd1caabd8eccc8 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 11:22:48 +0200
Subject: [PATCH 15/21] added infra log styles

---
 ccp/js/logterminalcontroller.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 6e1a2e9..76c1748 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -79,6 +79,11 @@ class LogTerminal extends HTMLElement {
           color: #ff3300;
           text-shadow: 1px 1px 1px rgba(200, 0, 0, .6), 0 0 .5em rgba(200, 0, 0, .6)
         }
+        
+        .terminal > .line.error {
+          color: rgba(255,255,255,0.6);
+          text-shadow: 1px 1px 1px rgba(200, 200, 200, .6), 0 0 .5em rgba(200, 0, 0, .6)
+        }
       </style>
       <template id="TERMINAL_TEMPLATE">
         <div name="terminal" class="container">
@@ -106,6 +111,7 @@ class LogTerminal extends HTMLElement {
       in: (e,d)=>d.lines,
       apply: (e,d,i)=>{
         if(d.source === "stderr") e.classList.add("error");
+        if(d.source === "infrastructure") e.classList.add("infrastructure");
         e.innerHTML = `<span>${d.line}</span>`
       }
     }

From dbfb991074d119954e058fbcfb6db0b0328a7cf3 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 12:08:47 +0200
Subject: [PATCH 16/21] aesthtic fixes

---
 ccp/js/logterminalcontroller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 76c1748..2d30aa8 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -67,6 +67,8 @@ class LogTerminal extends HTMLElement {
           min-height:10rem;
           padding: 5px;
           overflow:auto;
+          font-size: xx-small;
+          line-height: 0.9rem;
         }
         
         .terminal > .line {
@@ -80,7 +82,7 @@ class LogTerminal extends HTMLElement {
           text-shadow: 1px 1px 1px rgba(200, 0, 0, .6), 0 0 .5em rgba(200, 0, 0, .6)
         }
         
-        .terminal > .line.error {
+        .terminal > .line.infrastructure {
           color: rgba(255,255,255,0.6);
           text-shadow: 1px 1px 1px rgba(200, 200, 200, .6), 0 0 .5em rgba(200, 0, 0, .6)
         }

From cab09d219f1fa8e1fb9027f7a14a2fdd741d401e Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 12:09:54 +0200
Subject: [PATCH 17/21] aesthetic fixes

---
 ccp/js/logterminalcontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 2d30aa8..88ebf42 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -84,7 +84,7 @@ class LogTerminal extends HTMLElement {
         
         .terminal > .line.infrastructure {
           color: rgba(255,255,255,0.6);
-          text-shadow: 1px 1px 1px rgba(200, 200, 200, .6), 0 0 .5em rgba(200, 0, 0, .6)
+          text-shadow: 1px 1px 1px rgba(200, 200, 200, .6), 0 0 .5em rgba(200, 200, 200, .6)
         }
       </style>
       <template id="TERMINAL_TEMPLATE">

From cdbbce396330751d0ef8fd4cbee8c14de78322d1 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 19:39:52 +0200
Subject: [PATCH 18/21] connect to unified socket with subject parameter

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index c1d3e10..5411b91 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -273,7 +273,7 @@ class CCPExecutionHistory extends HTMLElement {
   }
   
   connectBroadcast(){
-    this.#socket = new WebSocket(this.#broadcasturl + "/executions");
+    this.#socket = new WebSocket(`${this.#broadcasturl}/unified?subject=${this.#boot.subject}`);
     this.#socket.onmessage = event=>{
       const data = JSON.parse(event.data)
       

From de1179c5153db2223b877ec6c8592fd9f2cb81b8 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 19:57:34 +0200
Subject: [PATCH 19/21] delay connectBroadcast in order to ensure subject

---
 ccp/js/executionhistorycontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 5411b91..7c253ae 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -26,10 +26,10 @@ class CCPExecutionHistory extends HTMLElement {
     this.#broadcasturl = this.#broadcasturl + "/ws/notification"
     this.#archive = this.getAttribute("archive")
     this.connectNewExecution()
-    this.connectBroadcast()
   }
   
   connectedCallback(){
+    this.connectBroadcast()
     this.render()
     this.refreshExecutions()
   }

From fb74d21d4bc8e088399d11a870f38a4ebcce1978 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Mon, 26 Jun 2023 20:11:40 +0200
Subject: [PATCH 20/21] delay connectBroadcast in order to ensure subject

---
 ccp/js/executionhistorycontroller.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ccp/js/executionhistorycontroller.js b/ccp/js/executionhistorycontroller.js
index 7c253ae..330a3c1 100644
--- a/ccp/js/executionhistorycontroller.js
+++ b/ccp/js/executionhistorycontroller.js
@@ -29,7 +29,7 @@ class CCPExecutionHistory extends HTMLElement {
   }
   
   connectedCallback(){
-    this.connectBroadcast()
+    this.connectBroadcastWithSubject()
     this.render()
     this.refreshExecutions()
   }
@@ -272,6 +272,15 @@ class CCPExecutionHistory extends HTMLElement {
     })
   }
   
+  connectBroadcastWithSubject(){
+    var interval = window.setInterval( ()=>{
+      if(this.#boot.subject){
+        window.clearInterval(interval)
+        this.connectBroadcast() 
+      }
+    }, 1000) 
+  }
+  
   connectBroadcast(){
     this.#socket = new WebSocket(`${this.#broadcasturl}/unified?subject=${this.#boot.subject}`);
     this.#socket.onmessage = event=>{

From b0fa8c54057c0eaf8410864af41e519ab6261225 Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Tue, 27 Jun 2023 09:55:17 +0200
Subject: [PATCH 21/21] improve readability

---
 ccp/js/logterminalcontroller.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ccp/js/logterminalcontroller.js b/ccp/js/logterminalcontroller.js
index 88ebf42..b87570e 100644
--- a/ccp/js/logterminalcontroller.js
+++ b/ccp/js/logterminalcontroller.js
@@ -67,24 +67,21 @@ class LogTerminal extends HTMLElement {
           min-height:10rem;
           padding: 5px;
           overflow:auto;
-          font-size: xx-small;
+          font-size: x-small;
           line-height: 0.9rem;
         }
         
         .terminal > .line {
           font-family: 'VT323', monospace;
           color: #88ff00;
-          text-shadow: 1px 1px 1px rgba(0, 200, 0, .6), 0 0 .5em rgba(0, 200, 0, .6)
         }
         
         .terminal > .line.error {
           color: #ff3300;
-          text-shadow: 1px 1px 1px rgba(200, 0, 0, .6), 0 0 .5em rgba(200, 0, 0, .6)
         }
         
         .terminal > .line.infrastructure {
-          color: rgba(255,255,255,0.6);
-          text-shadow: 1px 1px 1px rgba(200, 200, 200, .6), 0 0 .5em rgba(200, 200, 200, .6)
+          color: rgba(255,255,255,0.8);
         }
       </style>
       <template id="TERMINAL_TEMPLATE">