Merge pull request #11 from qlik-oss/QLIK-96528/ClickInStory

Disable visual selections in snapshots and locked dims
qlik-oss · Jun 27, 2019 · 57c2ba6 · 57c2ba6
2 parents 9866bfa + 9724f31
commit 57c2ba6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/bridgepicassospec.js b/src/bridgepicassospec.js
@@ -1,7 +1,7 @@
 import ThemeManager from './theme';
 import { interactionsSetup } from './interactions.js';
 
-export default function (element, layout, direction, isEditMode) {
+export default function (element, layout, direction, isInteractable) {
   let labels = {
     startvalue: layout.labelsshow ? "Start Value" : layout.startName,
     endvalue: layout.labelsshow ? "End Value" : layout.endName,
@@ -34,7 +34,7 @@ export default function (element, layout, direction, isEditMode) {
   }
 
   return {
-    interactions: (isEditMode ? [] : interactionsSetup()),
+    interactions: (!isInteractable ? [] : interactionsSetup()),
     scales: {
       v: {
         data: {
@@ -110,7 +110,7 @@ export default function (element, layout, direction, isEditMode) {
         displayOrder: 0
       },
       brush: {
-        trigger: (isEditMode ? [] : [{
+        trigger: (!isInteractable ? [] : [{
           on: 'tap',
           contexts: ['highlight'],
           globalPropagation: 'stop',
@@ -182,7 +182,7 @@ export default function (element, layout, direction, isEditMode) {
         }
       },
       brush: {
-        trigger: (isEditMode ? [] : [{
+        trigger: (!isInteractable ? [] : [{
           on: 'tap',
           contexts: ['highlight'],
           globalPropagation: 'stop',

diff --git a/src/controller.js b/src/controller.js
@@ -55,7 +55,10 @@ export default ['$scope', '$element', function($scope, $element) {
 
     if (isEditMode || typeof $scope.chart.settings === 'undefined') {
       up.settings = bridgepicassospec(
-        $scope.chart.element, layout, $scope.$parent.options.direction, isEditMode);
+        $scope.chart.element,
+        layout,
+        $scope.$parent.options.direction,
+        !isEditMode && !$scope.backendApi.isSnapshot && !layout.qHyperCube.qDimensionInfo[0].qLocked);
     }
 
     $scope.chart.update(up);

diff --git a/src/converthypercube.js b/src/converthypercube.js
@@ -45,6 +45,7 @@ class ConvertHypercube {
       qMax: dimInfo.qMax,
       qMin: dimInfo.qMin,
       qSortIndicator: dimInfo.qSortIndicator,
+      qLocked: dimInfo.qLocked,
       qStateCounts: {
         qAlternative: dimInfo.qStateCounts.qAlternative,
         qDeselected: dimInfo.qStateCounts.qDeselected,