d2-analysis - npm Package Compare versions

Comparing version 25.0.11 to 25.0.12

lib/init/legendSetsInit.js

@@ -17,3 +17,3 @@ 'use strict';
         baseUrl: apiPath + '/legendSets.json',
-        params: ['fields=id,displayName|rename(name),legends[id,displayName|rename(name),startValue,endValue,color]', 'paging=false'],
+        params: ['fields=id,displayName~rename(name),legends[id,displayName~rename(name),startValue,endValue,color]', 'paging=false'],
         success: function success(r) {
@@ -20,0 +20,0 @@ appManager.addLegendSets(r.legendSets);

lib/init/organisationUnitLevelsInit.js

@@ -17,3 +17,3 @@ 'use strict';
         baseUrl: apiPath + '/organisationUnitLevels.json',
-        params: ['fields=id,displayName|rename(name),level', 'paging=false'],
+        params: ['fields=id,displayName~rename(name),level', 'paging=false'],
         success: function success(r) {
@@ -20,0 +20,0 @@ appManager.addOrganisationUnitLevels(r.organisationUnitLevels);

lib/manager/AppManager.js

@@ -77,3 +77,3 @@ 'use strict';
 
-    t.defaultAnalysisFields = ['*', 'interpretations[*,user[id,displayName],likedBy[id,displayName],comments[lastUpdated,text,user[id,displayName]]]', 'columns[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]', 'rows[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]', 'filters[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]', 'access', 'userGroupAccesses', 'publicAccess', 'displayDescription', 'user[displayName]', '!href', '!rewindRelativePeriods', '!userOrganisationUnit', '!userOrganisationUnitChildren', '!userOrganisationUnitGrandChildren', '!externalAccess', '!relativePeriods', '!columnDimensions', '!rowDimensions', '!filterDimensions', '!organisationUnitGroups', '!itemOrganisationUnitGroups', '!indicators', '!dataElements', '!dataElementOperands', '!dataElementGroups', '!dataSets', '!periods', '!organisationUnitLevels', '!organisationUnits'];
+    t.defaultAnalysisFields = ['*', 'interpretations[*,user[id,displayName],likedBy[id,displayName],comments[lastUpdated,text,user[id,displayName]]]', 'columns[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]', 'rows[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]', 'filters[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]', 'access', 'userGroupAccesses', 'publicAccess', 'displayDescription', 'user[displayName]', '!href', '!rewindRelativePeriods', '!userOrganisationUnit', '!userOrganisationUnitChildren', '!userOrganisationUnitGrandChildren', '!externalAccess', '!relativePeriods', '!columnDimensions', '!rowDimensions', '!filterDimensions', '!organisationUnitGroups', '!itemOrganisationUnitGroups', '!indicators', '!dataElements', '!dataElementOperands', '!dataElementGroups', '!dataSets', '!periods', '!organisationUnitLevels', '!organisationUnits'];
 
@@ -326,3 +326,3 @@ t.displayPropertyMap = {
 
-    return this.displayPropertyUrl = key + '|rename(name)';
+    return this.displayPropertyUrl = key + '~rename(name)';
 };
@@ -329,0 +329,0 @@

lib/manager/UiManager.js

@@ -10,6 +10,10 @@ 'use strict';
 
-var _isString = require('d2-utilizr/lib/isString');
+var _isArray = require('d2-utilizr/lib/isArray');
 
-var _isString2 = _interopRequireDefault(_isString);
+var _isArray2 = _interopRequireDefault(_isArray);
 
+var _isFunction = require('d2-utilizr/lib/isFunction');
+
+var _isFunction2 = _interopRequireDefault(_isFunction);
+
 var _isObject = require('d2-utilizr/lib/isObject');
@@ -19,5 +23,5 @@
 
-var _isArray = require('d2-utilizr/lib/isArray');
+var _isString = require('d2-utilizr/lib/isString');
 
-var _isArray2 = _interopRequireDefault(_isArray);
+var _isString2 = _interopRequireDefault(_isString);
 
@@ -583,5 +587,4 @@ var _arrayTo = require('d2-utilizr/lib/arrayTo');
     // svg
-    t.submitSvgForm = function (type) {
-        var svg = Ext.query('svg'),
-            form = Ext.query('#exportForm')[0];
+    t.getSvg = function () {
+        var svg = Ext.query('svg');
 
@@ -596,4 +599,17 @@ if (!((0, _isArray2.default)(svg) && svg.length)) {
 
+        return svg;
+    };
+
+    t.submitSvgForm = function (type, filename) {
+        var form = Ext.query('#exportForm')[0];
+        var chart = this.get('chart');
+
+        var svg = chart && (0, _isFunction2.default)(chart.getSVGForExport) ? chart.getSVGForExport() : this.getSvg();
+
+        if (!svg) {
+            return;
+        }
+
         Ext.query('#svgField')[0].value = svg;
-        Ext.query('#filenameField')[0].value = 'test';
+        Ext.query('#filenameField')[0].value = filename || 'Untitled';
 
@@ -600,0 +616,0 @@ form.action = t.appManager.getPath() + '/api/svg.' + type;

lib/ui/FavoriteWindow.js

@@ -65,3 +65,3 @@ 'use strict';
         storeFields = 'id,name,lastUpdated,access,title,description',
-        urlFields = 'id,displayName|rename(name),lastUpdated,access,title,description',
+        urlFields = 'id,displayName~rename(name),lastUpdated,access,title,description',
         sortField = 'name',
@@ -68,0 +68,0 @@ sortDirection = 'asc',

package.json

 {
   "name": "d2-analysis",
-  "version": "25.0.11",
+  "version": "25.0.12",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

src/init/legendSetsInit.js

@@ -14,3 +14,3 @@ export var legendSetsInit;
         params: [
-            'fields=id,displayName|rename(name),legends[id,displayName|rename(name),startValue,endValue,color]',
+            'fields=id,displayName~rename(name),legends[id,displayName~rename(name),startValue,endValue,color]',
             'paging=false'
@@ -17,0 +17,0 @@ ],

src/init/organisationUnitLevelsInit.js

@@ -14,3 +14,3 @@ export var organisationUnitLevelsInit;
         params: [
-            'fields=id,displayName|rename(name),level',
+            'fields=id,displayName~rename(name),level',
             'paging=false'
@@ -17,0 +17,0 @@ ],

src/manager/AppManager.js

@@ -42,5 +42,5 @@ import isArray from 'd2-utilizr/lib/isArray';
         'interpretations[*,user[id,displayName],likedBy[id,displayName],comments[lastUpdated,text,user[id,displayName]]]',
-        'columns[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]',
-        'rows[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]',
-        'filters[dimension,filter,items[dimensionItem|rename(id),dimensionItemType,$]]',
+        'columns[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]',
+        'rows[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]',
+        'filters[dimension,filter,items[dimensionItem~rename(id),dimensionItemType,$]]',
         'access',
@@ -324,3 +324,3 @@ 'userGroupAccesses',
 
-    return this.displayPropertyUrl = (key + '|rename(name)');
+    return this.displayPropertyUrl = (key + '~rename(name)');
 };
@@ -327,0 +327,0 @@

src/manager/UiManager.js

@@ -0,4 +1,5 @@
+import isArray from 'd2-utilizr/lib/isArray';
+import isFunction from 'd2-utilizr/lib/isFunction';
+import isObject from 'd2-utilizr/lib/isObject';
 import isString from 'd2-utilizr/lib/isString';
-import isObject from 'd2-utilizr/lib/isObject';
-import isArray from 'd2-utilizr/lib/isArray';
 import arrayTo from 'd2-utilizr/lib/arrayTo';
@@ -571,5 +572,4 @@
     // svg
-    t.submitSvgForm = function(type) {
-        var svg = Ext.query('svg'),
-            form = Ext.query('#exportForm')[0];
+    t.getSvg = function() {
+        var svg = Ext.query('svg');
 
@@ -584,4 +584,17 @@ if (!(isArray(svg) && svg.length)) {
 
+        return svg;
+    };
+
+    t.submitSvgForm = function(type, filename) {
+        var form = Ext.query('#exportForm')[0];
+        var chart = this.get('chart');
+
+        var svg = chart && isFunction(chart.getSVGForExport) ? chart.getSVGForExport() : this.getSvg();
+
+        if (!svg) {
+            return;
+        }
+
         Ext.query('#svgField')[0].value = svg;
-        Ext.query('#filenameField')[0].value = 'test';
+        Ext.query('#filenameField')[0].value = filename || 'Untitled';
 
@@ -588,0 +601,0 @@ form.action = t.appManager.getPath() + '/api/svg.' + type;

src/ui/FavoriteWindow.js

@@ -54,3 +54,3 @@ import { RenameWindow } from './RenameWindow.js';
         storeFields = 'id,name,lastUpdated,access,title,description',
-        urlFields = 'id,displayName|rename(name),lastUpdated,access,title,description',
+        urlFields = 'id,displayName~rename(name),lastUpdated,access,title,description',
         sortField = 'name',
@@ -57,0 +57,0 @@ sortDirection = 'asc',

No alert changes

Improved metrics

Total package byte prevSize

2111612

increased by0.07%

Lines of code

28482

increased by0.07%

No dependency changes