From a1e331d69cecac4933d02b42f8851fbaafd45dc2 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 8 Apr 2021 17:50:55 -0500
Subject: [PATCH 01/36] Add save to file functionality.

---
 .../control-bar/control-bar.component.html     |  6 ++++++
 .../control-bar/control-bar.component.ts       | 18 ++++++++++++++++++
 .../modal-file-browser.component.html          |  3 +--
 .../modal-file-browser.component.ts            |  1 +
 src/app/services/projects.service.ts           | 15 ++++++++++++++-
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/app/components/control-bar/control-bar.component.html b/src/app/components/control-bar/control-bar.component.html
index d39d600b..bf640e39 100644
--- a/src/app/components/control-bar/control-bar.component.html
+++ b/src/app/components/control-bar/control-bar.component.html
@@ -6,6 +6,12 @@
         <i class="fas fa-spin fa-spinner"></i>
     </div>
     <div *ngIf="!loadingActiveProject && !loadingActiveProjectFailed" class="cell small-8 align-middle grid-x">
+        <button class="button tiny" (click)="openSaveProjectModal()">
+          <i class="fas fa-save"></i>
+          <div style="display: inline-block; margin-left: 5px">
+            Save
+          </div>
+        </button>
         <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>
         <div *ngIf="loadingData" style="margin-left: 1rem">
             <i class="fas fa-spin fa-spinner" style="margin-right: 0.3rem"></i>
diff --git a/src/app/components/control-bar/control-bar.component.ts b/src/app/components/control-bar/control-bar.component.ts
index 3204b676..6569a96b 100644
--- a/src/app/components/control-bar/control-bar.component.ts
+++ b/src/app/components/control-bar/control-bar.component.ts
@@ -1,11 +1,13 @@
 import {Component, OnInit, OnDestroy, Input} from '@angular/core';
 import { ProjectsService } from '../../services/projects.service';
 import { Project } from '../../models/models';
+import { BsModalRef, BsModalService } from 'ngx-foundation';
 import { GeoDataService } from '../../services/geo-data.service';
 import {LatLng} from 'leaflet';
 import {skip} from 'rxjs/operators';
 import {combineLatest, Subscription} from 'rxjs';
 import {NotificationsService} from '../../services/notifications.service';
+import { ModalFileBrowserComponent } from '../modal-file-browser/modal-file-browser.component';
 
 @Component({
   selector: 'app-control-bar',
@@ -20,8 +22,10 @@ export class ControlBarComponent implements OnInit, OnDestroy {
   private loadingActiveProject = true;
   private loadingActiveProjectFailed = false;
   private loadingData = false;
+  modalRef: BsModalRef;
 
   constructor(private projectsService: ProjectsService,
+              private bsModalService: BsModalService,
               private geoDataService: GeoDataService,
               private notificationsService: NotificationsService,
               ) { }
@@ -60,6 +64,20 @@ export class ControlBarComponent implements OnInit, OnDestroy {
     }));
   }
 
+  openSaveProjectModal() {
+    const initialState = {
+      single: true,
+      allowFolders: true,
+      onlyFolder: true,
+    };
+    const modal: BsModalRef = this.bsModalService.show(ModalFileBrowserComponent, { initialState });
+    modal.content.onClose.subscribe( (next) => {
+      this.projectsService.saveProject(this.activeProject.uuid,
+                                       next[0].path,
+                                       next[0].system)
+    });
+  }
+
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }
diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.html b/src/app/components/modal-file-browser/modal-file-browser.component.html
index 2b60b68e..49dbd952 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.html
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.html
@@ -2,11 +2,10 @@
   [single]=single
   [allowFolders]=allowFolders
   [allowedExtensions]=allowedExtensions
+  [onlyFolder]=onlyFolder
   (selection)="onSelect($event)">
 </app-file-browser>
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>
     <button class="button" [disabled]="!selectedFiles.length" (click)="close()">Import</button>
 </div>
-
-
diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.ts b/src/app/components/modal-file-browser/modal-file-browser.component.ts
index eeec4bb6..c15c4da9 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.ts
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.ts
@@ -13,6 +13,7 @@ export class ModalFileBrowserComponent implements OnInit {
   @Input() allowedExtensions: Array<string> = this.tapisFilesService.IMPORTABLE_FEATURE_TYPES;
   @Input() single: false;
   @Input() allowFolders: false;
+  @Input() onlyFolder: false;
   selectedFiles: Array<RemoteFile> = [];
   public onClose: Subject<Array<RemoteFile>> = new Subject<Array<RemoteFile>>();
   constructor(private modalRef: BsModalRef, private tapisFilesService: TapisFilesService) { }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 56cc0701..d3c9fd11 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -112,6 +112,19 @@ export class ProjectsService {
       );
   }
 
+  saveProject(projectUUID: string, path: string, system: string) {
+    const payload = {
+      project_uuid: projectUUID,
+      path,
+      system_id: system
+    };
+    this.http.post<any>(this.envService.apiUrl + `/projects/save/`, payload).subscribe(resp => {
+      this.notificationsService.showSuccessToast(`Saved file to ${system}/${path}/${projectUUID}.hazmapper`)
+    }, error => {
+      console.log(error);
+    });
+  }
+
   setActiveProjectUUID(uuid: string): void {
     this._loadingActiveProject.next(true);
     this._loadingActiveProjectFailed.next(false);
@@ -193,4 +206,4 @@ export class ProjectsService {
       );
   }
 
-}
\ No newline at end of file
+}

From d8ca261a11425a354890232b3eb39dbcd8d734ac Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 21 Apr 2021 15:39:50 -0500
Subject: [PATCH 02/36] Improve project save.

---
 src/app/app.module.ts                         |   7 +-
 .../control-bar/control-bar.component.html    |   9 +-
 .../control-bar/control-bar.component.ts      |  15 +-
 .../file-browser/file-browser.component.ts    |   5 +-
 .../main-welcome/main-welcome.component.html  |  45 ++++--
 .../main-welcome/main-welcome.component.styl  |  13 +-
 .../modal-create-project.component.html       |  22 ++-
 .../modal-create-project.component.ts         |  15 +-
 .../modal-file-browser.component.html         |   5 +-
 .../modal-link-project.component.html         |  28 ++++
 .../modal-link-project.component.spec.ts      |  25 ++++
 .../modal-link-project.component.styl         |  10 ++
 .../modal-link-project.component.ts           |  59 ++++++++
 .../project-browser.component.html            |  16 ++
 .../project-browser.component.spec.ts         |  25 ++++
 .../project-browser.component.styl            |  14 ++
 .../project-browser.component.ts              |  39 +++++
 .../public-map-info-panel.component.html      |   5 +-
 .../users-panel/users-panel.component.html    |  18 +++
 .../users-panel/users-panel.component.ts      |  40 +++++
 src/app/models/models.ts                      |   2 +
 src/app/services/projects.service.ts          |  17 ++-
 src/assets/designsafe.svg                     | 138 ++++++++++++++++++
 src/assets/nheri.png                          | Bin 0 -> 12528 bytes
 24 files changed, 519 insertions(+), 53 deletions(-)
 create mode 100644 src/app/components/modal-link-project/modal-link-project.component.html
 create mode 100644 src/app/components/modal-link-project/modal-link-project.component.spec.ts
 create mode 100644 src/app/components/modal-link-project/modal-link-project.component.styl
 create mode 100644 src/app/components/modal-link-project/modal-link-project.component.ts
 create mode 100644 src/app/components/project-browser/project-browser.component.html
 create mode 100644 src/app/components/project-browser/project-browser.component.spec.ts
 create mode 100644 src/app/components/project-browser/project-browser.component.styl
 create mode 100644 src/app/components/project-browser/project-browser.component.ts
 create mode 100644 src/assets/designsafe.svg
 create mode 100644 src/assets/nheri.png

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6f804dc4..5b123de6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -52,6 +52,8 @@ import { MainProjectComponent } from './components/main-project/main-project.com
 import {DragDropModule, CDK_DRAG_CONFIG} from '@angular/cdk/drag-drop';
 import { LoginComponent } from './components/login/login.component';
 import { LogoutComponent } from './components/logout/logout.component';
+import { ProjectBrowserComponent } from './components/project-browser/project-browser.component';
+import { ModalLinkProjectComponent } from './components/modal-link-project/modal-link-project.component';
 
 @NgModule({
   declarations: [
@@ -87,6 +89,8 @@ import { LogoutComponent } from './components/logout/logout.component';
     MainProjectComponent,
     LoginComponent,
     LogoutComponent,
+    ProjectBrowserComponent,
+    ModalLinkProjectComponent,
   ],
   imports: [
     CommonModule,
@@ -151,6 +155,7 @@ import { LogoutComponent } from './components/logout/logout.component';
     ModalCreatePointCloudComponent,
     ModalCreateOverlayComponent,
     ModalCreateTileServerComponent,
-    ModalPointCloudInfoComponent]
+    ModalPointCloudInfoComponent,
+    ModalLinkProjectComponent]
 })
 export class AppModule { }
diff --git a/src/app/components/control-bar/control-bar.component.html b/src/app/components/control-bar/control-bar.component.html
index bf640e39..4ab822fe 100644
--- a/src/app/components/control-bar/control-bar.component.html
+++ b/src/app/components/control-bar/control-bar.component.html
@@ -6,13 +6,10 @@
         <i class="fas fa-spin fa-spinner"></i>
     </div>
     <div *ngIf="!loadingActiveProject && !loadingActiveProjectFailed" class="cell small-8 align-middle grid-x">
-        <button class="button tiny" (click)="openSaveProjectModal()">
-          <i class="fas fa-save"></i>
-          <div style="display: inline-block; margin-left: 5px">
-            Save
-          </div>
-        </button>
         <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>
+        <div *ngIf="activeProject.system_name" style="padding-left: 30px">
+          <span>Project: {{activeProject.system_name}}</span>
+        </div>
         <div *ngIf="loadingData" style="margin-left: 1rem">
             <i class="fas fa-spin fa-spinner" style="margin-right: 0.3rem"></i>
             <span>Loading Data</span>
diff --git a/src/app/components/control-bar/control-bar.component.ts b/src/app/components/control-bar/control-bar.component.ts
index 6569a96b..1ed77f72 100644
--- a/src/app/components/control-bar/control-bar.component.ts
+++ b/src/app/components/control-bar/control-bar.component.ts
@@ -8,6 +8,7 @@ import {skip} from 'rxjs/operators';
 import {combineLatest, Subscription} from 'rxjs';
 import {NotificationsService} from '../../services/notifications.service';
 import { ModalFileBrowserComponent } from '../modal-file-browser/modal-file-browser.component';
+import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
 
 @Component({
   selector: 'app-control-bar',
@@ -64,20 +65,6 @@ export class ControlBarComponent implements OnInit, OnDestroy {
     }));
   }
 
-  openSaveProjectModal() {
-    const initialState = {
-      single: true,
-      allowFolders: true,
-      onlyFolder: true,
-    };
-    const modal: BsModalRef = this.bsModalService.show(ModalFileBrowserComponent, { initialState });
-    modal.content.onClose.subscribe( (next) => {
-      this.projectsService.saveProject(this.activeProject.uuid,
-                                       next[0].path,
-                                       next[0].system)
-    });
-  }
-
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }
diff --git a/src/app/components/file-browser/file-browser.component.ts b/src/app/components/file-browser/file-browser.component.ts
index ac59e6e8..ce6c3838 100644
--- a/src/app/components/file-browser/file-browser.component.ts
+++ b/src/app/components/file-browser/file-browser.component.ts
@@ -25,6 +25,7 @@ export class FileBrowserComponent implements OnInit {
   @Input() helpText = 'Note: Only files are selectable, not folders. Double click on a folder to navigate into it.';
   @Input() allowedExtensions: Array<string> = [];
   @Output() selection: EventEmitter<Array<RemoteFile>> = new EventEmitter<Array<RemoteFile>>();
+  @Output() systemSelection: EventEmitter<any> = new EventEmitter<any>();
 
   private currentUser: AuthenticatedUser;
   private currentDirectory: RemoteFile;
@@ -65,8 +66,9 @@ export class FileBrowserComponent implements OnInit {
         this.myDataSystem = systems.find( (sys) => sys.id === 'designsafe.storage.default');
         this.communityDataSystem = systems.find( (sys) => sys.id === 'designsafe.storage.community');
         this.publishedDataSystem = systems.find( (sys) => sys.id === 'designsafe.storage.published');
-        this.selectedSystem = this.myDataSystem;
         this.projects = projects;
+        this.selectedSystem = this.myDataSystem;
+        this.systemSelection.next(this.myDataSystem);
         this.currentUser = user;
         const init = <RemoteFile> {
           system: this.myDataSystem.id,
@@ -86,6 +88,7 @@ export class FileBrowserComponent implements OnInit {
       type: 'dir',
       path: pth
     };
+    this.systemSelection.next(system)
     this.browse(init);
   }
 
diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index fce42dbb..710c10e6 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -9,11 +9,14 @@
 
     <div class="grid-x align-center">
       <div id=welcome-projects-list class="grid-y align-center">
-        <div class="welcome-project-header grid-x align-justify">
-          <div>
+        <div class="welcome-project-header grid-x">
+          <div class="list-column">
             <b>Maps</b>
           </div>
-          <div>
+          <div class="list-column">
+            <b>Linked Project</b>
+          </div>
+          <div class="list-column" style="text-align: right">
             <div id="new-map" (click)="openCreateProjectModal()">
               <i class="fas fa-plus"></i>
               Create a New Map
@@ -40,18 +43,28 @@
 
           <ng-template #projectDisconnected>
             <div *ngIf="projects.length > 0; else noProject" class="project-list-container">
-              <div *ngFor="let p of projects; let indexOfelement=index;">
+              <div *ngFor="let p of projects; let indexOfElement=index;">
                 <div (dblclick)="routeToProject(p.uuid)"
                      class="project-list-item"
                      [ngClass]="{
-                                 'welcome-project-light': (indexOfelement % 2) == 0,
-                                 'welcome-project-dark': (indexOfelement % 2) == 1,
+                                 'welcome-project-light': (indexOfElement % 2) == 0,
+                                 'welcome-project-dark': (indexOfElement % 2) == 1,
                                  'welcome-project': true,
-                                 'grid-x': true,
-                                 'align-justify' :true
+                                 'grid-x': true
                                  }">
-                  {{p.name}}
-                  <div>
+
+                  <div class="list-column">
+                    {{p.name}}
+                  </div>
+
+                  <div class="list-column">
+                    <ng-container *ngIf="p.system_name" class="list-column link-hover">
+                      <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
+                        <span>{{p.system_name}}</span>
+                      </a>
+                    </ng-container>
+                  </div>
+                  <div class="list-column" style="text-align: right">
                     <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
                       <i class="fas fa-folder-open"></i>
                     </button>
@@ -88,8 +101,16 @@
       </div>
     </div>
 
-    <div class="grid-x" id="sponsor">Powered by
-      <img src="assets/nsf.png" width="50px">
+    <div class="grid-x" id="sponsor">
+      <a href="https://www.nsf.gov/">
+        <img src="assets/nsf.png" width="60px">
+      </a>
+      <a href="https://www.designsafe-ci.org/">
+        <img src="assets/designsafe.svg" width="200px">
+      </a>
+      <a href="https://www.designsafe-ci.org/about/">
+        <img src="assets/nheri.png" width="150px">
+      </a>
     </div>
 
   </div>
diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index b15606d2..f9c6e115 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -14,7 +14,8 @@
     #user-guide
       width: 550px
       text-align: right
-    
+  .list-column
+    width: 187px
   #sponsor
     height: 50px
     display: flex
@@ -22,7 +23,7 @@
     justify-content: center
     background-color: #f7f7f7
     img
-      padding-left: 5px
+      padding-left: 10px
   #welcome-background
     background-color: #f7f7f7
     height: calc(100% - 40px)
@@ -40,21 +41,21 @@
         .project-list-item-button
           cursor: pointer
           margin: 0px 10px
+          :hover
+            color: #fff
     .welcome-project-header
       font-size: 14px
       padding: 12px
       background-color: #d0d0d0
     .welcome-project-light
-      font-size: 14px
-      padding: 12px
       background-color: #ffffff
     .welcome-project-dark
-      font-size: 14px
-      padding: 12px
       background-color: #eeeeee
     .welcome-project:hover
       color: #ffffff
       background-color: #3c6fdb
+      a
+        color: #ADDFFF
     #welcome-no-information
       height: 100%
       display: flex
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 5932fbed..b1e4d536 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -10,9 +10,22 @@ <h4> Create a new Map </h4>
             <label> Description
                 <textarea formControlName="description" required="true"></textarea>
             </label>
+
+            <div class="link-project">
+              <label>
+                <span style="padding-right: 10px">Link Project</span>
+                <input formControlName="linkProject" type="checkbox" [(ngModel)]="linkProject">
+              </label>
+
+            </div>
+            <div *ngIf="linkProject">
+              <app-project-browser
+                (selection)="onProjectSelection($event)">
+              </app-project-browser>
+            </div>
             <div class="button-group small">
                 <button class="button small warning" type="button" (click)="close()">Close</button>
-                <button class="button small align-right" type="submit" [disabled]="!projCreateForm.valid || submitting">Submit</button>
+                <button class="button small align-right" type="submit" [disabled]="(!projCreateForm.valid || submitting || (linkProject && !dsProject))">Submit</button>
             </div>
         </form>
     </tab>
@@ -22,8 +35,10 @@ <h4> Create a new Map </h4>
           [onlyFolder]="true"
           [single]="true"
           [heading]="'Select a RApp Folder'"
+          [allowedExtensions]="allowedExtensions"
           [helpText]="'All files inside this folder (that can be) will be imported. ' +
-           'This folder will also be periodically scraped for new data.'"
+           'This folder will also be periodically scraped for new data.' +
+           'A project link will be created with the project of this folder.'"
           (selection)="onFolderSelection($event)"
         >
         </app-file-browser>
@@ -34,6 +49,3 @@ <h4> Create a new Map </h4>
         </div>
     </tab>
 </tabset>
-
-
-
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 95ca0a16..34815b3f 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -18,7 +18,9 @@ export class ModalCreateProjectComponent implements OnInit {
 
   projCreateForm: FormGroup;
   rapidFolder: RemoteFile;
+  linkProject = false;
   submitting: boolean;
+  dsProject: any;
   errorMessage = '';
 
   constructor(private bsModalRef: BsModalRef, private projectsService: ProjectsService) { }
@@ -27,9 +29,9 @@ export class ModalCreateProjectComponent implements OnInit {
     this.submitting = false;
     this.projCreateForm = new FormGroup( {
       name: new FormControl(''),
-      description: new FormControl('')
+      description: new FormControl(''),
+      linkProject: new FormControl(false)
     });
-
   }
 
   close(project: Project) {
@@ -41,6 +43,10 @@ export class ModalCreateProjectComponent implements OnInit {
     this.rapidFolder = item[0];
   }
 
+  onProjectSelection(item: any) {
+    this.dsProject = item;
+  }
+
   createRapidProject() {
     this.errorMessage = '';
     const req: RapidProjectRequest = new RapidProjectRequest(this.rapidFolder.system, this.rapidFolder.path)
@@ -57,11 +63,14 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
+      if (this.linkProject) {
+        // console.log(this.linkProject)
+        this.projectsService.linkExportProject(project, this.dsProject.id, '/');
+      }
       this.close(project);
     }, err => {
       this.errorMessage = err.toString();
     });
     this.submitting = true;
   }
-
 }
diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.html b/src/app/components/modal-file-browser/modal-file-browser.component.html
index 49dbd952..58fef4e8 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.html
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.html
@@ -3,9 +3,10 @@
   [allowFolders]=allowFolders
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
-  (selection)="onSelect($event)">
+  (selection)="onSelect($event)"
+  (systemSelection)="onSystemSelect($event)">
 </app-file-browser>
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>
-    <button class="button" [disabled]="!selectedFiles.length" (click)="close()">Import</button>
+    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles" (click)="close()">Import</button>
 </div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
new file mode 100644
index 00000000..060cddef
--- /dev/null
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -0,0 +1,28 @@
+<app-file-browser
+  [single]=single
+  [allowFolders]=allowFolders
+  [allowedExtensions]=allowedExtensions
+  [onlyFolder]=onlyFolder
+  [heading]="'Select Export Location'"
+  [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
+           'If you select a project, you can link the current map to the project.'"
+  (selection)="onSelect($event)"
+  (systemSelection)="onSystemSelect($event)">
+</app-file-browser>
+
+<div class="link-project">
+  <label>
+    <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
+    <input #linkCheckbox type="checkbox"
+           [disabled]="this.selectedSystem && !this.selectedSystem.id.includes('project')"
+           [(ngModel)]="linkProject">
+  </label>
+  <div *ngIf="linkCheckbox.disabled">
+    <small><em>Must be in a project folder to link!</em></small>
+  </div>
+</div>
+
+<div>
+    <button class="button warning" (click)="cancel()">Cancel</button>
+    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles" (click)="close()">Import</button>
+</div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.spec.ts b/src/app/components/modal-link-project/modal-link-project.component.spec.ts
new file mode 100644
index 00000000..1b802959
--- /dev/null
+++ b/src/app/components/modal-link-project/modal-link-project.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModalLinkProjectComponent } from './modal-link-project.component';
+
+describe('ModalLinkProjectComponent', () => {
+  let component: ModalLinkProjectComponent;
+  let fixture: ComponentFixture<ModalLinkProjectComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ModalLinkProjectComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ModalLinkProjectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/modal-link-project/modal-link-project.component.styl b/src/app/components/modal-link-project/modal-link-project.component.styl
new file mode 100644
index 00000000..3f5a1661
--- /dev/null
+++ b/src/app/components/modal-link-project/modal-link-project.component.styl
@@ -0,0 +1,10 @@
+:host
+  .dimmed
+    color: #ccc
+  .link-project
+    padding: 20px
+    label
+      font-size: 19px
+      span
+        padding-right: 10px
+  
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
new file mode 100644
index 00000000..fd34bba5
--- /dev/null
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -0,0 +1,59 @@
+import {Component, Input, OnInit} from '@angular/core';
+import { RemoteFile} from 'ng-tapis/models/remote-file';
+import { BsModalRef } from 'ngx-foundation/modal/bs-modal-ref.service';
+import { Subject } from 'rxjs';
+import { TapisFilesService } from '../../services/tapis-files.service';
+import {ChangeDetectorRef } from '@angular/core';
+
+
+@Component({
+  selector: 'app-modal-link-project',
+  templateUrl: './modal-link-project.component.html',
+  styleUrls: ['./modal-link-project.component.styl']
+})
+export class ModalLinkProjectComponent implements OnInit {
+  @Input() allowedExtensions: Array<string> = this.tapisFilesService.IMPORTABLE_FEATURE_TYPES;
+  @Input() single: false;
+  @Input() allowFolders: false;
+  @Input() onlyFolder: false;
+  @Input() allowEmptyFiles: false;
+  selectedFiles: Array<RemoteFile> = [];
+  selectedSystem: any;
+  linkProject: boolean = false;
+  public onCloseAll: Subject<any> = new Subject<any>();
+  constructor(private modalRef: BsModalRef,
+              private tapisFilesService: TapisFilesService,
+              private cdref: ChangeDetectorRef ) { }
+
+  ngOnInit() {
+  }
+
+  ngAfterContentChecked() {
+    this.cdref.detectChanges();
+  }
+
+  onSelect(items: Array<RemoteFile>) {
+    this.selectedFiles = items;
+  }
+
+  onSystemSelect(system: any) {
+    this.selectedSystem = system;
+  }
+
+  testIt(hw) {
+    console.log(hw.disabled);
+  }
+
+  close() {
+    this.onCloseAll.next({
+      fileList: this.selectedFiles,
+      linkProject: this.linkProject,
+      system: this.selectedSystem
+    });
+    this.modalRef.hide();
+  }
+
+  cancel() {
+    this.modalRef.hide();
+  }
+}
diff --git a/src/app/components/project-browser/project-browser.component.html b/src/app/components/project-browser/project-browser.component.html
new file mode 100644
index 00000000..b79756a5
--- /dev/null
+++ b/src/app/components/project-browser/project-browser.component.html
@@ -0,0 +1,16 @@
+<h6>
+  Select a project to link to
+</h6>
+<div *ngIf="projects; else spin" class="selection-container">
+  <div *ngFor="let p of projects; let selectIndex = index">
+    <div (click)="select(p, selectIndex)"
+         [ngClass]="{'selected': selectIndex == currentIndex, 'selection-item': true}">
+      {{p.description}}
+    </div>
+  </div>
+</div>
+<ng-template #spin>
+  <div style="padding: 30px">
+    <i class="fas fa-spin fa-spinner"></i>
+  </div>
+</ng-template>
diff --git a/src/app/components/project-browser/project-browser.component.spec.ts b/src/app/components/project-browser/project-browser.component.spec.ts
new file mode 100644
index 00000000..ea0a9bc7
--- /dev/null
+++ b/src/app/components/project-browser/project-browser.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProjectBrowserComponent } from './project-browser.component';
+
+describe('ProjectBrowserComponent', () => {
+  let component: ProjectBrowserComponent;
+  let fixture: ComponentFixture<ProjectBrowserComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProjectBrowserComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProjectBrowserComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/project-browser/project-browser.component.styl b/src/app/components/project-browser/project-browser.component.styl
new file mode 100644
index 00000000..857b24a6
--- /dev/null
+++ b/src/app/components/project-browser/project-browser.component.styl
@@ -0,0 +1,14 @@
+@import '../../../variables.styl'
+
+:host
+  .selection-container
+    padding: 15px
+    background: #f9f9f9
+    margin-bottom: 20px
+  .selection-item
+    border 1px solid transparent
+  .selection-item:hover
+    border 1px solid #ccc
+    user-select: none
+  .selected
+    background: #d3d3d3
\ No newline at end of file
diff --git a/src/app/components/project-browser/project-browser.component.ts b/src/app/components/project-browser/project-browser.component.ts
new file mode 100644
index 00000000..99c3a1da
--- /dev/null
+++ b/src/app/components/project-browser/project-browser.component.ts
@@ -0,0 +1,39 @@
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import {SystemSummary} from 'ng-tapis';
+import {AgaveSystemsService} from '../../services/agave-systems.service';
+import { take } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-project-browser',
+  templateUrl: './project-browser.component.html',
+  styleUrls: ['./project-browser.component.styl']
+})
+export class ProjectBrowserComponent implements OnInit {
+
+  static limit = 200;
+  public projects: Array<SystemSummary>;
+  public hasError: boolean;
+  private currentIndex = 0;
+  public inProgress = true;
+  private offset = 0;
+
+  @Output() selection: EventEmitter<any> = new EventEmitter<any>();
+
+  constructor(private agaveSystemsService: AgaveSystemsService) { }
+
+  ngOnInit() {
+    this.agaveSystemsService.list();
+    this.agaveSystemsService.projects.pipe(take(1)).subscribe(projects => {
+      this.selection.next(projects[0]);
+      this.projects = projects;
+    })
+  }
+
+
+  select(system: any, index: number) {
+    console.log(system);
+    this.selection.next(system);
+    this.currentIndex = index;
+  }
+
+}
diff --git a/src/app/components/public-map-info-panel/public-map-info-panel.component.html b/src/app/components/public-map-info-panel/public-map-info-panel.component.html
index 369263fe..87973639 100644
--- a/src/app/components/public-map-info-panel/public-map-info-panel.component.html
+++ b/src/app/components/public-map-info-panel/public-map-info-panel.component.html
@@ -5,7 +5,10 @@
   <div class="dock-panel-content">
     <h5>Name:</h5>
     <span>{{activeProject.name}}</span>
+    <div *ngIf="activeProject.system_name">
+      <span>{{activeProject.system_name}}</span>
+    </div>
     <h5>Description:</h5>
     <span>{{activeProject.description}}</span>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 51684fc2..92065cca 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -34,6 +34,17 @@ <h6 id="property-title">Description:</h6>
       >
       </app-edit-name-input>
 
+      <h6 id="property-title">Linked Project</h6>
+      <div *ngIf="activeProject.system_name; else noLink" style="margin-bottom: 20px">
+        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span>{{activeProject.system_name}}</span></a>
+      </div>
+      <ng-template #noLink>
+        <div style="margin-bottom: 20px">
+          No link! <br />
+          <em>You must export the map to a project.</em>
+        </div>
+      </ng-template>
+
       <h6 id="property-title">Public Access</h6>
 
       <div *ngIf="activeProject.public" class="public-status-container">
@@ -53,9 +64,16 @@ <h6 id="property-title">Public Access</h6>
           <i class="fas fa-globe"></i>  Make map public
         </button>
       </div>
+
+
+      <div class="grid-x">
+      <button class="button hollow" (click)=openExportProjectModal()>
+        <i class="fas fa-save"></i>  Export map
+      </button>
       <button class="button warning alert hollow" (click)=deleteProject()>
         <i class="fas fa-trash"></i>  Delete map
       </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 8cd0abfe..5fc28ebc 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -1,10 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import {ProjectsService} from '../../services/projects.service';
 import {ModalService} from '../../services/modal.service';
+import { BsModalRef, BsModalService } from 'ngx-foundation';
 import {IProjectUser} from '../../models/project-user';
 import {FormGroup, FormControl} from '@angular/forms';
 import {Project} from '../../models/models';
 import {EnvService} from '../../services/env.service';
+import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
+import { ModalFileBrowserComponent } from '../modal-file-browser/modal-file-browser.component';
 
 @Component({
   selector: 'app-users-panel',
@@ -23,6 +26,7 @@ export class UsersPanelComponent implements OnInit {
   publicStatusChangingError = false;
 
   constructor(private projectsService: ProjectsService,
+              private bsModalService: BsModalService,
               private modalService: ModalService,
               private envService: EnvService) { }
 
@@ -45,6 +49,42 @@ export class UsersPanelComponent implements OnInit {
    return publicUrl;
   }
 
+  openLinkProjectModal() {
+    const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent);
+    modal.content.onClose.subscribe( (next) => {
+      console.log(next.id);
+      // this.projectsService.linkExportProject(this.activeProject, next.id);
+    });
+  }
+
+  openExportProjectModal() {
+    const initialState = {
+      single: true,
+      allowFolders: true,
+      onlyFolder: true,
+      allowEmptyFiles: true,
+      allowedExtensions: []
+    };
+    const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
+    modal.content.onCloseAll.subscribe( (next) => {
+      const path = next.fileList.length > 0 ? next.fileList[0].path : '/';
+      console.log(path);
+      console.log(next);
+      console.log(next.system.id)
+      if (next.system.id.includes('project') && next.linkProject) {
+        console.log("awesome.");
+        this.projectsService.linkExportProject(this.activeProject,
+                                               next.system.id,
+                                               path)
+      } else {
+        console.log("Fridge");
+        this.projectsService.exportProject(this.activeProject.uuid,
+                                           next.system.id,
+                                           path)
+      }
+    });
+  }
+
   updateMapPublicAccess(makePublic: boolean) {
     const title = makePublic ? 'Make map public' : 'Make map private';
     const message = makePublic ? 'Are you sure you want to make this map public?'
diff --git a/src/app/models/models.ts b/src/app/models/models.ts
index f84ba35e..54b20b47 100644
--- a/src/app/models/models.ts
+++ b/src/app/models/models.ts
@@ -49,6 +49,8 @@ export interface Project {
   name: string;
   uuid?: string;
   public?: boolean;
+  system_name?: string;
+  system_id?: string;
 }
 
 export class Project implements Project {
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index d3c9fd11..5fd9a71a 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -96,6 +96,19 @@ export class ProjectsService {
       );
   }
 
+  linkExportProject(proj: Project, systemId: string, path: string = '/') {
+    const data = {
+      systemId,
+      path
+    };
+
+    this.http.put<Project>(this.envService.apiUrl + `/projects/${proj.id}/link`, data).subscribe(
+        proj => {
+          this._projects.next([...this._projects.value, proj]);
+        }
+      );
+  }
+
   createRapidProject(data: RapidProjectRequest) {
     return this.http.post<Project>(this.envService.apiUrl + `/projects/rapid/`, data)
       .pipe(
@@ -112,13 +125,13 @@ export class ProjectsService {
       );
   }
 
-  saveProject(projectUUID: string, path: string, system: string) {
+  exportProject(projectUUID: string, system: string, path: string) {
     const payload = {
       project_uuid: projectUUID,
       path,
       system_id: system
     };
-    this.http.post<any>(this.envService.apiUrl + `/projects/save/`, payload).subscribe(resp => {
+    this.http.post<any>(this.envService.apiUrl + `/projects/export/`, payload).subscribe(resp => {
       this.notificationsService.showSuccessToast(`Saved file to ${system}/${path}/${projectUUID}.hazmapper`)
     }, error => {
       console.log(error);
diff --git a/src/assets/designsafe.svg b/src/assets/designsafe.svg
new file mode 100644
index 00000000..48f4fee6
--- /dev/null
+++ b/src/assets/designsafe.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 290.6 35.7" style="enable-background:new 0 0 290.6 35.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#CB463F;}
+	.st1{opacity:0.25;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#565656;}
+	.st4{fill:#136AC9;}
+	.st5{fill:#4D4E4E;}
+	.st6{fill:#48A59D;}
+</style>
+<path class="st0" d="M14.3,6H6.1v22h8.1c6.1,0.1,11.1-4.9,11.2-11c0,0,0,0,0,0l0,0l0,0C25.4,10.9,20.4,6,14.3,6
+	C14.3,6,14.3,6,14.3,6z M13.3,10.9c3.7,0,6.3,2.2,6.3,6.2c0,4.3-2.9,6.1-6.3,6.1h-1.3V10.9L13.3,10.9z"/>
+<polygon class="st0" points="27.3,6 27.3,28 27.3,28 39.9,28 39.9,28 39.9,23.2 39.9,23.2 33.1,23.2 33.1,19.4 39.5,19.4 39.5,19.4 
+	39.5,14.5 39.5,14.5 33.1,14.5 33.1,10.9 39.9,10.9 39.9,10.8 39.9,6 39.9,6 27.3,6 "/>
+<path class="st0" d="M52.5,14.6L51,14.1c-1-0.3-2.5-0.8-2.5-2.1s1.4-1.8,2.5-1.8c1.4,0,2.7,0.5,3.8,1.5L57,7.2l0,0l0,0
+	c-2.1-1.2-4.5-1.8-6.9-1.8c-4.4,0-7.6,2.9-7.6,7.4l0,0c0,4.3,2.4,5.2,6,6.2c1.2,0.4,3.5,0.9,3.5,2.5s-1.4,2.2-2.8,2.2
+	c-1.9-0.1-3.7-0.9-5.1-2.3l-2.5,4.6l0,0l0,0c2.3,1.6,5,2.5,7.8,2.5c2.3,0.1,4.5-0.7,6.2-2.1c1.6-1.5,2.4-3.7,2.3-5.9l0,0l0,0
+	C57.9,17,55.5,15.5,52.5,14.6z"/>
+<polygon class="st0" points="59.8,6 59.8,28 59.8,28 65.6,28 65.6,28 65.6,6 65.6,6 59.8,6 "/>
+<path class="st0" d="M79.1,15.7v4.5h4.7c-0.2,2.5-2.1,3.8-4.6,3.8c-3.8,0-5.8-3.5-5.8-6.9s2-6.9,5.7-6.9c2.2,0,4.1,1.4,4.8,3.5
+	l5.4-2.3l0,0l0,0c-1.9-4.1-5.4-6.2-9.9-6.2c-7.1,0-11.9,4.7-11.9,11.9l0,0l0,0c0,6.9,4.8,11.6,11.7,11.6c3.6,0.2,7-1.4,9.1-4.3
+	c2-2.8,2.2-5.5,2.2-8.7l0,0l0,0L79.1,15.7z"/>
+<polygon class="st0" points="108.6,6 108.6,6 108.6,19.5 108.6,19.5 98.1,6 92.3,6 92.3,6 92.3,28 92.3,28 98.1,28 98.1,28 
+	98.1,14.5 98.1,14.5 108.6,28 114.3,28 114.3,28 114.3,6 114.3,6 "/>
+<g class="st1">
+	<path class="st2" d="M18.9,19.9l0.1-0.1L18.9,19.9z"/>
+	<path class="st2" d="M18.6,20.5l0.1-0.1L18.6,20.5z"/>
+	<path class="st2" d="M18.3,21c0,0,0.1-0.1,0.1-0.1C18.4,20.9,18.3,21,18.3,21z"/>
+	<path class="st2" d="M19.4,18.6C19.4,18.6,19.4,18.6,19.4,18.6C19.4,18.4,19.4,18.5,19.4,18.6z"/>
+	<path class="st2" d="M19.5,17.8L19.5,17.8z"/>
+	<path class="st2" d="M18,21.3l-0.1,0.1L18,21.3z"/>
+	<path class="st2" d="M19.2,19.3v-0.1V19.3z"/>
+	<path class="st2" d="M24.8,20.8c0,0,0-0.1,0-0.1C24.8,20.7,24.8,20.7,24.8,20.8z"/>
+	<path class="st2" d="M24.3,21.8L24.3,21.8L24.3,21.8z"/>
+	<path class="st2" d="M18.6,6.8c0.7,0.3,1.3,0.6,1.9,1C19.9,7.4,19.3,7.1,18.6,6.8z"/>
+	<path class="st2" d="M14.3,6.2H6.4v15.1l5.2,0.2V10.6h1.6c4,0,6.5,2.5,6.5,6.4c0.1,1.7-0.5,3.4-1.8,4.7l6.1,0.1
+		c0.7-1.5,1.1-3.1,1.1-4.8C25.2,11,20.3,6.2,14.3,6.2z"/>
+	<path class="st2" d="M25.1,19.6c0,0,0-0.1,0-0.1S25.1,19.6,25.1,19.6z"/>
+	<path class="st2" d="M14.3,6L14.3,6c1.5,0,3,0.3,4.3,0.8C17.2,6.3,15.8,6,14.3,6z"/>
+	<path class="st2" d="M25.4,18.4c0,0,0-0.1,0-0.1C25.4,18.3,25.4,18.3,25.4,18.4z"/>
+	<path class="st2" d="M27.6,21.9l5.2,0.1v-2.8h6.5v-4.4h-6.5v-4.2h6.8V6.2h-12L27.6,21.9z"/>
+	<path class="st2" d="M52.4,14.8l-1.5-0.4c-1-0.3-2.7-0.9-2.7-2.3s1.6-2,2.7-2c1.4,0,2.7,0.5,3.7,1.3l2-4l0,0
+		c-2-1.1-4.3-1.6-6.5-1.7c-4.4,0-7.3,2.9-7.3,7.2c0,4.1,2.2,5,5.8,6l0.2,0c1.3,0.4,3.5,1,3.5,2.7c0,0.2,0,0.4-0.1,0.6h5.4
+		c0.1-0.5,0.1-1,0.1-1.5C57.7,17.7,56,15.9,52.4,14.8z"/>
+	<path class="st2" d="M44.2,21.9L44,22.1h0.4L44.2,21.9z"/>
+	<path class="st2" d="M51.9,21.5L51.9,21.5c0,0.2,0,0.4-0.1,0.5C51.9,21.9,51.9,21.7,51.9,21.5z"/>
+	<path class="st2" d="M44.1,21.5c0.2,0.2,0.4,0.3,0.6,0.5C44.5,21.8,44.3,21.7,44.1,21.5z"/>
+	<path class="st2" d="M57.8,22.1L57.8,22.1L57.8,22.1z"/>
+	<polygon class="st2" points="57,7.2 57,7.2 57,7.2 57,7.2 	"/>
+	<path class="st2" d="M57.8,19.3c-0.2-1.1-0.7-2-1.5-2.8C57.1,17.3,57.6,18.3,57.8,19.3z"/>
+	<path class="st2" d="M60.1,22.1h5.2V6.2h-5.2V22.1z"/>
+	<path class="st2" d="M74.3,21c0.2,0.4,0.4,0.7,0.6,1C74.7,21.7,74.5,21.4,74.3,21z"/>
+	<path class="st2" d="M73.8,19.8c0.1,0.4,0.3,0.8,0.5,1.1C74.1,20.5,73.9,20.2,73.8,19.8z"/>
+	<path class="st2" d="M73.4,17.1L73.4,17.1c0,0.4,0,0.9,0.1,1.3C73.4,18,73.4,17.6,73.4,17.1z"/>
+	<path class="st2" d="M73.1,17.1c0-3.5,2.1-7.2,6-7.2c2.2,0,4.2,1.4,4.9,3.4l5-2.1l0,0c-1.7-3.7-5.5-6-9.6-5.8
+		c-7,0-11.7,4.7-11.7,11.6c0,1.7,0.3,3.4,1,4.9l6,0C73.6,20.6,73.1,18.9,73.1,17.1z"/>
+	<path class="st2" d="M73.5,18.5c0.1,0.4,0.2,0.8,0.3,1.2C73.6,19.3,73.5,18.9,73.5,18.5z"/>
+	<path class="st2" d="M79.3,5.2c-0.9,0-1.7,0.1-2.6,0.2C77.6,5.3,78.5,5.2,79.3,5.2z"/>
+	<path class="st2" d="M79.4,16v4h4.7v0.3c0,0.6-0.2,1.1-0.4,1.6l5.8-0.1c0.6-1.9,0.9-3.8,0.8-5.8H79.4z"/>
+	<path class="st2" d="M90.4,17.2c0,0.1,0,0.2,0,0.3C90.4,17.4,90.4,17.3,90.4,17.2z"/>
+	<path class="st2" d="M90.3,18.7v0.2V18.7z"/>
+	<path class="st2" d="M89.6,21.8L89.6,21.8C89.6,21.8,89.6,21.8,89.6,21.8L89.6,21.8z"/>
+	<polygon class="st2" points="108.6,19.5 98.1,6 98.1,6 108.6,19.5 	"/>
+	<path class="st2" d="M108.8,19.5v0.2h-0.4l-0.1-0.1L97.9,6.2h-5.4v15.5l5.2-0.1v-7.3h0.4l0.1,0.1l5.5,7.1l10.3-0.3v-15h-5.2V19.5z"
+		/>
+	<rect x="98.1" y="14.5" class="st2" width="0" height="7.1"/>
+</g>
+<path class="st3" d="M127.6,10.1c-0.7-1.3-2.1-2.1-3.6-2.1c-1.8,0-3.7,1.2-3.7,3.1c0,1.7,1.7,2.6,3.1,3.2l1.6,0.6
+	c3.1,1.2,5.5,3,5.5,6.7c-0.1,3.9-3.4,6.9-7.2,6.7c-3.4-0.1-6.2-2.7-6.7-6l2.8-0.6c0,2.3,1.9,4.2,4.2,4.1c2.3,0,4.2-1.9,4.1-4.2
+	c0-2.4-1.9-3.4-3.8-4.2l-1.5-0.6c-2.5-1.1-4.8-2.5-4.8-5.6c0-3.6,3.2-5.7,6.5-5.7c2.4,0,4.6,1.2,5.7,3.3L127.6,10.1z"/>
+<path class="st3" d="M136.9,22.5l-2.5,5.5h-3L142,4.9L152.6,28h-3l-2.5-5.5L136.9,22.5z M142,11l-3.9,9h7.9L142,11z"/>
+<path class="st3" d="M157.5,8.4v6.2h7.7v2.5h-7.7V28h-2.8V5.9h10.7v2.5H157.5z"/>
+<path class="st3" d="M169,5.9h11.9v2.5h-9.1v6.2h8.9v2.5h-8.9v8.4h9.1V28H169V5.9z"/>
+<g class="st1">
+	<path class="st2" d="M127.8,16.4L127.8,16.4L127.8,16.4z"/>
+	<path class="st2" d="M127.5,20.5c0,0.1,0.1,0.2,0.1,0.3C127.6,20.7,127.6,20.6,127.5,20.5z"/>
+	<path class="st2" d="M117.6,11.1c0,3,2.3,4.5,4.8,5.5l1.5,0.6c1.7,0.7,3.4,1.6,3.8,3.6l2.6-0.1c-0.3-3.3-2.9-4.8-5.4-5.8l-1.6-0.6
+		c-2.1-0.8-3.2-1.9-3.2-3.3c0-2,2-3.2,3.8-3.2c1.5-0.1,2.9,0.7,3.6,2.1l2-1.2c-1.1-2-3.3-3.3-5.6-3.2
+		C120.9,5.5,117.6,7.5,117.6,11.1z"/>
+	<path class="st2" d="M126.9,19.3c0.1,0.1,0.1,0.2,0.2,0.2C127,19.5,126.9,19.4,126.9,19.3z"/>
+	<path class="st2" d="M127.2,19.9c0.1,0.1,0.1,0.2,0.2,0.3C127.4,20,127.3,20,127.2,19.9z"/>
+	<path class="st2" d="M126,15.4L126,15.4L126,15.4z"/>
+	<path class="st2" d="M128.7,17.1L128.7,17.1L128.7,17.1z"/>
+	<path class="st2" d="M126.9,15.9L126.9,15.9L126.9,15.9z"/>
+	<path class="st2" d="M127.6,10.1L127.6,10.1c-0.7-1.3-2.1-2.1-3.6-2.1l0,0C125.5,7.9,126.9,8.8,127.6,10.1z"/>
+	<path class="st2" d="M125.8,18.4l0.3,0.2L125.8,18.4z"/>
+	<path class="st2" d="M125.2,18l0.3,0.2L125.2,18z"/>
+	<path class="st2" d="M124.5,17.7l0.3,0.1L124.5,17.7z"/>
+	<path class="st2" d="M122.3,16.8l1.5,0.6l0.2,0.1l-0.2-0.1L122.3,16.8c-2.5-1.1-4.8-2.5-4.8-5.6c0-3.6,3.2-5.7,6.5-5.7l0,0
+		c-3.3,0-6.5,2.1-6.5,5.7C117.5,14.2,119.8,15.7,122.3,16.8z"/>
+	<path class="st2" d="M126.6,19c-0.1-0.1-0.1-0.2-0.2-0.2C126.5,18.8,126.5,18.9,126.6,19z"/>
+	<path class="st2" d="M130.4,20.8L130.4,20.8C130.4,20.8,130.4,20.8,130.4,20.8L130.4,20.8z"/>
+	<path class="st2" d="M130.2,19.7L130.2,19.7z"/>
+	<path class="st2" d="M129.3,17.9C129.3,17.9,129.3,17.8,129.3,17.9C129.3,17.8,129.3,17.9,129.3,17.9z"/>
+</g>
+<g class="st1">
+	<path class="st2" d="M148.8,20L142,5.2l-7,15.4C139.6,20.4,144.3,20.2,148.8,20z M141.9,11l0.1-0.2l0.1,0.2l3.9,9l0.1,0.1h-8.2
+		L138,20L141.9,11z"/>
+	<polygon class="st2" points="145.9,20 145.9,20 142,11 142,11 	"/>
+	<polygon class="st2" points="142,4.9 142,4.9 134.8,20.6 134.8,20.6 	"/>
+</g>
+<g class="st1">
+	<path class="st2" d="M154.8,19.7l2.6-0.1v-2.5h7.7v-2.3h-7.7V8.3h8V6h-10.6V19.7z"/>
+</g>
+<g class="st1">
+	<polygon class="st2" points="171.7,17.1 180.6,17.1 180.6,17.1 	"/>
+	<path class="st2" d="M171.6,18.9V17h8.9v-2.3h-8.9V8.3h9.1V6h-11.7v13L171.6,18.9z"/>
+	<rect x="169" y="5.9" class="st2" width="0" height="13.1"/>
+</g>
+<g>
+	<polygon class="st2" points="220.8,30.1 239.9,7.1 258.6,30.1 	"/>
+	<polygon class="st2" points="286.8,6.3 268.2,29.7 249,6.3 	"/>
+	<polygon class="st4" points="193.1,5.8 213.4,30.5 233.1,5.8 	"/>
+	<path class="st2" d="M214.8,22.3c-0.8,0.3-1.6,0.4-2.4,0.4c-0.8,0-1.6-0.2-2.3-0.5c-1.4-0.6-2.5-1.8-3.1-3.2
+		c-0.6-1.4-0.5-3,0.4-4.2c0.4-0.6,0.9-1.1,1.6-1.4c0.3-0.2,0.7-0.3,1-0.4c0.3-0.1,0.7-0.1,1-0.1c1.4,0.1,2.7,1,3.2,2.4
+		c0.6,1.6-0.2,3.4-1.7,4.1c1.1,0,2-0.5,2.7-1.4c0.7-0.9,1-2.1,0.8-3.2c-0.2-1.2-0.8-2.2-1.6-3c-0.9-0.8-2-1.3-3.2-1.4
+		c-0.6-0.1-1.2,0-1.8,0.1c-0.6,0.1-1.1,0.3-1.6,0.6c-2.1,1.1-3.5,3.2-3.7,5.5c0,0.3,0,0.6,0,0.9l9.3,11.4l8.4-10.6
+		c-0.7,0.5-1.4,1-2.1,1.5C218.1,20.8,216.5,21.7,214.8,22.3z"/>
+	<path class="st0" d="M247.6,5.8l20.2,24.8l19.7-24.8H247.6z M279.5,12.4L277.6,9l1.3-2.2h3.1l-2.9,2.4L279.5,12.4z M270.8,14.4
+		l-4,8l0.5-8l-4-3.6l4.3-4h5.4l-5.3,4.4L270.8,14.4z M259.4,8.9l-2.6,3.7l0.5-3.6l-2.2-2.2h3.2L259.4,8.9z"/>
+	<rect x="258.5" y="23.3" class="st5" width="19.3" height="1.3"/>
+	<path class="st6" d="M239.9,6.3l-20.2,24.3h39.9L239.9,6.3z M235.1,29.4l-0.7,0.2h-2.1c0.6-0.2,1.3-0.4,2-0.5l0.7-0.2l-0.2-0.8
+		l2.2,0.3c3-0.8,5.8-2.3,8.1-4.4l-0.5-0.4l2-1.2c0.9-1.1,1.7-2.2,2.4-3.4l0.4,0.5c-0.7,1.1-1.4,2.2-2.2,3.2l-0.5,2.3l-1-0.7
+		c-2.3,2.2-5.1,3.7-8.2,4.6l-1,0.8h-1.2L235.1,29.4z M237.6,12l2.2-0.7c0.6-0.5,1.1-1,1.5-1.6l0.4,0.4c-0.5,0.6-1,1.1-1.5,1.6
+		l-1.1,2.1l-0.6-0.8c-1.6,1-3.2,1.9-5,2.6l0.8-0.9c1.3-0.6,2.6-1.3,3.8-2.1L237.6,12z M230.3,19.6h2.2c3-0.7,5.9-1.9,8.5-3.5
+		l-0.7-0.8l2.5-0.8c0.5-0.5,0.9-1,1.2-1.6l0.3,0.4c-0.4,0.7-1,1.4-1.6,2l-1,1.8l-0.5-0.6c-2.6,1.6-5.4,2.7-8.3,3.4l-1.7,1.8
+		l-0.5-1.1c-0.6,0.2-1.3,0.4-1.9,0.6l0.6-0.8l1-0.3L230.3,19.6z M224.3,27.5l2-0.4c2.1-1.1,4.3-1.9,6.7-2.3l0.3-0.1l-0.2-0.9
+		l2.6,0.3c3-0.6,5.8-2.1,7.9-4.3l-0.7-0.5l2.3-1.4c0.5-0.7,0.9-1.4,1.3-2.1l0.4,0.4c-0.5,0.8-1,1.6-1.5,2.4l-0.5,2l-0.8-0.6
+		c-2.3,2.4-5.3,4-8.6,4.6l-1.7,1.3l-0.2-0.9l-0.3,0.1c-2.1,0.3-4.2,1-6.1,1.9l-1.4,2.1l-0.5-0.8c-0.3,0.3-0.6,0.6-0.8,0.9h-0.7
+		c0.4-0.5,0.8-0.9,1.2-1.3L224.3,27.5z M248.3,28l-0.5-0.6l2.2-0.7c1-0.9,1.9-2,2.5-3.2L253,24c-0.7,1.2-1.5,2.2-2.5,3.1l-1.1,2.1
+		l-0.6-0.8c-0.6,0.4-1.3,0.8-1.9,1.1h-1.2C246.6,29.1,247.5,28.6,248.3,28L248.3,28z M255,26.6l0.4,0.5c-0.4,0.9-0.8,1.7-1.4,2.5
+		h-0.7C254.1,28.7,254.7,27.7,255,26.6L255,26.6z"/>
+	<rect x="230.3" y="12.2" class="st5" width="19.2" height="1.2"/>
+</g>
+</svg>
diff --git a/src/assets/nheri.png b/src/assets/nheri.png
new file mode 100644
index 0000000000000000000000000000000000000000..26e82495e0569289d99559954b0cb4898d620f41
GIT binary patch
literal 12528
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

literal 0
HcmV?d00001


From f700060a39e5a908ac0133782e63080a63c43d19 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 21 Apr 2021 15:43:10 -0500
Subject: [PATCH 03/36] Remove unnecessary logs.

---
 .../modal-link-project/modal-link-project.component.ts        | 4 ++--
 src/app/components/users-panel/users-panel.component.ts       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index fd34bba5..39696c98 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -20,7 +20,7 @@ export class ModalLinkProjectComponent implements OnInit {
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
   linkProject: boolean = false;
-  public onCloseAll: Subject<any> = new Subject<any>();
+  public onClose: Subject<any> = new Subject<any>();
   constructor(private modalRef: BsModalRef,
               private tapisFilesService: TapisFilesService,
               private cdref: ChangeDetectorRef ) { }
@@ -45,7 +45,7 @@ export class ModalLinkProjectComponent implements OnInit {
   }
 
   close() {
-    this.onCloseAll.next({
+    this.onClose.next({
       fileList: this.selectedFiles,
       linkProject: this.linkProject,
       system: this.selectedSystem
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 5fc28ebc..8d0a0304 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -66,18 +66,16 @@ export class UsersPanelComponent implements OnInit {
       allowedExtensions: []
     };
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
-    modal.content.onCloseAll.subscribe( (next) => {
+    modal.content.onClose.subscribe( (next) => {
       const path = next.fileList.length > 0 ? next.fileList[0].path : '/';
       console.log(path);
       console.log(next);
       console.log(next.system.id)
       if (next.system.id.includes('project') && next.linkProject) {
-        console.log("awesome.");
         this.projectsService.linkExportProject(this.activeProject,
                                                next.system.id,
                                                path)
       } else {
-        console.log("Fridge");
         this.projectsService.exportProject(this.activeProject.uuid,
                                            next.system.id,
                                            path)

From 1ff2a99151e3d21c140f5ebeedb1a21d3b69e694 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 21 Apr 2021 15:49:21 -0500
Subject: [PATCH 04/36] Change Import to Export.

---
 .../modal-link-project/modal-link-project.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 060cddef..78f6e1ea 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -24,5 +24,5 @@
 
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>
-    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles" (click)="close()">Import</button>
+    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles" (click)="close()">Export</button>
 </div>

From 257c81d40fb01b4ecfad996efd489c410fb6d417 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 23 Apr 2021 13:13:42 -0500
Subject: [PATCH 05/36] Cleanup and fix routing.

---
 .../modal-create-project.component.ts                 |  1 -
 .../modal-link-project.component.ts                   |  4 ----
 .../project-browser/project-browser.component.ts      |  5 -----
 .../components/users-panel/users-panel.component.ts   | 11 -----------
 src/app/services/projects.service.ts                  |  6 +++---
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 34815b3f..097a7e8f 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -64,7 +64,6 @@ export class ModalCreateProjectComponent implements OnInit {
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
       if (this.linkProject) {
-        // console.log(this.linkProject)
         this.projectsService.linkExportProject(project, this.dsProject.id, '/');
       }
       this.close(project);
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index 39696c98..01c00e6b 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -40,10 +40,6 @@ export class ModalLinkProjectComponent implements OnInit {
     this.selectedSystem = system;
   }
 
-  testIt(hw) {
-    console.log(hw.disabled);
-  }
-
   close() {
     this.onClose.next({
       fileList: this.selectedFiles,
diff --git a/src/app/components/project-browser/project-browser.component.ts b/src/app/components/project-browser/project-browser.component.ts
index 99c3a1da..e9806cd0 100644
--- a/src/app/components/project-browser/project-browser.component.ts
+++ b/src/app/components/project-browser/project-browser.component.ts
@@ -9,13 +9,11 @@ import { take } from 'rxjs/operators';
   styleUrls: ['./project-browser.component.styl']
 })
 export class ProjectBrowserComponent implements OnInit {
-
   static limit = 200;
   public projects: Array<SystemSummary>;
   public hasError: boolean;
   private currentIndex = 0;
   public inProgress = true;
-  private offset = 0;
 
   @Output() selection: EventEmitter<any> = new EventEmitter<any>();
 
@@ -29,11 +27,8 @@ export class ProjectBrowserComponent implements OnInit {
     })
   }
 
-
   select(system: any, index: number) {
-    console.log(system);
     this.selection.next(system);
     this.currentIndex = index;
   }
-
 }
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 8d0a0304..3ef21c48 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -49,14 +49,6 @@ export class UsersPanelComponent implements OnInit {
    return publicUrl;
   }
 
-  openLinkProjectModal() {
-    const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent);
-    modal.content.onClose.subscribe( (next) => {
-      console.log(next.id);
-      // this.projectsService.linkExportProject(this.activeProject, next.id);
-    });
-  }
-
   openExportProjectModal() {
     const initialState = {
       single: true,
@@ -68,9 +60,6 @@ export class UsersPanelComponent implements OnInit {
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
     modal.content.onClose.subscribe( (next) => {
       const path = next.fileList.length > 0 ? next.fileList[0].path : '/';
-      console.log(path);
-      console.log(next);
-      console.log(next.system.id)
       if (next.system.id.includes('project') && next.linkProject) {
         this.projectsService.linkExportProject(this.activeProject,
                                                next.system.id,
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 5fd9a71a..7d279e05 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -96,13 +96,13 @@ export class ProjectsService {
       );
   }
 
-  linkExportProject(proj: Project, systemId: string, path: string = '/') {
+  linkExportProject(proj: Project, system_id: string, path: string = '/') {
     const data = {
-      systemId,
+      system_id,
       path
     };
 
-    this.http.put<Project>(this.envService.apiUrl + `/projects/${proj.id}/link`, data).subscribe(
+    this.http.post<Project>(this.envService.apiUrl + `/projects/${proj.id}/link/`, data).subscribe(
         proj => {
           this._projects.next([...this._projects.value, proj]);
         }

From 47a6d26d592e136a3955838455e85de0e2a44ded Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 26 Apr 2021 17:07:22 -0500
Subject: [PATCH 06/36] Add delete files and better export dialog

---
 src/app/app.module.ts                         |  2 -
 .../main-welcome/main-welcome.component.html  |  5 ++-
 .../main-welcome/main-welcome.component.ts    | 27 ++++++++++--
 .../modal-confirmation-body.component.ts      | 17 ++++----
 .../modal-create-project.component.html       | 34 +++++++++++----
 .../modal-create-project.component.styl       | 10 +++++
 .../modal-create-project.component.ts         | 42 ++++++++++++++-----
 .../modal-link-project.component.html         | 16 +++++--
 .../modal-link-project.component.styl         |  4 +-
 .../modal-link-project.component.ts           | 12 +++++-
 .../project-browser.component.html            | 16 -------
 .../project-browser.component.spec.ts         | 25 -----------
 .../project-browser.component.styl            | 14 -------
 .../project-browser.component.ts              | 34 ---------------
 .../users-panel/users-panel.component.html    | 19 ++++++++-
 .../users-panel/users-panel.component.ts      |  1 -
 src/app/models/models.ts                      |  1 +
 src/app/services/projects.service.ts          | 33 ++++++++-------
 18 files changed, 163 insertions(+), 149 deletions(-)
 delete mode 100644 src/app/components/project-browser/project-browser.component.html
 delete mode 100644 src/app/components/project-browser/project-browser.component.spec.ts
 delete mode 100644 src/app/components/project-browser/project-browser.component.styl
 delete mode 100644 src/app/components/project-browser/project-browser.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5b123de6..98ee07f2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -52,7 +52,6 @@ import { MainProjectComponent } from './components/main-project/main-project.com
 import {DragDropModule, CDK_DRAG_CONFIG} from '@angular/cdk/drag-drop';
 import { LoginComponent } from './components/login/login.component';
 import { LogoutComponent } from './components/logout/logout.component';
-import { ProjectBrowserComponent } from './components/project-browser/project-browser.component';
 import { ModalLinkProjectComponent } from './components/modal-link-project/modal-link-project.component';
 
 @NgModule({
@@ -89,7 +88,6 @@ import { ModalLinkProjectComponent } from './components/modal-link-project/modal
     MainProjectComponent,
     LoginComponent,
     LogoutComponent,
-    ProjectBrowserComponent,
     ModalLinkProjectComponent,
   ],
   imports: [
diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 710c10e6..8ab82d3e 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -58,7 +58,7 @@
                   </div>
 
                   <div class="list-column">
-                    <ng-container *ngIf="p.system_name" class="list-column link-hover">
+                    <ng-container *ngIf="p.system_name && p.system_id.includes('project')" class="list-column link-hover">
                       <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
                         <span>{{p.system_name}}</span>
                       </a>
@@ -68,7 +68,8 @@
                     <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
                       <i class="fas fa-folder-open"></i>
                     </button>
-                    <button class="project-list-item-button" (click)=deleteProject(p)>
+                    <!-- <button class="project-list-item-button" (click)=deleteProject(p)> -->
+                    <button class="project-list-item-button" (click)=openDeleteProjectModal(p)>
                       <i class="fas fa-trash"></i>
                     </button>
                   </div>
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 8f67bbad..7a6ea160 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -5,6 +5,7 @@ import {ProjectsService} from '../../services/projects.service';
 import {BsModalService} from 'ngx-foundation';
 import {ModalCreateProjectComponent} from '../modal-create-project/modal-create-project.component';
 import { Router, ActivatedRoute } from '@angular/router';
+import { ModalConfirmationBodyComponent } from '../modal-confirmation-body/modal-confirmation-body.component';
 
 @Component({
   selector: 'app-main-welcome',
@@ -51,13 +52,31 @@ export class MainWelcomeComponent implements OnInit {
   }
 
   openCreateProjectModal() {
-    const modal = this.bsModalService.show(ModalCreateProjectComponent);
-    modal.content.onClose.subscribe( (project) => {
-      this.routeToProject(project.uuid);
-    });
+    this.bsModalService.show(ModalCreateProjectComponent);
   }
 
   deleteProject(p: Project) {
     this.projectsService.deleteProject(p);
   }
+
+  openDeleteProjectModal(p: Project) {
+    let initialState = {
+      title: 'Delete Project',
+      message: 'Confirm deleting project.',
+      options: ['Cancel', 'Confirm']
+    };
+    if (p.system_path) {
+      initialState = {
+        title: 'Delete Project',
+        message: 'Deleting this project will remove the associated file as well.',
+        options: ['Cancel', 'Confirm']
+      };
+    }
+    const modal = this.bsModalService.show(ModalConfirmationBodyComponent, {initialState});
+    modal.content.answer.subscribe( (close) => {
+      if (close === 'Confirm') {
+        this.projectsService.deleteProject(p);
+      }
+    });
+  }
 }
diff --git a/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts b/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
index 115c2b85..f33d9965 100644
--- a/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
+++ b/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
@@ -1,5 +1,6 @@
-import { Component, Output, EventEmitter } from '@angular/core';
+import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-foundation/modal';
+import {Subject} from 'rxjs';
 
 @Component({
   selector: 'app-modal-confirmation-body',
@@ -7,15 +8,15 @@ import { BsModalRef, BsModalService } from 'ngx-foundation/modal';
   styleUrls: ['./modal-confirmation-body.component.styl']
 })
 export class ModalConfirmationBodyComponent {
-  title: string;
-  message: string;
-  options: string;
-  answer: string;
+  @Input() options: Array<any> = [false, true];
+  @Input() message: string = 'message';
+  @Input() title: string = 'title';
+  public readonly answer: Subject<string> = new Subject<string>();
 
   constructor(public bsModalRef: BsModalRef) { }
 
-  closeModal(answer) {
-    this.answer = answer;
+  closeModal(answer: string) {
+    this.answer.next(answer);
     this.bsModalRef.hide();
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index b1e4d536..16206fe7 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -13,19 +13,39 @@ <h4> Create a new Map </h4>
 
             <div class="link-project">
               <label>
-                <span style="padding-right: 10px">Link Project</span>
-                <input formControlName="linkProject" type="checkbox" [(ngModel)]="linkProject">
+                <span style="padding-right: 10px">Export Project</span>
+                <input formControlName="exportProject" type="checkbox">
               </label>
 
             </div>
-            <div *ngIf="linkProject">
-              <app-project-browser
-                (selection)="onProjectSelection($event)">
-              </app-project-browser>
+            <div *ngIf="projCreateForm.get('exportProject').value">
+              <app-file-browser
+                [single]=true
+                [allowFolders]=true
+                [allowedExtensions]=[]
+                [onlyFolder]=true
+                [showPublicSystems]=false
+                [heading]="'Select Export Location'"
+                [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
+                         'If you select a project, you can link the current map to the project.'"
+                (selection)="onSelect($event)"
+                (systemSelection)="onSystemSelect($event)">
+              </app-file-browser>
+
+              <div class="confirm-checkbox">
+                <label>
+                  <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
+                  <input #linkCheckbox type="checkbox"
+                         formControlName="linkProject">
+                </label>
+                <div *ngIf="linkCheckbox.disabled">
+                  <small><em>Must be in a project folder to link!</em></small>
+                </div>
+              </div>
             </div>
             <div class="button-group small">
                 <button class="button small warning" type="button" (click)="close()">Close</button>
-                <button class="button small align-right" type="submit" [disabled]="(!projCreateForm.valid || submitting || (linkProject && !dsProject))">Submit</button>
+                <button class="button small align-right" type="submit" [disabled]="(!projCreateForm.valid || submitting)">Submit</button>
             </div>
         </form>
     </tab>
diff --git a/src/app/components/modal-create-project/modal-create-project.component.styl b/src/app/components/modal-create-project/modal-create-project.component.styl
index e69de29b..53f03b28 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.styl
+++ b/src/app/components/modal-create-project/modal-create-project.component.styl
@@ -0,0 +1,10 @@
+:host
+  .dimmed
+    color: #ccc
+  .confirm-checkbox
+    padding: 20px
+    label
+      font-size: 19px
+      span
+        padding-right: 10px
+  
\ No newline at end of file
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 097a7e8f..9ef86f0b 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -5,7 +5,7 @@ import { ProjectsService } from '../../services/projects.service';
 import { Project } from '../../models/models';
 import {RemoteFile} from 'ng-tapis';
 import {RapidProjectRequest} from '../../models/rapid-project-request';
-import {Subject} from 'rxjs';
+import {ChangeDetectorRef } from '@angular/core';
 
 @Component({
   selector: 'app-modal-create-project',
@@ -14,28 +14,33 @@ import {Subject} from 'rxjs';
 })
 export class ModalCreateProjectComponent implements OnInit {
 
-  public readonly onClose: Subject<any> = new Subject<any>();
-
   projCreateForm: FormGroup;
   rapidFolder: RemoteFile;
-  linkProject = false;
+  exportProject = false;
   submitting: boolean;
-  dsProject: any;
   errorMessage = '';
+  selectedFiles: Array<RemoteFile> = [];
+  selectedSystem: any;
 
-  constructor(private bsModalRef: BsModalRef, private projectsService: ProjectsService) { }
+  constructor(private bsModalRef: BsModalRef,
+              private cdref: ChangeDetectorRef,
+              private projectsService: ProjectsService) { }
 
   ngOnInit() {
     this.submitting = false;
     this.projCreateForm = new FormGroup( {
       name: new FormControl(''),
       description: new FormControl(''),
+      exportProject: new FormControl(false),
       linkProject: new FormControl(false)
     });
   }
 
+  ngAfterContentChecked() {
+    this.cdref.detectChanges();
+  }
+
   close(project: Project) {
-    this.onClose.next(project);
     this.bsModalRef.hide();
   }
 
@@ -43,8 +48,17 @@ export class ModalCreateProjectComponent implements OnInit {
     this.rapidFolder = item[0];
   }
 
-  onProjectSelection(item: any) {
-    this.dsProject = item;
+  onSelect(items: Array<RemoteFile>) {
+    this.selectedFiles = items;
+  }
+
+  onSystemSelect(system: any) {
+    this.selectedSystem = system;
+    if (system.id.includes('project')) {
+      this.projCreateForm.get('linkProject').enable()
+    } else {
+      this.projCreateForm.get('linkProject').disable()
+    }
   }
 
   createRapidProject() {
@@ -63,8 +77,14 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
-      if (this.linkProject) {
-        this.projectsService.linkExportProject(project, this.dsProject.id, '/');
+      if (this.projCreateForm.get('exportProject').value) {
+        const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : '/';
+        const systemId = this.selectedSystem.id;
+        if (this.projCreateForm.get('linkProject').value) {
+          this.projectsService.linkExportProject(project, systemId, path);
+        } else {
+          this.projectsService.exportProject(project.uuid, systemId, path);
+        }
       }
       this.close(project);
     }, err => {
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 78f6e1ea..1a1adf70 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -3,6 +3,7 @@
   [allowFolders]=allowFolders
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
+  [showPublicSystems]=false
   [heading]="'Select Export Location'"
   [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
            'If you select a project, you can link the current map to the project.'"
@@ -10,11 +11,11 @@
   (systemSelection)="onSystemSelect($event)">
 </app-file-browser>
 
-<div class="link-project">
+<div class="confirm-checkbox">
   <label>
     <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
     <input #linkCheckbox type="checkbox"
-           [disabled]="this.selectedSystem && !this.selectedSystem.id.includes('project')"
+           [disabled]="selectedSystem && !selectedSystem.id.includes('project')"
            [(ngModel)]="linkProject">
   </label>
   <div *ngIf="linkCheckbox.disabled">
@@ -22,7 +23,16 @@
   </div>
 </div>
 
+<div *ngIf="activeProject.system_path" class="confirm-checkbox">
+  <label>
+    <span>Remove previously saved file</span>
+    <input type="checkbox"
+           [(ngModel)]="confirmRemove">
+  </label>
+  <small><em>Exporting this map will remove the previous link and saved location.</em></small>
+</div>
+
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>
-    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles" (click)="close()">Export</button>
+    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles || (activeProject.system_path && !confirmRemove)" (click)="close()">Export</button>
 </div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.styl b/src/app/components/modal-link-project/modal-link-project.component.styl
index 3f5a1661..6290b70c 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.styl
+++ b/src/app/components/modal-link-project/modal-link-project.component.styl
@@ -1,8 +1,8 @@
 :host
   .dimmed
     color: #ccc
-  .link-project
-    padding: 20px
+  .confirm-checkbox
+    padding: 0px 20px 20px 20px
     label
       font-size: 19px
       span
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index 01c00e6b..23ef1e83 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -1,9 +1,11 @@
-import {Component, Input, OnInit} from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { RemoteFile} from 'ng-tapis/models/remote-file';
+import { Project } from '../../models/models';
+import { ProjectsService } from '../../services/projects.service';
 import { BsModalRef } from 'ngx-foundation/modal/bs-modal-ref.service';
 import { Subject } from 'rxjs';
 import { TapisFilesService } from '../../services/tapis-files.service';
-import {ChangeDetectorRef } from '@angular/core';
+import { ChangeDetectorRef } from '@angular/core';
 
 
 @Component({
@@ -19,13 +21,19 @@ export class ModalLinkProjectComponent implements OnInit {
   @Input() allowEmptyFiles: false;
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
+  activeProject: Project;
   linkProject: boolean = false;
+  confirmRemove: boolean = false;
   public onClose: Subject<any> = new Subject<any>();
   constructor(private modalRef: BsModalRef,
+              private projectsService: ProjectsService,
               private tapisFilesService: TapisFilesService,
               private cdref: ChangeDetectorRef ) { }
 
   ngOnInit() {
+    this.projectsService.activeProject.subscribe( (next) => {
+      this.activeProject = next;
+    });
   }
 
   ngAfterContentChecked() {
diff --git a/src/app/components/project-browser/project-browser.component.html b/src/app/components/project-browser/project-browser.component.html
deleted file mode 100644
index b79756a5..00000000
--- a/src/app/components/project-browser/project-browser.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<h6>
-  Select a project to link to
-</h6>
-<div *ngIf="projects; else spin" class="selection-container">
-  <div *ngFor="let p of projects; let selectIndex = index">
-    <div (click)="select(p, selectIndex)"
-         [ngClass]="{'selected': selectIndex == currentIndex, 'selection-item': true}">
-      {{p.description}}
-    </div>
-  </div>
-</div>
-<ng-template #spin>
-  <div style="padding: 30px">
-    <i class="fas fa-spin fa-spinner"></i>
-  </div>
-</ng-template>
diff --git a/src/app/components/project-browser/project-browser.component.spec.ts b/src/app/components/project-browser/project-browser.component.spec.ts
deleted file mode 100644
index ea0a9bc7..00000000
--- a/src/app/components/project-browser/project-browser.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProjectBrowserComponent } from './project-browser.component';
-
-describe('ProjectBrowserComponent', () => {
-  let component: ProjectBrowserComponent;
-  let fixture: ComponentFixture<ProjectBrowserComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ProjectBrowserComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ProjectBrowserComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/components/project-browser/project-browser.component.styl b/src/app/components/project-browser/project-browser.component.styl
deleted file mode 100644
index 857b24a6..00000000
--- a/src/app/components/project-browser/project-browser.component.styl
+++ /dev/null
@@ -1,14 +0,0 @@
-@import '../../../variables.styl'
-
-:host
-  .selection-container
-    padding: 15px
-    background: #f9f9f9
-    margin-bottom: 20px
-  .selection-item
-    border 1px solid transparent
-  .selection-item:hover
-    border 1px solid #ccc
-    user-select: none
-  .selected
-    background: #d3d3d3
\ No newline at end of file
diff --git a/src/app/components/project-browser/project-browser.component.ts b/src/app/components/project-browser/project-browser.component.ts
deleted file mode 100644
index e9806cd0..00000000
--- a/src/app/components/project-browser/project-browser.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
-import {SystemSummary} from 'ng-tapis';
-import {AgaveSystemsService} from '../../services/agave-systems.service';
-import { take } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-project-browser',
-  templateUrl: './project-browser.component.html',
-  styleUrls: ['./project-browser.component.styl']
-})
-export class ProjectBrowserComponent implements OnInit {
-  static limit = 200;
-  public projects: Array<SystemSummary>;
-  public hasError: boolean;
-  private currentIndex = 0;
-  public inProgress = true;
-
-  @Output() selection: EventEmitter<any> = new EventEmitter<any>();
-
-  constructor(private agaveSystemsService: AgaveSystemsService) { }
-
-  ngOnInit() {
-    this.agaveSystemsService.list();
-    this.agaveSystemsService.projects.pipe(take(1)).subscribe(projects => {
-      this.selection.next(projects[0]);
-      this.projects = projects;
-    })
-  }
-
-  select(system: any, index: number) {
-    this.selection.next(system);
-    this.currentIndex = index;
-  }
-}
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 92065cca..dac58d49 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -34,14 +34,29 @@ <h6 id="property-title">Description:</h6>
       >
       </app-edit-name-input>
 
+      <h6 id="property-title">Saved Location</h6>
+      <div *ngIf="activeProject.system_path; else noSave" style="margin-bottom: 20px">
+        <div *ngIf="activeProject.system_id.includes('project'); else noProject">
+          <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id.substr(8) + activeProject.system_path"><span>{{activeProject.system_path}}</span></a>
+        </div>
+        <ng-template #noProject>
+          <a [href]="'https://www.designsafe-ci.org/data/browser/' + activeProject.system_id + activeProject.system_path"><span>{{activeProject.system_path}}</span></a>
+        </ng-template>
+      </div>
+      <ng-template #noSave>
+        <div style="margin-bottom: 20px">
+          Map not saved.
+        </div>
+      </ng-template>
+
       <h6 id="property-title">Linked Project</h6>
-      <div *ngIf="activeProject.system_name; else noLink" style="margin-bottom: 20px">
+      <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
         <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span>{{activeProject.system_name}}</span></a>
       </div>
       <ng-template #noLink>
         <div style="margin-bottom: 20px">
           No link! <br />
-          <em>You must export the map to a project.</em>
+          <small><em>You must export the map to a project.</em></small>
         </div>
       </ng-template>
 
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 3ef21c48..eab49d67 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -7,7 +7,6 @@ import {FormGroup, FormControl} from '@angular/forms';
 import {Project} from '../../models/models';
 import {EnvService} from '../../services/env.service';
 import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
-import { ModalFileBrowserComponent } from '../modal-file-browser/modal-file-browser.component';
 
 @Component({
   selector: 'app-users-panel',
diff --git a/src/app/models/models.ts b/src/app/models/models.ts
index 54b20b47..517f23e9 100644
--- a/src/app/models/models.ts
+++ b/src/app/models/models.ts
@@ -51,6 +51,7 @@ export interface Project {
   public?: boolean;
   system_name?: string;
   system_id?: string;
+  system_path?: string;
 }
 
 export class Project implements Project {
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 7d279e05..066b984b 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -96,15 +96,29 @@ export class ProjectsService {
       );
   }
 
+  exportProject(project_uuid: string, system_id: string, path: string) {
+    const payload = {
+      project_uuid,
+      path,
+      system_id
+    };
+    this.http.put<any>(this.envService.apiUrl + `/projects/export/`, payload).subscribe(resp => {
+      this.notificationsService.showSuccessToast(`Saved file to ${system_id}/${path}/${project_uuid}.hazmapper`)
+      this.getProjects();
+    }, error => {
+      console.log(error);
+    });
+  }
+
   linkExportProject(proj: Project, system_id: string, path: string = '/') {
     const data = {
       system_id,
       path
     };
 
-    this.http.post<Project>(this.envService.apiUrl + `/projects/${proj.id}/link/`, data).subscribe(
-        proj => {
-          this._projects.next([...this._projects.value, proj]);
+    this.http.put<Project>(this.envService.apiUrl + `/projects/${proj.id}/link/`, data).subscribe(
+        resp => {
+          this.getProjects();
         }
       );
   }
@@ -125,19 +139,6 @@ export class ProjectsService {
       );
   }
 
-  exportProject(projectUUID: string, system: string, path: string) {
-    const payload = {
-      project_uuid: projectUUID,
-      path,
-      system_id: system
-    };
-    this.http.post<any>(this.envService.apiUrl + `/projects/export/`, payload).subscribe(resp => {
-      this.notificationsService.showSuccessToast(`Saved file to ${system}/${path}/${projectUUID}.hazmapper`)
-    }, error => {
-      console.log(error);
-    });
-  }
-
   setActiveProjectUUID(uuid: string): void {
     this._loadingActiveProject.next(true);
     this._loadingActiveProjectFailed.next(false);

From 53ebebb6420d46fe97fed1559aff472b6001f423 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 26 Apr 2021 17:12:46 -0500
Subject: [PATCH 07/36] Make name consistent.

---
 .../modal-create-project.component.html                     | 6 +++---
 .../modal-create-project/modal-create-project.component.ts  | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 16206fe7..019bf227 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -13,12 +13,12 @@ <h4> Create a new Map </h4>
 
             <div class="link-project">
               <label>
-                <span style="padding-right: 10px">Export Project</span>
-                <input formControlName="exportProject" type="checkbox">
+                <span style="padding-right: 10px">Export Map</span>
+                <input formControlName="exportMap" type="checkbox">
               </label>
 
             </div>
-            <div *ngIf="projCreateForm.get('exportProject').value">
+            <div *ngIf="projCreateForm.get('exportMap').value">
               <app-file-browser
                 [single]=true
                 [allowFolders]=true
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 9ef86f0b..1ba0e163 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -16,7 +16,6 @@ export class ModalCreateProjectComponent implements OnInit {
 
   projCreateForm: FormGroup;
   rapidFolder: RemoteFile;
-  exportProject = false;
   submitting: boolean;
   errorMessage = '';
   selectedFiles: Array<RemoteFile> = [];
@@ -31,7 +30,7 @@ export class ModalCreateProjectComponent implements OnInit {
     this.projCreateForm = new FormGroup( {
       name: new FormControl(''),
       description: new FormControl(''),
-      exportProject: new FormControl(false),
+      exportMap: new FormControl(false),
       linkProject: new FormControl(false)
     });
   }

From 5ef2ae3e299b65197c5ed70edf6205723c7f4702 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 26 Apr 2021 17:38:09 -0500
Subject: [PATCH 08/36] Fix exportMap name

---
 .../modal-create-project/modal-create-project.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 1ba0e163..dd757022 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -76,7 +76,7 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
-      if (this.projCreateForm.get('exportProject').value) {
+      if (this.projCreateForm.get('exportMap').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : '/';
         const systemId = this.selectedSystem.id;
         if (this.projCreateForm.get('linkProject').value) {

From 04d32e369b08c1b09f6fada9fe635afb539679a4 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Tue, 27 Apr 2021 13:59:18 -0500
Subject: [PATCH 09/36] Fix project deletion/change.

---
 .../main-welcome/main-welcome.component.styl  |  1 +
 .../modal-create-project.component.ts         |  2 +-
 .../users-panel/users-panel.component.ts      |  2 +-
 src/app/services/projects.service.ts          | 23 +++++++++++--------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index f9c6e115..9d0c4ce9 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -37,6 +37,7 @@
         font-size: 14px
         padding: 12px
         display: flex
+        flex-wrap: nowrap
         jusitfy-content: space-between
         .project-list-item-button
           cursor: pointer
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index dd757022..64cda49a 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -82,7 +82,7 @@ export class ModalCreateProjectComponent implements OnInit {
         if (this.projCreateForm.get('linkProject').value) {
           this.projectsService.linkExportProject(project, systemId, path);
         } else {
-          this.projectsService.exportProject(project.uuid, systemId, path);
+          this.projectsService.exportProject(project.id, systemId, path);
         }
       }
       this.close(project);
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index eab49d67..0a47eb1a 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -64,7 +64,7 @@ export class UsersPanelComponent implements OnInit {
                                                next.system.id,
                                                path)
       } else {
-        this.projectsService.exportProject(this.activeProject.uuid,
+        this.projectsService.exportProject(this.activeProject.id,
                                            next.system.id,
                                            path)
       }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 066b984b..1b835af0 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -3,7 +3,7 @@ import {HttpClient, HttpErrorResponse} from '@angular/common/http';
 import {BehaviorSubject, Observable, ReplaySubject} from 'rxjs';
 import {Project} from '../models/models';
 import { RapidProjectRequest } from '../models/rapid-project-request';
-import {catchError, map, tap} from 'rxjs/operators';
+import {catchError, map, tap, filter, take} from 'rxjs/operators';
 import {IProjectUser} from '../models/project-user';
 import {NotificationsService} from './notifications.service';
 import {GeoDataService} from './geo-data.service';
@@ -96,15 +96,15 @@ export class ProjectsService {
       );
   }
 
-  exportProject(project_uuid: string, system_id: string, path: string) {
+  exportProject(projectId: number, system_id: string, path: string) {
     const payload = {
-      project_uuid,
       path,
       system_id
     };
-    this.http.put<any>(this.envService.apiUrl + `/projects/export/`, payload).subscribe(resp => {
-      this.notificationsService.showSuccessToast(`Saved file to ${system_id}/${path}/${project_uuid}.hazmapper`)
-      this.getProjects();
+    this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload).subscribe(current_project => {
+      this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${current_project.uuid}.hazmapper`)
+      this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
+                           current_project]);
     }, error => {
       console.log(error);
     });
@@ -117,10 +117,13 @@ export class ProjectsService {
     };
 
     this.http.put<Project>(this.envService.apiUrl + `/projects/${proj.id}/link/`, data).subscribe(
-        resp => {
-          this.getProjects();
-        }
-      );
+      resp => {
+        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${resp.uuid}.hazmapper`)
+        this._projects.next([...this._projects.value.filter((p) => p.id != proj.id),
+                             resp]);
+      }, error => {
+        console.log(error);
+      });
   }
 
   createRapidProject(data: RapidProjectRequest) {

From 33a4801b102fa14f1fb39de80be8a5ab2a4d8ae7 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 30 Apr 2021 11:42:53 -0500
Subject: [PATCH 10/36] Fix confirmation for project delete in welcome page.

---
 .../main-welcome/main-welcome.component.ts    | 30 ++++++-------------
 .../modal-confirmation-body.component.ts      | 19 ++++++------
 src/app/services/projects.service.ts          |  4 +++
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 7a6ea160..0365c61f 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -5,7 +5,7 @@ import {ProjectsService} from '../../services/projects.service';
 import {BsModalService} from 'ngx-foundation';
 import {ModalCreateProjectComponent} from '../modal-create-project/modal-create-project.component';
 import { Router, ActivatedRoute } from '@angular/router';
-import { ModalConfirmationBodyComponent } from '../modal-confirmation-body/modal-confirmation-body.component';
+import { ModalService } from 'src/app/services/modal.service';
 
 @Component({
   selector: 'app-main-welcome',
@@ -28,7 +28,8 @@ export class MainWelcomeComponent implements OnInit {
     private router: Router,
     private geoDataService: GeoDataService,
     private projectsService: ProjectsService,
-    private bsModalService: BsModalService
+    private bsModalService: BsModalService,
+    private modalService: ModalService
   ) { }
 
   ngOnInit() {
@@ -55,27 +56,14 @@ export class MainWelcomeComponent implements OnInit {
     this.bsModalService.show(ModalCreateProjectComponent);
   }
 
-  deleteProject(p: Project) {
-    this.projectsService.deleteProject(p);
-  }
-
   openDeleteProjectModal(p: Project) {
-    let initialState = {
-      title: 'Delete Project',
-      message: 'Confirm deleting project.',
-      options: ['Cancel', 'Confirm']
-    };
-    if (p.system_path) {
-      initialState = {
-        title: 'Delete Project',
-        message: 'Deleting this project will remove the associated file as well.',
-        options: ['Cancel', 'Confirm']
-      };
-    }
-    const modal = this.bsModalService.show(ModalConfirmationBodyComponent, {initialState});
-    modal.content.answer.subscribe( (close) => {
-      if (close === 'Confirm') {
+    this.modalService.confirm(
+      'Delete map',
+      'Are you sure you want to delete this map?  All associated features, metadata, and saved files will be deleted. THIS CANNOT BE UNDONE.',
+      ['Cancel', 'Delete']).subscribe( (answer) => {
+      if (answer === 'Delete') {
         this.projectsService.deleteProject(p);
+
       }
     });
   }
diff --git a/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts b/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
index f33d9965..113bd6a4 100644
--- a/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
+++ b/src/app/components/modal-confirmation-body/modal-confirmation-body.component.ts
@@ -1,6 +1,5 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-foundation/modal';
-import {Subject} from 'rxjs';
 
 @Component({
   selector: 'app-modal-confirmation-body',
@@ -8,15 +7,15 @@ import {Subject} from 'rxjs';
   styleUrls: ['./modal-confirmation-body.component.styl']
 })
 export class ModalConfirmationBodyComponent {
-  @Input() options: Array<any> = [false, true];
-  @Input() message: string = 'message';
-  @Input() title: string = 'title';
-  public readonly answer: Subject<string> = new Subject<string>();
+  title: string;
+  message: string;
+  options: string;
+  answer: string;
 
   constructor(public bsModalRef: BsModalRef) { }
 
-  closeModal(answer: string) {
-    this.answer.next(answer);
-    this.bsModalRef.hide();
-  }
+ closeModal(answer) {
+   this.answer = answer;
+   this.bsModalRef.hide();
+ }
 }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 1b835af0..bc82ee22 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -9,7 +9,9 @@ import {NotificationsService} from './notifications.service';
 import {GeoDataService} from './geo-data.service';
 import { EnvService } from '../services/env.service';
 import { AuthService } from '../services/authentication.service';
+import {MAIN, LOGIN} from '../constants/routes';
 import {defaultTileServers} from '../constants/tile-servers';
+import { Router } from '@angular/router';
 
 @Injectable({
   providedIn: 'root'
@@ -38,6 +40,7 @@ export class ProjectsService {
   constructor(private http: HttpClient,
               private notificationsService: NotificationsService,
               private geoDataService: GeoDataService,
+              private router: Router,
               private authService: AuthService,
               private envService: EnvService) { }
 
@@ -174,6 +177,7 @@ export class ProjectsService {
     this.http.delete(this.envService.apiUrl + `/projects/${proj.id}/`)
       .subscribe( (resp) => {
         this.getProjects();
+        this.router.navigate([MAIN]);
       }, error => {
         this.notificationsService.showErrorToast('Could not delete project!');
       });

From e54769f37e81f7f4a167210a1880545f8c70339f Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 30 Apr 2021 16:19:23 -0500
Subject: [PATCH 11/36] Add arbitrary file saving instead of just uuid.

---
 .../file-browser/file-browser.component.ts    |  2 ++
 .../modal-create-project.component.html       |  9 ++++++
 .../modal-create-project.component.ts         | 21 ++++++++++---
 .../modal-link-project.component.html         | 14 +++++++--
 .../modal-link-project.component.ts           | 12 ++++++-
 .../users-panel/users-panel.component.html    |  7 +----
 .../users-panel/users-panel.component.ts      | 31 ++++++++++++++++---
 src/app/models/models.ts                      |  1 +
 src/app/services/projects.service.ts          | 14 +++++----
 9 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/src/app/components/file-browser/file-browser.component.ts b/src/app/components/file-browser/file-browser.component.ts
index ce6c3838..b015348d 100644
--- a/src/app/components/file-browser/file-browser.component.ts
+++ b/src/app/components/file-browser/file-browser.component.ts
@@ -26,6 +26,7 @@ export class FileBrowserComponent implements OnInit {
   @Input() allowedExtensions: Array<string> = [];
   @Output() selection: EventEmitter<Array<RemoteFile>> = new EventEmitter<Array<RemoteFile>>();
   @Output() systemSelection: EventEmitter<any> = new EventEmitter<any>();
+  @Output() currentPath: EventEmitter<string> = new EventEmitter<string>();
 
   private currentUser: AuthenticatedUser;
   private currentDirectory: RemoteFile;
@@ -122,6 +123,7 @@ export class FileBrowserComponent implements OnInit {
                   // This removes the first item in the listing, which in Agave
                   // is always a reference to self '.' and replaces with '..'
                   const current = files.shift();
+                  this.currentPath.next(current.path);
                   current.path = this.tapisFilesService.getParentPath(current.path);
                   current.name = '..';
                   files.unshift(current);
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 019bf227..15c5ddf2 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -29,9 +29,18 @@ <h4> Create a new Map </h4>
                 [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
                          'If you select a project, you can link the current map to the project.'"
                 (selection)="onSelect($event)"
+                (currentPath)="setCurrentPath($event)"
                 (systemSelection)="onSystemSelect($event)">
               </app-file-browser>
 
+              <div style="padding: 20px 0px">
+                <label> Custom file name:
+                  <input type="text"
+                         formControlName="fileSuffix">
+                </label>
+                <small><em>If name is not given, file will be saved as the map uuid.</em></small>
+              </div>
+
               <div class="confirm-checkbox">
                 <label>
                   <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 64cda49a..99a7301b 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -18,6 +18,8 @@ export class ModalCreateProjectComponent implements OnInit {
   rapidFolder: RemoteFile;
   submitting: boolean;
   errorMessage = '';
+  currentPath: string;
+  fileSuffix: string = '';
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
 
@@ -31,7 +33,8 @@ export class ModalCreateProjectComponent implements OnInit {
       name: new FormControl(''),
       description: new FormControl(''),
       exportMap: new FormControl(false),
-      linkProject: new FormControl(false)
+      linkProject: new FormControl(false),
+      fileSuffix: new FormControl('')
     });
   }
 
@@ -77,12 +80,18 @@ export class ModalCreateProjectComponent implements OnInit {
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
       if (this.projCreateForm.get('exportMap').value) {
-        const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : '/';
+        const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
         if (this.projCreateForm.get('linkProject').value) {
-          this.projectsService.linkExportProject(project, systemId, path);
+          this.projectsService.linkExportProject(project.id,
+                                                 systemId,
+                                                 path,
+                                                 this.projCreateForm.get('fileSuffix').value);
         } else {
-          this.projectsService.exportProject(project.id, systemId, path);
+          this.projectsService.exportProject(project.id,
+                                             systemId,
+                                             path,
+                                             this.projCreateForm.get('fileSuffix').value);
         }
       }
       this.close(project);
@@ -91,4 +100,8 @@ export class ModalCreateProjectComponent implements OnInit {
     });
     this.submitting = true;
   }
+
+  setCurrentPath(path: string) {
+    this.currentPath = path;
+  }
 }
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 1a1adf70..15b3db2d 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -8,9 +8,17 @@
   [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
            'If you select a project, you can link the current map to the project.'"
   (selection)="onSelect($event)"
-  (systemSelection)="onSystemSelect($event)">
+  (systemSelection)="onSystemSelect($event)"
+  (currentPath)="setCurrentPath($event)">
 </app-file-browser>
 
+<div style="padding: 20px 0px">
+  <label> Custom file name:
+    <input type="text" [(ngModel)]="fileSuffix">
+  </label>
+  <small><em>If name is not given, file will be saved as the map uuid.</em></small>
+</div>
+
 <div class="confirm-checkbox">
   <label>
     <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
@@ -33,6 +41,6 @@
 </div>
 
 <div>
-    <button class="button warning" (click)="cancel()">Cancel</button>
-    <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles || (activeProject.system_path && !confirmRemove)" (click)="close()">Export</button>
+  <button class="button warning" (click)="cancel()">Cancel</button>
+  <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles || (activeProject.system_path && !confirmRemove)" (click)="close()">Export</button>
 </div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index 23ef1e83..49842365 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -21,8 +21,10 @@ export class ModalLinkProjectComponent implements OnInit {
   @Input() allowEmptyFiles: false;
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
+  fileSuffix: string = '';
   activeProject: Project;
   linkProject: boolean = false;
+  currentPath: string;
   confirmRemove: boolean = false;
   public onClose: Subject<any> = new Subject<any>();
   constructor(private modalRef: BsModalRef,
@@ -42,17 +44,25 @@ export class ModalLinkProjectComponent implements OnInit {
 
   onSelect(items: Array<RemoteFile>) {
     this.selectedFiles = items;
+    console.log(this.selectedFiles)
   }
 
   onSystemSelect(system: any) {
     this.selectedSystem = system;
+    console.log(this.selectedFiles)
+  }
+
+  setCurrentPath(path: string) {
+    this.currentPath = path;
   }
 
   close() {
     this.onClose.next({
       fileList: this.selectedFiles,
       linkProject: this.linkProject,
-      system: this.selectedSystem
+      system: this.selectedSystem,
+      fileSuffix: this.fileSuffix,
+      currentPath: this.currentPath
     });
     this.modalRef.hide();
   }
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index dac58d49..44cc9929 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -36,12 +36,7 @@ <h6 id="property-title">Description:</h6>
 
       <h6 id="property-title">Saved Location</h6>
       <div *ngIf="activeProject.system_path; else noSave" style="margin-bottom: 20px">
-        <div *ngIf="activeProject.system_id.includes('project'); else noProject">
-          <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id.substr(8) + activeProject.system_path"><span>{{activeProject.system_path}}</span></a>
-        </div>
-        <ng-template #noProject>
-          <a [href]="'https://www.designsafe-ci.org/data/browser/' + activeProject.system_id + activeProject.system_path"><span>{{activeProject.system_path}}</span></a>
-        </ng-template>
+        <a [href]="dsHref"><span>{{activeProject.system_path}}</span></a>
       </div>
       <ng-template #noSave>
         <div style="margin-bottom: 20px">
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 0a47eb1a..c179a58c 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -23,6 +23,8 @@ export class UsersPanelComponent implements OnInit {
   descriptionErrorMessage = 'Project description must be under 4096 characters!';
   publicStatusChanging = false;
   publicStatusChangingError = false;
+  dsHref: string;
+  projectHref: string;
 
   constructor(private projectsService: ProjectsService,
               private bsModalService: BsModalService,
@@ -35,7 +37,24 @@ export class UsersPanelComponent implements OnInit {
     });
 
     this.projectsService.activeProject.subscribe( (next) => {
-      this.activeProject = next;
+      if (next) {
+        this.activeProject = next;
+
+        const dsUrl = 'https://www.designsafe-ci.org/data/browser/';
+        if (next.system_id.includes('project')) {
+          this.dsHref = dsUrl + 'projects/' +
+            next.system_id.substr(8) +
+            next.system_path + '/'
+          if (next.system_name) {
+            this.projectHref = dsUrl + 'projects/' +
+              next.system_id + '/'
+          }
+        } else {
+          this.dsHref = dsUrl + 'agave/' +
+            next.system_id +
+            next.system_path + '/'
+        }
+      }
     });
 
     this.projectsService.projectUsers$.subscribe( (next) => {
@@ -58,15 +77,17 @@ export class UsersPanelComponent implements OnInit {
     };
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
     modal.content.onClose.subscribe( (next) => {
-      const path = next.fileList.length > 0 ? next.fileList[0].path : '/';
+      const path = next.fileList.length > 0 ? next.fileList[0].path : next.currentPath;
       if (next.system.id.includes('project') && next.linkProject) {
-        this.projectsService.linkExportProject(this.activeProject,
+        this.projectsService.linkExportProject(this.activeProject.id,
                                                next.system.id,
-                                               path)
+                                               path,
+                                               next.fileSuffix)
       } else {
         this.projectsService.exportProject(this.activeProject.id,
                                            next.system.id,
-                                           path)
+                                           path,
+                                           next.fileSuffix)
       }
     });
   }
diff --git a/src/app/models/models.ts b/src/app/models/models.ts
index 517f23e9..d80735ed 100644
--- a/src/app/models/models.ts
+++ b/src/app/models/models.ts
@@ -50,6 +50,7 @@ export interface Project {
   uuid?: string;
   public?: boolean;
   system_name?: string;
+  system_file?: string;
   system_id?: string;
   system_path?: string;
 }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index bc82ee22..5857256e 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -99,10 +99,11 @@ export class ProjectsService {
       );
   }
 
-  exportProject(projectId: number, system_id: string, path: string) {
+  exportProject(projectId: number, system_id: string, path: string = '/', file_suffix: string = '') {
     const payload = {
+      system_id,
       path,
-      system_id
+      file_suffix
     };
     this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload).subscribe(current_project => {
       this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${current_project.uuid}.hazmapper`)
@@ -113,16 +114,17 @@ export class ProjectsService {
     });
   }
 
-  linkExportProject(proj: Project, system_id: string, path: string = '/') {
+  linkExportProject(projectId: number, system_id: string, path: string = '/', file_suffix: string = '') {
     const data = {
       system_id,
-      path
+      path,
+      file_suffix
     };
 
-    this.http.put<Project>(this.envService.apiUrl + `/projects/${proj.id}/link/`, data).subscribe(
+    this.http.put<Project>(this.envService.apiUrl + `/projects/${projectId}/link/`, data).subscribe(
       resp => {
         this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${resp.uuid}.hazmapper`)
-        this._projects.next([...this._projects.value.filter((p) => p.id != proj.id),
+        this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
                              resp]);
       }, error => {
         console.log(error);

From 082ebad876b8f0c255aa9c828628fd1dbeec9ecd Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 30 Apr 2021 16:20:06 -0500
Subject: [PATCH 12/36] Remove logs.

---
 .../modal-link-project/modal-link-project.component.ts          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index 49842365..f657e5cc 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -44,12 +44,10 @@ export class ModalLinkProjectComponent implements OnInit {
 
   onSelect(items: Array<RemoteFile>) {
     this.selectedFiles = items;
-    console.log(this.selectedFiles)
   }
 
   onSystemSelect(system: any) {
     this.selectedSystem = system;
-    console.log(this.selectedFiles)
   }
 
   setCurrentPath(path: string) {

From b138bb6d4e13c0f03d1014d764c6f5f78f88ecbb Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 14 May 2021 13:08:44 -0500
Subject: [PATCH 13/36] Change fileSuffix to fileName.

---
 .../modal-create-project.component.html                   | 2 +-
 .../modal-create-project.component.ts                     | 8 ++++----
 .../modal-link-project/modal-link-project.component.html  | 2 +-
 .../modal-link-project/modal-link-project.component.ts    | 4 ++--
 src/app/components/users-panel/users-panel.component.ts   | 4 ++--
 src/app/services/projects.service.ts                      | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 15c5ddf2..6625452f 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -36,7 +36,7 @@ <h4> Create a new Map </h4>
               <div style="padding: 20px 0px">
                 <label> Custom file name:
                   <input type="text"
-                         formControlName="fileSuffix">
+                         formControlName="fileName">
                 </label>
                 <small><em>If name is not given, file will be saved as the map uuid.</em></small>
               </div>
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 99a7301b..bf0b262d 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -19,7 +19,7 @@ export class ModalCreateProjectComponent implements OnInit {
   submitting: boolean;
   errorMessage = '';
   currentPath: string;
-  fileSuffix: string = '';
+  fileName: string = '';
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
 
@@ -34,7 +34,7 @@ export class ModalCreateProjectComponent implements OnInit {
       description: new FormControl(''),
       exportMap: new FormControl(false),
       linkProject: new FormControl(false),
-      fileSuffix: new FormControl('')
+      fileName: new FormControl('')
     });
   }
 
@@ -86,12 +86,12 @@ export class ModalCreateProjectComponent implements OnInit {
           this.projectsService.linkExportProject(project.id,
                                                  systemId,
                                                  path,
-                                                 this.projCreateForm.get('fileSuffix').value);
+                                                 this.projCreateForm.get('fileName').value);
         } else {
           this.projectsService.exportProject(project.id,
                                              systemId,
                                              path,
-                                             this.projCreateForm.get('fileSuffix').value);
+                                             this.projCreateForm.get('fileName').value);
         }
       }
       this.close(project);
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 15b3db2d..4dabf70d 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -14,7 +14,7 @@
 
 <div style="padding: 20px 0px">
   <label> Custom file name:
-    <input type="text" [(ngModel)]="fileSuffix">
+    <input type="text" [(ngModel)]="fileName">
   </label>
   <small><em>If name is not given, file will be saved as the map uuid.</em></small>
 </div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index f657e5cc..d035bfb7 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -21,7 +21,7 @@ export class ModalLinkProjectComponent implements OnInit {
   @Input() allowEmptyFiles: false;
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
-  fileSuffix: string = '';
+  fileName: string = '';
   activeProject: Project;
   linkProject: boolean = false;
   currentPath: string;
@@ -59,7 +59,7 @@ export class ModalLinkProjectComponent implements OnInit {
       fileList: this.selectedFiles,
       linkProject: this.linkProject,
       system: this.selectedSystem,
-      fileSuffix: this.fileSuffix,
+      fileName: this.fileName,
       currentPath: this.currentPath
     });
     this.modalRef.hide();
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index c179a58c..360cdbab 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -82,12 +82,12 @@ export class UsersPanelComponent implements OnInit {
         this.projectsService.linkExportProject(this.activeProject.id,
                                                next.system.id,
                                                path,
-                                               next.fileSuffix)
+                                               next.fileName)
       } else {
         this.projectsService.exportProject(this.activeProject.id,
                                            next.system.id,
                                            path,
-                                           next.fileSuffix)
+                                           next.fileName)
       }
     });
   }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 5857256e..8e04227f 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -99,11 +99,11 @@ export class ProjectsService {
       );
   }
 
-  exportProject(projectId: number, system_id: string, path: string = '/', file_suffix: string = '') {
+  exportProject(projectId: number, system_id: string, path: string = '/', file_name: string = '') {
     const payload = {
       system_id,
       path,
-      file_suffix
+      file_name
     };
     this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload).subscribe(current_project => {
       this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${current_project.uuid}.hazmapper`)
@@ -114,11 +114,11 @@ export class ProjectsService {
     });
   }
 
-  linkExportProject(projectId: number, system_id: string, path: string = '/', file_suffix: string = '') {
+  linkExportProject(projectId: number, system_id: string, path: string = '/', file_name: string = '') {
     const data = {
       system_id,
       path,
-      file_suffix
+      file_name
     };
 
     this.http.put<Project>(this.envService.apiUrl + `/projects/${projectId}/link/`, data).subscribe(

From c68a12a5b9233fecf7ac86f465154f115952a48b Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 14 May 2021 15:29:19 -0500
Subject: [PATCH 14/36] Suggested fixes.

---
 .../main-welcome/main-welcome.component.html         |  1 -
 .../main-welcome/main-welcome.component.ts           | 11 +++++++----
 .../modal-create-project.component.html              |  3 +--
 .../modal-create-project.component.ts                | 10 ++++++++--
 .../modal-link-project.component.html                |  2 +-
 .../modal-link-project.component.ts                  |  5 +++++
 .../users-panel/users-panel.component.html           | 12 ++++++------
 7 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 8ab82d3e..58f57c87 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -68,7 +68,6 @@
                     <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
                       <i class="fas fa-folder-open"></i>
                     </button>
-                    <!-- <button class="project-list-item-button" (click)=deleteProject(p)> -->
                     <button class="project-list-item-button" (click)=openDeleteProjectModal(p)>
                       <i class="fas fa-trash"></i>
                     </button>
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 0365c61f..ebd83e02 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Project } from '../../models/models';
 import {GeoDataService} from '../../services/geo-data.service';
 import {ProjectsService} from '../../services/projects.service';
-import {BsModalService} from 'ngx-foundation';
+import {BsModalRef, BsModalService} from 'ngx-foundation';
 import {ModalCreateProjectComponent} from '../modal-create-project/modal-create-project.component';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ModalService } from 'src/app/services/modal.service';
@@ -48,12 +48,15 @@ export class MainWelcomeComponent implements OnInit {
     this.projectsService.getProjects();
   }
 
-  routeToProject(projectId: number) {
-    this.router.navigate(['project', projectId], { relativeTo: this.route });
+  routeToProject(projectUUID: string) {
+    this.router.navigate(['project', projectUUID], { relativeTo: this.route });
   }
 
   openCreateProjectModal() {
-    this.bsModalService.show(ModalCreateProjectComponent);
+    const modal: BsModalRef = this.bsModalService.show(ModalCreateProjectComponent);
+    modal.content.onClose.subscribe( (project: Project) => {
+      this.routeToProject(project.uuid);
+    });
   }
 
   openDeleteProjectModal(p: Project) {
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 6625452f..fa98f232 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -13,7 +13,7 @@ <h4> Create a new Map </h4>
 
             <div class="link-project">
               <label>
-                <span style="padding-right: 10px">Export Map</span>
+                <span style="padding-right: 10px">Export Map Link</span>
                 <input formControlName="exportMap" type="checkbox">
               </label>
 
@@ -64,7 +64,6 @@ <h4> Create a new Map </h4>
           [onlyFolder]="true"
           [single]="true"
           [heading]="'Select a RApp Folder'"
-          [allowedExtensions]="allowedExtensions"
           [helpText]="'All files inside this folder (that can be) will be imported. ' +
            'This folder will also be periodically scraped for new data.' +
            'A project link will be created with the project of this folder.'"
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index bf0b262d..55c3a7d8 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -6,6 +6,7 @@ import { Project } from '../../models/models';
 import {RemoteFile} from 'ng-tapis';
 import {RapidProjectRequest} from '../../models/rapid-project-request';
 import {ChangeDetectorRef } from '@angular/core';
+import { Subject } from 'rxjs';
 
 @Component({
   selector: 'app-modal-create-project',
@@ -14,6 +15,8 @@ import {ChangeDetectorRef } from '@angular/core';
 })
 export class ModalCreateProjectComponent implements OnInit {
 
+  public readonly onClose: Subject<any> = new Subject<any>();
+
   projCreateForm: FormGroup;
   rapidFolder: RemoteFile;
   submitting: boolean;
@@ -43,6 +46,7 @@ export class ModalCreateProjectComponent implements OnInit {
   }
 
   close(project: Project) {
+    this.onClose.next(project);
     this.bsModalRef.hide();
   }
 
@@ -57,9 +61,11 @@ export class ModalCreateProjectComponent implements OnInit {
   onSystemSelect(system: any) {
     this.selectedSystem = system;
     if (system.id.includes('project')) {
-      this.projCreateForm.get('linkProject').enable()
+      this.projCreateForm.get('linkProject').enable();
+      this.projCreateForm.get('linkProject').setValue(true);
     } else {
-      this.projCreateForm.get('linkProject').disable()
+      this.projCreateForm.get('linkProject').disable();
+      this.projCreateForm.get('linkProject').setValue(false);
     }
   }
 
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 4dabf70d..116400bb 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -37,7 +37,7 @@
     <input type="checkbox"
            [(ngModel)]="confirmRemove">
   </label>
-  <small><em>Exporting this map will remove the previous link and saved location.</em></small>
+  <small><em>Exporting this map will remove the previous link and link file's location.</em></small>
 </div>
 
 <div>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index d035bfb7..e517a762 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -48,6 +48,11 @@ export class ModalLinkProjectComponent implements OnInit {
 
   onSystemSelect(system: any) {
     this.selectedSystem = system;
+    if (system.id.includes('project')) {
+      this.linkProject = true;
+    } else {
+      this.linkProject = false;
+    }
   }
 
   setCurrentPath(path: string) {
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 44cc9929..4582d760 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -34,24 +34,24 @@ <h6 id="property-title">Description:</h6>
       >
       </app-edit-name-input>
 
-      <h6 id="property-title">Saved Location</h6>
+      <h6 id="property-title">Map Link Location</h6>
       <div *ngIf="activeProject.system_path; else noSave" style="margin-bottom: 20px">
         <a [href]="dsHref"><span>{{activeProject.system_path}}</span></a>
       </div>
       <ng-template #noSave>
         <div style="margin-bottom: 20px">
-          Map not saved.
+          Map link not saved.
         </div>
       </ng-template>
 
       <h6 id="property-title">Linked Project</h6>
       <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
-        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span>{{activeProject.system_name}}</span></a>
+        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span style="display:inline-block; text-overflow:ellipsis; overflow:hidden; width:100%;">{{activeProject.system_name}}</span></a>
       </div>
       <ng-template #noLink>
         <div style="margin-bottom: 20px">
-          No link! <br />
-          <small><em>You must export the map to a project.</em></small>
+          No map link! <br />
+          <small><em>To link to a project, you must export a map link to a project.</em></small>
         </div>
       </ng-template>
 
@@ -78,7 +78,7 @@ <h6 id="property-title">Public Access</h6>
 
       <div class="grid-x">
       <button class="button hollow" (click)=openExportProjectModal()>
-        <i class="fas fa-save"></i>  Export map
+        <i class="fas fa-save"></i>  Export map link
       </button>
       <button class="button warning alert hollow" (click)=deleteProject()>
         <i class="fas fa-trash"></i>  Delete map

From 45417af389f934c48a63563cdd4506a92668346d Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Fri, 14 May 2021 16:40:37 -0500
Subject: [PATCH 15/36] Show DesignSafe project name in Linked Projects and
 truncate long names.

---
 .../main-welcome/main-welcome.component.html  |  9 +++--
 .../main-welcome/main-welcome.component.ts    | 36 +++++++++++++------
 .../users-panel/users-panel.component.html    |  2 +-
 .../users-panel/users-panel.component.ts      | 24 +++++++------
 src/app/models/models.ts                      |  1 +
 src/app/services/agave-systems.service.ts     | 18 ++++++++++
 src/app/services/projects.service.ts          |  6 ----
 7 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 58f57c87..007f058c 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -58,11 +58,16 @@
                   </div>
 
                   <div class="list-column">
-                    <ng-container *ngIf="p.system_name && p.system_id.includes('project')" class="list-column link-hover">
+                    <ng-container *ngIf="p.system_name && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
                       <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
-                        <span>{{p.system_name}}</span>
+                        <span style="display:inline-block; text-overflow:ellipsis; overflow:hidden; width:175px; white-space: nowrap;">
+                          {{p.dsName}} | {{p.system_name}}
+                        </span>
                       </a>
                     </ng-container>
+                    <ng-template #noSystem>
+                      ------
+                    </ng-template>
                   </div>
                   <div class="list-column" style="text-align: right">
                     <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index ebd83e02..7881b13a 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -3,9 +3,12 @@ import { Project } from '../../models/models';
 import {GeoDataService} from '../../services/geo-data.service';
 import {ProjectsService} from '../../services/projects.service';
 import {BsModalRef, BsModalService} from 'ngx-foundation';
+import {AgaveSystemsService} from '../../services/agave-systems.service';
 import {ModalCreateProjectComponent} from '../modal-create-project/modal-create-project.component';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ModalService } from 'src/app/services/modal.service';
+import { combineLatest } from 'rxjs';
+import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'app-main-welcome',
@@ -17,10 +20,10 @@ export class MainWelcomeComponent implements OnInit {
   release_url = 'https://github.com/TACC-cloud/hazmapper';
   guide_url = 'https://www.designsafe-ci.org/rw/user-guide/workspace/hazmapper/';
 
-  spinner: boolean;
+  spinner: boolean = true;
   connected: boolean;
 
-  public projects: Project[] = [];
+  public projects = [];
   public activeProject: Project;
 
   constructor(
@@ -29,23 +32,36 @@ export class MainWelcomeComponent implements OnInit {
     private geoDataService: GeoDataService,
     private projectsService: ProjectsService,
     private bsModalService: BsModalService,
-    private modalService: ModalService
+    private modalService: ModalService,
+    private agaveSystemsService: AgaveSystemsService
   ) { }
 
   ngOnInit() {
-    this.projectsService.loadingProjects.subscribe((isLoading) => {
-      this.spinner = isLoading;
-    });
+
+    this.projectsService.getProjects();
+    this.agaveSystemsService.getDSProjectId();
 
     this.projectsService.loadingProjectsFailed.subscribe((connected) => {
       this.connected = connected;
     });
 
-    this.projectsService.projects.subscribe( (projects) => {
-      this.projects = projects;
-    });
+    combineLatest(
+      this.projectsService.projects,
+      this.agaveSystemsService.dsProjects).pipe(take(1))
+        .subscribe(([projects, dsProjects]) => {
+          if (projects.length > 0) {
+            this.projects = dsProjects.length > 0
+              ? projects.map(p => {
+                p.dsName = dsProjects.find(dp => dp.id === p.system_id).dsId
+                return p;
+              })
+              : projects;
+            this.spinner = false;
+          } else {
+            this.spinner = true;
+          }
+        });
 
-    this.projectsService.getProjects();
   }
 
   routeToProject(projectUUID: string) {
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 4582d760..a678f00b 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -46,7 +46,7 @@ <h6 id="property-title">Map Link Location</h6>
 
       <h6 id="property-title">Linked Project</h6>
       <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
-        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span style="display:inline-block; text-overflow:ellipsis; overflow:hidden; width:100%;">{{activeProject.system_name}}</span></a>
+        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span>{{activeProject.system_name}}</span></a>
       </div>
       <ng-template #noLink>
         <div style="margin-bottom: 20px">
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 360cdbab..ae01705f 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -41,18 +41,20 @@ export class UsersPanelComponent implements OnInit {
         this.activeProject = next;
 
         const dsUrl = 'https://www.designsafe-ci.org/data/browser/';
-        if (next.system_id.includes('project')) {
-          this.dsHref = dsUrl + 'projects/' +
-            next.system_id.substr(8) +
-            next.system_path + '/'
-          if (next.system_name) {
-            this.projectHref = dsUrl + 'projects/' +
-              next.system_id + '/'
+        if (next.system_id) {
+          if (next.system_id.includes('project')) {
+            this.dsHref = dsUrl + 'projects/' +
+              next.system_id.substr(8) +
+              next.system_path + '/'
+            if (next.system_name) {
+              this.projectHref = dsUrl + 'projects/' +
+                next.system_id + '/'
+            }
+          } else {
+            this.dsHref = dsUrl + 'agave/' +
+              next.system_id +
+              next.system_path + '/'
           }
-        } else {
-          this.dsHref = dsUrl + 'agave/' +
-            next.system_id +
-            next.system_path + '/'
         }
       }
     });
diff --git a/src/app/models/models.ts b/src/app/models/models.ts
index d80735ed..40b1da4a 100644
--- a/src/app/models/models.ts
+++ b/src/app/models/models.ts
@@ -47,6 +47,7 @@ export interface Project {
   description: string;
   id?: number;
   name: string;
+  dsName?: string;
   uuid?: string;
   public?: boolean;
   system_name?: string;
diff --git a/src/app/services/agave-systems.service.ts b/src/app/services/agave-systems.service.ts
index 5b788b1f..e14ba904 100644
--- a/src/app/services/agave-systems.service.ts
+++ b/src/app/services/agave-systems.service.ts
@@ -16,6 +16,8 @@ export class AgaveSystemsService {
   public readonly systems: Observable<SystemSummary[]> = this._systems.asObservable();
   private _projects: ReplaySubject<SystemSummary[]> = new ReplaySubject<SystemSummary[]>(1);
   public readonly projects: Observable<SystemSummary[]> = this._projects.asObservable();
+  private _dsProjects: ReplaySubject<any[]> = new ReplaySubject<any[]>(1);
+  public readonly dsProjects: Observable<any[]> = this._dsProjects.asObservable();
   constructor(private tapis: ApiService, private envService: EnvService, private http: HttpClient) { }
 
   list() {
@@ -39,4 +41,20 @@ export class AgaveSystemsService {
         this._projects.next(null);
       });
   }
+
+  getDSProjectId() {
+    this.http.get<DesignSafeProjectCollection>(this.envService.designSafeUrl + `/projects/v2/`)
+      .subscribe( resp => {
+        const projectSystems = resp.projects.map((project) => {
+          return {
+            id: 'project-' + project.uuid,
+            dsId: project.value.projectId
+          };
+        });
+        this._dsProjects.next(projectSystems);
+      }, error => {
+        this._dsProjects.next(null);
+      });
+
+  }
 }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 8e04227f..23c28f79 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -25,9 +25,6 @@ export class ProjectsService {
   private _projectUsers: ReplaySubject<Array<IProjectUser>> = new ReplaySubject<Array<IProjectUser>>(1);
   public readonly projectUsers$: Observable<Array<IProjectUser>> = this._projectUsers.asObservable();
 
-  private _loadingProjects: BehaviorSubject<boolean> = new BehaviorSubject(false);
-  public loadingProjects: Observable<boolean> = this._loadingProjects.asObservable();
-
   private _loadingProjectsFailed: BehaviorSubject<boolean> = new BehaviorSubject(false);
   public loadingProjectsFailed: Observable<boolean> = this._loadingProjectsFailed.asObservable();
 
@@ -45,14 +42,11 @@ export class ProjectsService {
               private envService: EnvService) { }
 
   getProjects(): void {
-    this._loadingProjects.next(true);
     this._loadingProjectsFailed.next(false);
     this.http.get<Project[]>(this.envService.apiUrl + `/projects/`).subscribe( resp => {
       this._projects.next(resp);
-      this._loadingProjects.next(false);
       this._loadingProjectsFailed.next(false);
     }, error => {
-      this._loadingProjects.next(false);
       this._loadingProjectsFailed.next(true);
       this.notificationsService.showErrorToast('Failed to retrieve project data! Geoapi might be down.');
     });

From eeb8db4a1cdda8024707e396553dbcdf4b1b001c Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 17 May 2021 11:02:17 -0500
Subject: [PATCH 16/36] Update active project on link creation.

---
 .../main-welcome/main-welcome.component.ts    | 25 +++++++++++--------
 .../modal-create-project.component.html       |  8 +++---
 .../modal-create-project.component.ts         |  4 +--
 src/app/services/projects.service.ts          | 15 ++++++-----
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 7881b13a..8a5cd4d2 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -49,19 +49,22 @@ export class MainWelcomeComponent implements OnInit {
       this.projectsService.projects,
       this.agaveSystemsService.dsProjects).pipe(take(1))
         .subscribe(([projects, dsProjects]) => {
-          if (projects.length > 0) {
-            this.projects = dsProjects.length > 0
-              ? projects.map(p => {
-                p.dsName = dsProjects.find(dp => dp.id === p.system_id).dsId
-                return p;
-              })
-              : projects;
-            this.spinner = false;
-          } else {
-            this.spinner = true;
+          if (dsProjects) {
+            console.log(dsProjects)
+            if (projects.length > 0) {
+              this.projects = dsProjects.length > 0
+                ? projects.map(p => {
+                  const pDir = dsProjects.find(dp => dp.id === p.system_id);
+                  p.dsName = pDir ? pDir.dsId : null;
+                  return p;
+                })
+                : projects;
+              this.spinner = false;
+            } else {
+              this.spinner = true;
+            }
           }
         });
-
   }
 
   routeToProject(projectUUID: string) {
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index fa98f232..a63c66ca 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -14,19 +14,19 @@ <h4> Create a new Map </h4>
             <div class="link-project">
               <label>
                 <span style="padding-right: 10px">Export Map Link</span>
-                <input formControlName="exportMap" type="checkbox">
+                <input formControlName="exportMapLink" type="checkbox">
               </label>
 
             </div>
-            <div *ngIf="projCreateForm.get('exportMap').value">
+            <div *ngIf="projCreateForm.get('exportMapLink').value">
               <app-file-browser
                 [single]=true
                 [allowFolders]=true
                 [allowedExtensions]=[]
                 [onlyFolder]=true
                 [showPublicSystems]=false
-                [heading]="'Select Export Location'"
-                [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
+                [heading]="'Select Link Export Location'"
+                [helpText]="'If no folder is selected, the link file will be exported to the root of the selected system.' +
                          'If you select a project, you can link the current map to the project.'"
                 (selection)="onSelect($event)"
                 (currentPath)="setCurrentPath($event)"
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 55c3a7d8..ee99f197 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -35,7 +35,7 @@ export class ModalCreateProjectComponent implements OnInit {
     this.projCreateForm = new FormGroup( {
       name: new FormControl(''),
       description: new FormControl(''),
-      exportMap: new FormControl(false),
+      exportMapLink: new FormControl(false),
       linkProject: new FormControl(false),
       fileName: new FormControl('')
     });
@@ -85,7 +85,7 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
-      if (this.projCreateForm.get('exportMap').value) {
+      if (this.projCreateForm.get('exportMapLink').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
         if (this.projCreateForm.get('linkProject').value) {
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 23c28f79..f9eac6fb 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -99,10 +99,12 @@ export class ProjectsService {
       path,
       file_name
     };
-    this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload).subscribe(current_project => {
-      this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${current_project.uuid}.hazmapper`)
+    this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload)
+      .subscribe(currentProject => {
+      this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${currentProject.uuid}.hazmapper`)
       this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
-                           current_project]);
+                           currentProject]);
+      this.setActiveProject(currentProject);
     }, error => {
       console.log(error);
     });
@@ -116,10 +118,11 @@ export class ProjectsService {
     };
 
     this.http.put<Project>(this.envService.apiUrl + `/projects/${projectId}/link/`, data).subscribe(
-      resp => {
-        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${resp.uuid}.hazmapper`)
+      (currentProject: Project) => {
+        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${currentProject.uuid}.hazmapper`)
         this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
-                             resp]);
+                             currentProject]);
+        this.setActiveProject(currentProject);
       }, error => {
         console.log(error);
       });

From 82110942bf84ff9788b6afef62e3054cd7416d02 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 17 May 2021 12:34:56 -0500
Subject: [PATCH 17/36] Combine link and export.

---
 .../main-welcome/main-welcome.component.ts    |  3 --
 .../modal-create-project.component.ts         | 16 ++++-------
 .../users-panel/users-panel.component.ts      | 16 ++++-------
 src/app/services/projects.service.ts          | 28 ++++++-------------
 4 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 8a5cd4d2..731a3f5b 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { Project } from '../../models/models';
-import {GeoDataService} from '../../services/geo-data.service';
 import {ProjectsService} from '../../services/projects.service';
 import {BsModalRef, BsModalService} from 'ngx-foundation';
 import {AgaveSystemsService} from '../../services/agave-systems.service';
@@ -29,7 +28,6 @@ export class MainWelcomeComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private router: Router,
-    private geoDataService: GeoDataService,
     private projectsService: ProjectsService,
     private bsModalService: BsModalService,
     private modalService: ModalService,
@@ -50,7 +48,6 @@ export class MainWelcomeComponent implements OnInit {
       this.agaveSystemsService.dsProjects).pipe(take(1))
         .subscribe(([projects, dsProjects]) => {
           if (dsProjects) {
-            console.log(dsProjects)
             if (projects.length > 0) {
               this.projects = dsProjects.length > 0
                 ? projects.map(p => {
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index ee99f197..520b1b3d 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -88,17 +88,11 @@ export class ModalCreateProjectComponent implements OnInit {
       if (this.projCreateForm.get('exportMapLink').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
-        if (this.projCreateForm.get('linkProject').value) {
-          this.projectsService.linkExportProject(project.id,
-                                                 systemId,
-                                                 path,
-                                                 this.projCreateForm.get('fileName').value);
-        } else {
-          this.projectsService.exportProject(project.id,
-                                             systemId,
-                                             path,
-                                             this.projCreateForm.get('fileName').value);
-        }
+        this.projectsService.exportProject(project.id,
+                                           systemId,
+                                           path,
+                                           this.projCreateForm.get('linkProject').value,
+                                           this.projCreateForm.get('fileName').value)
       }
       this.close(project);
     }, err => {
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index ae01705f..631fece3 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -80,17 +80,11 @@ export class UsersPanelComponent implements OnInit {
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
     modal.content.onClose.subscribe( (next) => {
       const path = next.fileList.length > 0 ? next.fileList[0].path : next.currentPath;
-      if (next.system.id.includes('project') && next.linkProject) {
-        this.projectsService.linkExportProject(this.activeProject.id,
-                                               next.system.id,
-                                               path,
-                                               next.fileName)
-      } else {
-        this.projectsService.exportProject(this.activeProject.id,
-                                           next.system.id,
-                                           path,
-                                           next.fileName)
-      }
+      this.projectsService.exportProject(this.activeProject.id,
+                                         next.system.id,
+                                         path,
+                                         next.system.id.includes('project') && next.linkProject,
+                                         next.fileName)
     });
   }
 
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index f9eac6fb..a6129592 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -93,32 +93,20 @@ export class ProjectsService {
       );
   }
 
-  exportProject(projectId: number, system_id: string, path: string = '/', file_name: string = '') {
+  exportProject(projectId: number,
+                system_id: string,
+                path: string = '/',
+                link: boolean,
+                file_name: string = '') {
     const payload = {
       system_id,
       path,
-      file_name
+      file_name,
+      link
     };
+
     this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload)
       .subscribe(currentProject => {
-      this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${currentProject.uuid}.hazmapper`)
-      this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
-                           currentProject]);
-      this.setActiveProject(currentProject);
-    }, error => {
-      console.log(error);
-    });
-  }
-
-  linkExportProject(projectId: number, system_id: string, path: string = '/', file_name: string = '') {
-    const data = {
-      system_id,
-      path,
-      file_name
-    };
-
-    this.http.put<Project>(this.envService.apiUrl + `/projects/${projectId}/link/`, data).subscribe(
-      (currentProject: Project) => {
         this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${currentProject.uuid}.hazmapper`)
         this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
                              currentProject]);

From 7c32c79d5f41871304aaa21141c682ec0493acc2 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 17 May 2021 12:58:58 -0500
Subject: [PATCH 18/36] Prepopulate uuid in project link modal.

---
 .../modal-create-project.component.html                   | 8 +++++---
 .../modal-link-project/modal-link-project.component.html  | 7 +++++--
 .../modal-link-project/modal-link-project.component.ts    | 1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index a63c66ca..21234a83 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -35,10 +35,12 @@ <h4> Create a new Map </h4>
 
               <div style="padding: 20px 0px">
                 <label> Custom file name:
-                  <input type="text"
-                         formControlName="fileName">
+                  <div style="display: flex; flex-direction: row">
+                    <input type="text" formControlName="fileName">
+                    <span style="line-height: 1.5; font-size: 1rem; margin: 5px">.hazmapper</span>
+                  </div>
                 </label>
-                <small><em>If name is not given, file will be saved as the map uuid.</em></small>
+                <small><em>If a name is not given, file will be saved as the map uuid.</em></small>
               </div>
 
               <div class="confirm-checkbox">
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 116400bb..7c1b229e 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -14,9 +14,12 @@
 
 <div style="padding: 20px 0px">
   <label> Custom file name:
-    <input type="text" [(ngModel)]="fileName">
+    <div style="display: flex; flex-direction: row">
+      <input type="text" [(ngModel)]="fileName">
+      <span style="line-height: 1.5; font-size: 1rem; margin: 5px">.hazmapper</span>
+    </div>
   </label>
-  <small><em>If name is not given, file will be saved as the map uuid.</em></small>
+  <small><em>If a name is not given, file will be saved as the map uuid.</em></small>
 </div>
 
 <div class="confirm-checkbox">
diff --git a/src/app/components/modal-link-project/modal-link-project.component.ts b/src/app/components/modal-link-project/modal-link-project.component.ts
index e517a762..6b5e7785 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.ts
+++ b/src/app/components/modal-link-project/modal-link-project.component.ts
@@ -35,6 +35,7 @@ export class ModalLinkProjectComponent implements OnInit {
   ngOnInit() {
     this.projectsService.activeProject.subscribe( (next) => {
       this.activeProject = next;
+      this.fileName = next.uuid;
     });
   }
 

From 22d9afcbdc57dd586154bdd0e3c8a9f66238e029 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 17 May 2021 13:17:28 -0500
Subject: [PATCH 19/36] Refactor export function.

---
 .../modal-create-project.component.ts                 |  2 +-
 .../components/users-panel/users-panel.component.ts   |  2 +-
 src/app/services/projects.service.ts                  | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index 520b1b3d..d9e19a3e 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -88,7 +88,7 @@ export class ModalCreateProjectComponent implements OnInit {
       if (this.projCreateForm.get('exportMapLink').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
-        this.projectsService.exportProject(project.id,
+        this.projectsService.exportProject(project,
                                            systemId,
                                            path,
                                            this.projCreateForm.get('linkProject').value,
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 631fece3..6af7c159 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -80,7 +80,7 @@ export class UsersPanelComponent implements OnInit {
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
     modal.content.onClose.subscribe( (next) => {
       const path = next.fileList.length > 0 ? next.fileList[0].path : next.currentPath;
-      this.projectsService.exportProject(this.activeProject.id,
+      this.projectsService.exportProject(this.activeProject,
                                          next.system.id,
                                          path,
                                          next.system.id.includes('project') && next.linkProject,
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index a6129592..671d74e9 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -93,11 +93,13 @@ export class ProjectsService {
       );
   }
 
-  exportProject(projectId: number,
+  exportProject(project: Project,
                 system_id: string,
                 path: string = '/',
                 link: boolean,
                 file_name: string = '') {
+    file_name = file_name === '' ? project.uuid : file_name;
+
     const payload = {
       system_id,
       path,
@@ -105,13 +107,14 @@ export class ProjectsService {
       link
     };
 
-    this.http.put<any>(this.envService.apiUrl + `/projects/${projectId}/export/`, payload)
+    this.http.put<any>(this.envService.apiUrl + `/projects/${project.id}/export/`, payload)
       .subscribe(currentProject => {
-        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${currentProject.uuid}.hazmapper`)
-        this._projects.next([...this._projects.value.filter((p) => p.id != projectId),
+        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${file_name}.hazmapper`)
+        this._projects.next([...this._projects.value.filter((p) => p.id != project.id),
                              currentProject]);
         this.setActiveProject(currentProject);
       }, error => {
+        this.notificationsService.showErrorToast(`Failed to create file ${system_id}/${path}/${file_name}.hazmapper`)
         console.log(error);
       });
   }

From 3479b709a0e5e0f1a9ca64ebedae71ec04480ba5 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 17 May 2021 13:42:39 -0500
Subject: [PATCH 20/36] Adjust welcome project list width.

---
 .../main-welcome/main-welcome.component.html  | 16 +++++------
 .../main-welcome/main-welcome.component.styl  | 28 ++++++++++++-------
 .../users-panel/users-panel.component.html    |  6 +++-
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 007f058c..a885518e 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -10,13 +10,13 @@
     <div class="grid-x align-center">
       <div id=welcome-projects-list class="grid-y align-center">
         <div class="welcome-project-header grid-x">
-          <div class="list-column">
+          <div class="map-column">
             <b>Maps</b>
           </div>
-          <div class="list-column">
+          <div class="project-column">
             <b>Linked Project</b>
           </div>
-          <div class="list-column" style="text-align: right">
+          <div class="button-column" style="text-align: right">
             <div id="new-map" (click)="openCreateProjectModal()">
               <i class="fas fa-plus"></i>
               Create a New Map
@@ -53,23 +53,23 @@
                                  'grid-x': true
                                  }">
 
-                  <div class="list-column">
+                  <div class="map-column">
                     {{p.name}}
                   </div>
 
-                  <div class="list-column">
+                  <div class="project-column">
                     <ng-container *ngIf="p.system_name && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
                       <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
-                        <span style="display:inline-block; text-overflow:ellipsis; overflow:hidden; width:175px; white-space: nowrap;">
+                        <span class="project-name">
                           {{p.dsName}} | {{p.system_name}}
                         </span>
                       </a>
                     </ng-container>
                     <ng-template #noSystem>
-                      ------
+                      ----------
                     </ng-template>
                   </div>
-                  <div class="list-column" style="text-align: right">
+                  <div class="button-column" style="text-align: right">
                     <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
                       <i class="fas fa-folder-open"></i>
                     </button>
diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index 9d0c4ce9..867ef513 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -12,10 +12,20 @@
     padding: 20px
     margin-bottom: 50px
     #user-guide
-      width: 550px
+      width: 100%
       text-align: right
-  .list-column
-    width: 187px
+  .map-column
+    width: 200px
+  .project-column
+    width: 100%
+  .button-column
+    width: 250px
+  .project-name
+    display: inline-block
+    text-overflow: ellipsis
+    overflow: hidden
+    width: 90%
+    white-space: nowrap
   #sponsor
     height: 50px
     display: flex
@@ -29,7 +39,7 @@
     height: calc(100% - 40px)
     #welcome-projects-list
       background-color: #ffffff
-      width: 600px
+      width: 100%
     .project-list-container
       height: 270px
       overflow-y: scroll
@@ -47,6 +57,8 @@
     .welcome-project-header
       font-size: 14px
       padding: 12px
+      display: flex
+      flex-wrap: nowrap
       background-color: #d0d0d0
     .welcome-project-light
       background-color: #ffffff
@@ -58,20 +70,16 @@
       a
         color: #ADDFFF
     #welcome-no-information
-      height: 100%
       display: flex
       flex-direction: column
       font-size: 24px
       padding: 90px
       height: 270px
       align-items: center
+      width: 100%
     #welcome-information
       background-color: #f7f7f7
-      // padding: 150px 300px
-      // padding: 50px
-      // margin-bottom: 20px
-      width: 800px
-      // width: calc(100% - 400px)
+      width: 100%
       #welcome-logo
         display: flex
         flex-direction: column
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index a678f00b..f1550aff 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -46,7 +46,11 @@ <h6 id="property-title">Map Link Location</h6>
 
       <h6 id="property-title">Linked Project</h6>
       <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
-        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'"><span>{{activeProject.system_name}}</span></a>
+        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'">
+          <span>
+            {{activeProject.system_name}}
+          </span>
+        </a>
       </div>
       <ng-template #noLink>
         <div style="margin-bottom: 20px">

From 9c8eae79b917172b5383f8b860f4ad580eda50c2 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 12:07:16 -0500
Subject: [PATCH 21/36] Remove unused function in file browser.

---
 .../modal-file-browser/modal-file-browser.component.html         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.html b/src/app/components/modal-file-browser/modal-file-browser.component.html
index 58fef4e8..81fa1e3d 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.html
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.html
@@ -4,7 +4,6 @@
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
   (selection)="onSelect($event)"
-  (systemSelection)="onSystemSelect($event)">
 </app-file-browser>
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>

From b1353695f3c9e24f5dc468df42e27246f6930133 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 12:12:13 -0500
Subject: [PATCH 22/36] Fix column width.

---
 .../components/main-welcome/main-welcome.component.html   | 2 +-
 .../components/main-welcome/main-welcome.component.styl   | 8 +++++---
 src/app/components/main-welcome/main-welcome.component.ts | 2 +-
 .../modal-file-browser/modal-file-browser.component.html  | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index a885518e..91b813f3 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -54,7 +54,7 @@
                                  }">
 
                   <div class="map-column">
-                    {{p.name}}
+                    <span class="project-name">{{p.name}}</span>
                   </div>
 
                   <div class="project-column">
diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index 867ef513..d18acf28 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -15,16 +15,18 @@
       width: 100%
       text-align: right
   .map-column
-    width: 200px
+    max-width: 120px
+    min-width: 120px
+    width: 120px
   .project-column
     width: 100%
   .button-column
-    width: 250px
+    width: 280px
   .project-name
     display: inline-block
     text-overflow: ellipsis
     overflow: hidden
-    width: 90%
+    width: 80%
     white-space: nowrap
   #sponsor
     height: 50px
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 731a3f5b..9e425371 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -19,7 +19,7 @@ export class MainWelcomeComponent implements OnInit {
   release_url = 'https://github.com/TACC-cloud/hazmapper';
   guide_url = 'https://www.designsafe-ci.org/rw/user-guide/workspace/hazmapper/';
 
-  spinner: boolean = true;
+  spinner = true;
   connected: boolean;
 
   public projects = [];
diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.html b/src/app/components/modal-file-browser/modal-file-browser.component.html
index 81fa1e3d..fec250fd 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.html
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.html
@@ -3,7 +3,7 @@
   [allowFolders]=allowFolders
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
-  (selection)="onSelect($event)"
+  (selection)="onSelect($event)">
 </app-file-browser>
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>

From 1e9578bdc095185aaba2d2753fa38262cafc899f Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 12:13:21 -0500
Subject: [PATCH 23/36] Stop spinner when no projects exist.

---
 src/app/components/main-welcome/main-welcome.component.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 9e425371..6749423a 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -56,10 +56,8 @@ export class MainWelcomeComponent implements OnInit {
                   return p;
                 })
                 : projects;
-              this.spinner = false;
-            } else {
-              this.spinner = true;
             }
+            this.spinner = false;
           }
         });
   }

From 82d176bae0162581998819cb9ca5d94165534636 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 12:21:22 -0500
Subject: [PATCH 24/36] Organization user-panel buttons.

---
 .../main-welcome/main-welcome.component.styl    |  1 +
 .../users-panel/users-panel.component.html      | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index d18acf28..9ce11167 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -22,6 +22,7 @@
     width: 100%
   .button-column
     width: 280px
+    white-space: nowrap
   .project-name
     display: inline-block
     text-overflow: ellipsis
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index f1550aff..8e91987a 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -74,19 +74,20 @@ <h6 id="property-title">Public Access</h6>
       <div *ngIf="!activeProject.public" class="public-status-container">
         <span class="public-status-message">This map is private and can only be viewed by team members.</span>
         <span *ngIf="this.publicStatusChangingError" class="label alert">Unable to make map public.</span>
-        <button class="button hollow right" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(true)>
+        <button class="button hollow left" style="margin-top: 20px" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(true)>
           <i class="fas fa-globe"></i>  Make map public
         </button>
       </div>
 
+      <hr />
 
-      <div class="grid-x">
-      <button class="button hollow" (click)=openExportProjectModal()>
-        <i class="fas fa-save"></i>  Export map link
-      </button>
-      <button class="button warning alert hollow" (click)=deleteProject()>
-        <i class="fas fa-trash"></i>  Delete map
-      </button>
+      <div style="display: flex; flex-direction: column; justify-content: center">
+        <button class="button hollow" (click)=openExportProjectModal()>
+          <i class="fas fa-save"></i>  Export map link
+        </button>
+        <button class="button warning alert hollow" (click)=deleteProject()>
+          <i class="fas fa-trash"></i>  Delete map
+        </button>
       </div>
     </div>
   </div>

From 8420411d467da68fa898ba0ffe283d1054aa9482 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 15:28:38 -0500
Subject: [PATCH 25/36] Correct project link.

---
 src/app/components/main-welcome/main-welcome.component.html | 6 +++---
 src/app/components/users-panel/users-panel.component.html   | 2 +-
 src/app/components/users-panel/users-panel.component.ts     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 91b813f3..ce97aa1a 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -54,13 +54,13 @@
                                  }">
 
                   <div class="map-column">
-                    <span class="project-name">{{p.name}}</span>
+                    <span [tooltip]="p.name" class="project-name">{{p.name}}</span>
                   </div>
 
                   <div class="project-column">
                     <ng-container *ngIf="p.system_name && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
-                      <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
-                        <span class="project-name">
+                      <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id.substr(8) + '/'">
+                        <span class="project-name" [tooltip]="p.system_name">
                           {{p.dsName}} | {{p.system_name}}
                         </span>
                       </a>
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 8e91987a..7e563a6d 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -46,7 +46,7 @@ <h6 id="property-title">Map Link Location</h6>
 
       <h6 id="property-title">Linked Project</h6>
       <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
-        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'">
+        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id.substr(8) + '/'">
           <span>
             {{activeProject.system_name}}
           </span>
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 6af7c159..531f9a30 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -45,15 +45,15 @@ export class UsersPanelComponent implements OnInit {
           if (next.system_id.includes('project')) {
             this.dsHref = dsUrl + 'projects/' +
               next.system_id.substr(8) +
-              next.system_path + '/'
+              next.system_path + '/';
             if (next.system_name) {
               this.projectHref = dsUrl + 'projects/' +
-                next.system_id + '/'
+                next.system_id + '/';
             }
           } else {
             this.dsHref = dsUrl + 'agave/' +
               next.system_id +
-              next.system_path + '/'
+              next.system_path + '/';
           }
         }
       }

From 27893f19f09341a64d51b27a78310dbdd15dc311 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 15:30:32 -0500
Subject: [PATCH 26/36] Add tiles for observable projects.

---
 src/app/services/projects.service.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 0f1ad17f..4dc65439 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -124,6 +124,9 @@ export class ProjectsService {
       .pipe(
         map( (proj) => {
           this._projects.next([proj, ...this._projects.value]);
+          defaultTileServers.forEach(ts => {
+            this.geoDataService.addTileServer(proj.id, ts, true);
+          });
           return proj;
         }),
        catchError( (err: any) =>  {

From f431d60bf552fd1d278102262873a74d27222faa Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 15:33:01 -0500
Subject: [PATCH 27/36] Correct project path link.

---
 src/app/components/users-panel/users-panel.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 531f9a30..7d296b04 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -44,7 +44,7 @@ export class UsersPanelComponent implements OnInit {
         if (next.system_id) {
           if (next.system_id.includes('project')) {
             this.dsHref = dsUrl + 'projects/' +
-              next.system_id.substr(8) +
+              next.system_id.substr(8) + '/' +
               next.system_path + '/';
             if (next.system_name) {
               this.projectHref = dsUrl + 'projects/' +

From 8c225311eef998cd6401e6bc7caf653ea35d7479 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 19 May 2021 15:51:55 -0500
Subject: [PATCH 28/36] Remove from project list after project deletion.

---
 src/app/components/main-welcome/main-welcome.component.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 6749423a..67549b30 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -35,7 +35,6 @@ export class MainWelcomeComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-
     this.projectsService.getProjects();
     this.agaveSystemsService.getDSProjectId();
 
@@ -45,8 +44,9 @@ export class MainWelcomeComponent implements OnInit {
 
     combineLatest(
       this.projectsService.projects,
-      this.agaveSystemsService.dsProjects).pipe(take(1))
+      this.agaveSystemsService.dsProjects)
         .subscribe(([projects, dsProjects]) => {
+          this.spinner = true;
           if (dsProjects) {
             if (projects.length > 0) {
               this.projects = dsProjects.length > 0
@@ -56,6 +56,8 @@ export class MainWelcomeComponent implements OnInit {
                   return p;
                 })
                 : projects;
+            } else {
+              this.projects = [];
             }
             this.spinner = false;
           }

From db8b2c7bd3d337bae254a40ab9f5a1b0de42e785 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 20 May 2021 15:40:35 -0500
Subject: [PATCH 29/36] Fetch DS project information locally.

---
 .../control-bar/control-bar.component.html    | 10 ++-
 .../control-bar/control-bar.component.ts      | 24 ++++--
 .../main-welcome/main-welcome.component.html  |  4 +-
 .../main-welcome/main-welcome.component.ts    | 21 +-----
 .../modal-file-browser.component.html         |  2 +-
 .../public-map-info-panel.component.html      |  4 +-
 .../users-panel/users-panel.component.html    |  4 +-
 .../users-panel/users-panel.component.ts      | 30 +++++---
 src/app/models/models.ts                      |  4 +-
 src/app/services/agave-systems.service.ts     | 32 ++++----
 src/app/services/projects.service.ts          | 75 +++++++++++++++++--
 11 files changed, 137 insertions(+), 73 deletions(-)

diff --git a/src/app/components/control-bar/control-bar.component.html b/src/app/components/control-bar/control-bar.component.html
index 4ab822fe..863e0f33 100644
--- a/src/app/components/control-bar/control-bar.component.html
+++ b/src/app/components/control-bar/control-bar.component.html
@@ -6,11 +6,13 @@
         <i class="fas fa-spin fa-spinner"></i>
     </div>
     <div *ngIf="!loadingActiveProject && !loadingActiveProjectFailed" class="cell small-8 align-middle grid-x">
-        <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>
-        <div *ngIf="activeProject.system_name" style="padding-left: 30px">
-          <span>Project: {{activeProject.system_name}}</span>
+      <ng-container *ngIf="activeProject">
+        <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>a
+        <div *ngIf="activeProject.ds_id" style="padding-left: 30px">
+          <span>Project: {{activeProject.ds_id}} | {{activeProject.title}}</span>
         </div>
-        <div *ngIf="loadingData" style="margin-left: 1rem">
+      </ng-container>
+      <div *ngIf="loadingData" style="margin-left: 1rem">
             <i class="fas fa-spin fa-spinner" style="margin-right: 0.3rem"></i>
             <span>Loading Data</span>
         </div>
diff --git a/src/app/components/control-bar/control-bar.component.ts b/src/app/components/control-bar/control-bar.component.ts
index 1ed77f72..351caf21 100644
--- a/src/app/components/control-bar/control-bar.component.ts
+++ b/src/app/components/control-bar/control-bar.component.ts
@@ -9,6 +9,7 @@ import {combineLatest, Subscription} from 'rxjs';
 import {NotificationsService} from '../../services/notifications.service';
 import { ModalFileBrowserComponent } from '../modal-file-browser/modal-file-browser.component';
 import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
+import { AgaveSystemsService } from 'src/app/services/agave-systems.service';
 
 @Component({
   selector: 'app-control-bar',
@@ -29,9 +30,12 @@ export class ControlBarComponent implements OnInit, OnDestroy {
               private bsModalService: BsModalService,
               private geoDataService: GeoDataService,
               private notificationsService: NotificationsService,
+              private agaveSystemsService: AgaveSystemsService
               ) { }
 
   ngOnInit() {
+    this.agaveSystemsService.list();
+
     this.subscription.add(this.projectsService.loadingActiveProject.subscribe(
       value => this.loadingActiveProject = value));
     this.subscription.add(this.projectsService.loadingActiveProjectFailed.subscribe(value => this.loadingActiveProjectFailed = value));
@@ -44,14 +48,18 @@ export class ControlBarComponent implements OnInit, OnDestroy {
         this.loadingData = (loadingOverlay || loadingPointCloud || loadingFeature);
       }));
 
-    this.subscription.add(this.projectsService.activeProject.subscribe(next => {
-      this.activeProject = next;
-      if (this.activeProject) {
-        this.geoDataService.getDataForProject(next.id);
-      } else {
-        this.geoDataService.clearData();
-      }
-    }));
+
+    this.subscription.add(combineLatest([this.projectsService.activeProject,
+                                         this.agaveSystemsService.projects])
+      .subscribe(([activeProject, dsProjects]) => {
+        this.activeProject = activeProject;
+        if (this.activeProject) {
+          this.geoDataService.getDataForProject(activeProject.id);
+          this.activeProject = this.agaveSystemsService.getDSProjectInformation([activeProject], dsProjects)[0];
+        } else {
+          this.geoDataService.clearData();
+        }
+      }));
 
     this.subscription.add(this.notificationsService.notifications.subscribe(next => {
       const hasSuccessNotification = next.some(note => note.status === 'success');
diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index a885518e..84cb551d 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -58,10 +58,10 @@
                   </div>
 
                   <div class="project-column">
-                    <ng-container *ngIf="p.system_name && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
+                    <ng-container *ngIf="p.ds_id && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
                       <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id + '/'">
                         <span class="project-name">
-                          {{p.dsName}} | {{p.system_name}}
+                          {{p.ds_id}} | {{p.title}}
                         </span>
                       </a>
                     </ng-container>
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 731a3f5b..e869035a 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -35,9 +35,8 @@ export class MainWelcomeComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-
     this.projectsService.getProjects();
-    this.agaveSystemsService.getDSProjectId();
+    this.agaveSystemsService.list();
 
     this.projectsService.loadingProjectsFailed.subscribe((connected) => {
       this.connected = connected;
@@ -45,22 +44,10 @@ export class MainWelcomeComponent implements OnInit {
 
     combineLatest(
       this.projectsService.projects,
-      this.agaveSystemsService.dsProjects).pipe(take(1))
+      this.agaveSystemsService.projects)
         .subscribe(([projects, dsProjects]) => {
-          if (dsProjects) {
-            if (projects.length > 0) {
-              this.projects = dsProjects.length > 0
-                ? projects.map(p => {
-                  const pDir = dsProjects.find(dp => dp.id === p.system_id);
-                  p.dsName = pDir ? pDir.dsId : null;
-                  return p;
-                })
-                : projects;
-              this.spinner = false;
-            } else {
-              this.spinner = true;
-            }
-          }
+          this.projects = this.agaveSystemsService.getDSProjectInformation(projects, dsProjects);
+          this.spinner = false;
         });
   }
 
diff --git a/src/app/components/modal-file-browser/modal-file-browser.component.html b/src/app/components/modal-file-browser/modal-file-browser.component.html
index 81fa1e3d..fec250fd 100644
--- a/src/app/components/modal-file-browser/modal-file-browser.component.html
+++ b/src/app/components/modal-file-browser/modal-file-browser.component.html
@@ -3,7 +3,7 @@
   [allowFolders]=allowFolders
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
-  (selection)="onSelect($event)"
+  (selection)="onSelect($event)">
 </app-file-browser>
 <div>
     <button class="button warning" (click)="cancel()">Cancel</button>
diff --git a/src/app/components/public-map-info-panel/public-map-info-panel.component.html b/src/app/components/public-map-info-panel/public-map-info-panel.component.html
index 87973639..386fb2c6 100644
--- a/src/app/components/public-map-info-panel/public-map-info-panel.component.html
+++ b/src/app/components/public-map-info-panel/public-map-info-panel.component.html
@@ -5,8 +5,8 @@
   <div class="dock-panel-content">
     <h5>Name:</h5>
     <span>{{activeProject.name}}</span>
-    <div *ngIf="activeProject.system_name">
-      <span>{{activeProject.system_name}}</span>
+    <div *ngIf="activeProject.systemName">
+      <span>{{activeProject.systemName}}</span>
     </div>
     <h5>Description:</h5>
     <span>{{activeProject.description}}</span>
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index f1550aff..5166090c 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -45,10 +45,10 @@ <h6 id="property-title">Map Link Location</h6>
       </ng-template>
 
       <h6 id="property-title">Linked Project</h6>
-      <div *ngIf="activeProject.system_name && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
+      <div *ngIf="activeProject.ds_id && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
         <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id + '/'">
           <span>
-            {{activeProject.system_name}}
+            {{activeProject.ds_id}} | {{activeProject.title}}
           </span>
         </a>
       </div>
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 6af7c159..d9a4e12e 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -7,6 +7,8 @@ import {FormGroup, FormControl} from '@angular/forms';
 import {Project} from '../../models/models';
 import {EnvService} from '../../services/env.service';
 import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
+import { AgaveSystemsService } from 'src/app/services/agave-systems.service';
+import { combineLatest } from 'rxjs';
 
 @Component({
   selector: 'app-users-panel',
@@ -29,31 +31,37 @@ export class UsersPanelComponent implements OnInit {
   constructor(private projectsService: ProjectsService,
               private bsModalService: BsModalService,
               private modalService: ModalService,
+              private agaveSystemsService: AgaveSystemsService,
               private envService: EnvService) { }
 
   ngOnInit() {
+    this.agaveSystemsService.list();
+
     this.addUserForm = new FormGroup( {
       username: new FormControl()
     });
 
-    this.projectsService.activeProject.subscribe( (next) => {
-      if (next) {
-        this.activeProject = next;
+    combineLatest([this.projectsService.activeProject,
+                                         this.agaveSystemsService.projects])
 
+      .subscribe(([activeProject, dsProjects]) => {
+    // this.projectsService.activeProject.subscribe( (next) => {
+      if (activeProject) {
+        this.activeProject = this.agaveSystemsService.getDSProjectInformation([activeProject], dsProjects)[0];
         const dsUrl = 'https://www.designsafe-ci.org/data/browser/';
-        if (next.system_id) {
-          if (next.system_id.includes('project')) {
+        if (activeProject.system_id) {
+          if (activeProject.system_id.includes('project')) {
             this.dsHref = dsUrl + 'projects/' +
-              next.system_id.substr(8) +
-              next.system_path + '/'
-            if (next.system_name) {
+              activeProject.system_id.substr(8) +
+              activeProject.system_path + '/'
+            if (activeProject.ds_id) {
               this.projectHref = dsUrl + 'projects/' +
-                next.system_id + '/'
+                activeProject.system_id + '/'
             }
           } else {
             this.dsHref = dsUrl + 'agave/' +
-              next.system_id +
-              next.system_path + '/'
+              activeProject.system_id +
+              activeProject.system_path + '/'
           }
         }
       }
diff --git a/src/app/models/models.ts b/src/app/models/models.ts
index 40b1da4a..bd17ced8 100644
--- a/src/app/models/models.ts
+++ b/src/app/models/models.ts
@@ -47,10 +47,10 @@ export interface Project {
   description: string;
   id?: number;
   name: string;
-  dsName?: string;
+  ds_id?: string;
+  title?: string;
   uuid?: string;
   public?: boolean;
-  system_name?: string;
   system_file?: string;
   system_id?: string;
   system_path?: string;
diff --git a/src/app/services/agave-systems.service.ts b/src/app/services/agave-systems.service.ts
index e14ba904..1fb94a83 100644
--- a/src/app/services/agave-systems.service.ts
+++ b/src/app/services/agave-systems.service.ts
@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
-import {SystemSummary} from 'ng-tapis';
+import {System, SystemSummary} from 'ng-tapis';
 import { ApiService } from 'ng-tapis';
-import {Observable, ReplaySubject} from 'rxjs';
+import {BehaviorSubject, Observable, ReplaySubject} from 'rxjs';
 import {HttpClient} from '@angular/common/http';
 import { EnvService } from '../services/env.service';
-import { DesignSafeProjectCollection } from '../models/models';
+import { DesignSafeProjectCollection, Project } from '../models/models';
 
 @Injectable({
   providedIn: 'root'
@@ -16,8 +16,6 @@ export class AgaveSystemsService {
   public readonly systems: Observable<SystemSummary[]> = this._systems.asObservable();
   private _projects: ReplaySubject<SystemSummary[]> = new ReplaySubject<SystemSummary[]>(1);
   public readonly projects: Observable<SystemSummary[]> = this._projects.asObservable();
-  private _dsProjects: ReplaySubject<any[]> = new ReplaySubject<any[]>(1);
-  public readonly dsProjects: Observable<any[]> = this._dsProjects.asObservable();
   constructor(private tapis: ApiService, private envService: EnvService, private http: HttpClient) { }
 
   list() {
@@ -32,7 +30,7 @@ export class AgaveSystemsService {
         const projectSystems = resp.projects.map((project) => {
           return {
             id: 'project-' + project.uuid,
-            name: project.uuid,
+            name: project.value.projectId,
             description: project.value.title,
           };
         });
@@ -42,19 +40,15 @@ export class AgaveSystemsService {
       });
   }
 
-  getDSProjectId() {
-    this.http.get<DesignSafeProjectCollection>(this.envService.designSafeUrl + `/projects/v2/`)
-      .subscribe( resp => {
-        const projectSystems = resp.projects.map((project) => {
-          return {
-            id: 'project-' + project.uuid,
-            dsId: project.value.projectId
-          };
-        });
-        this._dsProjects.next(projectSystems);
-      }, error => {
-        this._dsProjects.next(null);
+  getDSProjectInformation(projects: Project[], dsProjects: SystemSummary[]): Project[] {
+    if (dsProjects.length > 0) {
+      return projects.map(p => {
+        const dsProject = dsProjects.find(dp => dp.id === p.system_id);
+        p.title = dsProject ? dsProject.description : null;
+        p.ds_id = dsProject ? dsProject.name : null;
+        return p;
       });
-
+    }
+    return projects;
   }
 }
diff --git a/src/app/services/projects.service.ts b/src/app/services/projects.service.ts
index 671d74e9..2d4ee887 100644
--- a/src/app/services/projects.service.ts
+++ b/src/app/services/projects.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import {HttpClient, HttpErrorResponse} from '@angular/common/http';
 import {BehaviorSubject, Observable, ReplaySubject} from 'rxjs';
-import {Project} from '../models/models';
+import {DesignSafeProjectCollection, Project} from '../models/models';
 import { RapidProjectRequest } from '../models/rapid-project-request';
 import {catchError, map, tap, filter, take} from 'rxjs/operators';
 import {IProjectUser} from '../models/project-user';
@@ -11,6 +11,7 @@ import { EnvService } from '../services/env.service';
 import { AuthService } from '../services/authentication.service';
 import {MAIN, LOGIN} from '../constants/routes';
 import {defaultTileServers} from '../constants/tile-servers';
+import { AgaveSystemsService } from '../services/agave-systems.service';
 import { Router } from '@angular/router';
 
 @Injectable({
@@ -37,6 +38,7 @@ export class ProjectsService {
   constructor(private http: HttpClient,
               private notificationsService: NotificationsService,
               private geoDataService: GeoDataService,
+              private agaveSystemsService: AgaveSystemsService,
               private router: Router,
               private authService: AuthService,
               private envService: EnvService) { }
@@ -45,6 +47,7 @@ export class ProjectsService {
     this._loadingProjectsFailed.next(false);
     this.http.get<Project[]>(this.envService.apiUrl + `/projects/`).subscribe( resp => {
       this._projects.next(resp);
+      // this.getDSInformation(resp);
       this._loadingProjectsFailed.next(false);
     }, error => {
       this._loadingProjectsFailed.next(true);
@@ -52,6 +55,43 @@ export class ProjectsService {
     });
   }
 
+  // getDSProjectInformation(projects: Project[]): Project[] {
+  //   return dsProjects.length > 0
+  //     ? projects.map(p => {
+  //       const pDir = dsProjects.find(dp => 'project-' + dp.uuid === p.system_id);
+  //       p.systemName = pDir ? pDir.value.title : null;
+  //       p.dsName = pDir ? pDir.value.projectId : null;
+  //       return p;
+  //     })
+  //     : projects;
+  // }
+
+  // getDSProjectInformation(projects?: Project[], currentProject?: Project): void {
+  //   return this.agaveSystemsService.getDSProjectIdObs()
+  //     .subscribe((resp: DesignSafeProjectCollection) => {
+  //       const dsProjects = resp.projects;
+  //       if (projects) {
+  //         const newProjects = dsProjects.length > 0
+  //           ? projects.map(p => {
+  //             const pDir = dsProjects.find(dp => 'project-' + dp.uuid === p.system_id);
+  //             p.systemName = pDir ? pDir.value.title : null;
+  //             p.dsName = pDir ? pDir.value.projectId : null;
+  //             return p;
+  //           })
+  //           : projects;
+
+  //         console.log(newProjects);
+  //         this._projects.next(newProjects);
+  //       }
+  //       if (currentProject) {
+  //         const pDir = dsProjects.find(dp => 'project-' + dp.uuid === currentProject.system_id);
+  //         currentProject.systemName = pDir ? pDir.value.title : null;
+  //         currentProject.dsName = pDir ? pDir.value.projectId : null;
+  //         this._activeProject.next(currentProject);
+  //       }
+  //     });
+  // }
+
   getProjectUsers(proj: Project): void {
     this.http.get<Array<IProjectUser>>(this.envService.apiUrl + `/projects/${proj.id}/users/`)
       .subscribe( (resp) => {
@@ -84,6 +124,7 @@ export class ProjectsService {
         tap(proj => {
           // Spread operator, just pushes the new project into the array
           this._projects.next([...this._projects.value, proj]);
+          // this.getDSInformation([...this._projects.value, proj], undefined);
           // Add default servers
           defaultTileServers.forEach(ts => {
             this.geoDataService.addTileServer(proj.id, ts, true);
@@ -109,12 +150,29 @@ export class ProjectsService {
 
     this.http.put<any>(this.envService.apiUrl + `/projects/${project.id}/export/`, payload)
       .subscribe(currentProject => {
-        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${file_name}.hazmapper`)
+        this.notificationsService.showSuccessToast(`Create file ${system_id}/${path}/${file_name}.hazmapper`);
+        // this.getDSInformation([...this._projects.value.filter((p) => p.id !== project.id)], currentProject);
         this._projects.next([...this._projects.value.filter((p) => p.id != project.id),
                              currentProject]);
         this.setActiveProject(currentProject);
+
+        // if (dsProjects) {
+        //   if (projects.length > 0) {
+        //     this.projects = dsProjects.length > 0
+        //       ? projects.map(p => {
+        //         const pDir = dsProjects.find(dp => dp.id === p.system_id);
+        //         p.dsName = pDir ? pDir.dsId : null;
+        //         return p;
+        //       })
+        //       : projects;
+        //     this.spinner = false;
+        //   } else {
+        //     this.spinner = true;
+        //   }
+        // }
+
       }, error => {
-        this.notificationsService.showErrorToast(`Failed to create file ${system_id}/${path}/${file_name}.hazmapper`)
+        this.notificationsService.showErrorToast(`Failed to create file ${system_id}/${path}/${file_name}.hazmapper`);
         console.log(error);
       });
   }
@@ -124,6 +182,10 @@ export class ProjectsService {
       .pipe(
         map( (proj) => {
           this._projects.next([proj, ...this._projects.value]);
+          // this.getDSInformation([...this._projects.value, proj], undefined);
+          defaultTileServers.forEach(ts => {
+            this.geoDataService.addTileServer(proj.id, ts, true);
+          });
           return proj;
         }),
        catchError( (err: any) =>  {
@@ -158,6 +220,7 @@ export class ProjectsService {
     //  is not a member of the project.  https://jira.tacc.utexas.edu/browse/DES-1927
 
     this._activeProject.next(proj);
+    // this.getDSInformation(undefined, proj);
     if (proj && this.authService.isLoggedIn()) {
       this.getProjectUsers(proj);
     }
@@ -206,9 +269,11 @@ export class ProjectsService {
         map((updatedProject) => {
           // Update the project list
           const projects = this._projects.value.map(proj => proj.id === this._activeProject.value.id ? updatedProject : proj);
-          this._projects.next(projects);
-          // Update the active project
+          // this._projects.next(projects);
+          // // Update the active project
           this._activeProject.next(updatedProject);
+
+          // this.getDSInformation(projects, updatedProject);
           return updatedProject;
         }),
         catchError((err: any) => {

From ea4632f4de6c15c05ec2692b04772f4f1d3d3c07 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 20 May 2021 15:57:33 -0500
Subject: [PATCH 30/36] Remove comment section.

---
 .../main-welcome/main-welcome.component.ts    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 13514bf8..d7602ddd 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -48,25 +48,6 @@ export class MainWelcomeComponent implements OnInit {
         .subscribe(([projects, dsProjects]) => {
           this.projects = this.agaveSystemsService.getDSProjectInformation(projects, dsProjects);
           this.spinner = false;
-// =======
-//       this.agaveSystemsService.dsProjects)
-//         .subscribe(([projects, dsProjects]) => {
-//           this.spinner = true;
-//           if (dsProjects) {
-//             if (projects.length > 0) {
-//               this.projects = dsProjects.length > 0
-//                 ? projects.map(p => {
-//                   const pDir = dsProjects.find(dp => dp.id === p.system_id);
-//                   p.dsName = pDir ? pDir.dsId : null;
-//                   return p;
-//                 })
-//                 : projects;
-//             } else {
-//               this.projects = [];
-//             }
-//             this.spinner = false;
-//           }
-// >>>>>>> 8c225311eef998cd6401e6bc7caf653ea35d7479
         });
   }
 

From 8a13b6e5ee7846c4446ec26618aeb45b1787eb1e Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Mon, 24 May 2021 11:29:04 -0500
Subject: [PATCH 31/36] Add saved location in welcome list.

---
 .../control-bar/control-bar.component.html    |  2 +-
 .../main-welcome/main-welcome.component.html  | 23 ++++++++++++-------
 .../main-welcome/main-welcome.component.styl  |  1 +
 .../main-welcome/main-welcome.component.ts    |  4 +++-
 .../modal-create-project.component.html       | 12 ----------
 .../modal-create-project.component.ts         |  3 +--
 .../modal-link-project.component.html         | 12 ----------
 .../modal-link-project.component.styl         |  2 +-
 src/styles.styl                               |  4 ++++
 9 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/app/components/control-bar/control-bar.component.html b/src/app/components/control-bar/control-bar.component.html
index 863e0f33..5a78c997 100644
--- a/src/app/components/control-bar/control-bar.component.html
+++ b/src/app/components/control-bar/control-bar.component.html
@@ -7,7 +7,7 @@
     </div>
     <div *ngIf="!loadingActiveProject && !loadingActiveProjectFailed" class="cell small-8 align-middle grid-x">
       <ng-container *ngIf="activeProject">
-        <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>a
+        <span style="margin-left: 1rem">{{isPublicView? 'Public Map': 'Map'}}: {{ activeProject.name }}</span>
         <div *ngIf="activeProject.ds_id" style="padding-left: 30px">
           <span>Project: {{activeProject.ds_id}} | {{activeProject.title}}</span>
         </div>
diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 8d14041c..920220fd 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -14,7 +14,7 @@
             <b>Maps</b>
           </div>
           <div class="project-column">
-            <b>Linked Project</b>
+            <b>Map Location</b>
           </div>
           <div class="button-column" style="text-align: right">
             <div id="new-map" (click)="openCreateProjectModal()">
@@ -44,7 +44,7 @@
           <ng-template #projectDisconnected>
             <div *ngIf="projects.length > 0; else noProject" class="project-list-container">
               <div *ngFor="let p of projects; let indexOfElement=index;">
-                <div (dblclick)="routeToProject(p.uuid)"
+                <div (click)="routeToProject(p.uuid)"
                      class="project-list-item"
                      [ngClass]="{
                                  'welcome-project-light': (indexOfElement % 2) == 0,
@@ -58,22 +58,29 @@
                   </div>
 
                   <div class="project-column">
-                    <ng-container *ngIf="p.ds_id && p.system_id.includes('project'); else noSystem" class="list-column link-hover">
-                      <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + p.system_id.substr(8) + '/'">
+                    <ng-container *ngIf="p.system_path; else noSystem">
+                      <ng-container *ngIf="p.system_id.includes('project')" class="list-column link-hover">
                         <span class="project-name" [tooltip]="p.title">
                           {{p.ds_id}} | {{p.title}}
                         </span>
-                      </a>
+                      </ng-container>
+
+                      <ng-container *ngIf="!p.system_id.includes('project')" class="list-column link-hover">
+                        <span class="project-name" [tooltip]="p.title">
+                          {{p.system_path}}
+                        </span>
+                      </ng-container>
                     </ng-container>
+
                     <ng-template #noSystem>
                       ----------
                     </ng-template>
                   </div>
                   <div class="button-column" style="text-align: right">
-                    <button class="project-list-item-button" (click)="routeToProject(p.uuid)">
-                      <i class="fas fa-folder-open"></i>
+                    <button class="project-list-item-button" [tooltip]="'Edit Map'">
+                      <i class="fas fa-edit"></i>
                     </button>
-                    <button class="project-list-item-button" (click)=openDeleteProjectModal(p)>
+                    <button class="project-list-item-button" [tooltip]="'Delete Map'" (click)="openDeleteProjectModal(p, $event)">
                       <i class="fas fa-trash"></i>
                     </button>
                   </div>
diff --git a/src/app/components/main-welcome/main-welcome.component.styl b/src/app/components/main-welcome/main-welcome.component.styl
index 9ce11167..8263fea4 100644
--- a/src/app/components/main-welcome/main-welcome.component.styl
+++ b/src/app/components/main-welcome/main-welcome.component.styl
@@ -52,6 +52,7 @@
         display: flex
         flex-wrap: nowrap
         jusitfy-content: space-between
+        cursor: pointer
         .project-list-item-button
           cursor: pointer
           margin: 0px 10px
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index d7602ddd..908da255 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -62,9 +62,11 @@ export class MainWelcomeComponent implements OnInit {
     });
   }
 
-  openDeleteProjectModal(p: Project) {
+  openDeleteProjectModal(p: Project, event) {
+    event.stopPropagation();
     this.modalService.confirm(
       'Delete map',
+      // tslint:disable-next-line:max-line-length
       'Are you sure you want to delete this map?  All associated features, metadata, and saved files will be deleted. THIS CANNOT BE UNDONE.',
       ['Cancel', 'Delete']).subscribe( (answer) => {
       if (answer === 'Delete') {
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 21234a83..93afbdf1 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -16,7 +16,6 @@ <h4> Create a new Map </h4>
                 <span style="padding-right: 10px">Export Map Link</span>
                 <input formControlName="exportMapLink" type="checkbox">
               </label>
-
             </div>
             <div *ngIf="projCreateForm.get('exportMapLink').value">
               <app-file-browser
@@ -42,17 +41,6 @@ <h4> Create a new Map </h4>
                 </label>
                 <small><em>If a name is not given, file will be saved as the map uuid.</em></small>
               </div>
-
-              <div class="confirm-checkbox">
-                <label>
-                  <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
-                  <input #linkCheckbox type="checkbox"
-                         formControlName="linkProject">
-                </label>
-                <div *ngIf="linkCheckbox.disabled">
-                  <small><em>Must be in a project folder to link!</em></small>
-                </div>
-              </div>
             </div>
             <div class="button-group small">
                 <button class="button small warning" type="button" (click)="close()">Close</button>
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index d9e19a3e..d7ae7aec 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -61,10 +61,8 @@ export class ModalCreateProjectComponent implements OnInit {
   onSystemSelect(system: any) {
     this.selectedSystem = system;
     if (system.id.includes('project')) {
-      this.projCreateForm.get('linkProject').enable();
       this.projCreateForm.get('linkProject').setValue(true);
     } else {
-      this.projCreateForm.get('linkProject').disable();
       this.projCreateForm.get('linkProject').setValue(false);
     }
   }
@@ -85,6 +83,7 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
+
       if (this.projCreateForm.get('exportMapLink').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 7c1b229e..52408e77 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -22,18 +22,6 @@
   <small><em>If a name is not given, file will be saved as the map uuid.</em></small>
 </div>
 
-<div class="confirm-checkbox">
-  <label>
-    <span [ngClass]="{dimmed: linkCheckbox.disabled}">Link Project</span>
-    <input #linkCheckbox type="checkbox"
-           [disabled]="selectedSystem && !selectedSystem.id.includes('project')"
-           [(ngModel)]="linkProject">
-  </label>
-  <div *ngIf="linkCheckbox.disabled">
-    <small><em>Must be in a project folder to link!</em></small>
-  </div>
-</div>
-
 <div *ngIf="activeProject.system_path" class="confirm-checkbox">
   <label>
     <span>Remove previously saved file</span>
diff --git a/src/app/components/modal-link-project/modal-link-project.component.styl b/src/app/components/modal-link-project/modal-link-project.component.styl
index 6290b70c..1a68da3e 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.styl
+++ b/src/app/components/modal-link-project/modal-link-project.component.styl
@@ -2,7 +2,7 @@
   .dimmed
     color: #ccc
   .confirm-checkbox
-    padding: 0px 20px 20px 20px
+    padding: 0px 0px 20px 0px
     label
       font-size: 19px
       span
diff --git a/src/styles.styl b/src/styles.styl
index 323535be..636177dd 100644
--- a/src/styles.styl
+++ b/src/styles.styl
@@ -12,6 +12,10 @@ html, body, h1, h2, h3, h4, h5, h6 {
     font-family Raleway
 }
 
+.tooltip {
+  word-wrap: break-word;
+}
+
 .menu.is-dropdown-submenu
     z-index 10000
 

From f304d5b685cadfafc922cd70b2fa068c51dd63d3 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Wed, 26 May 2021 16:52:39 -0500
Subject: [PATCH 32/36] Organize manage panel with tabs.

---
 .../edit-name-input.component.html            |   1 +
 .../edit-name-input.component.styl            |   2 +-
 .../main-welcome/main-welcome.component.html  |  25 +--
 .../main-welcome/main-welcome.component.ts    |   4 +-
 .../modal-create-project.component.html       |   6 +-
 .../modal-create-project.component.ts         |   9 +-
 .../modal-link-project.component.html         |   8 +-
 .../users-panel/users-panel.component.html    | 178 ++++++++++--------
 .../users-panel/users-panel.component.styl    |   7 +-
 .../users-panel/users-panel.component.ts      |  16 +-
 10 files changed, 143 insertions(+), 113 deletions(-)

diff --git a/src/app/components/edit-name-input/edit-name-input.component.html b/src/app/components/edit-name-input/edit-name-input.component.html
index c17ea04c..bd2953da 100644
--- a/src/app/components/edit-name-input/edit-name-input.component.html
+++ b/src/app/components/edit-name-input/edit-name-input.component.html
@@ -6,6 +6,7 @@
          title="{{currentName}}"
          data-position="top"
          data-alignment="left"
+         [tooltip]="currentName"
          *ngIf="!inputShown"
          (dblclick)=showInput()>
       {{currentName}}
diff --git a/src/app/components/edit-name-input/edit-name-input.component.styl b/src/app/components/edit-name-input/edit-name-input.component.styl
index 0b93fdb7..89701dfb 100644
--- a/src/app/components/edit-name-input/edit-name-input.component.styl
+++ b/src/app/components/edit-name-input/edit-name-input.component.styl
@@ -8,7 +8,7 @@
     #property-subcontainer
         display: flex
         align-items: center
-        width: 200px
+        width: 150px
     #property-name
         display: inline-block
         font-size: 16px
diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 920220fd..00f147cc 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -3,7 +3,7 @@
     <div id="welcome-information" class="grid-y">
       <div id="welcome-logo">
         <img src="assets/Hazmapper-Stack@4x.png" width="250px">
-        <div style="margin-top: 10px" id="release-version">Version 2.3D (<a href={{release_url}}>Release Notes</a>)</div>
+        <div style="margin-top: 10px" id="release-version">Version 2.3D</div>
       </div>
     </div>
 
@@ -11,10 +11,10 @@
       <div id=welcome-projects-list class="grid-y align-center">
         <div class="welcome-project-header grid-x">
           <div class="map-column">
-            <b>Maps</b>
+            <b>Map</b>
           </div>
           <div class="project-column">
-            <b>Map Location</b>
+            <b>Project</b>
           </div>
           <div class="button-column" style="text-align: right">
             <div id="new-map" (click)="openCreateProjectModal()">
@@ -58,21 +58,12 @@
                   </div>
 
                   <div class="project-column">
-                    <ng-container *ngIf="p.system_path; else noSystem">
-                      <ng-container *ngIf="p.system_id.includes('project')" class="list-column link-hover">
-                        <span class="project-name" [tooltip]="p.title">
-                          {{p.ds_id}} | {{p.title}}
-                        </span>
-                      </ng-container>
-
-                      <ng-container *ngIf="!p.system_id.includes('project')" class="list-column link-hover">
-                        <span class="project-name" [tooltip]="p.title">
-                          {{p.system_path}}
-                        </span>
-                      </ng-container>
+                    <ng-container *ngIf="p.system_path && p.system_id.includes('project'); else noProject" class="list-column link-hover">
+                      <span class="project-name" [tooltip]="p.title">
+                        {{p.ds_id}} | {{p.title}}
+                      </span>
                     </ng-container>
-
-                    <ng-template #noSystem>
+                    <ng-template #noProject>
                       ----------
                     </ng-template>
                   </div>
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 908da255..340544ef 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -58,7 +58,9 @@ export class MainWelcomeComponent implements OnInit {
   openCreateProjectModal() {
     const modal: BsModalRef = this.bsModalService.show(ModalCreateProjectComponent);
     modal.content.onClose.subscribe( (project: Project) => {
-      this.routeToProject(project.uuid);
+      if (project) {
+        this.routeToProject(project.uuid);
+      }
     });
   }
 
diff --git a/src/app/components/modal-create-project/modal-create-project.component.html b/src/app/components/modal-create-project/modal-create-project.component.html
index 93afbdf1..91fc84ce 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.html
+++ b/src/app/components/modal-create-project/modal-create-project.component.html
@@ -13,7 +13,7 @@ <h4> Create a new Map </h4>
 
             <div class="link-project">
               <label>
-                <span style="padding-right: 10px">Export Map Link</span>
+                <span style="padding-right: 10px">Save Map Link</span>
                 <input formControlName="exportMapLink" type="checkbox">
               </label>
             </div>
@@ -24,8 +24,8 @@ <h4> Create a new Map </h4>
                 [allowedExtensions]=[]
                 [onlyFolder]=true
                 [showPublicSystems]=false
-                [heading]="'Select Link Export Location'"
-                [helpText]="'If no folder is selected, the link file will be exported to the root of the selected system.' +
+                [heading]="'Select Link Save Location'"
+                [helpText]="'If no folder is selected, the link file will be saved to the root of the selected system.' +
                          'If you select a project, you can link the current map to the project.'"
                 (selection)="onSelect($event)"
                 (currentPath)="setCurrentPath($event)"
diff --git a/src/app/components/modal-create-project/modal-create-project.component.ts b/src/app/components/modal-create-project/modal-create-project.component.ts
index d7ae7aec..37202ecf 100644
--- a/src/app/components/modal-create-project/modal-create-project.component.ts
+++ b/src/app/components/modal-create-project/modal-create-project.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, AfterContentChecked } from '@angular/core';
 import { BsModalRef } from 'ngx-foundation';
 import { FormGroup, FormControl } from '@angular/forms';
 import { ProjectsService } from '../../services/projects.service';
@@ -13,7 +13,7 @@ import { Subject } from 'rxjs';
   templateUrl: './modal-create-project.component.html',
   styleUrls: ['./modal-create-project.component.styl']
 })
-export class ModalCreateProjectComponent implements OnInit {
+export class ModalCreateProjectComponent implements OnInit, AfterContentChecked {
 
   public readonly onClose: Subject<any> = new Subject<any>();
 
@@ -22,7 +22,7 @@ export class ModalCreateProjectComponent implements OnInit {
   submitting: boolean;
   errorMessage = '';
   currentPath: string;
-  fileName: string = '';
+  fileName = '';
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
 
@@ -69,7 +69,7 @@ export class ModalCreateProjectComponent implements OnInit {
 
   createRapidProject() {
     this.errorMessage = '';
-    const req: RapidProjectRequest = new RapidProjectRequest(this.rapidFolder.system, this.rapidFolder.path)
+    const req: RapidProjectRequest = new RapidProjectRequest(this.rapidFolder.system, this.rapidFolder.path);
     this.projectsService.createRapidProject(req).subscribe( (project) => {
       this.close(project);
     }, (err) => {
@@ -83,7 +83,6 @@ export class ModalCreateProjectComponent implements OnInit {
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
     this.projectsService.create(p).subscribe( (project) => {
-
       if (this.projCreateForm.get('exportMapLink').value) {
         const path = this.selectedFiles.length > 0 ? this.selectedFiles[0].path : this.currentPath;
         const systemId = this.selectedSystem.id;
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 52408e77..3b5d4305 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -4,8 +4,8 @@
   [allowedExtensions]=allowedExtensions
   [onlyFolder]=onlyFolder
   [showPublicSystems]=false
-  [heading]="'Select Export Location'"
-  [helpText]="'If no folder is selected, the file will be exported to the root of the selected system.' +
+  [heading]="'Select Save Location'"
+  [helpText]="'If no folder is selected, the file will be saved to the root of the selected system.' +
            'If you select a project, you can link the current map to the project.'"
   (selection)="onSelect($event)"
   (systemSelection)="onSystemSelect($event)"
@@ -28,10 +28,10 @@
     <input type="checkbox"
            [(ngModel)]="confirmRemove">
   </label>
-  <small><em>Exporting this map will remove the previous link and link file's location.</em></small>
+  <small><em>Saving this map will remove the previous link and link file's location.</em></small>
 </div>
 
 <div>
   <button class="button warning" (click)="cancel()">Cancel</button>
-  <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles || (activeProject.system_path && !confirmRemove)" (click)="close()">Export</button>
+  <button class="button" [disabled]="!selectedFiles.length && !allowEmptyFiles || (activeProject.system_path && !confirmRemove)" (click)="close()">Save</button>
 </div>
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 00129b62..1e35ee0a 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -1,94 +1,116 @@
 <div class="dock-panel">
   <div class="dock-panel-header">
-    <span class="dock-panel-title"> Team Members </span>
+    <span class="dock-panel-title"> Manage </span>
   </div>
 
   <div class="dock-panel-content">
-    <div>
-      <form [formGroup]="addUserForm" (ngSubmit)="addUser()">
-        <input type="text" formControlName="username" required="true">
-        <button class="button success" type="submit" [disabled]="!addUserForm.valid">Add</button>
-      </form>
-    </div>
-    <h4> Current Members </h4>
-    <app-user-row [user]="user" *ngFor="let user of projectUsers"></app-user-row>
-    <div class="">
-      <h4> Map </h4>
-      <h6 id="property-title">Name:</h6>
-      <app-edit-name-input
-        [inputType]="'text'"
-        [currentName]="activeProject.name"
-        [errorMessage]="nameErrorMessage"
-        [inputError]="nameInputError"
-        (nameChange)="changeProjectName($event)"
-      >
-      </app-edit-name-input>
+    <tabset>
+      <tab heading="Map">
+        <h6 id="property-title">Name:</h6>
+        <app-edit-name-input
+          [inputType]="'text'"
+          [currentName]="activeProject.name"
+          [errorMessage]="nameErrorMessage"
+          [inputError]="nameInputError"
+          (nameChange)="changeProjectName($event)"
+        >
+        </app-edit-name-input>
 
-      <h6 id="property-title">Description:</h6>
-      <app-edit-name-input
-        [inputType]="'textarea'"
-        [currentName]="activeProject.description"
-        [errorMessage]="descriptionErrorMessage"
-        [inputError]="descriptionInputError"
-        (nameChange)="changeProjectDescription($event)"
-      >
-      </app-edit-name-input>
+        <h6 id="property-title">Description:</h6>
+        <app-edit-name-input
+          [inputType]="'textarea'"
+          [currentName]="activeProject.description"
+          [errorMessage]="descriptionErrorMessage"
+          [inputError]="descriptionInputError"
+          (nameChange)="changeProjectDescription($event)"
+        >
+        </app-edit-name-input>
 
-      <h6 id="property-title">Map Link Location</h6>
-      <div *ngIf="activeProject.system_path; else noSave" style="margin-bottom: 20px">
-        <a [href]="dsHref"><span>{{activeProject.system_path}}</span></a>
-      </div>
-      <ng-template #noSave>
-        <div style="margin-bottom: 20px">
-          Map link not saved.
+        <div style="display: flex; flex-direction: column; justify-content: center">
+          <button class="button warning alert hollow" (click)=deleteProject()>
+            <i class="fas fa-trash"></i>  Delete map
+          </button>
         </div>
-      </ng-template>
+      </tab>
 
-      <h6 id="property-title">Linked Project</h6>
-      <div *ngIf="activeProject.ds_id && activeProject.system_id.includes('project'); else noLink" style="margin-bottom: 20px">
-        <a [href]="'https://www.designsafe-ci.org/data/browser/projects/' + activeProject.system_id.substr(8) + '/'">
-          <span>
-            {{activeProject.ds_id}} | {{activeProject.title}}
-          </span>
-        </a>
-      </div>
-      <ng-template #noLink>
-        <div style="margin-bottom: 20px">
-          No map link! <br />
-          <small><em>To link to a project, you must export a map link to a project.</em></small>
+      <tab heading="Members">
+        <div>
+          <form [formGroup]="addUserForm" (ngSubmit)="addUser()">
+            <input type="text" formControlName="username" required="true">
+            <button class="button success" style="width: 100%" type="submit" [disabled]="!addUserForm.valid">Add</button>
+          </form>
         </div>
-      </ng-template>
+        <h6 id="property-title"> Current Members </h6>
+        <app-user-row [user]="user" *ngFor="let user of projectUsers"></app-user-row>
+      </tab>
 
-      <h6 id="property-title">Public Access</h6>
 
-      <div *ngIf="activeProject.public" class="public-status-container">
-        <span class="public-status-message"> This map can be viewed by anyone with this link:</span>
-        <a  [href]="getPublicUrl()" target="_blank">
-          {{getPublicUrl()}}
-        </a>
-        <span *ngIf="this.publicStatusChangingError" class="label alert">Unable to make map private.</span>
-        <button class="button hollow right" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(false)>
-          <i class="fas fa-lock"></i>  Make map private
-        </button>
-      </div>
-      <div *ngIf="!activeProject.public" class="public-status-container">
-        <span class="public-status-message">This map is private and can only be viewed by team members.</span>
-        <span *ngIf="this.publicStatusChangingError" class="label alert">Unable to make map public.</span>
-        <button class="button hollow left" style="margin-top: 20px" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(true)>
-          <i class="fas fa-globe"></i>  Make map public
-        </button>
-      </div>
+      <tab heading="Public">
+        <h6 id="property-title">Public Access</h6>
 
-      <hr />
+        <div *ngIf="activeProject.public" class="public-status-container">
+          <span class="public-status-message" style="margin-bottom: 20px"> This map can be viewed by anyone with this link:</span>
+          <div style="display: flex">
+            <a [href]="getPublicUrl()" [tooltip]="getPublicUrl()" target="_blank" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; width: 180px">
+              {{getPublicUrl()}}
+            </a>
+            <span style="display: inline-block; cursor: pointer" (click)="copyLinkToClipboard(getPublicUrl())">
+              <i class="far fa-copy"></i>
+            </span>
+          </div>
+          <span *ngIf="this.publicStatusChangingError" class="label alert">Unable to make map private.</span>
+          <button class="button hollow left" style="margin-top: 20px" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(false)>
+            <i class="fas fa-lock"></i>  Make map private
+          </button>
+        </div>
+        <div *ngIf="!activeProject.public" class="public-status-container">
+          <span class="public-status-message">This map is private and can only be viewed by team members.</span>
+          <span *ngIf="this.publicStatusChangingError" class="label alert">Unable to make map public.</span>
+          <button class="button hollow left" style="margin-top: 20px" [disabled]="this.publicStatusChanging" (click)=updateMapPublicAccess(true)>
+            <i class="fas fa-globe"></i>  Make map public
+          </button>
+        </div>
+      </tab>
+
+      <tab heading="Save">
+        <h6 id="property-title">Location</h6>
+        <div *ngIf="activeProject.system_path || activeProject.ds_id; else noSave">
+          <div *ngIf="activeProject.system_path" style="margin-bottom: 10px">
+            <span>Path:  </span>
+            <a [href]="dsHref"><span>{{activeProject.system_path}}</span></a>
+          </div>
+
+          <div *ngIf="activeProject.system_id.includes('project'); else myData" style="margin-bottom: 20px">
+            <span>Project:  </span>
+            <a [href]="projectHref">
+              <span>
+                {{activeProject.ds_id}} | {{activeProject.title}}
+              </span>
+            </a>
+          </div>
+
+          <ng-template #myData>
+            <div style="margin-bottom: 20px">
+              <span>System: </span>
+              <a [href]="myDataHref">
+                <span>My Data</span>
+              </a>
+            </div>
+          </ng-template>
+        </div>
+        <ng-template #noSave>
+          <div style="margin-bottom: 20px">
+            Map link not saved.
+          </div>
+        </ng-template>
+
+        <div style="display: flex; flex-direction: column; justify-content: center">
+          <button class="button hollow" (click)=openExportProjectModal()>
+            <i class="fas fa-save"></i>  Save map link
+          </button>
+        </div>
+      </tab>
 
-      <div style="display: flex; flex-direction: column; justify-content: center">
-        <button class="button hollow" (click)=openExportProjectModal()>
-          <i class="fas fa-save"></i>  Export map link
-        </button>
-        <button class="button warning alert hollow" (click)=deleteProject()>
-          <i class="fas fa-trash"></i>  Delete map
-        </button>
-      </div>
-    </div>
+    </tabset>
   </div>
 </div>
diff --git a/src/app/components/users-panel/users-panel.component.styl b/src/app/components/users-panel/users-panel.component.styl
index 5005cb5e..963f4732 100644
--- a/src/app/components/users-panel/users-panel.component.styl
+++ b/src/app/components/users-panel/users-panel.component.styl
@@ -9,4 +9,9 @@
         font-size: 12px
         font-style: italic
     .right
-        align-self: flex-end
\ No newline at end of file
+        align-self: flex-end
+
+::ng-deep
+  .tabs-title
+    .nav-link
+      padding: 0.5rem
\ No newline at end of file
diff --git a/src/app/components/users-panel/users-panel.component.ts b/src/app/components/users-panel/users-panel.component.ts
index 4cec2421..cd0e3548 100644
--- a/src/app/components/users-panel/users-panel.component.ts
+++ b/src/app/components/users-panel/users-panel.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import {ProjectsService} from '../../services/projects.service';
+import {NotificationsService} from '../../services/notifications.service';
 import {ModalService} from '../../services/modal.service';
 import { BsModalRef, BsModalService } from 'ngx-foundation';
 import {IProjectUser} from '../../models/project-user';
@@ -9,6 +10,7 @@ import {EnvService} from '../../services/env.service';
 import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-project.component';
 import { AgaveSystemsService } from 'src/app/services/agave-systems.service';
 import { combineLatest } from 'rxjs';
+import { copyToClipboard } from '../../utils/copyText';
 
 @Component({
   selector: 'app-users-panel',
@@ -27,10 +29,12 @@ export class UsersPanelComponent implements OnInit {
   publicStatusChangingError = false;
   dsHref: string;
   projectHref: string;
+  myDataHref: string;
 
   constructor(private projectsService: ProjectsService,
               private bsModalService: BsModalService,
               private modalService: ModalService,
+              private notificationsService: NotificationsService,
               private agaveSystemsService: AgaveSystemsService,
               private envService: EnvService) { }
 
@@ -57,8 +61,9 @@ export class UsersPanelComponent implements OnInit {
                 activeProject.system_id.substr(8) + '/';
             }
           } else {
-            this.dsHref = dsUrl + 'agave/' +
-              activeProject.system_id +
+            this.myDataHref = dsUrl + 'agave/' +
+              activeProject.system_id;
+            this.dsHref = this.myDataHref +
               activeProject.system_path + '/';
           }
         }
@@ -90,10 +95,15 @@ export class UsersPanelComponent implements OnInit {
                                          next.system.id,
                                          path,
                                          next.system.id.includes('project') && next.linkProject,
-                                         next.fileName)
+                                         next.fileName);
     });
   }
 
+  copyLinkToClipboard(link: string) {
+    copyToClipboard(link);
+    this.notificationsService.showSuccessToast(`Copied ${link} to the clipboard!`);
+  }
+
   updateMapPublicAccess(makePublic: boolean) {
     const title = makePublic ? 'Make map public' : 'Make map private';
     const message = makePublic ? 'Are you sure you want to make this map public?'

From 0dd878a9442aa0b4586396ebc935cbca1866f96a Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 27 May 2021 09:04:32 -0500
Subject: [PATCH 33/36] Add copy text feature.

---
 src/app/utils/copyText.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/app/utils/copyText.ts

diff --git a/src/app/utils/copyText.ts b/src/app/utils/copyText.ts
new file mode 100644
index 00000000..503d1c69
--- /dev/null
+++ b/src/app/utils/copyText.ts
@@ -0,0 +1,14 @@
+// This creates a temporary element to copy a string to clipboard
+export function copyToClipboard(text: string): void {
+  const tempText = document.createElement('textarea');
+  tempText.style.position = 'fixed';
+  tempText.style.left = '0';
+  tempText.style.top = '0';
+  tempText.style.opacity = '0';
+  tempText.value = text;
+  document.body.appendChild(tempText);
+  tempText.focus();
+  tempText.select();
+  document.execCommand('copy');
+  document.body.removeChild(tempText);
+}

From 0998d101f80c688654669f277a4b480fb9d9f82a Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 27 May 2021 11:57:34 -0500
Subject: [PATCH 34/36] Handle error when project undefined.

---
 .../components/file-tree-node/file-tree-node.component.html | 6 +-----
 src/app/components/users-panel/users-panel.component.html   | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/components/file-tree-node/file-tree-node.component.html b/src/app/components/file-tree-node/file-tree-node.component.html
index fa50dfed..966055d6 100644
--- a/src/app/components/file-tree-node/file-tree-node.component.html
+++ b/src/app/components/file-tree-node/file-tree-node.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="{'active': isActiveFeature()}">
+<div *ngIf="node" [ngClass]="{'active': isActiveFeature()}">
   <div *ngIf="node.isDir() && node.getPath()" class="clickable" (click)="onClick(node)">
     <i class="fas fa-folder-open" *ngIf="displayChildren"></i>
     <i class="fas fa-folder" *ngIf="!displayChildren"></i>
@@ -23,7 +23,3 @@
       </app-file-tree-node>
   </div>
 </div>
-
-
-
-
diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 1e35ee0a..8f2e99c0 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -4,7 +4,7 @@
   </div>
 
   <div class="dock-panel-content">
-    <tabset>
+    <tabset *ngIf="activeProject">
       <tab heading="Map">
         <h6 id="property-title">Name:</h6>
         <app-edit-name-input

From c0094670e28c36cf352f0826fbbf475d1abe7773 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Thu, 27 May 2021 14:39:11 -0500
Subject: [PATCH 35/36] Change wording.

---
 src/app/components/users-panel/users-panel.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/users-panel/users-panel.component.html b/src/app/components/users-panel/users-panel.component.html
index 8f2e99c0..aed1a704 100644
--- a/src/app/components/users-panel/users-panel.component.html
+++ b/src/app/components/users-panel/users-panel.component.html
@@ -73,7 +73,7 @@ <h6 id="property-title">Public Access</h6>
       </tab>
 
       <tab heading="Save">
-        <h6 id="property-title">Location</h6>
+        <h6 id="property-title">Saved Location</h6>
         <div *ngIf="activeProject.system_path || activeProject.ds_id; else noSave">
           <div *ngIf="activeProject.system_path" style="margin-bottom: 10px">
             <span>Path:  </span>

From 2611409ad763a199c1c6f4d77048a0e053fb3761 Mon Sep 17 00:00:00 2001
From: duckonomy <contact@duckonomy.com>
Date: Tue, 1 Jun 2021 13:03:53 -0500
Subject: [PATCH 36/36] Minor fixes.

---
 src/app/components/main-welcome/main-welcome.component.html | 4 ++--
 src/app/components/main-welcome/main-welcome.component.ts   | 6 +++---
 .../modal-link-project/modal-link-project.component.html    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/components/main-welcome/main-welcome.component.html b/src/app/components/main-welcome/main-welcome.component.html
index 00f147cc..acc74e75 100644
--- a/src/app/components/main-welcome/main-welcome.component.html
+++ b/src/app/components/main-welcome/main-welcome.component.html
@@ -33,7 +33,7 @@
         </div>
 
         <ng-template #projectLoaded>
-          <div *ngIf="connected; else projectDisconnected">
+          <div *ngIf="notConnected; else projectConnected">
             <div id="welcome-no-information">
               <div>
                 Failed to Connect to Server!
@@ -41,7 +41,7 @@
             </div>
           </div>
 
-          <ng-template #projectDisconnected>
+          <ng-template #projectConnected>
             <div *ngIf="projects.length > 0; else noProject" class="project-list-container">
               <div *ngFor="let p of projects; let indexOfElement=index;">
                 <div (click)="routeToProject(p.uuid)"
diff --git a/src/app/components/main-welcome/main-welcome.component.ts b/src/app/components/main-welcome/main-welcome.component.ts
index 340544ef..7f8e2bc5 100644
--- a/src/app/components/main-welcome/main-welcome.component.ts
+++ b/src/app/components/main-welcome/main-welcome.component.ts
@@ -20,7 +20,7 @@ export class MainWelcomeComponent implements OnInit {
   guide_url = 'https://www.designsafe-ci.org/rw/user-guide/workspace/hazmapper/';
 
   spinner = true;
-  connected: boolean;
+  notConnected: boolean;
 
   public projects = [];
   public activeProject: Project;
@@ -38,8 +38,8 @@ export class MainWelcomeComponent implements OnInit {
     this.projectsService.getProjects();
     this.agaveSystemsService.list();
 
-    this.projectsService.loadingProjectsFailed.subscribe((connected) => {
-      this.connected = connected;
+    this.projectsService.loadingProjectsFailed.subscribe((notConnected) => {
+      this.notConnected = notConnected;
     });
 
     combineLatest(
diff --git a/src/app/components/modal-link-project/modal-link-project.component.html b/src/app/components/modal-link-project/modal-link-project.component.html
index 3b5d4305..7e2a688b 100644
--- a/src/app/components/modal-link-project/modal-link-project.component.html
+++ b/src/app/components/modal-link-project/modal-link-project.component.html
@@ -28,7 +28,7 @@
     <input type="checkbox"
            [(ngModel)]="confirmRemove">
   </label>
-  <small><em>Saving this map will remove the previous link and link file's location.</em></small>
+  <small><em>Saving this map will remove the previous link.</em></small>
 </div>
 
 <div>