Merge branch 'master' into rfontanarosa/1975/createedit-survey-clicki…

…ng-publish-changes-doesnt-bring-user-back-to-the-main-screen

web/src/app/models/survey.model.ts

@@ -78,6 +78,10 @@ export class Survey extends Copiable {
     super();
   }
 
+  hasJobs(): boolean {
+    return this.jobs.size > 0;
+  }
+
   getJob(jobId: string): Job | undefined {
     return this.jobs.get(jobId);
   }

web/src/app/pages/create-survey/create-survey.component.html

@@ -89,10 +89,13 @@
               (onValidationChange)="onValidationChange($event)"
             ></data-sharing-terms>
           </ground-step-card>
-          <survey-review
+          <ground-step-card
             *ngSwitchCase="SetupPhase.REVIEW"
-            #surveyReview
-          ></survey-review>
+            title="Review survey"
+            description="Is your survey ready? Share it with collectors and other organizers."
+          >
+            <share-survey></share-survey>
+          </ground-step-card>
         </div>
       </div>
     </div>

web/src/app/pages/create-survey/create-survey.component.spec.ts

@@ -28,6 +28,7 @@ import {ActivatedRoute} from '@angular/router';
 import {List, Map} from 'immutable';
 import {Observable, Subject} from 'rxjs';
 
+import {ShareSurveyComponent} from 'app/components/share-survey/share-survey.component';
 import {Job} from 'app/models/job.model';
 import {LocationOfInterest} from 'app/models/loi.model';
 import {DataSharingType, Survey, SurveyState} from 'app/models/survey.model';
@@ -46,8 +47,6 @@ import {SurveyService} from 'app/services/survey/survey.service';
 import {TaskService} from 'app/services/task/task.service';
 import {ActivatedRouteStub} from 'testing/activated-route-stub';
 
-import {SurveyReviewComponent} from './survey-review/survey-review.component';
-
 describe('CreateSurveyComponent', () => {
   let component: CreateSurveyComponent;
   let fixture: ComponentFixture<CreateSurveyComponent>;
@@ -189,7 +188,7 @@ describe('CreateSurveyComponent', () => {
         SurveyDetailsComponent,
         JobDetailsComponent,
         DataSharingTermsComponent,
-        SurveyReviewComponent,
+        ShareSurveyComponent,
       ],
       providers: [
         {provide: NavigationService, useValue: navigationServiceSpy},

web/src/app/pages/create-survey/create-survey.component.ts

@@ -50,6 +50,21 @@ export class CreateSurveyComponent implements OnInit {
 
   readonly SetupPhase = SetupPhase;
 
+  @ViewChild('surveyDetails')
+  surveyDetails?: SurveyDetailsComponent;
+
+  @ViewChild('jobDetails')
+  jobDetails?: JobDetailsComponent;
+
+  @ViewChild('surveyLoi')
+  surveyLoi?: SurveyLoiComponent;
+
+  @ViewChild('taskDetails')
+  taskDetails?: TaskDetailsComponent;
+
+  @ViewChild('dataSharingTerms')
+  dataSharingTerms?: DataSharingTermsComponent;
+
   constructor(
     private surveyService: SurveyService,
     private jobService: JobService,
@@ -125,7 +140,7 @@ export class CreateSurveyComponent implements OnInit {
     ) {
       return SetupPhase.DEFINE_TASKS;
     }
-    if (survey.jobs.size > 0) {
+    if (survey.hasJobs()) {
       return SetupPhase.DEFINE_LOIS;
     }
     if (this.hasTitle(survey)) {
@@ -162,7 +177,7 @@ export class CreateSurveyComponent implements OnInit {
   }
 
   job(): Job | undefined {
-    if (this.survey?.jobs.size ?? 0 > 0) {
+    if (this.survey?.hasJobs()) {
       return this.survey?.jobs.values().next().value;
     }
     return undefined;
@@ -234,9 +249,6 @@ export class CreateSurveyComponent implements OnInit {
     this.survey = this.surveyService.getActiveSurvey();
   }
 
-  @ViewChild('surveyDetails')
-  surveyDetails?: SurveyDetailsComponent;
-
   private async saveSurveyTitleAndDescription(): Promise<string | void> {
     const [name, description] = this.surveyDetails!.toTitleAndDescription();
     if (this.surveyId === NavigationService.SURVEY_ID_NEW) {
@@ -250,9 +262,6 @@ export class CreateSurveyComponent implements OnInit {
     );
   }
 
-  @ViewChild('jobDetails')
-  jobDetails?: JobDetailsComponent;
-
   private getFirstJob(): Job {
     // there should only be at most one job attached to this survey at this
     // point when user is still in the survey creation flow.
@@ -262,7 +271,7 @@ export class CreateSurveyComponent implements OnInit {
   private async saveJobName(): Promise<void> {
     const name = this.jobDetails!.toJobName();
     let job;
-    if (this.survey!.jobs.size > 0) {
+    if (this.survey?.hasJobs()) {
       job = this.getFirstJob();
     } else {
       job = this.jobService.createNewJob();
@@ -303,15 +312,6 @@ export class CreateSurveyComponent implements OnInit {
     await this.surveyService.updateState(SurveyState.READY);
   }
 
-  @ViewChild('surveyLoi')
-  surveyLoi?: SurveyLoiComponent;
-
-  @ViewChild('taskDetails')
-  taskDetails?: TaskDetailsComponent;
-
-  @ViewChild('dataSharingTerms')
-  dataSharingTerms?: DataSharingTermsComponent;
-
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }

web/src/app/pages/create-survey/create-survey.module.ts

@@ -22,6 +22,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 
 import {HeaderModule} from 'app/components/header/header.module';
+import {ShareSurveyModule} from 'app/components/share-survey/share-survey.module';
 import {CreateSurveyComponent} from 'app/pages/create-survey/create-survey.component';
 import {DataSharingTermsModule} from 'app/pages/create-survey/data-sharing-terms/data-sharing-terms.module';
 import {TaskDetailsModule} from 'app/pages/create-survey/task-details/task-details.module';
@@ -30,7 +31,6 @@ import {JobDetailsModule} from './job-details/job-details.module';
 import {StepCardModule} from './step-card/step-card.module';
 import {SurveyDetailsModule} from './survey-details/survey-details.module';
 import {SurveyLoiModule} from './survey-loi/survey-loi.module';
-import {SurveyReviewModule} from './survey-review/survey-review.module';
 
 @NgModule({
   declarations: [CreateSurveyComponent],
@@ -40,7 +40,7 @@ import {SurveyReviewModule} from './survey-review/survey-review.module';
     TaskDetailsModule,
     SurveyDetailsModule,
     SurveyLoiModule,
-    SurveyReviewModule,
+    ShareSurveyModule,
     CommonModule,
     MatButtonModule,
     MatInputModule,