Merge pull request #799 from mathematicalthinking/validateJSImport

Make validate.js a regular import

Author: exidy80

app/components/answer-new.js

@@ -2,7 +2,8 @@ import ErrorHandlingComponent from './error-handling';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import isEqual from 'lodash/isEqual';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
+import validate from 'validate.js';
 import $ from 'jquery';
 import { all, reject, resolve } from 'rsvp';
 
@@ -292,7 +293,7 @@ export default class AnswerNew extends ErrorHandlingComponent {
     };
     let constraints = this.constraints;
 
-    let errors = window.validate(values, constraints);
+    let errors = validate(values, constraints);
     if (errors) {
       for (let key of Object.keys(errors)) {
         let errorProp = `${key}Errors`;

app/components/assignment-new.js

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
+import validate from 'validate.js';
 import moment from 'moment';
 
 export default class AssignmentNewComponent extends Component {
@@ -388,7 +389,7 @@ export default class AssignmentNewComponent extends Component {
 
     const constraints = this.constraints;
 
-    let errors = window.validate(values, constraints);
+    let errors = validate(values, constraints);
     if (errors) {
       // errors
       for (let key of Object.keys(errors)) {

app/components/search-bar.js

@@ -2,6 +2,7 @@ import Component from '@ember/component';
 import { computed } from '@ember/object';
 /*global _:false */
 import { alias } from '@ember/object/computed';
+import validate from 'validate.js';
 
 export default Component.extend({
   classNames: ['search-bar-comp'],
@@ -117,7 +118,7 @@ export default Component.extend({
       let values = { query: val };
       let constraints = this.inputConstraints;
 
-      let errors = window.validate(values, constraints);
+      let errors = validate(values, constraints);
       if (errors) {
         for (let key of Object.keys(errors)) {
           let errorProp = `${key}Errors`;

app/components/section-new.js

@@ -2,7 +2,8 @@ import ErrorHandlingComponent from './error-handling';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { later } from '@ember/runloop';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
+import validate from 'validate.js';
 import $ from 'jquery';
 
 export default class SectionNewComponent extends ErrorHandlingComponent {
@@ -110,7 +111,7 @@ export default class SectionNewComponent extends ErrorHandlingComponent {
       teacher: teacher,
       organization: organization,
     };
-    let validation = window.validate(values, constraints);
+    let validation = validate(values, constraints);
     if (validation) {
       // errors
       for (let key of Object.keys(validation)) {

app/components/workspace-new-settings.js

@@ -1,7 +1,8 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 /*global _:false */
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
+import validate from 'validate.js';
 
 export default Component.extend({
   elementId: 'workspace-new-settings',
@@ -200,7 +201,7 @@ export default Component.extend({
       const permissions = this.workspacePermissions;
       const submissionSettings = this.selectedSubmissionSettings;
 
-      errors = window.validate(
+      errors = validate(
         { workspaceName, owner, privacySetting },
         this.constraints
       );

app/components/ws-copy-owner-settings.js

@@ -1,7 +1,8 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 /*global _:false */
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
+import validate from 'validate.js';
 import CurrentUserMixin from '../mixins/current_user_mixin';
 
 export default Component.extend(CurrentUserMixin, {
@@ -183,12 +184,12 @@ export default Component.extend(CurrentUserMixin, {
       if (!doCreateFolderSet) {
         this.set('folderSetName', null);
         this.set('folderSetPrivacy', null);
-        errors = window.validate(
+        errors = validate(
           { name, owner, mode, doCreateFolderSet },
           this.constraints
         );
       } else {
-        errors = window.validate(
+        errors = validate(
           {
             name,
             owner,

ember-cli-build.js

@@ -17,7 +17,6 @@ module.exports = function (defaults) {
    */
 
   app.import('vendor/guiders.js');
-  app.import('vendor/validate.min.js');
   app.import('vendor/dropzone.js');
 
   // Use `app.import` to add additional libraries to the generated

package.json

@@ -90,6 +90,7 @@
     "typeahead.js": "^0.11.1",
     "underscore": "^1.13.6",
     "uuid": "^8.3.2",
+    "validate.js": "^0.13.1",
     "wordcloud": "^1.2.2"
   },
   "devDependencies": {