From 2aaa115997e49417c2e092e7dd7a1ae467e4f28b Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 25 Sep 2018 17:39:30 -0400
Subject: [PATCH] LP#1779158 Active -> Recent Imports UI

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/cat/vandelay/import.component.html   |  5 +-
 ...omponent.html => recent-imports.component.html} | 35 +++++++-----
 ...ts.component.ts => recent-imports.component.ts} | 66 ++++++++++++++--------
 .../src/app/staff/cat/vandelay/routing.module.ts   |  4 +-
 .../app/staff/cat/vandelay/vandelay.component.html |  2 +-
 .../src/app/staff/cat/vandelay/vandelay.module.ts  |  4 +-
 6 files changed, 75 insertions(+), 41 deletions(-)
 rename Open-ILS/src/eg2/src/app/staff/cat/vandelay/{active-imports.component.html => recent-imports.component.html} (67%)
 rename Open-ILS/src/eg2/src/app/staff/cat/vandelay/{active-imports.component.ts => recent-imports.component.ts} (56%)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
index 6f48fb649b..95be13db7a 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
@@ -150,9 +150,12 @@
     <div class="col-lg-3">
       <input [(ngModel)]="sessionName" class="form-control" type="text"/>
     </div>
-    <div class="col-lg-3" *ngIf="bibTrashGroups.length">
+    <div class="col-lg-3">
       <label i18n>Remove MARC Field Groups</label>
     </div>
+    <div class="col-lg-3" *ngIf="bibTrashGroups.length == 0">
+        <span i18n class="font-italic">No Removal Groups Configured</span>
+    </div>
     <div class="col-lg-3" *ngIf="bibTrashGroups.length">
       <select multiple [(ngModel)]="selectedTrashGroups" 
         class="form-control" size="3">
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
similarity index 67%
rename from Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html
rename to Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
index f77ae51bcb..a7a5438689 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.html
@@ -1,3 +1,16 @@
+<div class="row mb-2">
+  <div class="col-lg-6">
+    <div class="input-group">
+      <div class="input-group-prepend">
+        <span class="input-group-text" i18n>Show Sessions Since: </span>
+      </div>
+      <eg-date-select 
+        [initialIso]="sinceDate"
+        (onChangeAsIso)="dateFilterChange($event)">
+      </eg-date-select>
+    </div>
+  </div>
+</div>
 
 <div *ngIf="trackers.length == 0">
     <div class="row">
@@ -10,12 +23,14 @@
 </div>
 
   <div class="row" *ngFor="let tracker of trackers">
-    <div class="col-lg-6">
-      <div class="card">
+    <div class="col-lg-12">
+      <div class="card tight-card">
         <div class="card-header">
-          <div class="panel-title text-center">
-            <span i18n>Import Tracker 
-                <span class="font-weight-bold">{{tracker.name()}}</span></span>
+          <div class="panel-title">
+            <span i18n>
+              {{tracker.create_time() | date:'short'}} : 
+              <span class="font-weight-bold">{{tracker.name()}}</span>
+            </span>
           </div>
         </div>
         <div class="card-body">
@@ -23,19 +38,13 @@
             <div class="list-group-item border-0 p-2">
               <!-- .id (not .id()) check to see if it's fleshed yet -->
               <span i18n *ngIf="tracker.queue().id">
-                Created on {{tracker.create_time() | date}} for
                 <a class="font-weight-bold"
                   routerLink="/staff/cat/vandelay/queue/{{tracker.record_type()}}/{{tracker.queue().id()}}">
                   Queue {{tracker.queue().name()}}
                 </a>
               </span>
-            </div>
-            <div class="list-group-item border-0 p-2">
-              <span *ngIf="tracker.action_type() == 'enqueue'" i18n>Enqueuing...</span>
-              <span *ngIf="tracker.action_type() == 'import'" i18n>Importing...</span>
-            </div>
-            <div class="list-group-item border-0 p-2">
-              <span i18n>State:</span>
+              <span class="pl-2" *ngIf="tracker.action_type() == 'enqueue'" i18n>Enqueuing...</span>
+              <span class="pl-2" *ngIf="tracker.action_type() == 'import'" i18n>Importing...</span>
               <span *ngIf="tracker.state() == 'active'" i18n>Active</span>
               <span *ngIf="tracker.state() == 'complete'" i18n>Complete</span>
               <span *ngIf="tracker.state() == 'error'" i18n>Error</span>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.ts
similarity index 56%
rename from Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts
rename to Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.ts
index 6ebcb66378..55b054b1cb 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/recent-imports.component.ts
@@ -5,13 +5,14 @@ import {PcrudService} from '@eg/core/pcrud.service';
 import {VandelayService} from './vandelay.service';
 
 @Component({
-    templateUrl: 'active-imports.component.html'
+    templateUrl: 'recent-imports.component.html'
 })
 
-export class ActiveImportsComponent implements OnInit {
+export class RecentImportsComponent implements OnInit {
 
     trackers: IdlObject[];
     refreshInterval = 2000; // ms
+    sinceDate: string;
 
     constructor(
         private idl: IdlService,
@@ -24,37 +25,36 @@ export class ActiveImportsComponent implements OnInit {
 
     ngOnInit() {
         this.pollTrackers();
+        let now = new Date();
+        now.setDate(now.getDate() - 1);
+        this.sinceDate = now.toISOString();
     }
 
-    pollTrackers() {
+    dateFilterChange(iso: string) {
+        this.sinceDate = iso;
+        // TODO: kill pending setTimeout and start a new poll loop.
+    }
 
-        const prevTrackers = this.trackers;
+    pollTrackers() {
 
-        // Report on active trackers for this workstation and for the
-        // logged in user, plus any that were already reported in the
-        // current instance of the UI.
+        // Report on recent trackers for this workstation and for the
+        // logged in user.  Always show active trackers.
         const query: any = {
-            '-and' : [
+            '-and': [
                 {
                     '-or': [
                         {workstation: this.auth.user().wsid()},
                         {usr: this.auth.user().id()}
+                    ],
+                }, {
+                    '-or': [
+                        {create_time: {'>=': this.sinceDate}},
+                        {state: 'active'}
                     ]
                 }
             ]
         };
 
-        if (this.trackers.length) {
-            query['-and'].push({
-                '-or': [
-                    {state: 'active'},
-                    {id: prevTrackers.map(t => t.id())}
-                ]
-            });
-        } else {
-            query['-and'].push({state: 'active'});
-        }
-
         this.pcrud.search('vst', query, {order_by: {vst: 'create_time'}})
         .subscribe(
             tracker => {
@@ -70,9 +70,30 @@ export class ActiveImportsComponent implements OnInit {
                     existing.total_actions(tracker.total_actions());
                     existing.actions_performed(tracker.actions_performed());
                 } else {
-                    // TODO: replace enqueue trackers with import trackers
-                    // for a given session instead of appending?
-                    this.trackers.push(tracker);
+
+                    // Only show the import tracker when both an enqueue
+                    // and import tracker exist for a given session.
+                    const sameSes = this.trackers.filter(
+                        t => t.session_key() === tracker.session_key())[0];
+
+                    if (sameSes) {
+                        if (sameSes.action_type() === 'enqueue') {
+                            // Remove the enqueueu tracker
+
+                            for (let idx = 0; idx < this.trackers.length; idx++) {
+                                const trkr = this.trackers[idx];
+                                if (trkr.id() === sameSes.id()) {
+                                    this.trackers.splice(idx, 1);
+                                    break;
+                                }
+                            }
+                       } else if (sameSes.action_type() === 'import') {
+                            // Avoid adding the new enqueue tracker
+                            return;
+                        }
+                    }
+
+                    this.trackers.unshift(tracker);
                     this.fleshTrackerQueue(tracker);
                 }
             },
@@ -96,4 +117,5 @@ export class ActiveImportsComponent implements OnInit {
         this.pcrud.retrieve(qClass, tracker.queue())
         .subscribe(queue => tracker.queue(queue));
     }
+
 }
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/routing.module.ts
index aee0720a7c..707b92b9ca 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/routing.module.ts
@@ -12,7 +12,7 @@ import {HoldingsProfilesComponent} from './holdings-profiles.component';
 import {QueueItemsComponent} from './queue-items.component';
 import {MatchSetListComponent} from './match-set-list.component';
 import {MatchSetComponent} from './match-set.component';
-import {ActiveImportsComponent} from './active-imports.component';
+import {RecentImportsComponent} from './recent-imports.component';
 
 const routes: Routes = [{
   path: '',
@@ -62,7 +62,7 @@ const routes: Routes = [{
     component: MatchSetComponent
   }, {
     path: 'active_imports',
-    component: ActiveImportsComponent
+    component: RecentImportsComponent
   }]
 }];
 
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
index 24471ed8dc..a81472d674 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html
@@ -35,7 +35,7 @@
   <li class="nav-item">
     <a class="nav-link" [ngClass]="{active: tab=='active_imports'}" 
       routerLink="/staff/cat/vandelay/active_imports" 
-      i18n>Active Imports</a>
+      i18n>Recent Imports</a>
   </li>
 </ul>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts
index 1a1d9b19a9..9bbfd46a26 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.module.ts
@@ -22,7 +22,7 @@ import {MatchSetComponent} from './match-set.component';
 import {MatchSetExpressionComponent} from './match-set-expression.component';
 import {MatchSetQualityComponent} from './match-set-quality.component';
 import {MatchSetNewPointComponent} from './match-set-new-point.component';
-import {ActiveImportsComponent} from './active-imports.component';
+import {RecentImportsComponent} from './recent-imports.component';
 
 @NgModule({
   declarations: [
@@ -43,7 +43,7 @@ import {ActiveImportsComponent} from './active-imports.component';
     MatchSetExpressionComponent,
     MatchSetQualityComponent,
     MatchSetNewPointComponent,
-    ActiveImportsComponent
+    RecentImportsComponent
   ],
   imports: [
     TreeModule,
-- 
2.11.0