You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/10/01 04:08:54 UTC
[atlas] branch branch-2.0 updated: ATLAS-3964: Atlas UI displayes
large numbers incorrectly
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new e497dcf ATLAS-3964: Atlas UI displayes large numbers incorrectly
e497dcf is described below
commit e497dcff7b72f00788c41bc60ca44794ebd16ce8
Author: Deep Singh <de...@gmail.com>
AuthorDate: Wed Sep 30 00:58:13 2020 -0700
ATLAS-3964: Atlas UI displayes large numbers incorrectly
Signed-off-by: kevalbhatt <kb...@apache.org>
(cherry picked from commit 545afb53d0eb4154162f3887cea2bf4a4d26e752)
---
dashboardv2/gruntfile.js | 6 ++++--
dashboardv2/package-lock.json | 5 +++++
dashboardv2/package.json | 3 ++-
dashboardv2/public/js/main.js | 3 ++-
dashboardv2/public/js/utils/Overrides.js | 13 +++++++++++--
dashboardv3/gruntfile.js | 6 ++++--
dashboardv3/package-lock.json | 5 +++++
dashboardv3/package.json | 3 ++-
dashboardv3/public/js/main.js | 3 ++-
dashboardv3/public/js/utils/Overrides.js | 13 +++++++++++--
10 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 747de0b..1f21df2 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -110,7 +110,8 @@ module.exports = function(grunt) {
'table-dragger.js': { 'table-dragger/dist': 'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
'jquery.steps.min.js': { 'jquery-steps/build': 'jquery-steps' },
- 'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js" }
+ 'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js" },
+ 'lossless-json.js': { 'lossless-json/dist': 'lossless-json' }
}
},
@@ -178,7 +179,8 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter': 'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
- { 'nvd3': 'nvd3/' }
+ { 'nvd3': 'nvd3/' },
+ { 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette': 'backbone-marionette' }],
'license': [{ 'table-dragger': 'table-dragger' }],
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 5ae7a2d..b14e4fe 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -2104,6 +2104,11 @@
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
"dev": true
},
+ "lossless-json": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz",
+ "integrity": "sha512-zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="
+ },
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index c2f7c0f..57c58c0 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -52,7 +52,8 @@
"requirejs-text": "2.0.15",
"select2": "4.0.3",
"table-dragger": "1.0.2",
- "underscore": "1.8.3"
+ "underscore": "1.8.3",
+ "lossless-json": "1.0.4"
},
"devDependencies": {
"grunt": "1.0.4",
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 8caa781..7cee837 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -181,7 +181,8 @@ require.config({
'table-dragger': 'libs/table-dragger/table-dragger',
'jstree': 'libs/jstree/jstree.min',
'jquery-steps': 'libs/jquery-steps/jquery.steps.min',
- 'dropzone': 'libs/dropzone/js/dropzone-amd-module'
+ 'dropzone': 'libs/dropzone/js/dropzone-amd-module',
+ 'lossless-json': 'libs/lossless-json/lossless-json'
},
/**
diff --git a/dashboardv2/public/js/utils/Overrides.js b/dashboardv2/public/js/utils/Overrides.js
index 33328f0..63770b5 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jquery-placeholder'], function(require, Utils) {
+define(['require', 'utils/Utils', 'lossless-json', 'marionette', 'backgrid', 'asBreadcrumbs', 'jquery-placeholder'], function(require, Utils, LosslessJSON) {
'use strict';
Backbone.$.ajaxSetup({
@@ -42,7 +42,16 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
if (options.cust_error) {
options.cust_error(that, response);
}
- }
+ },
+ converters: _.extend($.ajaxSettings.converters, {
+ "text json": function(data) {
+ try {
+ return LosslessJSON.parse(data, function(k, v) { return (v.isLosslessNumber) ? v.value : v });
+ } catch (err) {
+ return $.parseJSON(data);
+ }
+ }
+ })
})
]);
}
diff --git a/dashboardv3/gruntfile.js b/dashboardv3/gruntfile.js
index 378a69a..62d8ddf 100644
--- a/dashboardv3/gruntfile.js
+++ b/dashboardv3/gruntfile.js
@@ -110,7 +110,8 @@ module.exports = function(grunt) {
'table-dragger.js': { 'table-dragger/dist': 'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
'jquery.steps.min.js': { 'jquery-steps/build': 'jquery-steps' },
- 'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js" }
+ 'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js" },
+ 'lossless-json.js': { 'lossless-json/dist': 'lossless-json' }
}
},
@@ -184,7 +185,8 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter': 'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
- { 'nvd3': 'nvd3/' }
+ { 'nvd3': 'nvd3/' },
+ { 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette': 'backbone-marionette' }],
'license': [{ 'table-dragger': 'table-dragger' }],
diff --git a/dashboardv3/package-lock.json b/dashboardv3/package-lock.json
index 9e0bf7c..c5f4059 100644
--- a/dashboardv3/package-lock.json
+++ b/dashboardv3/package-lock.json
@@ -2112,6 +2112,11 @@
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
"dev": true
},
+ "lossless-json": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz",
+ "integrity": "sha512-zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="
+ },
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
diff --git a/dashboardv3/package.json b/dashboardv3/package.json
index 8950200..33754ad 100644
--- a/dashboardv3/package.json
+++ b/dashboardv3/package.json
@@ -53,7 +53,8 @@
"requirejs-text": "2.0.15",
"select2": "4.0.3",
"table-dragger": "1.0.2",
- "underscore": "1.8.3"
+ "underscore": "1.8.3",
+ "lossless-json": "1.0.4"
},
"devDependencies": {
"grunt": "1.0.4",
diff --git a/dashboardv3/public/js/main.js b/dashboardv3/public/js/main.js
index 17e3362..3acfd87 100644
--- a/dashboardv3/public/js/main.js
+++ b/dashboardv3/public/js/main.js
@@ -210,7 +210,8 @@ require.config({
'table-dragger': 'libs/table-dragger/table-dragger',
'jstree': 'libs/jstree/jstree.min',
'jquery-steps': 'libs/jquery-steps/jquery.steps.min',
- 'dropzone': 'libs/dropzone/js/dropzone-amd-module'
+ 'dropzone': 'libs/dropzone/js/dropzone-amd-module',
+ 'lossless-json': 'libs/lossless-json/lossless-json'
},
/**
diff --git a/dashboardv3/public/js/utils/Overrides.js b/dashboardv3/public/js/utils/Overrides.js
index 33328f0..63770b5 100644
--- a/dashboardv3/public/js/utils/Overrides.js
+++ b/dashboardv3/public/js/utils/Overrides.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jquery-placeholder'], function(require, Utils) {
+define(['require', 'utils/Utils', 'lossless-json', 'marionette', 'backgrid', 'asBreadcrumbs', 'jquery-placeholder'], function(require, Utils, LosslessJSON) {
'use strict';
Backbone.$.ajaxSetup({
@@ -42,7 +42,16 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
if (options.cust_error) {
options.cust_error(that, response);
}
- }
+ },
+ converters: _.extend($.ajaxSettings.converters, {
+ "text json": function(data) {
+ try {
+ return LosslessJSON.parse(data, function(k, v) { return (v.isLosslessNumber) ? v.value : v });
+ } catch (err) {
+ return $.parseJSON(data);
+ }
+ }
+ })
})
]);
}