Merge pull request #7060 from ORNL-AMO/issue-7059

Issue 7059 - Add logic and defense for new applicationInstanceData

Author: esserhr

src/app/core/core.component.ts

@@ -143,7 +143,9 @@ export class CoreComponent implements OnInit {
     if (this.electronService.isElectron) {
       this.electronUpdateAvailableSub.unsubscribe();
       this.releaseDataSub.unsubscribe();
-      this.applicationInstanceDataSubscription.unsubscribe();
+      if (this.applicationInstanceDataSubscription) {
+        this.applicationInstanceDataSubscription.unsubscribe();
+      }
     }
     this.assessmentUpdateAvailableSub.unsubscribe();
     this.openingTutorialSub.unsubscribe();
@@ -166,7 +168,7 @@ export class CoreComponent implements OnInit {
       }
       this.setAllDbData();
     } else {
-      await this.coreService.setExistingApplicationInstanceData();
+      await this.coreService.setApplicationInstanceData();
       this.setAllDbData();
     }
 

src/app/core/core.service.ts

@@ -79,9 +79,13 @@ export class CoreService {
     this.applicationDataService.applicationInstanceData.next(applicationInstanceData);
   }
 
-  async setExistingApplicationInstanceData() {
+  async setApplicationInstanceData() {
     let existingApplicationData: Array<ApplicationInstanceData> = await firstValueFrom(this.applicationDataService.getApplicationInstanceData());
-    this.applicationDataService.applicationInstanceData.next(existingApplicationData[0]);
+    if (existingApplicationData.length === 0) {
+      await this.setNewApplicationInstanceData();
+    } else {
+      this.applicationDataService.applicationInstanceData.next(existingApplicationData[0]);
+    }
   }
 
   async createDefaultDirectories() {

src/app/dashboard/data-and-backup/data-and-backup.component.html

@@ -32,7 +32,7 @@
             <div class="card-header bold">
                 Automatic Backup
             </div>
-            <div *ngIf="electronService.isElectron" class="card-body">
+            <div *ngIf="electronService.isElectron && applicationInstanceData" class="card-body">
                 <div class="d-flex w-100 alert feature-action">
                     <div class="d-flex flex-fill">
                         <label>