Upgraded version of jsonforms and lodash + bug fixes + hidden github keys as env vars

app/src/components/core/metaschema/metaSchema.ts

@@ -60,7 +60,7 @@ module app.core.metaschema {
 
                 // child definitions
                 var notGeneratedChildDefinitions = acceptedElements.filter(function (name:string) {
-                    return !_.contains(rootDefinitionsNames, name) && !_.contains(alreadyGenerated, name);
+                    return !_.includes(rootDefinitionsNames, name) && !_.includes(alreadyGenerated, name);
                 });
                 for (var i = 0; i < notGeneratedChildDefinitions.length; i++) {
                     Metaschema.generateDefinition(definitions, notGeneratedChildDefinitions[i], metaschema, resolvedMetaschema, rootDefinitionsNames, alreadyGenerated);
@@ -246,7 +246,7 @@ module app.core.metaschema {
          */
         getDefinitionByTypeLabel(typeLabel:String):Definition {
             return _.find(this.definitions, (definition:Definition) => {
-                return _.contains(definition.getTypeLabels(), typeLabel);
+                return _.includes(definition.getTypeLabels(), typeLabel);
             })
         }
 

app/src/components/core/validation/validator.service.ts

@@ -2,7 +2,6 @@ declare var tv4;
 declare var JsonRefs;
 
 module app.core {
-
     import Metaschema = app.core.metaschema.Metaschema;
     import TreeElement = app.core.model.TreeElement;
     import IQService = angular.IQService;

app/src/components/detail/detail.html

@@ -6,7 +6,7 @@
     </md-subheader>
     <md-content class="md-padding" ng-class="{'bottom-border': detail.detailService.currentElement && !detail.detailService.currentElement.isValid()}" ng-if="detail.detailService.currentElement">
         <section class="jsf" layout="row">
-            <jsonforms schema="detail.detailService.schema" ui-schema="detail.detailService.uiSchema"
+            <jsonforms schema="detail.detailService.schema" uischema="detail.detailService.uiSchema"
                        data="detail.detailService.currentElement">
             </jsonforms>
         </section>

app/src/components/preview/preview.html

@@ -1,5 +1,5 @@
 <md-content style="height: 100%;" class="md-padding jsf" ng-if="preview.previewService.schema">
-    <jsonforms schema="preview.previewService.schema" ui-schema="preview.previewService.uiSchema"
+    <jsonforms schema="preview.previewService.schema" uischema="preview.previewService.uiSchema"
                data="preview.data"></jsonforms>
 </md-content>
 <md-button ng-if="!preview.configService.isPreviewTab()&&preview.shouldShowNewTabButton()" ng-click="preview.openInNewTab()" class="md-fab accent md-fab-bottom-right">

backend/config/config.js

@@ -1,7 +1,7 @@
 
 var config = {};
 
-config.appName = "JsonFormEditor";
-config.appUrl = 'https://jsonformseditor.herokuapp.com';
+config.appName = process.env['GITHUB_APP_NAME'];
+config.appUrl = process.env['GITHUB_APP_URL'];
 
 module.exports = config;

backend/config/keys.js

@@ -4,8 +4,8 @@
 
 var keys = {};
 
-keys.clientId = "42e0b0e6cf509096ac40";
-keys.clientSecret = "30eed32b0b2ae5732a173ef184ec851b3f668c93";
+keys.clientId = process.env['GITHUB_CLIENT_ID'];
+keys.clientSecret = process.env['GITHUB_CLIENT_SECRET'];
 keys.sessionSecret = "random_key_to_encode_sessions";
 
 

bower.json

@@ -10,7 +10,6 @@
     "angular-ui-router": "^0.2.15",
     "bootstrap": "~3.3.5",
     "jquery": "~2.1.4",
-    "jsonforms": "0.0.15",
     "material-design-lite": "~1.0.6",
     "angular-material": "~1.1.0",
     "ngclipboard": "latest",

build.config.js

@@ -68,8 +68,8 @@ module.exports = {
             'app/assets/libs/path-loader/browser/path-loader.js',
             'app/assets/libs/traverse/traverse.js',
             'app/assets/libs/json-refs/browser/json-refs.js',
-            'app/assets/libs/tv4/tv4.js',
-            'app/assets/libs/jsonforms/dist/js/jsonforms.js',
+            'node_modules/tv4/tv4.js',
+            'node_modules/jsonforms/dist/jsonforms.js',
             'app/assets/libs/material-design-lite/material.js',
             'app/assets/libs/angular-animate/angular-animate.js',
             'app/assets/libs/angular-aria/angular-aria.js',
@@ -87,7 +87,7 @@ module.exports = {
             'app/assets/libs/bootstrap/dist/css/bootstrap-theme.css',
             'app/assets/libs/material-design-lite/material.css',
             'app/assets/libs/angular-material/angular-material.css',
-            'app/assets/libs/jsonforms/dist/css/jsonforms.css'
+            'node_modules/jsonforms/dist/jsonforms.css'
         ],
         assets: [
         ]

package.json

@@ -6,16 +6,18 @@
   "repository": "https://github.com/eclipsesource/JsonFormsEditor",
   "license": "MIT",
   "dependencies": {
-    "bower": "^1.3.1",
     "body-parser": "~1.13.2",
+    "bower": "^1.3.1",
     "cookie-parser": "~1.3.5",
     "debug": "~2.2.0",
     "express": "~4.13.1",
+    "express-session": "1.12.0",
+    "jsonforms": "1.0.2",
     "morgan": "~1.6.1",
     "passport": "0.3.1",
     "passport-github": "1.1.0",
     "request": "2.69.0",
-    "express-session": "1.12.0"
+    "tv4": "^1.2.7"
   },
   "devDependencies": {
     "coveralls": "2.11.8",
@@ -48,6 +50,7 @@
     "remap-istanbul": "latest"
   },
   "scripts": {
+    "preinstall": "npm install typings -g",
     "postinstall": "bower install && grunt dist && ./node_modules/protractor/bin/webdriver-manager update"
   }
 }

typings/lodash/lodash.d.ts

@@ -3914,7 +3914,7 @@ declare module _ {
         ): LoDashExplicitArrayWrapper<boolean>;
     }
 
-    //_.contains
+    //_.includes
     interface LoDashStatic {
         /**
          * @see _.includes
@@ -5460,7 +5460,7 @@ declare module _ {
          * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
          * it’s used as the offset from the end of collection.
          *
-         * @alias _.contains, _.include
+         * @alias _.includes, _.include
          *
          * @param collection The collection to search.
          * @param target The value to search for.