Task/DES-2001: Project links as observables (subscribe to project-user data).

src/app/components/modal-create-project/modal-create-project.component.ts

@@ -69,7 +69,7 @@ export class ModalCreateProjectComponent implements OnInit, AfterContentChecked
 
   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, true);
     this.projectsService.createRapidProject(req).subscribe( (project) => {
       this.close(project);
     }, (err) => {
@@ -82,16 +82,32 @@ export class ModalCreateProjectComponent implements OnInit, AfterContentChecked
     const p = new Project();
     p.description = this.projCreateForm.get('description').value;
     p.name = this.projCreateForm.get('name').value;
-    this.projectsService.create(p).subscribe( (project) => {
+    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;
-        this.projectsService.exportProject(project,
-                                           systemId,
-                                           path,
-                                           this.projCreateForm.get('linkProject').value,
-                                           this.projCreateForm.get('fileName').value)
+        if (!systemId.includes('project')) {
+          this.projectsService.exportProject(project,
+            systemId,
+            path,
+            this.projCreateForm.get('linkProject').value,
+            this.projCreateForm.get('fileName').value);
+        } else {
+          const req: RapidProjectRequest = new RapidProjectRequest(
+            systemId,
+            path,
+            true,
+            project.id,
+            this.projCreateForm.get('fileName').value
+          );
+          this.projectsService.createRapidProject(req).subscribe((resProject: Project) => {
+            this.close(resProject);
+          }, (err) => {
+            this.errorMessage = err.toString();
+          });
+        }
       }
+
       this.close(project);
     }, err => {
       this.errorMessage = err.toString();

src/app/components/modal-link-project/modal-link-project.component.ts

@@ -21,11 +21,11 @@ export class ModalLinkProjectComponent implements OnInit {
   @Input() allowEmptyFiles: false;
   selectedFiles: Array<RemoteFile> = [];
   selectedSystem: any;
-  fileName: string = '';
+  fileName = '';
   activeProject: Project;
-  linkProject: boolean = false;
+  linkProject = false;
   currentPath: string;
-  confirmRemove: boolean = false;
+  confirmRemove = false;
   public onClose: Subject<any> = new Subject<any>();
   constructor(private modalRef: BsModalRef,
               private projectsService: ProjectsService,

src/app/components/users-panel/users-panel.component.ts

@@ -11,6 +11,7 @@ import { ModalLinkProjectComponent } from '../modal-link-project/modal-link-proj
 import { AgaveSystemsService } from 'src/app/services/agave-systems.service';
 import { combineLatest } from 'rxjs';
 import { copyToClipboard } from '../../utils/copyText';
+import {RapidProjectRequest} from 'src/app/models/rapid-project-request';
 
 @Component({
   selector: 'app-users-panel',
@@ -89,13 +90,23 @@ export class UsersPanelComponent implements OnInit {
       allowedExtensions: []
     };
     const modal: BsModalRef = this.bsModalService.show(ModalLinkProjectComponent, { initialState });
-    modal.content.onClose.subscribe( (next) => {
+    modal.content.onClose.subscribe((next) => {
       const path = next.fileList.length > 0 ? next.fileList[0].path : next.currentPath;
-      this.projectsService.exportProject(this.activeProject,
-                                         next.system.id,
-                                         path,
-                                         next.system.id.includes('project') && next.linkProject,
-                                         next.fileName);
+      if (next.linkProject) {
+        const req: RapidProjectRequest = new RapidProjectRequest(next.system.id, path, false, this.activeProject.id, next.fileName);
+        this.projectsService.createRapidProject(req).subscribe((project: Project) => {
+          this.notificationsService.showSuccessToast(`Saved to ${next.system.id}/${path}`);
+        }, (err) => {
+          this.notificationsService.showErrorToast(`Failed to save to ${next.system.id}/${path} ${err.toString()}`);
+        });
+
+      } else {
+        this.projectsService.exportProject(this.activeProject,
+                                           next.system.id,
+                                           path,
+                                           next.system.id.includes('project') && next.linkProject,
+                                           next.fileName);
+      }
     });
   }
 

src/app/models/models.ts

@@ -2,7 +2,7 @@ import {Feature as GeoJSONFeature,
   GeoJsonProperties,
   Geometry,
   FeatureCollection as IFeatureCollection } from 'geojson';
-
+import { MarkerOptions } from 'leaflet';
 
 // TODO: break these out into their own files
 
@@ -216,3 +216,14 @@ export interface DesignSafeProject {
 export interface DesignSafeProjectCollection {
   projects: DesignSafeProject[];
 }
+
+export interface MarkerIcon {
+  color: string;
+  name: string;
+}
+
+export interface MarkerConfig {
+  type: string;
+  icon?: MarkerIcon;
+  options?: MarkerOptions;
+}

src/app/models/rapid-project-request.ts

@@ -1,10 +1,16 @@
 
 class RapidProjectRequest {
   system_id: string;
+  project_id: number;
+  file_name: string;
+  watch_content: boolean;
   path: string;
 
-  constructor(systemId: string, path: string) {
+  constructor(systemId: string, path: string, watchContent: boolean, projectId?: number, fileName?: string) {
     this.system_id = systemId;
+    this.project_id = projectId ? projectId : undefined;
+    this.file_name = fileName ? fileName : '';
+    this.watch_content = watchContent;
     this.path = path;
   }
 }