Merge branch 'master' into 7463-double-popups-across-courses-resource…

…s-and-manager-fetc

src/app/configuration/configuration-guard.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Router } from '@angular/router';
 import { CouchService } from '../shared/couchdb.service';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -12,7 +12,7 @@ export class ConfigurationGuard {
     private couchService: CouchService
   ) {}
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+  canActivate(): Observable<boolean> {
     return this.couchService.findAll('configurations').pipe(map((data: any[]) => {
       if (data.length > 0) {
         this.router.navigate([ '/login' ]);

src/app/configuration/configuration.component.ts

@@ -1,16 +1,14 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { CouchService } from '../shared/couchdb.service';
 import { ValidatorService } from '../validators/validator.service';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { CustomValidators } from '../validators/custom-validators';
 import { findDocuments } from '../shared/mangoQueries';
 import { MatStepper } from '@angular/material/stepper';
 import { Router, ActivatedRoute } from '@angular/router';
-import { Observable, forkJoin } from 'rxjs';
 import { environment } from '../../environments/environment';
 import { finalize } from 'rxjs/operators';
-import { debug } from '../debug-operator';
 import { ConfigurationService } from './configuration.service';
 import { StateService } from '../shared/state.service';
 

src/app/courses/courses-router.module.ts

@@ -8,7 +8,6 @@ import { ExamsAddComponent } from '../exams/exams-add.component';
 import { CoursesStepViewComponent } from './step-view-courses/courses-step-view.component';
 import { ExamsViewComponent } from '../exams/exams-view.component';
 import { CoursesProgressLeaderComponent } from './progress-courses/courses-progress-leader.component';
-import { CoursesProgressLearnerComponent } from './progress-courses/courses-progress-learner.component';
 import { CoursesEnrollComponent } from './enroll-courses/courses-enroll.component';
 
 const routes: Routes = [

src/app/courses/courses.component.ts

@@ -424,7 +424,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
     this.dialogsListService.getListAndColumns('communityregistrationrequests', { 'registrationRequest': 'accepted' })
     .pipe(takeUntil(this.onDestroy$))
     .subscribe((planet) => {
-      const data = { okClick: this.sendCourse('courses').bind(this),
+      const data = { okClick: this.sendCourse().bind(this),
         filterPredicate: filterSpecificFields([ 'name' ]),
         allowMulti: true,
         ...planet };
@@ -434,7 +434,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
     });
   }
 
-  sendCourse(db: string) {
+  sendCourse() {
     return (selected: any) => {
       const coursesToSend = this.selection.selected.map(id => findByIdInArray(this.courses.data, id));
       this.syncService.createChildPullDoc(coursesToSend, 'courses', selected).subscribe(() => {

src/app/courses/courses.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
-import { Subject, forkJoin, of, combineLatest, zip } from 'rxjs';
+import { Subject, forkJoin, of } from 'rxjs';
 import { UserService } from '../shared/user.service';
 import { findDocuments, inSelector } from '../shared/mangoQueries';
-import { switchMap, map, startWith, skip, debounceTime, filter, take } from 'rxjs/operators';
+import { switchMap, map, filter, take } from 'rxjs/operators';
 import { RatingService } from '../shared/forms/rating.service';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { StateService } from '../shared/state.service';

src/app/courses/progress-courses/courses-progress-leader.component.ts

@@ -6,7 +6,7 @@ import { takeUntil } from 'rxjs/operators';
 import { CoursesService } from '../courses.service';
 import { SubmissionsService } from '../../submissions/submissions.service';
 import { CsvService } from '../../shared/csv.service';
-import { dedupeShelfReduce, dedupeObjectArray } from '../../shared/utils';
+import { dedupeObjectArray } from '../../shared/utils';
 import { DialogsLoadingService } from '../../shared/dialogs/dialogs-loading.service';
 import { findDocuments } from '../../shared/mangoQueries';
 import { UserProfileDialogComponent } from '../../users/users-profile/users-profile-dialog.component';

src/app/courses/progress-courses/courses-progress-learner.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute, ParamMap } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { CoursesService } from '../courses.service';

src/app/exams/exams-add.component.ts

@@ -6,7 +6,7 @@ import {
   Validators
 } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatDialog } from '@angular/material/dialog';
 
 import { CouchService } from '../shared/couchdb.service';
 import { ValidatorService } from '../validators/validator.service';

src/app/exams/exams-preview.component.ts

@@ -1,4 +1,4 @@
-import { Component, Inject, ViewChild } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 
 @Component({

src/app/manager-dashboard/certifications/certifications-view.component.ts

@@ -1,12 +1,11 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Subject, combineLatest } from 'rxjs';
-import { switchMap, takeUntil, debounceTime, auditTime } from 'rxjs/operators';
+import { switchMap, takeUntil, auditTime } from 'rxjs/operators';
 import { CertificationsService } from './certifications.service';
 import { TableState } from '../../users/users-table.component';
 import { CoursesService } from '../../courses/courses.service';
 import { UsersService } from '../../users/users.service';
-import { dedupeShelfReduce } from '../../shared/utils';
 
 @Component({
   templateUrl: './certifications-view.component.html'

src/app/manager-dashboard/manager-fetch.component.ts

@@ -81,6 +81,8 @@ export class ManagerFetchComponent implements OnInit, AfterViewInit {
   }
 
   getPushedItem() {
+    console.log('Getting pushed list');
+
     const itemsToPull = this.selection.selected.map(id => findByIdInArray(this.pushedItems.data, id));
     const deleteItems = itemsToPull.map(sentItem => ({ _id: sentItem._id, _rev: sentItem._rev, _deleted: true }));
     this.syncService.replicatorsArrayWithTags(itemsToPull, 'pull', 'parent').pipe(switchMap((replicators) =>

src/app/manager-dashboard/manager-sync.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service';
-import { forkJoin, of } from 'rxjs';
+import { forkJoin } from 'rxjs';
 
 @Component({
   templateUrl: './manager-sync.component.html'

src/app/manager-dashboard/reports/reports-detail.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation, HostBinding, ViewChild
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { combineLatest, Subject, of } from 'rxjs';
-import { map, takeUntil, take } from 'rxjs/operators';
+import { takeUntil, take } from 'rxjs/operators';
 import { ReportsService } from './reports.service';
 import { StateService } from '../../shared/state.service';
 import { Chart } from 'chart.js';

src/app/manager-dashboard/reports/reports-pending.component.ts

@@ -1,10 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { CouchService } from '../../shared/couchdb.service';
-import { forkJoin, Subject } from 'rxjs';
-import { findDocuments } from '../../shared/mangoQueries';
+import { forkJoin } from 'rxjs';
 import { StateService } from '../../shared/state.service';
 import { PlanetMessageService } from '../../shared/planet-message.service';
-import { ReportsService } from './reports.service';
 import { ManagerService } from '../manager.service';
 import { attachNamesToPlanets } from './reports.utils';
 
@@ -25,7 +23,6 @@ export class ReportsPendingComponent implements OnInit {
     private couchService: CouchService,
     private stateService: StateService,
     private planetMessageService: PlanetMessageService,
-    private reportsService: ReportsService,
     private managerService: ManagerService
   ) {}
 

src/app/manager-dashboard/reports/reports.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { forkJoin, Observable } from 'rxjs';
+import { forkJoin } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 import { CouchService } from '../../shared/couchdb.service';
 import { findDocuments } from '../../shared/mangoQueries';

src/app/manager-dashboard/requests/requests-table.component.ts

@@ -8,7 +8,6 @@ import { MatTableDataSource } from '@angular/material/table';
 import { switchMap, takeUntil, finalize } from 'rxjs/operators';
 import { forkJoin, of, Subject } from 'rxjs';
 import { filterSpecificFields, sortNumberOrString } from '../../shared/table-helpers';
-import { DialogsViewComponent } from '../../shared/dialogs/dialogs-view.component';
 import { DialogsListService } from '../../shared/dialogs/dialogs-list.service';
 import { DialogsListComponent } from '../../shared/dialogs/dialogs-list.component';
 import { StateService } from '../../shared/state.service';

src/app/meetups/meetups.component.ts

@@ -1,10 +1,8 @@
 import { Component, OnInit, ViewChild, AfterViewInit, OnDestroy } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
-import { MatDialog } from '@angular/material/dialog';
 import { MatPaginator, PageEvent } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
-import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { filterSpecificFields, selectedOutOfFilter, composeFilterFunctions, filterSpecificFieldsByWord } from '../shared/table-helpers';
 import { SelectionModel } from '@angular/cdk/collections';
@@ -13,7 +11,6 @@ import { UserService } from '../shared/user.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { MeetupService } from './meetups.service';
-import { debug } from '../debug-operator';
 import { StateService } from '../shared/state.service';
 import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service';
 import { findByIdInArray } from '../shared/utils';
@@ -54,7 +51,6 @@ export class MeetupsComponent implements OnInit, AfterViewInit, OnDestroy {
 
   constructor(
     private couchService: CouchService,
-    private dialog: MatDialog,
     private planetMessageService: PlanetMessageService,
     private router: Router,
     private route: ActivatedRoute,

src/app/meetups/meetups.service.ts

@@ -1,11 +1,9 @@
-import { OnDestroy } from '@angular/core';
 import { Injectable } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { findDocuments } from '../shared/mangoQueries';
 import { UserService } from '../shared/user.service';
-import { Subject, of, forkJoin } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
-import { dedupeShelfReduce } from '../shared/utils';
+import { Subject } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';

src/app/notifications/notifications.component.ts

@@ -6,9 +6,8 @@ import { filterDropdowns } from '../shared/table-helpers';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 
-import { MatPaginator, PageEvent } from '@angular/material/paginator';
+import { MatPaginator } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
-import { PlanetMessageService } from '../shared/planet-message.service';
 import { NotificationsService } from './notifications.service';
 
 @Component({
@@ -27,7 +26,6 @@ export class NotificationsComponent implements OnInit, AfterViewInit {
   constructor(
     private couchService: CouchService,
     private userService: UserService,
-    private planetMessageService: PlanetMessageService,
     private notificationsService: NotificationsService
   ) {
     this.userService.notificationStateChange$.pipe(takeUntil(this.onDestroy$)).subscribe(() => {