From d3d5af75c01b5aba23c3e64c02028d363f7af869 Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@ethz.ch>
Date: Tue, 26 Mar 2024 14:16:46 +0100
Subject: [PATCH] BIS-1025: Spreadsheet improvements, encoding/decoding symbols
with backwards compatibility
---
.../webapps/eln-lims/html/js/util/JExcelEditorManager.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JExcelEditorManager.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JExcelEditorManager.js
index 08fd9a52c39..baf37957278 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JExcelEditorManager.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/JExcelEditorManager.js
@@ -131,7 +131,13 @@ var JExcelEditorManager = new function() {
var jExcelEditorValue = null;
if(jExcelEditorValueAsStringWithTags) {
var jExcelEditorValueAsStringNoTags = jExcelEditorValueAsStringWithTags.substring(6, jExcelEditorValueAsStringWithTags.length - 7);
- jExcelEditorValue = JSON.parse(window.decodeURIComponent(window.escape(window.atob(jExcelEditorValueAsStringNoTags))));
+ try {
+ // Improved decoding, used for the new encoding
+ jExcelEditorValue = JSON.parse(window.decodeURIComponent(window.escape(window.atob(jExcelEditorValueAsStringNoTags))));
+ } catch (error) {
+ // Original decoding, used to support systems until they update
+ jExcelEditorValue = JSON.parse(window.atob(jExcelEditorValueAsStringNoTags));
+ }
}
if(jExcelEditorValue) {
headers = jExcelEditorValue.headers;
--
GitLab