fix edit permission check for elements in mounted projects, fix rejected code 304 elements handling

Author: dlamoris

app/config/config.example.js

@@ -13,7 +13,7 @@
     //Do not modify the structure of this
     window.__env = {
         // View Editor Version
-        version: '4.0.0',
+        version: '4.0.1',
         // API url
         apiUrl: 'http://localhost:8080',
         // Base url

src/directives/Utils.js

@@ -388,6 +388,8 @@ function Utils($q, $uibModal, $timeout, $templateCache, $compile, $window, URLSe
     * @param {boolean} doNotScroll whether to scroll to element
     */
     var startEdit = function(scope, mmsViewCtrl, domElement, template, doNotScroll) {
+        PermissionsService.initializePermissions({id: scope.element._projectId}, {id: scope.element._refId, _projectId: scope.element._projectId})
+        .finally(function(data) {
         if (mmsViewCtrl.isEditable() && !scope.isEditing && scope.element && scope.commitId === 'latest' && PermissionsService.hasProjectIdBranchIdEditPermission(scope.element._projectId, scope.element._refId)) {
             var elementOb = scope.element;
             var reqOb = {elementId: elementOb.id, projectId: elementOb._projectId, refId: elementOb._refId};
@@ -443,6 +445,7 @@ function Utils($q, $uibModal, $timeout, $templateCache, $compile, $window, URLSe
                 }
             });
         }
+        });
     };
 
     /**

src/directives/mmsSpec.js

@@ -177,7 +177,9 @@ function mmsSpec(Utils, URLService, AuthService, ElementService, UtilsService, V
                         }
                     });*/
                 }
-                if ((scope.mmsCommitId !== 'latest' && scope.mmsCommitId) || !PermissionsService.hasProjectIdBranchIdEditPermission(scope.mmsProjectId, scope.mmsRefId)) {
+                PermissionsService.initializePermissions({id: scope.element._projectId}, {id: scope.element._refId, _projectId: scope.element._projectId})
+                .finally(function(data) {
+                if ((scope.mmsCommitId !== 'latest' && scope.mmsCommitId) || !PermissionsService.hasProjectIdBranchIdEditPermission(scope.element._projectId, scope.element._refId)) {
                     scope.editable = false;
                     scope.edit = null;
                     scope.editing = false;
@@ -212,6 +214,7 @@ function mmsSpec(Utils, URLService, AuthService, ElementService, UtilsService, V
                         }
                     });
                 }
+                });
                 getTypeClass(scope.element);
                 scope.elementDataLink = URLService.getRoot() + '/projects/'+scope.element._projectId+'/refs/'+scope.element._refId+'/elements/'+scope.element.id+'?commitId='+scope.element._commitId+'&token='+AuthService.getToken();
                 scope.gettingSpec = false;

src/services/ElementService.js

@@ -466,8 +466,8 @@ function ElementService($q, $http, URLService, UtilsService, CacheService, HttpS
                 }, Object.assign({timeout: 60000}))
             .then(function(response) {
                 var rejected = response.data.rejected;
-                if (rejected && rejected.length > 0 && rejected[0].code === 304 && rejected[0].element) { //elem will be rejected if server detects no changes
-                    deferred.resolve(rejected[0].element);
+                if (rejected && rejected.length > 0 && rejected[0].code === 304 && rejected[0].object) { //elem will be rejected if server detects no changes
+                    deferred.resolve(rejected[0].object);
                     return;
                 }
                 if (!angular.isArray(response.data.elements) || response.data.elements.length === 0) {
@@ -831,7 +831,7 @@ function ElementService($q, $http, URLService, UtilsService, CacheService, HttpS
 
     function _bulkUpdateSuccessHandler(serverResponse, deferred) {
         var results = [];
-        var elements = serverResponse.data.elements;
+        var elements = serverResponse.data.elements ? serverResponse.data.elements : [];
         elements.forEach(function (e) {
             var metaOb = _createMetaOb(e);
             var editCopy = JSON.parse(JSON.stringify(e));
@@ -847,8 +847,8 @@ function ElementService($q, $http, URLService, UtilsService, CacheService, HttpS
         var rejected = serverResponse.data.rejected;
         if (rejected && rejected.length > 0) {
             rejected.forEach(function(e) {
-                if (e.code === 304 && e.element) {
-                    results.push(e.element); //add any server rejected elements because they haven't changed
+                if (e.code === 304 && e.object) {
+                    results.push(e.object); //add any server rejected elements because they haven't changed
                 }
             });
         }

src/services/PermissionsService.js

@@ -19,7 +19,10 @@ function PermissionsService($q, $http, URLService, CacheService, _) {
         var url = URLService.getPermissionsLookupURL();
 
         var deferred = $q.defer();                
-
+        if (permissions.project[projectOb.id] !== undefined && permissions.ref[projectOb.id + '/' + refOb.id] !== undefined) {
+            deferred.resolve(permissions);
+            return deferred.promise;
+        }
         $http.put(url, { "lookups" : [ 
             {
                 "type" : "PROJECT",