[cuegui] fix job monitor filter behavior (#1139)

* cuegui: job monitor fix call to undefined member Signed-off-by: Oblet Alexis <[email protected]> * cuegui: job monitor fix datetime python import Signed-off-by: Oblet Alexis <[email protected]> * cuegui: monitor job search - allow regex when searching Signed-off-by: Oblet Alexis <[email protected]> * cuegui: monitor jobs search - remove items before each search Signed-off-by: Oblet Alexis <[email protected]> * cuegui: monitor job - save loadFinished plugin settings Signed-off-by: Oblet Alexis <[email protected]> Co-authored-by: Diego Tavares da Silva <[email protected]>
AcademySoftwareFoundation · Jul 8, 2022 · 3f974d2 · 3f974d2
1 parent 132569b
commit 3f974d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cuegui/cuegui/JobMonitorTree.py b/cuegui/cuegui/JobMonitorTree.py
@@ -300,7 +300,6 @@ def addJob(self, job, timestamp=None, loading_from_config=False):
                     for j in self.__reverseDependents:
                         if j in self.__load:
                             del self.__load[j]
-
         finally:
             self.ticksLock.unlock()
 

diff --git a/cuegui/cuegui/plugins/MonitorJobsPlugin.py b/cuegui/cuegui/plugins/MonitorJobsPlugin.py
@@ -22,7 +22,7 @@
 
 from builtins import str
 from builtins import map
-from datetime import datetime
+import datetime
 import re
 import weakref
 
@@ -89,9 +89,12 @@ def __init__(self, parent):
                                      ("columnWidths",
                                       self.jobMonitor.getColumnWidths,
                                       self.jobMonitor.setColumnWidths),
-                                      ("columnOrder",
+                                     ("columnOrder",
                                       self.jobMonitor.getColumnOrder,
                                       self.jobMonitor.setColumnOrder),
+                                     ("loadFinished",
+                                      self.__loadFinishedJobsCheckBox.isChecked,
+                                      self.__loadFinishedJobsCheckBox.setChecked),
                                       ("grpDependentCb",
                                       self.getGrpDependent,
                                       self.setGrpDependent),
@@ -194,13 +197,15 @@ def _regexLoadJobsHandle(self):
         substring = str(self.__regexLoadJobsEditBox.text()).strip()
         load_finished_jobs = self.__loadFinishedJobsCheckBox.isChecked()
 
+        self.jobMonitor.removeAllItems()
+
         if cuegui.Utils.isStringId(substring):
             # If a uuid is provided, load it
             self.jobMonitor.addJob(substring)
         elif load_finished_jobs or re.search(
                 r"^([a-z0-9_]+)\-([a-z0-9\.]+)\-", substring, re.IGNORECASE):
             # If show and shot is provided, or if "load finished" checkbox is checked, load all jobs
-            for job in opencue.api.getJobs(substr=[substring], include_finished=True):
+            for job in opencue.api.getJobs(regex=[substring], include_finished=True):
                 self.jobMonitor.addJob(job)
         else:
             # Otherwise, just load current matching jobs (except for the empty string)