Merge pull request #1174 from City-of-Helsinki/UHF-11396

UHF-11396: Set error label level to 3 by default
City-of-Helsinki · Feb 5, 2025 · d5be6d7 · d5be6d7
2 parents 3128c16 + f80d6cb
commit d5be6d7
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 12 deletions.
diff --git a/dist/css/styles.min.css b/dist/css/styles.min.css
diff --git a/dist/js/district-and-project-search.min.js b/dist/js/district-and-project-search.min.js
diff --git a/dist/js/health-station-search.min.js b/dist/js/health-station-search.min.js
diff --git a/dist/js/job-search.min.js b/dist/js/job-search.min.js
diff --git a/dist/js/linkedevents.min.js b/dist/js/linkedevents.min.js
diff --git a/dist/js/maternity-and-child-health-clinic-search.min.js b/dist/js/maternity-and-child-health-clinic-search.min.js
diff --git a/dist/js/news-archive.min.js b/dist/js/news-archive.min.js
diff --git a/dist/js/ploughing-schedule.min.js b/dist/js/ploughing-schedule.min.js
diff --git a/dist/js/school-search.min.js b/dist/js/school-search.min.js
diff --git a/src/js/react/common/ResultsError.tsx b/src/js/react/common/ResultsError.tsx
@@ -5,9 +5,10 @@ import { ForwardedRef, forwardRef } from 'react';
 type ResultsErrorProps = {
   error: string|Error;
   className?: string;
+  headingLevel?: number;
 }
 
-const ResultsError = forwardRef(({ error, className }: ResultsErrorProps, ref: ForwardedRef<HTMLDivElement>) => {
+const ResultsError = forwardRef(({ error, className, headingLevel = 3 }: ResultsErrorProps, ref: ForwardedRef<HTMLDivElement>) => {
   console.warn(`Error loading data from Elastic: ${error}`);
 
   if (drupalSettings?.helfi_react_search?.sentry_dsn_react) {
@@ -19,6 +20,7 @@ const ResultsError = forwardRef(({ error, className }: ResultsErrorProps, ref: F
       <Notification
         label={Drupal.t('An error occured while loading the content', {}, { context: 'React search' })}
         type='error'
+        headingLevel={headingLevel}
       >
         {Drupal.t('Please reload the page or try again later.', {}, {context: 'React search'})}
       </Notification>

diff --git a/src/scss/06_components/pages/_cookie-compliance.scss b/src/scss/06_components/pages/_cookie-compliance.scss
@@ -82,7 +82,6 @@
 .helfi-charts-cookie-compliance {
   align-content: center;
   align-items: center;
-  background-color: $color-black-10;;
   display: flex;
   justify-content: center;
 
@@ -142,6 +141,17 @@
   }
 }
 
+// Cookie compliance elements that are on a gray background need to have
+// darker shade of gray.
+.embedded-content-cookie-compliance {
+  background-color: $color-black-10;
+}
+
+.react-and-share-cookie-compliance,
+.helfi-charts-cookie-compliance {
+  background-color: $color-black-5;
+}
+
 .layout-main-wrapper > .block--react-and-share:last-child .message {
   margin-bottom: 80px;
 }