From 73cee5e46fbf300d2cdf9baaa6e225259affb0e7 Mon Sep 17 00:00:00 2001
From: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
Date: Thu, 17 Dec 2020 21:03:46 +0300
Subject: [PATCH] def ProcessorActivityItemCreate(inDef, inArgList=None,
 inArgDict=None, inArgGSettingsStr=None, inArgLoggerStr=None): # Create
 ActivityItem # return dict def
 ProcessorAliasDefUpdate(inGSettings=inGSettings, inDef=inDef,
 inAliasStr=lDefAliasStr)

# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (execute permanently)
def HTMLLinkDefExecute(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):

# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (add in processor queue)
def HTMLLinkDefProcessor(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):
---
 Sources/pyOpenRPA/Orchestrator/Processor.py   |  3 ++-
 Sources/pyOpenRPA/Orchestrator/Web/Basic.py   | 22 +++++++++++++++++++
 .../Orchestrator/__Orchestrator__.py          | 21 ++++++++++++++++++
 changelog.md                                  |  9 +++++++-
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/Sources/pyOpenRPA/Orchestrator/Processor.py b/Sources/pyOpenRPA/Orchestrator/Processor.py
index 78dd6e6e..d50420ed 100644
--- a/Sources/pyOpenRPA/Orchestrator/Processor.py
+++ b/Sources/pyOpenRPA/Orchestrator/Processor.py
@@ -25,7 +25,8 @@ def ProcessorRunSync(inGSettings):
             if lL: lL.debug(f'Processor ActivityList len: {len(lActivityList)}')
             lActivityItem = inGSettings["ProcessorDict"]["ActivityList"].pop(0) # Extract the first item from processor queue
             ActivityListExecute(inGSettings = inGSettings, inActivityList = [lActivityItem]) # execute the activity item
-        time.sleep(inGSettings["ProcessorDict"]["CheckIntervalSecFloat"]) # Sleep when list is empty
+        else:
+            time.sleep(inGSettings["ProcessorDict"]["CheckIntervalSecFloat"]) # Sleep when list is empty
 
 # Execute ActivityItem list
 # return the def result
diff --git a/Sources/pyOpenRPA/Orchestrator/Web/Basic.py b/Sources/pyOpenRPA/Orchestrator/Web/Basic.py
index 76161049..cbfd4cff 100644
--- a/Sources/pyOpenRPA/Orchestrator/Web/Basic.py
+++ b/Sources/pyOpenRPA/Orchestrator/Web/Basic.py
@@ -1,4 +1,5 @@
 import json
+from .. import __Orchestrator__
 # Escape JS to the safe JS for the inline JS in HTML tags ATTENTION! Use it only if want to paste JS into HTML tag - not in <script>
 # USAGE: JSEscapeForHTMLInline(inJSStr="lTest=\"Hello World\"; alert(\"lTest\")")
 def JSEscapeForHTMLInline(inJSStr):
@@ -39,6 +40,27 @@ def HTMLLinkJSOnClick(inJSOnClickStr, inTitleStr, inColorStr=None):
     lResult=f"<a {lCSSStyleStr} onclick=\"{inJSOnClickStr}\">{inTitleStr}</a>"
     return lResult
 
+# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (add in processor queue)
+def HTMLLinkDefProcessor(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):
+    lDefAliasStr = inDef
+    if callable(inDef): lDefAliasStr = str(inDef)
+    if inLinkTitleStr is None: inLinkTitleStr = lDefAliasStr
+    lDefAliasStr=__Orchestrator__.ProcessorAliasDefUpdate(inGSettings=inGSettings, inDef=inDef, inAliasStr=lDefAliasStr)
+    lActivityList = [__Orchestrator__.ProcessorActivityItemCreate(inDef=lDefAliasStr,inArgList=inArgList,inArgDict=inArgDict,inArgGSettingsStr=inArgGSettingsStr,inArgLoggerStr=inArgLoggerStr)]
+    lJSStr = JSProcessorActivityListAdd(lActivityList)
+    lHTMLStr = HTMLLinkJSOnClick(inJSOnClickStr=lJSStr,inTitleStr=inLinkTitleStr, inColorStr=inLinkColorStr)
+    return lHTMLStr
+
+# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (execute permanently)
+def HTMLLinkDefExecute(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):
+    lDefAliasStr = inDef
+    if callable(inDef): lDefAliasStr = str(inDef)
+    if inLinkTitleStr is None: inLinkTitleStr = lDefAliasStr
+    lDefAliasStr=__Orchestrator__.ProcessorAliasDefUpdate(inGSettings=inGSettings, inDef=inDef, inAliasStr=lDefAliasStr)
+    lActivityList = [__Orchestrator__.ProcessorActivityItemCreate(inDef=lDefAliasStr,inArgList=inArgList,inArgDict=inArgDict,inArgGSettingsStr=inArgGSettingsStr,inArgLoggerStr=inArgLoggerStr)]
+    lJSStr = JSActivityListExecute(lActivityList)
+    lHTMLStr = HTMLLinkJSOnClick(inJSOnClickStr=lJSStr,inTitleStr=inLinkTitleStr, inColorStr=inLinkColorStr)
+    return lHTMLStr
 
 # HTML Generator for the CP up to v.1.2.0
 def HTMLControlPanelBC(inCPDict):
diff --git a/Sources/pyOpenRPA/Orchestrator/__Orchestrator__.py b/Sources/pyOpenRPA/Orchestrator/__Orchestrator__.py
index e89dd803..a2bfc9ee 100644
--- a/Sources/pyOpenRPA/Orchestrator/__Orchestrator__.py
+++ b/Sources/pyOpenRPA/Orchestrator/__Orchestrator__.py
@@ -359,6 +359,27 @@ def ProcessorAliasDefCreate(inGSettings, inDef, inAliasStr=None):
         if lL: lL.warning(f"Orchestrator.ProcessorAliasDefCreate: Alias {inAliasStr} already exists in alias dictionary. Another alias will be generated and returned")
     inGSettings["ProcessorDict"]["AliasDefDict"][inAliasStr] = inDef
     return inAliasStr
+
+# Update alias for def (can be used in ActivityItem in field Def)
+# return Alias str
+def ProcessorAliasDefUpdate(inGSettings, inDef, inAliasStr):
+    inGSettings["ProcessorDict"]["AliasDefDict"][inAliasStr] = inDef
+    return inAliasStr
+
+# Create ActivityItem
+# return dict
+def ProcessorActivityItemCreate(inDef, inArgList=None, inArgDict=None, inArgGSettingsStr=None, inArgLoggerStr=None):
+    if inArgList is None: inArgList=[]
+    if inArgDict is None: inArgDict={}
+    lActivityItemDict= {
+            "Def":inDef, # def link or def alias (look gSettings["Processor"]["AliasDefDict"])
+            "ArgList":inArgList, # Args list
+            "ArgDict":inArgDict, # Args dictionary
+            "ArgGSettings": inArgGSettingsStr, # Name of GSettings attribute: str (ArgDict) or index (for ArgList)
+            "ArgLogger": inArgLoggerStr # Name of GSettings attribute: str (ArgDict) or index (for ArgList)
+        }
+    return lActivityItemDict
+
 # Add Activity item in Processor list
 def ProcessorActivityItemAppend(inGSettings, inDef, inArgList=None, inArgDict=None, inArgGSettingsStr=None, inArgLoggerStr=None):
     if inArgList is None: inArgList=[]
diff --git a/changelog.md b/changelog.md
index 1d19e798..d9d3bb23 100644
--- a/changelog.md
+++ b/changelog.md
@@ -116,8 +116,15 @@
     
 - ORC Defs
 def JSActivityListExecute(inActivityList): # Create JS for execute activity list/ activity permanent # USAGE: Orchestrator.Web.Basic.JSActivityListExecute(inActivityList)
-
 def JSProcessorActivityListAdd(inActivityList): # Create JS for send activity list/ activity to the processor # USAGE: Orchestrator.Web.Basic.JSProcessorActivityListAdd(inActivityList)
+def ProcessorActivityItemCreate(inDef, inArgList=None, inArgDict=None, inArgGSettingsStr=None, inArgLoggerStr=None): # Create ActivityItem # return dict
+def ProcessorAliasDefUpdate(inGSettings=inGSettings, inDef=inDef, inAliasStr=lDefAliasStr)
+
+# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (execute permanently)
+def HTMLLinkDefExecute(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):
+
+# Create HTMLLink by the def, argdict, arglist, gsettingsStr, logger Str titleStr, color, (add in processor queue)
+def HTMLLinkDefProcessor(inGSettings, inDef, inArgDict=None, inArgList=None, inArgGSettingsStr="", inArgLoggerStr="", inLinkTitleStr=None, inLinkColorStr=""):
 [1.1.0]
 After 2 month test prefinal with new improovements (+RobotRDPActive in Orchestrator + Easy ControlPanelTemplate)
 Beta before 1.1.0 (new way of OpenRPA with improvements. Sorry, but no backward compatibility)/ Backward compatibility will start from 1.0.1