Release 3.5.2

Gruntfile.js

@@ -67,6 +67,12 @@ module.exports = function(grunt) {
             host: 'mms-ts-uat.jpl.nasa.gov',//'localhost',//'100.64.243.161',
             port: 8080
           },
+          {
+            context: '/xlrapi',
+            https: serverHttps,
+            host: servers[key],
+            port: serverPort
+          },
           {
             context: '/alfresco',  // '/api'
             host: servers[key],
@@ -347,7 +353,7 @@ module.exports = function(grunt) {
     artifactory: {
       options: {
         url: artifactoryUrl,
-        repository: releaseRepo, //snapshotRepo,
+        repository: releaseRepo,
         username: artifactoryUser,
         password: artifactoryPassword
       },
@@ -358,7 +364,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.5.1',
+            version: '3.5.2',
             path: 'deploy/'
           }]
         }

app/js/mms/controllers/tree.controller.js

@@ -691,7 +691,8 @@ function($anchorScroll, $q, $filter, $location, $uibModal, $scope, $rootScope, $
         $scope.searchOptions = {
             callback: addExistingView,
             itemsPerPage: 200,
-            filterQueryList: [queryFilter]
+            filterQueryList: [queryFilter],
+            hideFilterOptions: true
         };
 
         $scope.ok = function() {

app/js/mms/directives/runXlr.js

@@ -0,0 +1,92 @@
+'use strict';
+
+angular.module('mmsApp')
+    .directive('runXlr', ['$http', '$uibModal', '$window', 'growl', 'ApplicationService', runXlr]);
+
+function runXlr($http, $uibModal, $window, growl, ApplicationService) {
+    return {
+        template: '<button class="btn btn-primary" ng-click="runXLR()">{{xlrTaskName}}</button>',
+        scope: {
+            templateId: '@',
+            xlrTaskName: '@'
+        },
+        controller: ['$scope', runXlrCtrl],
+        link: runXlrLink
+    };
+    function runXlrLink(scope, element, attrs, ctrls) {}
+
+    function runXlrCtrl($scope) {
+        var modalOpen = false;
+        $scope.xlrTaskName = $scope.xlrTaskName ? $scope.xlrTaskName : 'Sync FN to JPL Network';
+        $scope.runXLR = runXLR;
+        function runXLR() {
+
+            modalOpen = true;
+            $uibModal.open({
+                template: '<div class="modal-header"><h4>Please login to {{xlrTaskName}}.</h4></div><div class="modal-body"><form name="loginForm" ng-submit="login(credentials)">' + 
+                                '<input type="text" class="form-control" ng-model="credentials.username" placeholder="Username" style="margin-bottom: 1.5em;" autofocus>' + 
+                                '<input type="password" class="form-control" ng-model="credentials.password" placeholder="Password" style="margin-bottom: 1.5em;">' + 
+                                '<button class="btn btn-block btn-primary" type="submit">LOG IN <span ng-if="spin" ><i class="fa fa-spin fa-spinner"></i>' + 
+                            '</span></button></form></div>',
+                scope: $scope,
+                backdrop: 'static',
+                controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
+                    $scope.credentials = {
+                        username: '',
+                        password: ''
+                    };
+                    $scope.spin = false;
+
+                    function make_base_auth(user, password) {
+                        var tok = user + ':' + password;
+                        var hash = $window.btoa(tok);
+                        return "Basic " + hash;
+                    }
+                    $scope.login = function (credentials) {
+                        $scope.spin = true;
+                        var baseAuth = make_base_auth(credentials.username, credentials.password);
+                        var email = credentials.username + '@jpl.nasa.gov';
+                        var postBody = {
+                            "releaseTitle": "CAE Portal Sync",
+                            "releaseVariables": {
+                                "contentEditor": credentials.username,
+                                "editorEmail": email
+                            },
+                            "autoStart": true
+                        };
+
+                        var link = "/xlrapi/v1/templates/Applications/" + $scope.templateId + "/create";
+                        var config = {
+                            method: 'POST',
+                            url: link,
+                            headers: {
+                                'Authorization': baseAuth,
+                                "Content-Type": "application/json",
+                                "cache-control": "no-cache",
+                            },
+                            "data": postBody,
+                            "withCredentials": true,
+                            "async": true,
+                            "crossDomain": true,
+                            "processData": false
+                        };
+                        $http(config).then(function() {
+                            growl.success($scope.xlrTaskName + ' is running. You will receive a completion email');
+                        }, function(error){
+                            growl.error($scope.xlrTaskName + ' has failed.');
+                        }).finally(function() {
+                            $scope.spin = false;
+                            modalOpen = false;
+                            $uibModalInstance.dismiss();
+                        });
+                    };
+                }],
+                size: 'md'
+            }).result.finally(function(){
+                modalOpen = false;
+            });
+
+        }
+
+    }
+}

app/js/mms/directives/veNav.js

@@ -87,7 +87,7 @@ function veNav($templateCache, $rootScope, $state, hotkeys, growl, $location, $u
             hotkeys.toggleCheatSheet();
         };
         scope.toggleAbout = function() {
-            scope.veV = '3.5.1';
+            scope.veV = '3.5.2';
             scope.mmsV = 'Loading...';
             ApplicationService.getMmsVersion().then(function(data) {
                 scope.mmsV = data;

app/partials/mms/add-pe.html

@@ -25,6 +25,7 @@ <h4 class="pe-type-{{presentationElemType}}">Add {{presentationElemType | lowerc
     </div>
 
     <div ng-show="!createForm">
+        <p>Begin by searching for the {{presentationElemType | lowercase}}, then click its name or documentation to add the {{presentationElemType | lowercase}}.</p>
         <mms-search mms-options="searchOptions" mms-project-id="{{viewOrSectionOb._projectId}}" mms-ref-id="{{viewOrSectionOb._refId}}"></mms-search>
     </div>
 </div>

app/partials/mms/new-view.html

@@ -22,6 +22,7 @@ <h4 class="item-type-View"></i>Add view</h4>
     </div>
 
     <div ng-show="!createForm">
+        <p>Begin by searching for the view, then click its name or documentation to add the view.</p>
         <div class="radio">
             <label><input type="radio" ng-model="newViewAggr.type" value="shared">Add view and its children</label><br>
             <label><input type="radio" ng-model="newViewAggr.type" value="none">Add view only</label>

src/directives/mmsSearch.js

@@ -113,7 +113,7 @@ function mmsSearch($window, $anchorScroll, CacheService, ElementService, Project
 
         scope.getTypeClass = function (element) {
             // Get Type
-            scope.elementTypeClass = UtilsService.getElementTypeClass(element, ViewService.getElementType(element));
+            return UtilsService.getElementTypeClass(element, ViewService.getElementType(element));
         };
 
         // Set search options

src/lib/ckeditor/config.js

@@ -22,7 +22,7 @@ CKEDITOR.editorConfig = function( config ) {
     config.autoGrow_onStartup = true;
     config.startupFocus = 'end';
     config.mathJaxLib = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
-    config.allowedContent = true;
+	config.allowedContent = true;
 	config.specialChars = ['€', '‘', '’', '“', '”', '–', '—', '¡', '¢', '£', '¤', '¥', '¦', '§', '¨', '©', 'ª', '«', '¬', '®', '¯', '°', '²', '³', '´', 'µ', '¶', '·', '¸', '¹', 'º', '»', '¼', '½', '¾', '¿', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Æ', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ð', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', '×', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'Þ', 'ß', 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', '÷', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ÿ', 'Œ', 'œ', 'Ŵ', '&#374', '&#373', 'ŷ', '‚', '‛', '„', '…', '™', '►', '•', '→', '⇒', '⇔', '♦', '≈','α','β','γ','δ','ε','ζ','η','θ','ι','κ','λ','μ','ν','ξ','ο','π','ρ','σ','τ','υ','φ','χ','ψ','ω','Α','Β','Γ','Δ','Ε','Ζ','Η','Θ','Ι','Κ','Λ','Μ','Ν','Ξ','Ο','Π','Ρ','Σ','Τ','Υ','Φ','Χ','Ψ','Ω'];
 	//config.protectedSource.push( /<i[^>]*><\/i>/g );