zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prabhjyotsi...@apache.org
Subject [zeppelin] branch master updated: [ZEPPELIN-2680] Allow opening notebook as a reader
Date Sat, 28 Sep 2019 10:32:00 GMT
This is an automated email from the ASF dual-hosted git repository.

prabhjyotsingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 3000d4a  [ZEPPELIN-2680] Allow opening notebook as a reader
3000d4a is described below

commit 3000d4a77019111ba57f04824cf9e7afbd23a73a
Author: redsk <nicola.bova@gmail.com>
AuthorDate: Fri Aug 23 13:25:25 2019 +0200

    [ZEPPELIN-2680] Allow opening notebook as a reader
    
    What is this PR for?
    --------------------
    
    When users only have reader permissions over a notebook AND the notebook
    contains a chart, the app sends a COMMIT_PARAGRAPH for each paragraph,
    which causes a write permission popup to show
    ("Insufficient privileges to write note").
    
    Ths issue is with function commitParagraphResult in `result.controller.js`.
    
    The original [fix](https://github.com/apache/zeppelin/pull/2439)
    introduced a nasty bug that dramatically increased CPU usage and was never
    merged.
    
    This PR fixes the bug. It also automatically switches to `report` mode
    as it is pointless to show UI features that the user is not allowed
    to control.
    
    What type of PR is it?
    ----------------------
    Bug Fix
    
    What is the Jira issue?
    -----------------------
    [ZEPPELIN-2680](https://issues.apache.org/jira/browse/ZEPPELIN-2680)
    
    Questions:
    
    - Does the licenses files need update? No
    - Is there breaking changes for older versions? No
    - Does this needs documentation? No
    
    Author: redsk <nicola.bova@gmail.com>
    
    Closes #3431 from redsk/ZEPPELIN-2680 and squashes the following commits:
    
    2f5a0b93e [redsk] [ZEPPELIN-2680] Allow opening notebook as a reader
---
 .../src/app/notebook/notebook.controller.js        | 38 +++++++++++++++++-----
 .../notebook/paragraph/result/result.controller.js |  4 ++-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index dfdb071..0515a85 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -809,7 +809,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
         minimumInputLength: 3,
       };
 
-      $scope.setIamOwner();
+      $scope.setMyPermissions();
       angular.element('#selectOwners').select2(selectJson);
       angular.element('#selectReaders').select2(selectJson);
       angular.element('#selectRunners').select2(selectJson);
@@ -1190,14 +1190,36 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
     }
   };
 
-  $scope.setIamOwner = function() {
-    if ($scope.permissions.owners.length > 0 &&
-      _.indexOf($scope.permissions.owners, $rootScope.ticket.principal) < 0) {
-      $scope.isOwner = false;
-      return false;
+  const arrayIntersection = function(arrayFirst, arraySecond) {
+    return arrayFirst.filter(function(x) {
+      if(arraySecond.indexOf(x) !== -1) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+  };
+
+  $scope.setMyPermissions = function() {
+    let myPermissions;
+    try {
+      myPermissions = JSON.parse($rootScope.ticket.roles);
+    } catch(err) {
+      myPermissions = [];
+    }
+    myPermissions.push($rootScope.ticket.principal);
+
+    $scope.isOwner = !($scope.permissions.owners.length > 0 &&
+       arrayIntersection(myPermissions, $scope.permissions.owners).length === 0);
+
+    $scope.isWriter = !($scope.permissions.writers.length > 0 &&
+       arrayIntersection(myPermissions, $scope.permissions.writers).length === 0);
+
+    if (!$scope.isOwner && !$scope.isWriter) {
+      $scope.viewOnly = true;
+      $scope.note.config.looknfeel = 'report';
+      initializeLookAndFeel();
     }
-    $scope.isOwner = true;
-    return true;
   };
 
   $scope.toggleNotePersonalizedMode = function() {
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
index b5435ed..dc0fdbf 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -744,7 +744,9 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams,
$location
       }, newParagraphConfig.results[resultIndex], paragraph, resultIndex);
       renderResult($scope.type, true);
     } else {
-      return websocketMsgSrv.commitParagraph(paragraph.id, title, text, newParagraphConfig,
params);
+      if (! $scope.viewOnly) {
+        return websocketMsgSrv.commitParagraph(paragraph.id, title, text, newParagraphConfig,
params);
+      }
     }
   };
 


Mime
View raw message