Using isNil

Author: DerekTBrown

both/collections/user.collection.ts

@@ -60,7 +60,7 @@
 
       if (this.isGlobalAdministrator(user_id)){
         return Role.global_admin;
-      } else if (_.isUndefined(res) || _.isNull(res)) {
+      } else if (_.isUndefined(res) || _.isNil(res)) {
         return Role.guest;
       } else {
         return res.role;
@@ -90,7 +90,7 @@
     // getCourseRecordFor
     UsersCollection.getCourseRecordFor = function(course_id : string, user_id : string) : string {
       let res = this.getPrivilegeFor(course_id, user_id);
-      if (typeof res === "undefined") {
+      if (_.isNil(res)) {
         return undefined;
       } else {
         return res.course_record;

client/imports/account/auth-guard.service.ts

@@ -12,7 +12,7 @@ export default class AuthGuard implements CanActivate, CanActivateChild {
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    if(_.isNull(Meteor.userId())){
+    if(_.isNil(Meteor.userId())){
       this.router.navigate(['/login'], { queryParams : { redirect_url: state.url }});
       return false;
     } else {

client/imports/admin/admin_user_list.component.ts

@@ -687,7 +687,7 @@
 				.afterClosed()
 				.first()
 				.subscribe((user) => {
-					if(!_.isNull(user)){
+					if(!_.isNil(user)){
 						Meteor.call('Users.addRoleForCourse', {
 							course_id : this.course_query._id,
 							user_id :user._id,

client/imports/course/course_view.component.ts

@@ -87,7 +87,7 @@
 			this.course_behaviorSubject
 				.subscribe((course) => {
 					this.zone.run(() => {
-						if(!_.isNull(course)){
+						if(!_.isNil(course)){
 							this.course_model = course;
 						}
 					});
@@ -115,7 +115,7 @@
 			// Get Instructors
 			this.instructors = this.course
 				.distinct()
-				.filter(x => !_.isNull(x))
+				.filter(x => !_.isNil(x))
 				.mergeMap((course) => {
 					Meteor.subscribe('users.instructors', course._id);
 					return Users.observable
@@ -154,7 +154,7 @@
 			// Get Course Record
 			this.course_record = this.course
 				.distinct()
-				.filter(x => !_.isNull(x))
+				.filter(x => !_.isNil(x))
 				.mergeMap((course) => {
 						Meteor.subscribe('course_records.id', course._id, Meteor.userId());
 						var course_record = CourseRecords.findOne({ user_id : Meteor.userId(), course_id : course._id });
@@ -168,7 +168,7 @@
 			// Get Labs
 			this.labs = this.course
 				.distinct()
-				.filter(x => !_.isNull(x))
+				.filter(x => !_.isNil(x))
 				.mergeMap((course) => {
 					Meteor.subscribe('labs.course', course._id);
 					return Labs.observable.find({ course_id : course._id })
@@ -217,7 +217,7 @@
 		private addInstructor(){
 			var dialogRef = this.dialog.open(SelectUser, { width: '600px' });
 			dialogRef.afterClosed().subscribe((user) => {
-				if(!_.isNull(user)){
+				if(!_.isNil(user)){
 					this.addRole(user._id, Role.instructor);
 				}
 			})
@@ -226,7 +226,7 @@
 		private addCourseAdmin(){
 			var dialogRef = this.dialog.open(SelectUser, { width: '600px' });
 			dialogRef.afterClosed().subscribe((user) => {
-				if(!_.isNull(user)){
+				if(!_.isNil(user)){
 					this.addRole(user._id, Role.course_admin);
 				}
 			})

client/imports/lab/lab_terminal.component.ts

@@ -36,7 +36,7 @@
     }
 
 		onResize(){
-			if(!_.isNull(this.xterm)){
+			if(!_.isNil(this.xterm)){
 				this.xterm.fit();
 			}
 		}

client/imports/lab/lab_view.component.ts

@@ -71,7 +71,7 @@
 							new Promise((resolve, reject) => {
 								Meteor.subscribe('labs.course',course_id, () => {
 									var lab = Labs.findOne({ _id : lab_id });
-									if(_.isNull(lab)){
+									if(_.isNil(lab)){
 										this.router.navigate(['/error','404']);
 									} else {
 										resolve(lab);

server/imports/api/lab.ts

@@ -71,15 +71,15 @@
     }
 
     export function isValidLabObject (sandbox : any) : sandbox is { Lab : typeof Lab } {
-       if (typeof sandbox === "undefined") {
+       if (_.isNil(sandbox)) {
          throw new Error("SandboxUndefined");
-       } else if (typeof sandbox.Lab === "undefined"){
+       } else if (!_.has(sandbox, "Lab")){
          throw new Error("LabUndefined");
-       } else if (typeof sandbox.Lab.name === "undefined"){
+       } else if (!_.has(sandbox, "Lab.name")){
          throw new Error("LabNameUndefined");
-       } else if (typeof sandbox.Lab._vm === "undefined"){
+       } else if (!_.has(sandbox, "Lab._vm")){
          throw new Error("VMUndefined");
-       } else if (typeof sandbox.Lab._tasks === "undefined") {
+       } else if (!_.has(sandbox, "Lab._tasks")) {
          throw new Error("TaskUndefined");
        } else if (_.every(sandbox.Lab._vm, isValidTaskObject)){
          throw new Error("InvalidTask");

server/imports/runtime/container.ts

@@ -55,7 +55,7 @@
       let prepare_containers : Promise<Dockerode.Container>;
 
       // Create Container
-      if (typeof id === "undefined") {
+      if (_.isNil(id)) {
 
         // Pull Image
         prepare_containers = Container.docker.pull(this.config.image, {})
@@ -83,11 +83,18 @@
           return container.start();
         })
 
-      } else if (typeof id === "string"){
+      } else if (typeof id === "string") {
         // Get Container
         prepare_containers = new Promise((resolve, reject) => {
-          resolve(Container.docker.getContainer(id));
+          if (_.isNil(Container.docker.getContainer(id))){
+            reject(new Meteor.Error("Could not find Docker Container."));
+          } else {
+            resolve(Container.docker.getContainer(id));
+          }
         });
+        
+      } else {
+        throw new Meteor.Error("Invalid id argument");
       }
 
       this._ready = prepare_containers

server/imports/runtime/lab_runtime.ts

@@ -17,7 +17,7 @@
 
  import { VMConfig, VMResolveConfig, VMConfigCustom } from '../api/vmconfig';
  import { Lab, isValidLabObject } from '../api/lab'
- import { InitObject, SetupObject, VerifyObject } from '../api/environment'; 
+ import { InitObject, SetupObject, VerifyObject } from '../api/environment';
 
  /*
   LabSandbox
@@ -165,7 +165,7 @@
 
             let lab_model = Labs.findOne({ _id : lab_id });
 
-            if (typeof lab_model === "undefined"){
+            if (_.isNil(lab_model)){
               reject(new Error("Lab Not Found"));
 
             } else {

server/methods/lab.methods.ts

@@ -12,7 +12,7 @@
   function labsCourse(course_id){
 
     let course = Courses.findOne(course_id);
-    if (_.isNull(course) || _.isUndefined(course)){
+    if (_.isNil(course) || _.isUndefined(course)){
       throw new Meteor.Error("Course not Found");
     }