From 64591796ec1c8ea38f7ef2a764f934ea435bea17 Mon Sep 17 00:00:00 2001
From: Tim Spencer <72101647+sei-tspencer@users.noreply.github.com>
Date: Thu, 2 May 2024 14:01:37 -0400
Subject: [PATCH] cwdoe-1259-1343 (#70)

---
 package.json                                  |  2 +-
 .../admin-collections.component.html          |  3 +-
 .../admin-collections.component.ts            |  6 +---
 .../admin-exhibits.component.html             |  3 +-
 .../admin-exhibits.component.ts               | 10 ++-----
 src/app/services/signalr.service.ts           | 28 +++++++++++++++----
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index f9c0cd6..6312681 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gallery-ui",
-  "version": "1.6.0",
+  "version": "1.6.1-rc1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/components/admin/admin-collections/admin-collections.component.html b/src/app/components/admin/admin-collections/admin-collections.component.html
index d030512..04415ac 100755
--- a/src/app/components/admin/admin-collections/admin-collections.component.html
+++ b/src/app/components/admin/admin-collections/admin-collections.component.html
@@ -60,7 +60,7 @@
       </button>
       <button
         mat-icon-button
-        (click)="uploadFile('json', '', ''); jsonInput.click(); $event.stopPropagation()"
+        (click)="isBusy = true; jsonInput.click(); $event.stopPropagation()"
         title="Upload Collection"
         [disabled]="isBusy"
       >
@@ -136,6 +136,7 @@
 <input
   hidden
   (change)="selectFile($event)"
+  (cancel)="isBusy = false"
   #jsonInput
   type="file"
   accept=".json"
diff --git a/src/app/components/admin/admin-collections/admin-collections.component.ts b/src/app/components/admin/admin-collections/admin-collections.component.ts
index 6954cfb..5d90f5e 100755
--- a/src/app/components/admin/admin-collections/admin-collections.component.ts
+++ b/src/app/components/admin/admin-collections/admin-collections.component.ts
@@ -199,7 +199,7 @@ export class AdminCollectionsComponent implements OnInit, OnDestroy {
         const link = document.createElement('a');
         link.href = url;
         link.target = '_blank';
-        link.download = collection.description.endsWith('.json') ? collection.description : collection.description + '.json';
+        link.download = collection.name + '-collection.json';
         link.click();
         this.isBusy = false;
       },
@@ -213,10 +213,6 @@ export class AdminCollectionsComponent implements OnInit, OnDestroy {
     );
   }
 
-  uploadFile(fileType: string, mselId: string, teamId: string) {
-    this.isBusy = true;
-  }
-
   /**
    * Selects the file(s) to be uploaded. Called when file selection is changed
    */
diff --git a/src/app/components/admin/admin-exhibits/admin-exhibits.component.html b/src/app/components/admin/admin-exhibits/admin-exhibits.component.html
index 5595b1d..76ca676 100755
--- a/src/app/components/admin/admin-exhibits/admin-exhibits.component.html
+++ b/src/app/components/admin/admin-exhibits/admin-exhibits.component.html
@@ -49,7 +49,7 @@
       </button>
       <button
         mat-icon-button
-        (click)="uploadFile('json', '', ''); jsonInput.click(); $event.stopPropagation()"
+        (click)="isBusy = true; jsonInput.click(); $event.stopPropagation()"
         title="Upload Exhibit"
         [disabled]="isBusy"
       >
@@ -175,6 +175,7 @@ <h4>Observers</h4>
 <input
   hidden
   (change)="selectFile($event)"
+  (cancel)="isBusy = false"
   #jsonInput
   type="file"
   accept=".json"
diff --git a/src/app/components/admin/admin-exhibits/admin-exhibits.component.ts b/src/app/components/admin/admin-exhibits/admin-exhibits.component.ts
index bdf1e9c..b446b63 100755
--- a/src/app/components/admin/admin-exhibits/admin-exhibits.component.ts
+++ b/src/app/components/admin/admin-exhibits/admin-exhibits.component.ts
@@ -271,7 +271,7 @@ export class AdminExhibitsComponent implements OnInit, OnDestroy {
         const month = ('0' + (exhibit.dateCreated.getMonth() + 1)).slice(-2);
         const day = ('0' + exhibit.dateCreated.getDate()).slice(-2);
         link.download = this.getCollectionName(this.selectedCollectionId) +
-          '-' + this.getUserName(exhibit.createdBy) +
+          '-exhibit-' + this.getUserName(exhibit.createdBy) +
           '-' + year + month + day + '.json';
         link.click();
         this.isBusy = false;
@@ -286,12 +286,6 @@ export class AdminExhibitsComponent implements OnInit, OnDestroy {
     );
   }
 
-  uploadFile(fileType: string, mselId: string, teamId: string) {
-    this.collectionDataService.setActive('');
-    this.exhibitList = [];
-    this.isBusy = true;
-  }
-
   /**
    * Selects the file(s) to be uploaded. Called when file selection is changed
    */
@@ -303,6 +297,8 @@ export class AdminExhibitsComponent implements OnInit, OnDestroy {
     }
     this.uploadProgress = 0;
     this.isBusy = true;
+    this.collectionDataService.setActive('');
+    this.exhibitList = [];
     this.exhibitDataService.uploadJson(file, 'events', true);
     this.jsonInput.nativeElement.value = null;
   }
diff --git a/src/app/services/signalr.service.ts b/src/app/services/signalr.service.ts
index b5822a6..586cc4a 100644
--- a/src/app/services/signalr.service.ts
+++ b/src/app/services/signalr.service.ts
@@ -24,6 +24,7 @@ import { takeUntil } from 'rxjs/operators';
 export class SignalRService implements OnDestroy {
   private hubConnection: signalR.HubConnection;
   private connectionPromise: Promise<void>;
+  private token = '';
   private unsubscribe$ = new Subject();
 
   constructor(
@@ -51,11 +52,9 @@ export class SignalRService implements OnDestroy {
 
     const accessToken = this.authService.getAuthorizationToken();
     this.hubConnection = new signalR.HubConnectionBuilder()
-      .withUrl(
-        `${this.settingsService.settings.ApiUrl}/hubs/main`, {
-          accessTokenFactory: () => this.authService.getAuthorizationToken(),
-        })
+      .withUrl(this.getHubUrlWithAuth())
       .withAutomaticReconnect(new RetryPolicy(120, 0, 5))
+      .configureLogging(signalR.LogLevel.Information)
       .build();
 
     this.hubConnection.onreconnected(() => {
@@ -69,11 +68,30 @@ export class SignalRService implements OnDestroy {
     return this.connectionPromise;
   }
 
+  private getHubUrlWithAuth(): string {
+    const accessToken = this.authService.getAuthorizationToken();
+    if (accessToken !== this.token) {
+      this.token = accessToken;
+      if (!this.token) {
+        location.reload();
+      }
+    }
+    const hubUrl = `${this.settingsService.settings.ApiUrl}/hubs/main?bearer=${accessToken}`;
+    return hubUrl;
+  }
+
   private reconnect() {
     if (this.hubConnection != null) {
       this.hubConnection.stop().then(() => {
+        this.hubConnection.baseUrl = this.getHubUrlWithAuth();
         this.connectionPromise = this.hubConnection.start();
-        this.connectionPromise.then(() => this.join());
+        this.connectionPromise.then(() => {
+          if (this.hubConnection.state !== signalR.HubConnectionState.Connected) {
+            setTimeout(() => this.reconnect(), 500);
+          } else {
+            this.join();
+          }
+        });
       });
     }
   }