Merge pull request #821 from City-of-Helsinki/UHF-10738

UHF-10738 Cookie policy
City-of-Helsinki · Oct 10, 2024 · 9cc7782 · 9cc7782
2 parents 5abf9fb + 8f5dd4a
commit 9cc7782
Show file tree

Hide file tree

Showing 32 changed files with 1,073 additions and 202 deletions.
diff --git a/assets/js/chat_leijuke.js b/assets/js/chat_leijuke.js
@@ -31,6 +31,8 @@
     console.warn(`No adapter found for ${chatSelection}!`);
   }
 
+  // @todo UHF-8650: EU Cookie Compliance module will be removed.
+  // @todo UHF-8650: Convert the following code to support HDS cookie banner.
   class EuCookieManager {
     cookieCheck(cookieNames) {
       let cookiesOk = true;

diff --git a/assets/js/reactAndShareSettings.js b/assets/js/reactAndShareSettings.js
@@ -2,6 +2,8 @@
   'use strict';
 
   var loadReactAndShare = function () {
+    // @todo UHF-8650: EU Cookie Compliance module will be removed.
+    // @todo UHF-8650: Convert the following code to support HDS cookie banner.
     if (Drupal.eu_cookie_compliance.hasAgreed('statistics')) {
       window.rnsData = {
         apiKey: drupalSettings.reactAndShareApiKey,

diff --git a/assets/js/telia_ace.js b/assets/js/telia_ace.js
@@ -18,6 +18,8 @@
       };
     }
 
+    // @todo UHF-8650: EU Cookie Compliance module will be removed.
+    // @todo UHF-8650: Convert the following code to support HDS cookie banner.
     // eslint-disable-next-line class-methods-use-this
     cookieCheck() {
       return Drupal.eu_cookie_compliance.hasAgreedWithCategory('chat');

diff --git a/assets/js/user_consent_functions.js b/assets/js/user_consent_functions.js
@@ -1,6 +1,8 @@
 (function (Drupal) {
   'use strict';
 
+  // @todo UHF-8650: EU Cookie Compliance module will be removed.
+  // @todo UHF-8650: Convert the following code to support HDS cookie banner.
   window.chat_user_consent = {
     retrieveUserConsent: () => (Drupal.eu_cookie_compliance.hasAgreedWithCategory('chat')),
     confirmUserConsent: () => {

diff --git a/helfi_platform_config.module b/helfi_platform_config.module
@@ -193,6 +193,7 @@ function helfi_platform_config_page_attachments_alter(array &$attachments): void
  */
 function helfi_platform_config_theme() : array {
   return [
+    // @todo Deprecated. Remove when the EU cookie compliance module is removed.
     'cookie_consent_intro' => [
       'variables' => [
         'title' => NULL,

diff --git a/modules/hdbt_cookie_banner/assets/css/cookie-banner-admin-ui.css b/modules/hdbt_cookie_banner/assets/css/cookie-banner-admin-ui.css
@@ -71,3 +71,20 @@ textarea {
   width: 100%;
   height: 90dvh;
 }
+
+/* JSON Textarea error colors */
+textarea.error {
+  border-color: #d9534f !important;
+}
+
+.alert-heading {
+  margin: 0;
+}
+
+.je-object__container:has(:not([style*="display: none;"]) > p[style="color: red;"]) > .je-object__title {
+  color: red;
+}
+
+input:not(:disabled) ~ .save-notice {
+  display: none;
+}