From 84794ae19d86546cf51bd834ff79667fe1a25f54 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 25 Jul 2019 18:45:40 +0200
Subject: [PATCH] show warning about deprecated columns in frontend
---
.../src/main/js/gui/leftPanel/OverlayPanel.js | 13 +++++++++++-
.../src/main/js/map/data/DataOverlay.js | 21 +++++++++++++++++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index e26912cc94..1c6454fa04 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -318,7 +318,17 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled) {
var result = [];
result[0] = overlay.getOrder();
- result[1] = overlay.getName();
+ if (overlay.getDeprecatedColumns() !== undefined && overlay.getDeprecatedColumns() !== null && overlay.getDeprecatedColumns().length > 0) {
+
+ result[1] = "<div title='This data overlay uses old deprecated column names: ";
+ for (var j = 0; j < overlay.getDeprecatedColumns().length; j++) {
+ result[1] += overlay.getDeprecatedColumns()[j] + ", ";
+ }
+ result[1] += " This format will be not supported in minerva 15 and higher. Please re-upload data set using new format.'>" +
+ "<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:orange'></i>" + overlay.getName() + "</div>"
+ } else {
+ result[1] = overlay.getName();
+ }
if (overlay.getInputDataAvailable()) {
if (disabled) {
@@ -351,6 +361,7 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled)
"</div>";
}
}
+ logger.debug(result);
return result;
};
diff --git a/frontend-js/src/main/js/map/data/DataOverlay.js b/frontend-js/src/main/js/map/data/DataOverlay.js
index 16692fff0d..8e5a78f53b 100644
--- a/frontend-js/src/main/js/map/data/DataOverlay.js
+++ b/frontend-js/src/main/js/map/data/DataOverlay.js
@@ -26,6 +26,7 @@ function DataOverlay(overlayId, name) {
this.setImagesDirectory(object.images);
this.setDescription(object.description);
this.setCreator(object.creator);
+ this.setDeprecatedColumns(object.deprecatedColumns);
this.setContent(object.content);
this.setFilename(object.filename);
this.setPublicOverlay(object.publicOverlay);
@@ -328,6 +329,22 @@ DataOverlay.prototype.setContent = function (content) {
this._content = content;
};
+/**
+ *
+ * @returns {string[]}
+ */
+DataOverlay.prototype.getDeprecatedColumns = function () {
+ return this._deprecatedColumns;
+};
+
+/**
+ *
+ * @param {string[]} deprecatedColumns
+ */
+DataOverlay.prototype.setDeprecatedColumns = function (deprecatedColumns) {
+ this._deprecatedColumns = deprecatedColumns;
+};
+
/**
*
* @returns {number}
@@ -380,7 +397,7 @@ DataOverlay.prototype.setType = function (type) {
*
* @param {boolean} value
*/
-DataOverlay.prototype.setGoogleLicenseConsent = function(value) {
+DataOverlay.prototype.setGoogleLicenseConsent = function (value) {
this._googleLicenseConsent = value;
};
@@ -388,7 +405,7 @@ DataOverlay.prototype.setGoogleLicenseConsent = function(value) {
*
* @returns {boolean}
*/
-DataOverlay.prototype.isGoogleLicenseConsent = function() {
+DataOverlay.prototype.isGoogleLicenseConsent = function () {
return this._googleLicenseConsent;
};
--
GitLab