@datarailsshared/dr_renderer 1.2.450 → 1.2.452
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
@@ -154,7 +154,6 @@ const FEATURES = {
|
|
154
154
|
MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
|
155
155
|
USE_NEW_SCENARIO_TAG: 'use_new_scenario_tag',
|
156
156
|
ENABLE_SERVER_WIDGET_DATA_SORTING: 'enable_server_widget_data_sorting',
|
157
|
-
CLIENT_WIDGET_SORTING_KEYS_MERGE: 'client_widget_sorting_keys_merge',
|
158
157
|
}
|
159
158
|
|
160
159
|
const TICKS_COUNT = 5;
|
@@ -209,7 +208,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
209
208
|
disableAnimation = document.ReportHippo.user.organization && document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.disable_animation
|
210
209
|
highchartsRenderer.enabledNewWidgetValueFormatting = highchartsRenderer.hasFeature(FEATURES.ENABLE_NEW_WIDGET_VALUE_FORMATTING);
|
211
210
|
highchartsRenderer.isSortingOnBackendEnabled = highchartsRenderer.hasFeature(FEATURES.ENABLE_SERVER_WIDGET_DATA_SORTING);
|
212
|
-
highchartsRenderer.CLIENT_WIDGET_SORTING_KEYS_MERGE = highchartsRenderer.hasFeature(FEATURES.CLIENT_WIDGET_SORTING_KEYS_MERGE);
|
213
211
|
}
|
214
212
|
|
215
213
|
// fix issue of use tootip.stickOnContact with tooltip.outside , source: https://github.com/highcharts/highcharts/pull/15960
|
@@ -9789,17 +9787,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
9789
9787
|
if (!sortingObjectToReturn) {
|
9790
9788
|
sortingObjectToReturn = lodash.clone(dataRow);
|
9791
9789
|
} else {
|
9792
|
-
|
9793
|
-
|
9794
|
-
|
9795
|
-
return lodash.chain(keysA).concat(keysB).uniqWith(lodash.isEqual).value();
|
9796
|
-
}
|
9797
|
-
sortingObjectToReturn.row_keys = concatUniqueKeys(sortingObjectToReturn.row_keys, dataRow.row_keys);
|
9798
|
-
sortingObjectToReturn.col_keys = concatUniqueKeys(sortingObjectToReturn.col_keys, dataRow.col_keys);
|
9799
|
-
} else {
|
9800
|
-
sortingObjectToReturn.row_keys = lodash.concat(sortingObjectToReturn.row_keys, dataRow.row_keys || []);
|
9790
|
+
const concatUniqueKeys = (keysA, keysB) => {
|
9791
|
+
if (!Array.isArray(keysB) || !keysB.length) return keysA;
|
9792
|
+
return lodash.chain(keysA).concat(keysB).uniqWith(lodash.isEqual).value();
|
9801
9793
|
}
|
9802
|
-
|
9794
|
+
sortingObjectToReturn.row_keys = concatUniqueKeys(sortingObjectToReturn.row_keys, dataRow.row_keys);
|
9795
|
+
sortingObjectToReturn.col_keys = concatUniqueKeys(sortingObjectToReturn.col_keys, dataRow.col_keys);
|
9803
9796
|
}
|
9804
9797
|
dataRow.isSortingObject = true;
|
9805
9798
|
}
|
@@ -30,7 +30,7 @@ function setInitialPointStyles(opts, series) {
|
|
30
30
|
const isSelected =
|
31
31
|
item && opts.selectedPoint &&
|
32
32
|
item.initialName === opts.selectedPoint.initialName &&
|
33
|
-
item.y === opts.selectedPoint.y;
|
33
|
+
item.y.toFixed(2) === opts.selectedPoint.y.toFixed(2);
|
34
34
|
item = Object.assign(item, getSeriesPointStyles(isSelected));
|
35
35
|
});
|
36
36
|
}
|
@@ -5260,7 +5260,6 @@ describe('highcharts_renderer', () => {
|
|
5260
5260
|
});
|
5261
5261
|
|
5262
5262
|
it('should get sort object and remove from data rows (several object encounters - for more than one Values field) with merge cols and rows under FF', () => {
|
5263
|
-
highchartsRenderer.CLIENT_WIDGET_SORTING_KEYS_MERGE = true;
|
5264
5263
|
const expectedObj = {
|
5265
5264
|
col_keys: [['colKey1'], ['colKey2'], ['colKey3'], ['colKey4'], ['colKey5']],
|
5266
5265
|
row_keys: [['rowKey1'], ['rowKey2'], ['rowKey1', 'rowKey2'], ['rowKey3']],
|