Merge pull request #509 from grtjn/master

Bugfixes for release 1.3.1

Author: grtjn

README.mdown

@@ -62,9 +62,7 @@ On Mac or Linux:
     npm install
     bower install
     gulp init-local
-    ./ml local bootstrap
-    ./ml local deploy modules
-    ./ml local deploy content
+    ./ml local install
     ./ml local mlcp -options_file import-sample-data.options
 
 On Windows:
@@ -73,9 +71,7 @@ On Windows:
     npm install
     bower install
     gulp init-local
-    ml.bat local bootstrap
-    ml.bat local deploy modules
-    ml.bat local deploy content
+    ml.bat local install
     ml.bat local mlcp -options_file import-sample-data.options
 
 ## Prepare your Application

app/templates/README.mdown

@@ -32,19 +32,15 @@ On Mac or Linux:
     npm install
     bower install
     gulp init-local
-    ./ml local bootstrap
-    ./ml local deploy modules
-    ./ml local deploy content
+    ./ml local install
     ./ml local mlcp -options_file import-sample-data.options
 
 On Windows:
 
     npm install
     bower install
     gulp init-local
-    ml.bat local bootstrap
-    ml.bat local deploy modules
-    ml.bat local deploy content
+    ml.bat local install
     ml.bat local mlcp -options_file import-sample-data.options
 
 ## Prepare your Application

app/templates/_gitignore

@@ -1,5 +1,6 @@
 node_modules
 bower_components
+/mlpm_modules
 coverage
 ui/fonts
 deploy/local.properties

app/templates/bower.json

@@ -20,7 +20,7 @@
     "font-awesome": "~4.6.0",
     "highcharts": "^4.2",
     "highlightjs": "~8.7.0",
-    "ng-json-explorer": "8c2a0f9104",
+    "ng-json-explorer": "f7236fa857",
     "ngtoast": "^2.0.0",
     "lodash": "~3.10.1",
     "ml-search-ng": "~0.2.0",
@@ -57,6 +57,7 @@
   "resolutions": {
     "angular": "~1.4.4",
     "angular-bootstrap": "^1.1",
-    "highcharts": "^4.2"
+    "highcharts": "^4.2",
+    "ng-json-explorer": "f7236fa857"
   }
 }

app/templates/deploy/app_specific.rb

@@ -100,9 +100,9 @@ def change_permissions(where)
         xquery version "1.0-ml";
 
         let $new-permissions := (
-          xdmp:permission("#{@properties["ml.app-name"]}-role", "read"),
-          xdmp:permission("#{@properties["ml.app-name"]}-role", "update"),
-          xdmp:permission("#{@properties["ml.app-name"]}-role", "execute")
+          xdmp:permission("#{@properties["ml.app-role"]}", "read"),
+          xdmp:permission("#{@properties["ml.app-role"]}", "update"),
+          xdmp:permission("#{@properties["ml.app-role"]}", "execute")
         )
 
         let $uris :=

app/templates/ui/app/error/errorInterceptor.service.js

@@ -14,38 +14,32 @@
       responseError: function(rejection) {
         var msg;
         var toastMsg;
-        if (rejection.status === 500 || rejection.status === 400) {
-          var messageBoardService = $injector.get('messageBoardService');
-          if (rejection.data && rejection.data.errorResponse) {
-            msg = {
-              title: rejection.data.errorResponse.status,
-              body: rejection.data.errorResponse.message
-            };
-          } else {
-            msg = {
-              title: (rejection.status === 400) ? 'Bad Request' : 'Internal Server Error',
-              body: ''
-            };
+        if (rejection.data && rejection.data.errorResponse) {
+          msg = {
+            title: rejection.data.errorResponse.status,
+            body: rejection.data.errorResponse.message
+          };
+        } else {
+          msg = {
+            title: (rejection.status === 401) ? 'Unauthorised' : (
+              (rejection.status >= 400 && rejection.status < 500) ? 'Bad Request' :
+                'Internal Server Error'
+            ),
+            body: ''
+          };
+        }
+        toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
+        toast.create({
+          className: 'danger',
+          content: toastMsg,
+          dismissOnTimeout: true,
+          timeout: 2000,
+          onDismiss: function () {
           }
+        });
+        if (rejection.status >= 400 && rejection.status !== 401) {
+          var messageBoardService = $injector.get('messageBoardService');
           messageBoardService.message(msg);
-          toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
-          toast.danger(toastMsg);
-        } else if (rejection.status === 401) {
-          if (rejection.data && rejection.data.errorResponse) {
-            msg = {
-              title: rejection.data.errorResponse.status,
-              body: rejection.data.errorResponse.message
-            };
-          } else {
-            msg = {
-              title: (rejection.status === 401) ? 'Unauthorised' : 'Internal Server Error',
-              body: ''
-            };
-          }
-          toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
-          var loginService = $injector.get('loginService');
-          loginService.logout();
-          toast.danger(toastMsg);
         }
         return $q.reject(rejection);
       }

app/templates/ui/styles/default.less

@@ -260,5 +260,5 @@ form .required:after {
 }
 
 #buttons-detail { overflow: auto; }
-#buttons-detail button { width: 30%; float: left; margin: 4px }
+#buttons-detail .btn { width: 30%; float: left; margin: 4px }
 

app/themes/dashboard/ui/app/dashboard/content-box.js

@@ -11,27 +11,32 @@
       replace: true,
       scope: {
         boxTitle: '@',
-        boxBordered: '@'
+        boxBordered: '@',
+        collapsed: '@'
       },
-      link: function(scope) {
-        scope.hasBorder = scope.boxBordered !== 'false' && scope.boxBordered !== 'no';
+      link: function($scope, $elem, $attrs) {
+        $scope.hasBorder = $scope.boxBordered !== 'false' && $scope.boxBordered !== 'no';
 
-        // TODO: what is the purpose of this watch?
-        scope.$watch(scope.boxTabs, function(newVal) {
-          if (newVal) {
-            scope.hasTabs = true;
-          } else {
-            scope.hasTabs = false;
-          }
+        $scope.toggleCollapsed = function() {
+          $scope.isCollapsed = !$scope.isCollapsed;
+        };
+
+        $scope.$watch(function() { return $attrs.collapsed; }, function(newVal) {
+          newVal = '' + newVal;
+          $scope.isCollapsed = newVal === 'true' || newVal === 'yes';
         });
       },
       /* jshint multistr: true */
       /* jscs: disable */
-      template: '<div class="box">\
-        <div class="box-header" ng-class="{ \'with-border\': boxBordered }" ng-if="boxTitle">\
+      template: '<div class="box" ng-init="collapsed = collapsed || false">\
+        <div class="box-header" ng-class="{ \'with-border\': boxBordered }" ng-if="boxTitle" ng-click="toggleCollapsed()">\
           <h3 class="box-title">{{ boxTitle }}</h3>\
+          <div class="box-tools pull-right">\
+            <button type="button" class="btn btn-box-tool" ng-hide="isCollapsed"><i class="fa fa-minus"></i></button>\
+            <button type="button" class="btn btn-box-tool" ng-show="isCollapsed"><i class="fa fa-plus"></i></button>\
+          </div>\
         </div>\
-        <div class="box-body" ng-transclude></div>\
+        <div class="box-body" ng-hide="isCollapsed" ng-transclude></div>\
       </div>'
       /* jscs: enable */
     };

slushfile.js

@@ -42,13 +42,13 @@ function printUsage() {
   process.stdout.write('  fork=<..>             Github fork to use for Roxy. Defaults to: marklogic\n');
   process.stdout.write('  branch=<..>           Github branch to use for Roxy. Defaults to: master\n');
   process.stdout.write('  theme=<..>            Slush theme to use. Defaults to: default\n');
-  process.stdout.write('  ml-version=<..>       MarkLogic version. Defaults to: 8\n');
+  process.stdout.write('  ml-version=<..>       MarkLogic version. Defaults to: 9\n');
   process.stdout.write('  ml-host=<..>          Host on which MarkLogic runs. Defaults to: localhost\n');
   process.stdout.write('  ml-admin-user=<..>    User for MarkLogic deployments. Defaults to: admin\n');
   process.stdout.write('  ml-admin-pass=<..>    Pass for MarkLogic deployments. Defaults to: <blank>\n');
   process.stdout.write('  ml-app-user=<..>      MarkLogic user for guest access. Defaults to: <app-name>-user\n');
   process.stdout.write('  ml-app-pass=<..>      MarkLogic pass for guest access. Defaults to: <roxy-appuser-password>\n');
-  process.stdout.write('  ml-http-port=<..>     Port at which MarkLogic app-server runs. Defaults to: 8040\n');
+  process.stdout.write('  ml-http-port=<..>     Port at which MarkLogic app-server runs. Defaults to: 8070\n');
   process.stdout.write('  ml-xcc-port=<..>      Port at which MarkLogic xcc-server runs. Defaults to: <ml-app-port>\n');
   process.stdout.write('  node-port=<..>        Port at which Node.js middle-tier runs. Defaults to: 9070\n');
   process.stdout.write('  guest-access=<..>     Whether guests are automatically logged in. Defaults to: false\n');
@@ -126,7 +126,10 @@ function processInput() {
     branch: 'master'
   };
   (gulp.args || process.argv).forEach(function(arg) {
-    if (isFlag(arg)) {
+    if (arg === 'help') {
+      printUsage();
+      process.exit(0);
+    } else if (isFlag(arg)) {
       var splits = arg.split('=');
       var flag = splits[0].replace(/^-+/,'');
       var value = splits[1];
@@ -474,7 +477,7 @@ gulp.task('init', ['checkForUpdates'], function(done) {
       type: 'list',
       name: 'mlVersion',
       message: 'MarkLogic version?',
-      choices: ['8', '7', '6', '5'],
+      choices: ['9', '8', '7'],
       default: 0
     });
   }
@@ -508,15 +511,15 @@ gulp.task('init', ['checkForUpdates'], function(done) {
       type: 'input',
       name: 'appPort',
       message: 'MarkLogic App/Rest port?',
-      default: 8040
+      default: 8070
     });
   }
   if (!clArgs['ml-xcc-port']) {
     prompts.push({
       type: 'input',
       name: 'xccPort',
       message: 'XCC port?',
-      default: 8041,
+      default: 8071,
       when: function(answers) {
         return (answers.mlVersion || clArgs['ml-version']) < 8;
       }