diff --git a/chart-modules/common/picasso/__tests__/advanced-color.spec.js b/chart-modules/common/picasso/__tests__/advanced-color.spec.js new file mode 100644 index 00000000..28eafbb4 --- /dev/null +++ b/chart-modules/common/picasso/__tests__/advanced-color.spec.js @@ -0,0 +1,19 @@ +import AdvancedColorer from '../advanced-colorer'; + +describe('advanced-color', () => { + describe('resolveColorByPropertyDef', () => { + test('should set labelExpRef when dimension label is expression', () => { + const properties = { byDimDef: { type: 'expression', label: '=1' } }; + const isDim = true; + const dimensions = [{}]; + const exclDimensions = []; + const measures = {}; + const customLabel = undefined; + AdvancedColorer.resolveColorByPropertyDef(properties, isDim, dimensions, exclDimensions, measures, customLabel); + + console.log(JSON.stringify(dimensions[0])); + + expect(dimensions[0].qAttributeDimensions[0].labelExpRef).toBe('color.altLabel'); + }); + }); +}); diff --git a/chart-modules/common/picasso/advanced-colorer.js b/chart-modules/common/picasso/advanced-colorer.js index 49c46d4a..ec9b1ec7 100644 --- a/chart-modules/common/picasso/advanced-colorer.js +++ b/chart-modules/common/picasso/advanced-colorer.js @@ -197,6 +197,10 @@ function resolveColorByPropertyDef(properties, isDim, dimensions, exclDimensions attribExps.isCustomFormatted = isCustomFormatted; } } + + if (attribExps.label && attribExps.label.charAt(0) === '=') { + attribExps.labelExpRef = 'color.altLabel'; + } break; case 'libraryItem': if (!isDim) { diff --git a/charts/distributionplot/package.json b/charts/distributionplot/package.json index 175bc07f..94959307 100644 --- a/charts/distributionplot/package.json +++ b/charts/distributionplot/package.json @@ -35,6 +35,7 @@ "build": "nebula build --config ../../nebula.config.js", "lint": "eslint src", "start": "nebula serve --type distributionplot --config ../../nebula.config.js", + "start:mfe": "nebula serve --type distributionplot --config ../../nebula.config.js --mfe", "sense": "nebula sense --partial", "sense:watch": "node ../../scripts/sense-watch" }, diff --git a/charts/distributionplot/src/distributionplot-cube-generator.js b/charts/distributionplot/src/distributionplot-cube-generator.js index e64797f3..f3d50aa0 100644 --- a/charts/distributionplot/src/distributionplot-cube-generator.js +++ b/charts/distributionplot/src/distributionplot-cube-generator.js @@ -54,8 +54,6 @@ function generateHyperCube(layout, properties, app, translator) { properties.qUndoExclude.qHyperCubeDef.qInterColumnSortOrder = [1, 0]; return Promise.resolve(); - - /* eslint-enable no-param-reassign */ } export default {