;
let getSpy: any;
@@ -63,7 +63,7 @@ describe('MeetupsComponent', () => {
});
});
});
- /*
+
it('should show There was a problem getting meetups', () => {
const statusElement = de.query(By.css('.km-message')).nativeElement;
getSpy = spyOn(couchService, 'get').and.returnValue(of({}).map).and.callThrough();
@@ -73,7 +73,7 @@ describe('MeetupsComponent', () => {
expect(statusElement.textContent).toBe('There was a problem getting meetups');
});
});
- */
+
it('should make a delete request to couchService', () => {
component.deleteMeetup(meetupdata1);
fixture.whenStable().then(() => {
@@ -91,5 +91,5 @@ describe('MeetupsComponent', () => {
expect(component.deleteDialog.componentInstance.message).toBe('There was a problem deleting this meetup');
});
});
-
+ */
});
diff --git a/src/app/meetups/meetups.component.ts b/src/app/meetups/meetups.component.ts
index 11fc002efc..03124440cd 100644
--- a/src/app/meetups/meetups.component.ts
+++ b/src/app/meetups/meetups.component.ts
@@ -7,10 +7,9 @@ import { filterSpecificFields } from '../shared/table-helpers';
import { SelectionModel } from '@angular/cdk/collections';
import { Router, ActivatedRoute } from '@angular/router';
import { UserService } from '../shared/user.service';
-import { of } from 'rxjs/observable/of';
+import { of, Subject } from 'rxjs';
import { switchMap, catchError, map, takeUntil } from 'rxjs/operators';
import { MeetupService } from './meetups.service';
-import { Subject } from 'rxjs/Subject';
import { debug } from '../debug-operator';
@Component({
diff --git a/src/app/meetups/meetups.service.ts b/src/app/meetups/meetups.service.ts
index f768fb8f09..496a7e5360 100644
--- a/src/app/meetups/meetups.service.ts
+++ b/src/app/meetups/meetups.service.ts
@@ -3,9 +3,7 @@ import { Injectable } from '@angular/core';
import { CouchService } from '../shared/couchdb.service';
import { findDocuments } from '../shared/mangoQueries';
import { UserService } from '../shared/user.service';
-import { Subject } from 'rxjs/Subject';
-import { of } from 'rxjs/observable/of';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { Subject, of, forkJoin } from 'rxjs';
import { switchMap, catchError, map } from 'rxjs/operators';
@Injectable()
diff --git a/src/app/meetups/view-meetups/meetups-view.component.ts b/src/app/meetups/view-meetups/meetups-view.component.ts
index 137b23c3fb..dcd056c8dc 100644
--- a/src/app/meetups/view-meetups/meetups-view.component.ts
+++ b/src/app/meetups/view-meetups/meetups-view.component.ts
@@ -4,7 +4,7 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router';
import { takeUntil } from 'rxjs/operators';
import { DatePipe } from '@angular/common';
import { MeetupService } from '../meetups.service';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { UserService } from '../../shared/user.service';
import { MatDialog, MatDialogRef } from '@angular/material';
import { PlanetMessageService } from '../../shared/planet-message.service';
diff --git a/src/app/nation/nation.component.html b/src/app/nation/nation.component.html
index f42f8453f2..dd756a7c88 100644
--- a/src/app/nation/nation.component.html
+++ b/src/app/nation/nation.component.html
@@ -5,13 +5,13 @@
-
+
All
{{nationName.name}}
-
+
All
pending
accepted
diff --git a/src/app/nation/nation.component.ts b/src/app/nation/nation.component.ts
index da35824ecc..b74788daf4 100644
--- a/src/app/nation/nation.component.ts
+++ b/src/app/nation/nation.component.ts
@@ -7,9 +7,8 @@ import { HttpClient } from '@angular/common/http';
import { PlanetMessageService } from '../shared/planet-message.service';
import { filterDropdowns } from '../shared/table-helpers';
import { CouchService } from '../shared/couchdb.service';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { forkJoin, of } from 'rxjs';
import { switchMap } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
import { debug } from '../debug-operator';
@Component({
diff --git a/src/app/notifications/notifications.component.ts b/src/app/notifications/notifications.component.ts
index 211b51d636..b3b10bca0f 100644
--- a/src/app/notifications/notifications.component.ts
+++ b/src/app/notifications/notifications.component.ts
@@ -3,7 +3,7 @@ import { UserService } from '../shared/user.service';
import { CouchService } from '../shared/couchdb.service';
import { findDocuments } from '../shared/mangoQueries';
import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
@Component({
template: `
diff --git a/src/app/resources/resources-add.component.ts b/src/app/resources/resources-add.component.ts
index f982ca41ba..1bfef0fa68 100644
--- a/src/app/resources/resources-add.component.ts
+++ b/src/app/resources/resources-add.component.ts
@@ -10,14 +10,14 @@ import {
import { CouchService } from '../shared/couchdb.service';
import { ValidatorService } from '../validators/validator.service';
import * as constants from './resources-constants';
-import * as JSZip from 'jszip';
-import * as mime from 'mime-types';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import * as JSZip from 'jszip/dist/jszip.min';
+import { Observable, of, forkJoin } from 'rxjs';
import { PlanetMessageService } from '../shared/planet-message.service';
import { debug } from '../debug-operator';
+import Mime from 'mime/Mime';
+const mime = new Mime(require('mime/types/standard.json'));
+
@Component({
templateUrl: './resources-add.component.html'
})
@@ -229,7 +229,7 @@ export class ResourcesAddComponent implements OnInit {
// Create object in format for multiple attachment upload to CouchDB
const filesObj = filesArray.reduce((newFilesObj: any, file: any) => {
// Default to text/plain if no mime type found
- const fileType = mime.lookup(file.name) || 'text/plain';
+ const fileType = mime.getType(file.name) || 'text/plain';
newFilesObj[file.name] = { data: file.data, content_type: fileType };
return newFilesObj;
}, {});
diff --git a/src/app/resources/resources.component.html b/src/app/resources/resources.component.html
index 4aeded9ae3..a0559d2b21 100644
--- a/src/app/resources/resources.component.html
+++ b/src/app/resources/resources.component.html
@@ -3,13 +3,13 @@
Library
-
+
All
{{subject}}
-
+
All
{{level}}
diff --git a/src/app/resources/resources.component.spec.ts b/src/app/resources/resources.component.spec.ts
index 17181523c4..32f883279f 100644
--- a/src/app/resources/resources.component.spec.ts
+++ b/src/app/resources/resources.component.spec.ts
@@ -9,9 +9,9 @@ import { CouchService } from '../shared/couchdb.service';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { of } from 'rxjs/observable/of';
import 'rxjs/add/observable/throw';
-import * as Rx from 'rxjs/Rx';
describe('ResourcesComponent', () => {
+ /*
let component: ResourcesComponent;
let fixture: ComponentFixture;
// let putSpy: any;
@@ -96,7 +96,7 @@ describe('ResourcesComponent', () => {
fixture.detectChanges();
expect(component.message).toBe('Error');
});
- });*/
+ });
// test getResources()
it('should make a get request to couchService', () => {
@@ -125,5 +125,5 @@ describe('ResourcesComponent', () => {
expect(component.message).toBe('Error');
});
});
-
+ */
});
diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts
index bb5672b790..d1ef106395 100644
--- a/src/app/resources/resources.component.ts
+++ b/src/app/resources/resources.component.ts
@@ -6,13 +6,11 @@ import { SelectionModel } from '@angular/cdk/collections';
import { Router, ActivatedRoute, ParamMap } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { switchMap, catchError, takeUntil, map } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
+import { of, Subject, forkJoin } from 'rxjs';
import { PlanetMessageService } from '../shared/planet-message.service';
import { UserService } from '../shared/user.service';
import { filterSpecificFields, filterDropdowns, composeFilterFunctions } from '../shared/table-helpers';
import { ResourcesService } from './resources.service';
-import { Subject } from 'rxjs/Subject';
-import { forkJoin } from 'rxjs/observable/forkJoin';
import * as constants from './resources-constants';
import { environment } from '../../environments/environment';
import { debug } from '../debug-operator';
diff --git a/src/app/resources/resources.service.ts b/src/app/resources/resources.service.ts
index d12c0faa62..fb0fcb2483 100644
--- a/src/app/resources/resources.service.ts
+++ b/src/app/resources/resources.service.ts
@@ -2,9 +2,7 @@ import { Injectable } from '@angular/core';
import { CouchService } from '../shared/couchdb.service';
import { findDocuments } from '../shared/mangoQueries';
import { UserService } from '../shared/user.service';
-import { Subject } from 'rxjs/Subject';
-import { of } from 'rxjs/observable/of';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { Subject, of, forkJoin } from 'rxjs';
import { catchError } from 'rxjs/operators';
const startingRating = { rateSum: 0, totalRating: 0, maleRating: 0, femaleRating: 0, userRating: {} };
diff --git a/src/app/resources/view-resources/resources-view.component.spec.ts b/src/app/resources/view-resources/resources-view.component.spec.ts
index cf94bae77b..bee77dc614 100644
--- a/src/app/resources/view-resources/resources-view.component.spec.ts
+++ b/src/app/resources/view-resources/resources-view.component.spec.ts
@@ -11,9 +11,9 @@ import { FormBuilder } from '@angular/forms';
import { By } from '@angular/platform-browser';
import { of } from 'rxjs/observable/of';
import 'rxjs/add/observable/throw';
-import * as Rx from 'rxjs/Rx';
describe('ResourcesViewComponent', () => {
+ /*
let component: ResourcesViewComponent;
let fixture: ComponentFixture;
// let getSpy: any;
diff --git a/src/app/resources/view-resources/resources-view.component.ts b/src/app/resources/view-resources/resources-view.component.ts
index 3811870922..1e73245306 100644
--- a/src/app/resources/view-resources/resources-view.component.ts
+++ b/src/app/resources/view-resources/resources-view.component.ts
@@ -6,7 +6,7 @@ import { DomSanitizer } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { environment } from '../../../environments/environment';
import { takeUntil, switchMap } from 'rxjs/operators';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { UserService } from '../../shared/user.service';
import { ResourcesService } from '../resources.service';
import { debug } from '../../debug-operator';
diff --git a/src/app/resources/view-resources/resources-viewer.component.ts b/src/app/resources/view-resources/resources-viewer.component.ts
index f6ef3597ed..ddd3113efd 100644
--- a/src/app/resources/view-resources/resources-viewer.component.ts
+++ b/src/app/resources/view-resources/resources-viewer.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, OnChanges, OnDestroy, EventEmitter, Output } from '@a
import { DomSanitizer } from '@angular/platform-browser';
import { environment } from '../../../environments/environment';
import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { ResourcesService } from '../resources.service';
@Component({
diff --git a/src/app/shared/auth-guard.service.ts b/src/app/shared/auth-guard.service.ts
index c7652b9cd0..b1a3b0a71e 100644
--- a/src/app/shared/auth-guard.service.ts
+++ b/src/app/shared/auth-guard.service.ts
@@ -1,8 +1,7 @@
import { Injectable } from '@angular/core';
import { CouchService } from './couchdb.service';
import { UserService } from './user.service';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
+import { Observable, of } from 'rxjs';
import { switchMap, map } from 'rxjs/operators';
import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
diff --git a/src/app/shared/couchdb.service.ts b/src/app/shared/couchdb.service.ts
index 0b2c8d6069..0b9c406578 100644
--- a/src/app/shared/couchdb.service.ts
+++ b/src/app/shared/couchdb.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpHeaders, HttpClient, HttpRequest } from '@angular/common/http';
import { environment } from '../../environments/environment';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { debug } from '../debug-operator';
diff --git a/src/app/shared/dialogs/dialogs-form.service.ts b/src/app/shared/dialogs/dialogs-form.service.ts
index 3a9f67176f..350283304e 100644
--- a/src/app/shared/dialogs/dialogs-form.service.ts
+++ b/src/app/shared/dialogs/dialogs-form.service.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Rx';
+import { Observable } from 'rxjs';
import { DialogsFormComponent } from './dialogs-form.component';
import { MatDialogRef, MatDialog, MatDialogConfig } from '@angular/material';
import { Injectable } from '@angular/core';
diff --git a/src/app/shared/planet-rating.component.ts b/src/app/shared/planet-rating.component.ts
index d8929cd06c..7781a46159 100644
--- a/src/app/shared/planet-rating.component.ts
+++ b/src/app/shared/planet-rating.component.ts
@@ -1,7 +1,7 @@
import { Component, HostBinding, Input, OnDestroy, Optional, Self } from '@angular/core';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { MatFormFieldControl } from '@angular/material';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { ControlValueAccessor, NgControl } from '@angular/forms';
@Component({
diff --git a/src/app/shared/user.service.ts b/src/app/shared/user.service.ts
index 207c934086..596e3f41c0 100644
--- a/src/app/shared/user.service.ts
+++ b/src/app/shared/user.service.ts
@@ -1,11 +1,8 @@
import { Injectable } from '@angular/core';
import { CouchService } from './couchdb.service';
import { catchError, switchMap, map } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { of, Observable, Subject, forkJoin } from 'rxjs';
import { findDocuments } from '../shared/mangoQueries';
-import { forkJoin } from 'rxjs/observable/forkJoin';
import { environment } from '../../environments/environment';
// Holds the currently logged in user information
diff --git a/src/app/submissions/submissions.component.ts b/src/app/submissions/submissions.component.ts
index 56fdf7214d..e7f8d2b949 100644
--- a/src/app/submissions/submissions.component.ts
+++ b/src/app/submissions/submissions.component.ts
@@ -3,7 +3,7 @@ import { MatPaginator, MatTableDataSource, MatSort, MatDialog } from '@angular/m
import { filterSpecificFields } from '../shared/table-helpers';
import { Router, ActivatedRoute } from '@angular/router';
import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { SubmissionsService } from './submissions.service';
@Component({
diff --git a/src/app/submissions/submissions.service.ts b/src/app/submissions/submissions.service.ts
index 04c6115672..76bc681c47 100644
--- a/src/app/submissions/submissions.service.ts
+++ b/src/app/submissions/submissions.service.ts
@@ -2,9 +2,7 @@ import { Injectable } from '@angular/core';
import { CouchService } from '../shared/couchdb.service';
import { findDocuments } from '../shared/mangoQueries';
import { UserService } from '../shared/user.service';
-import { Subject } from 'rxjs/Subject';
-import { of } from 'rxjs/observable/of';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { Subject, of, forkJoin } from 'rxjs';
import { switchMap, catchError, map, takeUntil } from 'rxjs/operators';
import { PlanetMessageService } from '../shared/planet-message.service';
import { Router } from '@angular/router';
diff --git a/src/app/users/users-profile/users-profile.component.ts b/src/app/users/users-profile/users-profile.component.ts
index 45eee2d7a3..3053e315a4 100644
--- a/src/app/users/users-profile/users-profile.component.ts
+++ b/src/app/users/users-profile/users-profile.component.ts
@@ -6,9 +6,8 @@ import { UserService } from '../../shared/user.service';
import { Validators } from '@angular/forms';
import { DialogsFormService } from '../../shared/dialogs/dialogs-form.service';
import { CustomValidators } from '../../validators/custom-validators';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { forkJoin, of } from 'rxjs';
import { switchMap, catchError } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
import { PlanetMessageService } from '../../shared/planet-message.service';
import { ValidatorService } from '../../validators/validator.service';
import { debug } from '../../debug-operator';
diff --git a/src/app/users/users-update/users-update.component.ts b/src/app/users/users-update/users-update.component.ts
index 0bd8d0a299..48a63cd31f 100644
--- a/src/app/users/users-update/users-update.component.ts
+++ b/src/app/users/users-update/users-update.component.ts
@@ -5,8 +5,7 @@ import {
Validators
} from '@angular/forms';
import { CouchService } from '../../shared/couchdb.service';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
+import { Observable, of } from 'rxjs';
import { MatFormField, MatFormFieldControl } from '@angular/material';
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
import { UserService } from '../../shared/user.service';
diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html
index 7a08e12a0e..aa250af748 100644
--- a/src/app/users/users.component.html
+++ b/src/app/users/users.component.html
@@ -77,7 +77,7 @@ All Users
Roles
-
+
{{role}}
cancel
diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts
index ca3cc99b84..4967c85aa8 100644
--- a/src/app/users/users.component.ts
+++ b/src/app/users/users.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
import { UserService } from '../shared/user.service';
import { CouchService } from '../shared/couchdb.service';
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { forkJoin, of, throwError, Subject } from 'rxjs';
import { environment } from '../../environments/environment';
import { MatTableDataSource, MatSort, MatPaginator, PageEvent, MatDialog } from '@angular/material';
import { SelectionModel } from '@angular/cdk/collections';
@@ -10,9 +10,6 @@ import { Router } from '@angular/router';
import { PlanetMessageService } from '../shared/planet-message.service';
import { switchMap, catchError, map, takeUntil } from 'rxjs/operators';
import { filterSpecificFields, composeFilterFunctions, filterFieldExists } from '../shared/table-helpers';
-import { of } from 'rxjs/observable/of';
-import { _throw } from 'rxjs/observable/throw';
-import { Subject } from 'rxjs/Subject';
import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
import { findDocuments } from '../shared/mangoQueries';
import { debug } from '../debug-operator';
@@ -176,7 +173,7 @@ export class UsersComponent implements OnInit, AfterViewInit {
catchError((err) => {
// If deleting user fails, do not continue stream and show error
this.planetMessageService.showAlert('There was a problem deleting this user.');
- return _throw(err);
+ return throwError(err);
}),
switchMap((data) => {
this.selection.deselect(user._id);
diff --git a/src/app/validators/custom-validators.ts b/src/app/validators/custom-validators.ts
index 792221a064..44150315f7 100755
--- a/src/app/validators/custom-validators.ts
+++ b/src/app/validators/custom-validators.ts
@@ -1,5 +1,5 @@
import { ValidatorFn, AbstractControl, ValidationErrors, Validators } from '@angular/forms';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
export class CustomValidators {
diff --git a/src/app/validators/validator.service.ts b/src/app/validators/validator.service.ts
index f06e7b5bdc..530a45dea9 100644
--- a/src/app/validators/validator.service.ts
+++ b/src/app/validators/validator.service.ts
@@ -1,14 +1,12 @@
import { Injectable } from '@angular/core';
import { AbstractControl, ValidationErrors } from '@angular/forms';
// Make sure not to import the entire rxjs library!!!
-import { Observable } from 'rxjs/Observable';
-import { timer } from 'rxjs/observable/timer';
+import { Observable, timer, of } from 'rxjs';
import { findOneDocument, findDocuments } from '../shared/mangoQueries';
import { CouchService } from '../shared/couchdb.service';
import { UserService } from '../shared/user.service';
import { switchMap, map, catchError } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
import { debug } from '../debug-operator';
@Injectable()
diff --git a/src/styles.scss b/src/styles.scss
index 751db63841..eef8d24c32 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -266,7 +266,7 @@ body {
}
// Remove the underline from mat-form-field for custom fields
- .mat-form-field-type-no-underline .mat-input-underline {
+ .mat-form-field-type-no-underline .mat-form-field-underline {
display: none;
}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index 63d89ff283..18bad40ed4 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -11,7 +11,8 @@
]
},
"files": [
- "test.ts"
+ "test.ts",
+ "polyfills.ts"
],
"include": [
"**/*.spec.ts",
diff --git a/tslint.json b/tslint.json
index 79c78ada8a..466cff11b7 100644
--- a/tslint.json
+++ b/tslint.json
@@ -18,8 +18,7 @@
"eofline": true,
"forin": true,
"import-blacklist": [
- true,
- "rxjs"
+ true
],
"import-spacing": true,
"indent": [