From 3078b976c388db3b6774391dca5b51d9244584f0 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 4 Jul 2018 15:55:29 +0200
Subject: [PATCH] warning message due to lack of google conesent improved,
additional explanation is in user provded overlays table
---
frontend-js/src/main/js/GuiConnector.js | 20 +++++++++++++++++++
.../src/main/js/gui/leftPanel/OverlayPanel.js | 12 ++++++++++-
frontend-js/src/main/js/minerva.js | 2 +-
.../js/map/overlay/SearchDbOverlay-test.js | 1 -
4 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js
index f4b4bbb80f..4c78a9bfcc 100644
--- a/frontend-js/src/main/js/GuiConnector.js
+++ b/frontend-js/src/main/js/GuiConnector.js
@@ -195,4 +195,24 @@ GuiConnector.alert = function (error, redirectIfSecurityError) {
}
};
+GuiConnector.warn = function (message) {
+ var self = GuiConnector;
+ logger.warn(message);
+ if (self._warnDialog === undefined) {
+ self._warnDialog = document.createElement("div");
+ self._warnDialogContent = document.createElement("div");
+ self._warnDialog.appendChild(self._warnDialogContent);
+ document.body.appendChild(self._warnDialog);
+ $(self._warnDialog).dialog({
+ classes: {
+ "ui-dialog": "ui-state-highlight"
+ },
+ modal: true,
+ title: "WARNING"
+ });
+ }
+ self._warnDialogContent.innerHTML = message;
+ $(self._warnDialog).dialog("open");
+};
+
module.exports = GuiConnector;
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index ab03202e55..ed05cfa64b 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -173,7 +173,17 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
});
};
$(checkbox).prop("disabled", disabled);
- viewTd.appendChild(checkbox);
+ if (disabled) {
+ var warningDiv = Functions.createElement({
+ type: "div",
+ content: "<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:orange'></i>",
+ xss: false
+ });
+ warningDiv.title = "You did not consent to terms of the license of Google Maps Platform. Click the \"Edit\" button to do so.";
+ viewTd.appendChild(warningDiv)
+ } else {
+ viewTd.appendChild(checkbox);
+ }
} else {
var img = guiUtils.createIcon("icons/search.png");
var link = document.createElement("a");
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 2c9e3d0e58..e145a36c91 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -607,7 +607,7 @@ function create(params) {
return ServerConnector.getLoggedUser();
}).then(function (user) {
if (leftPanel.isGoogleLicenseConsentRequired()) {
- GuiConnector.alert("Some data overlays doesn't have consent to the terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a>. To be able to visualize them you must edit data overlay. ")
+ GuiConnector.warn("Visualization of data overlays (Overlays tab) requires consent to terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a>. Click the \"Edit\" button for the overlay to do so.");
}
if (user.getLogin() !== "anonymous" && !user.isTermsOfUseConsent()) {
requestConsent(user, params.getConfiguration().getOption(ConfigurationType.TERMS_OF_USE));
diff --git a/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js b/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
index fffa28e316..ff096dcce9 100644
--- a/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
+++ b/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
@@ -94,7 +94,6 @@ describe('SearchDbOverlay', function () {
return searchDb.searchByEncodedQuery(query);
}).then(function (result) {
assert.ok(logger.getWarnings().length > 0);
- assert.equal(result.length, 0);
});
});
});
--
GitLab