handleDeps in Config form

Author: ShMcK

lib/actions.js

@@ -8,6 +8,8 @@ exports.pageSet = page_position_1.pageSet;
 var package_json_1 = require('./modules/package-json');
 exports.pjSave = package_json_1.pjSave;
 exports.pjLoad = package_json_1.pjLoad;
+var runner_1 = require('./modules/runner');
+exports.runnerSet = runner_1.runnerSet;
 var setup_1 = require('./modules/setup');
 exports.setupVerify = setup_1.setupVerify;
 exports.setupPackage = setup_1.setupPackage;

lib/components/Config/handleDeps.js

@@ -0,0 +1,15 @@
+"use strict";
+function handleDependencies(pj, runner) {
+    var deps = pj.dependencies;
+    Object.keys(deps)
+        .filter(function (key) { return key.match(/-coderoad$/); })
+        .forEach(function (key) { return delete deps[key]; });
+    if (!deps || !pj.dependencies.hasOwnProperty(runner)) {
+        var dep = {};
+        dep[runner] = 'latest';
+        deps = Object.assign({}, pj.dependencies, dep);
+    }
+    return deps || {};
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = handleDependencies;

lib/components/Config/index.js

@@ -24,6 +24,7 @@ var TopPanel_1 = require('../TopPanel');
 var textField_1 = require('../Form/textField');
 var selectField_1 = require('../Form/selectField');
 var validate_1 = require('./validate');
+var handleDeps_1 = require('./handleDeps');
 var styles = {
     card: {
         margin: '10px',
@@ -70,12 +71,7 @@ var TutorialConfig = (function (_super) {
         var packageJson = this.props.packageJson;
         var name = values.name, runnerItem = values.runnerItem, repo = values.repo;
         var _a = runnerItem.split(': '), language = _a[0], runner = _a[1];
-        if (!packageJson.dependencies || !packageJson.dependencies.hasOwnProperty(runner)) {
-            alert("run \"npm install\" to load your test runner");
-            var dep = {};
-            dep[runner] = 'latest';
-            var dependencies = Object.assign({}, packageJson.dependencies, dep);
-        }
+        var dependencies = handleDeps_1.default(packageJson, runner);
         this.props.pjSave(Object.assign({}, packageJson, {
             name: name,
             repository: repo || '',

lib/modules/runner/index.js

@@ -7,7 +7,7 @@ exports.runnerSet = runnerSet;
 var r = function () {
     alert('Runner not installed. Run "npm install"');
 };
-function runner(runner, action) {
+function reducer(runner, action) {
     if (runner === void 0) { runner = r; }
     switch (action.type) {
         case RUNNER_SET:
@@ -18,4 +18,4 @@ function runner(runner, action) {
             return runner;
     }
 }
-exports.runner = runner;
+exports.reducer = reducer;

lib/reducers.js

@@ -4,6 +4,7 @@ var redux_form_1 = require('redux-form');
 var page_position_1 = require('./modules/page-position');
 var setup_1 = require('./modules/setup');
 var package_json_1 = require('./modules/package-json');
+var runner_1 = require('./modules/runner');
 var tutorial_1 = require('./modules/tutorial');
 var window_1 = require('./modules/window');
 var validate_tutorial_1 = require('./modules/validate-tutorial');
@@ -14,4 +15,5 @@ exports.default = redux_1.combineReducers({
     alert: core_coderoad_1.alertReducer, checks: setup_1.reducer, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer, form: redux_form_1.reducer,
     packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, route: core_coderoad_1.routeReducer,
     tutorial: tutorial_1.reducer, updated: updated_1.reducer, validation: validate_tutorial_1.reducer, windowToggle: window_1.reducer,
+    runner: runner_1.reducer,
 });

src/components/Config/handleDeps.ts

@@ -0,0 +1,16 @@
+export default function handleDependencies(pj, runner) {
+  let deps = pj.dependencies;
+  // remove all runners
+  Object.keys(deps)
+    .filter(key => key.match(/-coderoad$/))
+    .forEach(key => delete deps[key]);
+
+  // add runner
+  if (!deps || !pj.dependencies.hasOwnProperty(runner)) {
+    // add dependency
+    const dep = {};
+    dep[runner] = 'latest';
+    deps = Object.assign({}, pj.dependencies, dep);
+  }
+  return deps || {};
+}

src/components/Config/index.tsx

@@ -5,12 +5,12 @@ import MenuItem from 'material-ui/MenuItem';
 import {Card, CardTitle, CardText} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
 import {pjSave, pjLoad, tutorialInit, routeSet, editorPjOpen} from '../../actions';
-import languageItems from './languageItems';
 import runnerItems from './runnerItems';
 import {topElement} from '../TopPanel';
 import textField from '../Form/textField';
 import selectField from '../Form/selectField';
 import validate from './validate';
+import handleDeps from './handleDeps';
 
 const styles = {
   card: {
@@ -66,21 +66,16 @@ class TutorialConfig extends React.Component <{
   }
   shouldComponentUpdate() {
     // hack to prevent lost focus on component update
-    return !(document.activeElement &&
-      typeof document.activeElement.value === 'string');
+    return !(
+      document.activeElement &&
+      typeof document.activeElement.value === 'string'
+    );
   }
   onSubmit(values) {
     const {packageJson} = this.props;
     const {name, runnerItem, repo} = values;
     const [language, runner] = runnerItem.split(': ');
-
-    if (!packageJson.dependencies || !packageJson.dependencies.hasOwnProperty(runner)) {
-      alert(`run "npm install" to load your test runner`);
-      // add dependency
-      const dep = {};
-      dep[runner] = 'latest';
-      const dependencies = Object.assign({}, packageJson.dependencies, dep);
-    }
+    const dependencies = handleDeps(packageJson, runner);
 
     this.props.pjSave(Object.assign(
       {},

tsconfig.json

@@ -24,6 +24,7 @@
   "src/typings/builder.d.ts",
   "src/typings/typings.d.ts",
   "src/actions.ts",
+  "src/components/Config/handleDeps.ts",
   "src/components/Config/validate.ts",
   "src/components/index.ts",
   "src/components/Page/TaskActions/task-object.ts",