Merge pull request #444 from NitorCreations/small-usability-improvements

Small usability improvements

CHANGELOG.md

@@ -2,17 +2,23 @@
 
 **Highlights**
 - `nflow-explorer`
-  - Sortable workflow definitions and instance search result table
+  - Sortable workflow definitions, workflow instance search result and executors tables
   - Persist workflow instance query parameters to URL
+  - Support wildcard characters when searching workflow instances by business key or external id
 
 **Details**
 - `nflow-jetty`
   - Dependency updates:
     - jetty 9.4.38.v20210224
 - `nflow-explorer`
+  - Added missing `executing` status to workflow instance search criteria
+  - Included child workflows when auto-refreshing workflow instance actions table
+  - Added more child workflow details to workflow instance actions
   - Dependency updates:
     - urijs 1.19.6
     - is-svg 4.3.1
+- `nflow-engine`
+  - Support SQL wildcards in workflow instance queries by business key or external id
 
 ## 7.2.4 (2021-02-25)
 

nflow-engine/src/main/java/io/nflow/engine/internal/dao/WorkflowInstanceDao.java

@@ -659,11 +659,11 @@ public Stream<WorkflowInstance> queryWorkflowInstancesAsStream(QueryWorkflowInst
       params.addValue("statuses", convertedStatuses);
     }
     if (query.businessKey != null) {
-      conditions.add("business_key = :business_key");
+      conditions.add("business_key like :business_key");
       params.addValue("business_key", query.businessKey);
     }
     if (query.externalId != null) {
-      conditions.add("external_id = :external_id");
+      conditions.add("external_id like :external_id");
       params.addValue("external_id", query.externalId);
     }
     conditions.add("executor_group = :executor_group");

nflow-explorer/src/app/components/constants.js

@@ -15,6 +15,7 @@
     CREATED: 'created',
     IN_PROGRESS: 'inProgress',
     FINISHED: 'finished',
-    MANUAL: 'manual'
+    MANUAL: 'manual',
+    EXECUTING: 'executing'
   });
 })();

nflow-explorer/src/app/executors/executorTable.html

@@ -1,30 +1,30 @@
 <div>
   <h2>Workflow executors</h2>
-  <table id="executors" class="table table-striped table-hover">
+  <table st-table="displayedExecutors" st-safe-src="ctrl.executors" id="executors" class="table table-striped table-hover">
     <thead>
-    <tr>
-      <th>Id</th>
-      <th>Host</th>
-      <th>Process ID</th>
-      <th>Executor group</th>
-      <th>Started</th>
-      <th>Stopped</th>
-      <th>Activity heartbeat</th>
-      <th>Heartbeat expires</th>
-    </tr>
+      <tr class="clickable-header">
+        <th st-sort="id">Id</th>
+        <th st-sort="host">Host</th>
+        <th st-sort="pid">Process ID</th>
+        <th st-sort="executorGroup">Executor group</th>
+        <th st-sort="started">Started</th>
+        <th st-sort="stopped">Stopped</th>
+        <th st-sort="active">Activity heartbeat</th>
+        <th st-sort="expires">Heartbeat expires</th>
+      </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="executor in ctrl.executors | orderBy:'active':true | filter:ctrl.isActive"
-        ng-class="ctrl.executorClass(executor)">
-      <td>{{executor.id}}</td>
-      <td>{{executor.host}}</td>
-      <td>{{executor.pid}}</td>
-      <td>{{executor.executorGroup}}</td>
-      <td title="{{executor.started | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.started | fromNow}}</td>
-      <td title="{{executor.stopped | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.stopped | fromNow}}</td>
-      <td title="{{executor.active | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.active | fromNow}}</td>
-      <td title="{{executor.expires | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.expires | fromNow}}</td>
-    </tr>
+      <tr ng-repeat="executor in displayedExecutors | orderBy:'active':true | filter:ctrl.isActive"
+          ng-class="ctrl.executorClass(executor)">
+        <td>{{executor.id}}</td>
+        <td>{{executor.host}}</td>
+        <td>{{executor.pid}}</td>
+        <td>{{executor.executorGroup}}</td>
+        <td title="{{executor.started | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.started | fromNow}}</td>
+        <td title="{{executor.stopped | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.stopped | fromNow}}</td>
+        <td title="{{executor.active | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.active | fromNow}}</td>
+        <td title="{{executor.expires | date:'yyyy-MM-dd HH:mm:ss'}}">{{executor.expires | fromNow}}</td>
+      </tr>
     </tbody>
   </table>
 </div>

nflow-explorer/src/app/search/searchForm.html

@@ -22,11 +22,11 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-3">
+        <div title="{{ctrl.wildCardTooltip}}" class="col-xs-3">
           <label for="businessKey">Business key</label>
           <input name="businessKey" type="text" ng-model="ctrl.model.businessKey" empty-to-null class="form-control"/>
         </div>
-        <div class="col-xs-3">
+        <div title="{{ctrl.wildCardTooltip}}" class="col-xs-3">
           <label for="externalId">External id</label>
           <input name="externalId" type="text" ng-model="ctrl.model.externalId" empty-to-null class="form-control" />
         </div>

nflow-explorer/src/app/search/searchForm.js

@@ -30,6 +30,7 @@
     self.search = navigateSearch;
     self.executeSearch = executeSearch;
     self.onTypeChange = CriteriaModel.onDefinitionChange;
+    self.wildCardTooltip = 'Use % to replace many characters and _ to replace a single character';
 
     initialize();
 

nflow-explorer/src/app/workflow/tabs/actionHistory.html

@@ -28,7 +28,12 @@
         <div ng-click="$event.stopPropagation();" ng-if="ctrl.childWorkflowFromAction(action).length" >
           <strong>Child workflows</strong>
           <ul ng-repeat="childWorkflow in ctrl.childWorkflowFromAction(action)">
-            <li><small><a ui-sref="workflow({id: childWorkflow.id})">{{childWorkflow.type}} ({{childWorkflow.id}})</a></small></li>
+            <li>
+              <small title="Business key: {{childWorkflow.businessKey}}&#10;External id: {{childWorkflow.externalId}}&#10;State text: {{childWorkflow.stateText}}&#10;Retries: {{childWorkflow.retries}}&#10;Priority: {{childWorkflow.priority}}&#10;Started: {{childWorkflow.started}}&#10;Modified: {{childWorkflow.modified}}">
+                <a ui-sref="workflow({id: childWorkflow.id})">{{childWorkflow.type}} ({{childWorkflow.id}})</a>
+                - {{childWorkflow.status}} in {{childWorkflow.state}}
+              </small>
+            </li>
           </ul>
         </div>
       </td>

nflow-explorer/src/app/workflow/workflow.js

@@ -19,7 +19,10 @@
     function reloadWorkflow(workflowId) {
       console.log('Fetching workflow id ' + workflowId);
       WorkflowService.get(workflowId).then(function(workflow) {
-        self.workflow = workflow;
+        WorkflowService.query({parentWorkflowId: workflow.id}).then(function(childWorkflows) {
+          self.workflow = workflow;
+          self.childWorkflows = childWorkflows;
+        });
       });
     }
     self.poller = $interval(function() { reloadWorkflow(self.workflow.id); },

nflow-explorer/test/spec/search/searchForm.js

@@ -40,7 +40,7 @@ describe('Directive: searchForm', function () {
     });
 
     it('sets instance statuses into view model', function () {
-      expect(getCtrl(WorkflowService).instanceStatuses).toEqual([ 'created', 'inProgress', 'finished', 'manual' ]);
+      expect(getCtrl(WorkflowService).instanceStatuses).toEqual([ 'created', 'inProgress', 'finished', 'manual', 'executing' ]);
     });
 
     it('with empty criteria does not trigger search', function () {