Replace global activeSurvey$ w/component inputs

web/package.json

@@ -8,8 +8,9 @@
     "build": "ng build -c $npm_config_config",
     "postbuild": "npm run --prefix scripts copy-asset-links",
     "build-all": "npm run build-local-deps && npm run build",
-    "build-and-test": "npm run build && npm run test",
-    "build-all-and-test": "npm run build-all && npm run test",
+    "build-and-test": "npm run build --config=local && npm run test",
+    "build-all-and-test": "npm run build-all --config=local && npm run test",
+    "build-all-and-test-headless": "npm run build-all --config=local && npm run test-headless",
     "watch": "npm run build -- --watch",
     "start": "ng serve -c $npm_config_config",
     "build-and-start": "npm run build && npm run start",

web/scripts/copy-asset-links.js

@@ -38,5 +38,5 @@ if (existsSync(assertLinksFilepath)) {
 
   writeFileSync(`${wellKnownDir}/assetLinks.json`, assertLinks);
 } else {
-  console.warn('Missing asserLinks.json file');
+  console.warn('Warning: Missing assetLinks.json file');
 }

web/src/app/components/header/header.component.spec.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {MatDialog} from '@angular/material/dialog';
 import {MatMenuModule} from '@angular/material/menu';
@@ -46,6 +47,7 @@ describe('HeaderComponent', () => {
         {provide: Router, useValue: {events: of()}},
         {provide: SurveyService, useValue: {canManageSurvey: () => false}},
       ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   });
 

web/src/app/components/loi-editor/loi-editor.component.spec.ts

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {GoogleMapsModule} from '@angular/google-maps';
 import {MatDialog} from '@angular/material/dialog';
+import {MatIconModule} from '@angular/material/icon';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {List, Map} from 'immutable';
 
 import {ImportDialogComponent} from 'app/components/import-dialog/import-dialog.component';
@@ -79,8 +82,9 @@ describe('LoiEditorComponent', () => {
     matDialogSpy = jasmine.createSpyObj<MatDialog>('MatDialog', ['open']);
 
     TestBed.configureTestingModule({
-      imports: [GoogleMapsModule],
+      imports: [GoogleMapsModule, MatSlideToggleModule, MatIconModule],
       declarations: [LoiEditorComponent],
+      schemas: [NO_ERRORS_SCHEMA],
       providers: [
         {
           provide: DataStoreService,

web/src/app/components/loi-selection/loi-selection.component.spec.ts

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {GoogleMapsModule} from '@angular/google-maps';
 import {MatDialog} from '@angular/material/dialog';
+import {MatIconModule} from '@angular/material/icon';
+import {MatListModule} from '@angular/material/list';
 import {List, Map} from 'immutable';
 
 import {Coordinate} from 'app/models/geometry/coordinate';
@@ -75,7 +78,12 @@ describe('LoiSelectionComponent', () => {
     matDialogSpy = jasmine.createSpyObj<MatDialog>('MatDialog', ['open']);
 
     TestBed.configureTestingModule({
-      imports: [GoogleMapsModule, GroundIconModule],
+      imports: [
+        GoogleMapsModule,
+        GroundIconModule,
+        MatListModule,
+        MatIconModule,
+      ],
       declarations: [LoiSelectionComponent],
       providers: [
         {
@@ -87,6 +95,7 @@ describe('LoiSelectionComponent', () => {
           useValue: matDialogSpy,
         },
       ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(LoiSelectionComponent);

web/src/app/components/share-list/share-list.component.spec.ts

@@ -19,6 +19,7 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 import {MatListModule} from '@angular/material/list';
 import {MatListHarness} from '@angular/material/list/testing';
+import {MatSelectModule} from '@angular/material/select';
 import {Map} from 'immutable';
 import {Subject, firstValueFrom, of} from 'rxjs';
 
@@ -55,7 +56,7 @@ describe('ShareListComponent', () => {
     {type: DataSharingType.PRIVATE}
   );
 
-  const user = new User('', '', true);
+  const user = new User('user1', 'user1@gmail.com', true);
 
   beforeEach(waitForAsync(() => {
     draftSurveyServiceSpy = jasmine.createSpyObj<DraftSurveyService>(
@@ -74,7 +75,7 @@ describe('ShareListComponent', () => {
 
     TestBed.configureTestingModule({
       declarations: [ShareListComponent],
-      imports: [MatListModule],
+      imports: [MatListModule, MatSelectModule],
       providers: [
         {provide: DraftSurveyService, useValue: draftSurveyServiceSpy},
         {provide: AuthService, useValue: authServiceSpy},
@@ -95,10 +96,10 @@ describe('ShareListComponent', () => {
 
   it('updates itself when acl changes', async () => {
     activeSurvey$.next(survey);
+    fixture.detectChanges();
+    await fixture.whenStable();
 
-    fixture.whenStable().then(async () => {
-      expect(component.acl?.length).toBe(0);
-    });
+    expect(component.acl?.length).toBe(0);
 
     activeSurvey$.next(
       new Survey(
@@ -107,18 +108,18 @@ describe('ShareListComponent', () => {
         surveyDescription,
         /* jobs= */ Map(),
         /* acl= */ Map({a: Role.OWNER, b: Role.OWNER}),
-        /* ownerId= */ '',
+        /* ownerId= */ 'user1',
         {type: DataSharingType.PRIVATE}
       )
     );
+    fixture.detectChanges();
+    await fixture.whenStable();
 
-    fixture.whenStable().then(async () => {
-      expect(component.acl?.length).toBe(2);
+    expect(component.acl?.length).toBe(2);
 
-      const aclList = await loader.getHarness(MatListHarness);
-      const aclListItems = await aclList.getItems();
+    const aclList = await loader.getHarness(MatListHarness);
+    const aclListItems = await aclList.getItems();
 
-      expect(aclListItems.length).toBe(2);
-    });
+    expect(aclListItems.length).toBe(3);
   });
 });

web/src/app/components/share-survey/share-survey.component.spec.ts

@@ -1,4 +1,6 @@
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {MatCardModule} from '@angular/material/card';
 import {MatDialogModule} from '@angular/material/dialog';
 import {MatIconModule} from '@angular/material/icon';
 
@@ -10,8 +12,9 @@ describe('ShareSurveyComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MatIconModule, MatDialogModule],
+      imports: [MatIconModule, MatDialogModule, MatCardModule],
       declarations: [ShareSurveyComponent],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ShareSurveyComponent);

web/src/app/components/sign-in-page/sign-in-page.component.spec.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {NavigationEnd, Router} from '@angular/router';
 import {BehaviorSubject, NEVER, of} from 'rxjs';
@@ -41,6 +42,7 @@ describe('SignInPageComponent', () => {
           useValue: {getUser$: () => NEVER, isAuthenticated$: () => NEVER},
         },
       ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   });
 

web/src/app/components/survey-list/survey-list.component.spec.ts

@@ -26,6 +26,7 @@ import {AngularFireAuth} from '@angular/fire/compat/auth';
 import {AngularFirestore} from '@angular/fire/compat/firestore';
 import {MatButtonModule} from '@angular/material/button';
 import {MatCardModule} from '@angular/material/card';
+import {MatChipsModule} from '@angular/material/chips';
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {MatGridListModule} from '@angular/material/grid-list';
 import {MatIconModule} from '@angular/material/icon';
@@ -176,6 +177,7 @@ describe('SurveyListComponent', () => {
         MatCardModule,
         MatGridListModule,
         MatIconModule,
+        MatChipsModule,
       ],
       declarations: [SurveyListComponent, HeaderComponent],
       providers: [

web/src/app/components/tasks-editor/add-task-button/add-task-button.component.spec.ts

@@ -15,6 +15,7 @@
  */
 
 import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {MatIconModule} from '@angular/material/icon';
 
 import {AddTaskButtonComponent} from './add-task-button.component';
 
@@ -24,6 +25,7 @@ describe('TaskButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [MatIconModule],
       declarations: [AddTaskButtonComponent],
     }).compileComponents();
 

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {
   ComponentFixture,
   TestBed,
@@ -23,6 +24,7 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import {MatDialogModule} from '@angular/material/dialog';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {By} from '@angular/platform-browser';
 import {ActivatedRoute} from '@angular/router';
 import {List, Map} from 'immutable';
@@ -43,6 +45,7 @@ import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/sur
 import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
 import {JobService} from 'app/services/job/job.service';
 import {LocationOfInterestService} from 'app/services/loi/loi.service';
+import {SURVEY_ID_NEW} from 'app/services/navigation/navigation.constants';
 import {NavigationService} from 'app/services/navigation/navigation.service';
 import {SurveyService} from 'app/services/survey/survey.service';
 import {TaskService} from 'app/services/task/task.service';
@@ -198,14 +201,15 @@ describe('CreateSurveyComponent', () => {
     ]);
 
     TestBed.configureTestingModule({
-      imports: [MatDialogModule],
+      imports: [MatDialogModule, MatProgressSpinnerModule],
       declarations: [
         CreateSurveyComponent,
         SurveyDetailsComponent,
         JobDetailsComponent,
         DataSharingTermsComponent,
         ShareSurveyComponent,
       ],
+      schemas: [NO_ERRORS_SCHEMA],
       providers: [
         {provide: NavigationService, useValue: navigationServiceSpy},
         {provide: SurveyService, useValue: surveyServiceSpy},
@@ -246,7 +250,7 @@ describe('CreateSurveyComponent', () => {
 
   describe('when no survey', () => {
     beforeEach(fakeAsync(() => {
-      surveyId$.next(NavigationService.SURVEY_ID_NEW);
+      surveyId$.next(SURVEY_ID_NEW);
       activeSurvey$.next(Survey.UNSAVED_NEW);
       tick();
       fixture.detectChanges();
@@ -314,7 +318,7 @@ describe('CreateSurveyComponent', () => {
   describe('Survey Details', () => {
     describe('when no survey', () => {
       beforeEach(fakeAsync(() => {
-        surveyId$.next(NavigationService.SURVEY_ID_NEW);
+        surveyId$.next(SURVEY_ID_NEW);
         activeSurvey$.next(Survey.UNSAVED_NEW);
         tick();
         fixture.detectChanges();

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

@@ -31,6 +31,7 @@ import {TaskDetailsComponent} from 'app/pages/create-survey/task-details/task-de
 import {DraftSurveyService} from 'app/services/draft-survey/draft-survey.service';
 import {JobService} from 'app/services/job/job.service';
 import {LocationOfInterestService} from 'app/services/loi/loi.service';
+import {SURVEY_ID_NEW} from 'app/services/navigation/navigation.constants';
 import {NavigationService} from 'app/services/navigation/navigation.service';
 import {SurveyService} from 'app/services/survey/survey.service';
 import {TaskService} from 'app/services/task/task.service';
@@ -155,7 +156,7 @@ export class CreateSurveyComponent implements OnInit {
   ngOnInit(): void {
     this.subscription.add(
       this.navigationService.getSurveyId$().subscribe(async surveyId => {
-        this.surveyId = surveyId ? surveyId : NavigationService.SURVEY_ID_NEW;
+        this.surveyId = surveyId ? surveyId : SURVEY_ID_NEW;
         this.surveyService.activateSurvey(this.surveyId);
         await this.draftSurveyService.init(this.surveyId);
         this.draftSurveyService
@@ -172,8 +173,7 @@ export class CreateSurveyComponent implements OnInit {
         .pipe(
           filter(
             ([survey]) =>
-              this.surveyId === NavigationService.SURVEY_ID_NEW ||
-              survey.id === this.surveyId
+              this.surveyId === SURVEY_ID_NEW || survey.id === this.surveyId
           )
         )
         .subscribe(([survey, lois]) => {
@@ -332,7 +332,7 @@ export class CreateSurveyComponent implements OnInit {
 
   private async saveSurveyTitleAndDescription(): Promise<string | void> {
     const [name, description] = this.surveyDetails!.toTitleAndDescription();
-    if (this.surveyId === NavigationService.SURVEY_ID_NEW) {
+    if (this.surveyId === SURVEY_ID_NEW) {
       return await this.surveyService.createSurvey(name, description);
     }
 

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

@@ -15,7 +15,11 @@
  */
 
 import {CommonModule} from '@angular/common';
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {ReactiveFormsModule} from '@angular/forms';
+import {MatCardModule} from '@angular/material/card';
+import {MatRadioModule} from '@angular/material/radio';
 
 import {
   DATA_SHARING_TYPE_DESCRIPTION,
@@ -30,7 +34,13 @@ describe('DataSharingTermsComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [DataSharingTermsComponent],
-      imports: [CommonModule],
+      imports: [
+        CommonModule,
+        MatCardModule,
+        MatRadioModule,
+        ReactiveFormsModule,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(DataSharingTermsComponent);

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

@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {ReactiveFormsModule} from '@angular/forms';
+import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatInputModule} from '@angular/material/input';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 import {SurveyDetailsComponent} from 'app/pages/create-survey/survey-details/survey-details.component';
 
@@ -26,6 +31,17 @@ describe('SurveyDetailsComponent', () => {
   const description = 'description';
 
   beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [SurveyDetailsComponent],
+      imports: [
+        MatFormFieldModule,
+        MatInputModule,
+        ReactiveFormsModule,
+        NoopAnimationsModule,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+
     fixture = TestBed.createComponent(SurveyDetailsComponent);
     component = fixture.componentInstance;
     component.title = title;

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {MatDialogModule} from '@angular/material/dialog';
 import {Map} from 'immutable';
@@ -55,6 +56,7 @@ describe('TaskDetailsComponent', () => {
           },
         },
       ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(TaskDetailsComponent);