fix(normalization): remove options not needed for normalization

qlik-oss · Jan 8, 2020 · 44175f1 · 44175f1
1 parent 9141556
commit 44175f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/src/expression-modifiers/normalization/_tests_/index.spec.js b/src/expression-modifiers/normalization/_tests_/index.spec.js
@@ -26,9 +26,6 @@ describe('normalization', () => {
       disabled: false,
       primaryDimension: 0,
       relativeNumbers: 0,
-      crossAllDimensions: false,
-      showExcludedValues: true,
-      fullNormalization: false,
       outputExpression: '',
     };
     expression = 'Sum([Sales])';

diff --git a/src/expression-modifiers/normalization/index.js b/src/expression-modifiers/normalization/index.js
@@ -7,9 +7,6 @@ const DEFAULT_OPTIONS = {
   disabled: false,
   primaryDimension: 0,
   relativeNumbers: 0,
-  crossAllDimensions: false,
-  showExcludedValues: true,
-  fullNormalization: false,
   outputExpression: '',
 };
 
@@ -41,7 +38,7 @@ function getSumDisregardSelec(expression) {
 export default {
   translationKey: 'properties.modifier.normalization',
 
-  needDimension: helper.needDimension,
+  needDimension: () => true,
 
   isApplicable({ properties, layout }) {
     return helper.isApplicable({

diff --git a/src/expression-modifiers/normalization/properties.js b/src/expression-modifiers/normalization/properties.js
@@ -6,6 +6,7 @@ const NORMALIZATION_TYPES = {
   RELATIVE_TO_TOTAL_SELECTION: 0,
   RELATIVE_TO_DIM_UNIVERSE: 1,
   RELATIVE_TO_TOTAL_UNIVERSE: 2,
+  RELATIVE_TO_TOTAL_WITHIN_GROUP: 3,
 };
 
 function getModifierIndex(measure, modifiersRef) {
@@ -72,7 +73,9 @@ export default function (rootPath, translationKeys = {}) {
               })); // To avoid depending on the layout, we use the first dimension in the drill down dimension
             },
             show(itemData, handler) {
-              return handler.layout.qHyperCube.qDimensionInfo.length > 1;
+              const modifier = getModifier(itemData, rootPath);
+              const { relativeNumbers } = modifier;
+              return relativeNumbers === NORMALIZATION_TYPES.RELATIVE_TO_TOTAL_WITHIN_GROUP && handler.layout.qHyperCube.qDimensionInfo.length > 1;
             },
           },
           relativeNumbers: {
@@ -101,20 +104,6 @@ export default function (rootPath, translationKeys = {}) {
               },
             ],
           },
-          crossAllDimensions: {
-            refFn: data => `${getRef(data, rootPath)}.crossAllDimensions`,
-            type: 'boolean',
-            translation: translationKeys.crossAllDimensions || 'properties.modifier.crossAllDimensions',
-            title: {
-              translation:
-              translationKeys.crossAllDimensionsTooltip || 'properties.modifier.normalization.crossAllDimensions.tooltip',
-            },
-            schemaIgnore: true,
-            defaultValue: false,
-            show(itemData, handler) {
-              return handler.layout.qHyperCube.qDimensionInfo.length > 1;
-            },
-          },
         },
         show(itemData, handler) {
           return helper.isApplicable({ properties: handler.properties });