Merge pull request #507 from mulesoft/xmas

Xmas

Author: carowright

.travis.yml

@@ -1,12 +1,11 @@
 sudo: false
 language: node_js
 node_js:
-  - "4.4"
+  - "8"
 before_script:
   - npm install -g grunt-cli
   - npm install -g bower
   - bower update
-  - node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

app/scripts/services/local-storage-file-system.js

@@ -304,8 +304,8 @@
           // }
           //move all child items
           localStorageHelper.forEach(function (entry) {
-            if (entry.path.toLowerCase() !== source.toLowerCase() &&
-              entry.path.indexOf(source) === 0) {
+            if (entry.path.toLowerCase() !== destination.toLowerCase() &&
+              entry.path.indexOf(source + '/') === 0) {
               var newPath = destination + entry.path.substring(source.length);
               localStorageHelper.remove(entry.path);
               entry.path = newPath;

app/scripts/services/mocking-service-client.js

@@ -6,9 +6,7 @@
       var self = this;
 
       self.proxy   = null;
-      // self.baseUri = 'http://mocksvc.mulesoft.com';
-      self.baseUri = 'http://ec2-52-201-242-128.compute-1.amazonaws.com';
-
+      self.baseUri = 'https://mocksvc.qax.mulesoft.com';
       self.buildURL = function buildURL() {
         var url   = self.baseUri + ['/mocks'].concat(Array.prototype.slice.call(arguments, 0)).join('/');
         var proxy = self.proxy || $window.RAML.Settings.proxy;

app/scripts/services/raml-repository.js

@@ -37,6 +37,10 @@
         return file.path.slice(-5) !== '.meta';
       }
 
+      function metaFile(file) {
+        return !notMetaFile(file);
+      }
+
       function handleErrorFor(file) {
         return function markFileWithError(error) {
           file.error = error;
@@ -144,15 +148,20 @@
           separated[entry.type || 'file'].push(entry);
         });
 
-        var files = separated.file.filter(notMetaFile).map(function (file) {
+        var createRamlFile = function (file) {
           return new RamlFile(file.path, file.contents, { dirty: false, persisted: true, root: file.root} );
-        });
+        };
+
+        var files = separated.file.filter(notMetaFile).map(createRamlFile);
+
+        var metaFiles = separated.file.filter(metaFile).map(createRamlFile);
 
         var directories = separated.folder.map(function (directory) {
           return new RamlDirectory(directory.path, directory.meta, directory.children);
         });
 
         this.children = directories.concat(files).sort(sortingFunction);
+        this.metaChildren = directories.concat(metaFiles).sort(sortingFunction);
       }
 
       RamlDirectory.prototype.getDirectories = function getDirectories() {
@@ -163,22 +172,34 @@
         return this.children.filter(function(t) { return !t.isDirectory; });
       };
 
-      RamlDirectory.prototype.forEachChildDo = function forEachChildDo(action) {
+      RamlDirectory.prototype.getMetaFiles = function getMetaFiles() {
+        return this.metaChildren.filter(function(t) { return !t.isDirectory; });
+      };
+
+      RamlDirectory.prototype.forEachItemDo = function forEachItemDo(action, isMetaChildren) {
         // BFS
-        var queue = this.children.slice();
+        var queue = isMetaChildren ? this.metaChildren.slice() : this.children.slice();
         var current;
 
         while (queue.length > 0) {
           current = queue.shift();
 
           if (current.isDirectory) {
-            queue = queue.concat(current.children);
+            queue = queue.concat((isMetaChildren) ? current.metaChildren : current.children);
           }
 
           action.call(current, current);
         }
       };
 
+      RamlDirectory.prototype.forEachChildDo = function forEachChildDo(action) {
+        this.forEachItemDo(action, false);
+      };
+
+      RamlDirectory.prototype.forEachMetaChildDo = function forEachChildDo(action) {
+        this.forEachItemDo(action, true);
+      };
+
       RamlDirectory.prototype.sortChildren = function sortChildren() {
         this.children.sort(sortingFunction);
       };
@@ -248,7 +269,8 @@
         // and collect all promises into an array
         var promises = [];
         directory.getDirectories().forEach(function(dir) { promises.push(service.removeDirectory(dir)); });
-        directory.getFiles().forEach(function(file) { promises.push(service.removeFile(file)); });
+        directory.getFiles().concat(directory.getMetaFiles())
+          .forEach(function(file) { promises.push(service.removeFile(file)); });
 
         // remove this directory object from parent's children list
         var parent = service.getParent(directory);
@@ -353,10 +375,18 @@
           .then(modifyFile, handleErrorFor(file))
           .then(function () {
             // remove the file object from the parent's children list
-            var index = parent.children.indexOf(file);
+            if (notMetaFile(file)) {
+              var index = parent.children.indexOf(file);
 
-            if (index !== -1) {
-              parent.children.splice(index, 1);
+              if (index !== -1) {
+                parent.children.splice(index, 1);
+              }
+            } else {
+              var metaIndex = parent.metaChildren.indexOf(file);
+
+              if (metaIndex !== -1) {
+                parent.metaChildren.splice(metaIndex, 1);
+              }
             }
 
             $rootScope.$broadcast('event:raml-editor-file-removed', file);
@@ -458,7 +488,13 @@
           target.forEachChildDo(function(c) {
             c.path = c.path.replace(target.path, newPath);
           });
+
+          // renames the path of each meta child under the current directory
+          target.forEachMetaChildDo(function(c) {
+            c.path = c.path.replace(target.path, newPath);
+          });
         } else {
+          service.moveMeta(target, destination);
           promise = target.persisted ? fileSystem.rename(target.path, newPath) : $q.when(target);
         }
 
@@ -475,6 +511,8 @@
         var metaFile = new RamlFile(file.path + '.meta', JSON.stringify(meta));
         return service.saveFile(metaFile)
           .then(function () {
+            var parent = service.getParent(metaFile);
+            parent.metaChildren.push(metaFile);
             return meta;
           })
         ;
@@ -493,6 +531,35 @@
         );
       };
 
+      service.moveMeta = function moveMeta(file, destination) {
+        var metaName = file.name + '.meta';
+        var newMetaPath = service.join(destination.path, metaName);
+        var metaPathName = file.path + '.meta';
+        var oldParent = service.getParent(file);
+
+        var metaFile = oldParent.metaChildren.find(function(meta) {
+          return meta.path === metaPathName;
+        });
+
+        if (metaFile) {
+          return fileSystem.rename(metaFile.path, newMetaPath).then(
+            function success() {
+              //Remove old parent meta data
+              var index = oldParent.metaChildren.indexOf(metaFile);
+              if (index !== -1) {
+                oldParent.metaChildren.splice(index, 1);
+              }
+              metaFile.path = newMetaPath;
+              destination.metaChildren.push(metaFile);
+              return metaFile;
+            },
+            function failure() {
+              return metaFile;
+            }
+          );
+        }
+      };
+
       service.join = function () {
         return Array.prototype.reduce.call(arguments, function (path, segment) {
           if (segment == null) {

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "api-designer",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/mulesoft/api-designer.git"
@@ -10,7 +10,7 @@
     "angular": "~1.3.17",
     "angular-bootstrap": ">=0.11.0 <0.14.0",
     "angular-ui-tree": "2.1.5",
-    "api-console": "mulesoft/api-console#v3.0.22",
+    "api-console": "mulesoft/api-console#v3.0.25",
     "es5-shim": "~2.3.0",
     "file-saver.js": "~1.20150304.1",
     "font-awesome": "~4.0.3",