@datarailsshared/dr_renderer 1.2.132 → 1.2.134-tigers
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/.circleci/config.yml +18 -2
- package/package.json +1 -1
- package/src/highcharts_renderer.js +17 -3
package/.circleci/config.yml
CHANGED
|
@@ -20,7 +20,12 @@ jobs:
|
|
|
20
20
|
- run:
|
|
21
21
|
name: Prepare publish version
|
|
22
22
|
command: |
|
|
23
|
-
|
|
23
|
+
postfix=""
|
|
24
|
+
if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
|
|
25
|
+
postfix="-$CIRCLE_BRANCH"
|
|
26
|
+
fi
|
|
27
|
+
|
|
28
|
+
VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
|
|
24
29
|
sed -i s/{{cicd_version}}/$VERSION/g ./package.json
|
|
25
30
|
cat ./package.json
|
|
26
31
|
- run:
|
|
@@ -32,7 +37,12 @@ jobs:
|
|
|
32
37
|
- run:
|
|
33
38
|
name: prepare git tag
|
|
34
39
|
command: |
|
|
35
|
-
|
|
40
|
+
postfix=""
|
|
41
|
+
if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
|
|
42
|
+
postfix="-$CIRCLE_BRANCH"
|
|
43
|
+
fi
|
|
44
|
+
|
|
45
|
+
VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
|
|
36
46
|
git config --global user.email noreplay@circleci.com
|
|
37
47
|
git config --global user.name circleci
|
|
38
48
|
git config --global -l
|
|
@@ -49,3 +59,9 @@ workflows:
|
|
|
49
59
|
branches:
|
|
50
60
|
only:
|
|
51
61
|
- /prod.*/
|
|
62
|
+
- /tigers/
|
|
63
|
+
- /bratans/
|
|
64
|
+
- /dragons/
|
|
65
|
+
- /tigers/
|
|
66
|
+
- /wizards/
|
|
67
|
+
- /rocket/
|
package/package.json
CHANGED
|
@@ -7367,7 +7367,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7367
7367
|
return dashboardsFilters;
|
|
7368
7368
|
};
|
|
7369
7369
|
|
|
7370
|
-
highchartsRenderer.
|
|
7370
|
+
highchartsRenderer.getPresentationTagType = function (data_model, local_current_dashboard) {
|
|
7371
|
+
if (local_current_dashboard == undefined) {
|
|
7372
|
+
local_current_dashboard = data_model.current_dashboard;
|
|
7373
|
+
}
|
|
7374
|
+
|
|
7375
|
+
if (local_current_dashboard.date_tags.length > 0) {
|
|
7376
|
+
return 'date_tags';
|
|
7377
|
+
}
|
|
7378
|
+
|
|
7379
|
+
if (local_current_dashboard.plan_tags.length > 0) {
|
|
7380
|
+
return 'plan_tags';
|
|
7381
|
+
}
|
|
7382
|
+
};
|
|
7383
|
+
|
|
7384
|
+
highchartsRenderer.getPresentationDataTag = function (data_model, local_current_dashboard, dataKeyTag = 'date_tags') {
|
|
7371
7385
|
let presentation_data_tag = null;
|
|
7372
7386
|
|
|
7373
7387
|
if (local_current_dashboard == undefined) {
|
|
@@ -7377,8 +7391,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7377
7391
|
if (local_current_dashboard && local_current_dashboard.presentation_data_tag_object) {
|
|
7378
7392
|
presentation_data_tag = local_current_dashboard.presentation_data_tag_object.value;
|
|
7379
7393
|
}
|
|
7380
|
-
else if(local_current_dashboard && local_current_dashboard
|
|
7381
|
-
local_current_dashboard.presentation_data_tag_object = lodash.clone(lodash.maxBy(local_current_dashboard
|
|
7394
|
+
else if(local_current_dashboard && local_current_dashboard[dataKeyTag] && local_current_dashboard[dataKeyTag].length > 0){
|
|
7395
|
+
local_current_dashboard.presentation_data_tag_object = lodash.clone(lodash.maxBy(local_current_dashboard[dataKeyTag], 'value'));
|
|
7382
7396
|
if(local_current_dashboard.presentation_data_tag_object){
|
|
7383
7397
|
presentation_data_tag = local_current_dashboard.presentation_data_tag_object.value;
|
|
7384
7398
|
}
|