Merge pull request #38 from qlik-oss/DEB-157/NineMeasures

1 Dim and 9 Measures OR 2 Dim and 8 Measures

src/definition/metric-semaphores.js

@@ -41,7 +41,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 10,
+        index: 8,
         color: '#f93f17'
       }
     },
@@ -52,7 +52,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 1,
+        index: 11,
         color: '#ffffff'
       }
     },
@@ -69,7 +69,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 8,
+        index: 9,
         color: '#ffcf02'
       }
     },
@@ -80,7 +80,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 15,
+        index: 12,
         color: '#000000'
       }
     },
@@ -91,7 +91,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 3,
+        index: 10,
         color: '#276e27'
       }
     },
@@ -102,7 +102,7 @@ const metricSemaphores = {
       component: 'color-picker',
       dualOutput: true,
       defaultValue: {
-        index: 1,
+        index: 11,
         color: '#ffffff'
       }
     }

src/index.js

@@ -20,12 +20,16 @@ export default {
   },
   data: {
     dimensions: {
-      max: 3,
+      max: function (nMeasures) {
+        return nMeasures < 9 ? 2 : 1;
+      },
       min: 1,
       uses: 'dimensions'
     },
     measures: {
-      max: 8,
+      max: function (nDims) {
+        return nDims < 2 ? 9 : 8;
+      },
       min: 1,
       uses: 'measures'
     }