allow passing in files while creating a new run for a world

forio · May 24, 2018 · d7ca505 · d7ca505
1 parent 34ae078
commit d7ca505
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 66 deletions.
diff --git a/dist/components/assignment/assignment.js b/dist/components/assignment/assignment.js
diff --git a/dist/components/assignment/index.html b/dist/components/assignment/index.html
@@ -7,7 +7,7 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.2.1/components/assignment/assignment.css">
+        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.2.2/components/assignment/assignment.css">
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>
     </head>
@@ -73,8 +73,8 @@
         </div>
     </div>
         <!-- make sure to include jquery, epicenter.js and assignment.js -->
-    <script src="https://forio.com/tools/js-libs/2.2.1/epicenter.min.js"></script>
-    <script src="https://forio.com/tools/js-libs/2.2.1/components/assignment/assignment.js"></script>
+    <script src="https://forio.com/tools/js-libs/2.2.2/epicenter.min.js"></script>
+    <script src="https://forio.com/tools/js-libs/2.2.2/components/assignment/assignment.js"></script>
     <script>
         new window.forio.MultiplayerAssignmentComponent({
             el: '#assignment-component',

diff --git a/dist/components/login/index.html b/dist/components/login/index.html
@@ -11,12 +11,12 @@
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 
         <!-- login.css provides styling for the group selector pop over dialog -->
-        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.2.1/components/login/login.css">
+        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.2.2/components/login/login.css">
 
         <!-- make sure to include jquery, epicenter.js and login.js -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-        <script src="https://forio.com/tools/js-libs/2.2.1/epicenter.min.js"></script>
-        <script src="https://forio.com/tools/js-libs/2.2.1/components/login/login.js"></script>
+        <script src="https://forio.com/tools/js-libs/2.2.2/epicenter.min.js"></script>
+        <script src="https://forio.com/tools/js-libs/2.2.2/components/login/login.js"></script>
     </head>
     <body>
         <!--

diff --git a/dist/epicenter-multiplayer-dependencies.js b/dist/epicenter-multiplayer-dependencies.js
diff --git a/dist/epicenter-multiplayer-dependencies.min.js b/dist/epicenter-multiplayer-dependencies.min.js
diff --git a/dist/epicenter-multiplayer-dependencies.min.js.map b/dist/epicenter-multiplayer-dependencies.min.js.map
diff --git a/dist/epicenter.js b/dist/epicenter.js
diff --git a/dist/epicenter.min.js b/dist/epicenter.min.js
diff --git a/dist/epicenter.min.js.map b/dist/epicenter.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epicenter-js",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/forio/epicenter-js-libs"

diff --git a/src/service/run-api-service.js b/src/service/run-api-service.js
@@ -217,13 +217,12 @@ module.exports = function (config) {
          */
         create: function (params, options) {
             var createOptions = $.extend(true, {}, serviceOptions, options, { url: urlConfig.getAPIPath('run') });
-            var runApiParams = ['model', 'scope', 'files', 'ephemeral'];
             if (typeof params === 'string') {
                 // this is just the model name
                 params = { model: params };
             } else {
                 // whitelist the fields that we actually can send to the api
-                params = _pick(params, runApiParams);
+                params = rutil.extractValidRunParams(params);
             }
 
             var oldSuccess = createOptions.success;

diff --git a/src/service/world-api-adapter.js b/src/service/world-api-adapter.js
@@ -26,6 +26,7 @@ var ConfigService = require('./configuration-service');
 var TransportFactory = require('../transport/http-transport-factory');
 var SessionManager = require('../store/session-manager');
 var _pick = require('../util/object-util')._pick;
+var rutil = require('../util/run-util');
 
 var apiBase = 'multiplayer/';
 var assignmentEndpoint = apiBase + 'assign';
@@ -553,14 +554,15 @@ module.exports = function (config) {
 
             setIdFilterOrThrowError(options);
 
-            var getOptions = $.extend(true, {},
+            var postParams = $.extend(true, {},
                 serviceOptions,
                 options,
                 { url: urlConfig.getAPIPath(apiEndpoint) + serviceOptions.filter + '/run' }
             );
 
-            validateModelOrThrowError(getOptions);
-            return http.post(_pick(getOptions, 'model'), getOptions);
+            validateModelOrThrowError(postParams);
+            var validRunParams = rutil.extractValidRunParams(postParams);
+            return http.post(validRunParams, postParams);
         },
 
         /**
@@ -662,7 +664,6 @@ module.exports = function (config) {
         */
         newRunForWorld: function (worldId, options) {
             var currentRunOptions = $.extend(true, {},
-                serviceOptions,
                 options,
                 { filter: worldId || serviceOptions.filter }
             );

diff --git a/src/util/run-util.js b/src/util/run-util.js
@@ -3,10 +3,16 @@
 */
 'use strict';
 var qutil = require('./query-util');
+var _pick = require('../util/object-util')._pick;
 var MAX_URL_LENGTH = 2048;
 
 module.exports = (function () {
     return {
+        extractValidRunParams: function (params) {
+            var validParams = ['model', 'scope', 'files', 'ephemeral'];
+            return _pick(params, validParams);
+        },
+
         /**
          * returns operations of the form `[[op1,op2], [arg1, arg2]]`
          * @param  {Object|Array|String} operations operations to perform