Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UHF-11396: Set error label level to 3 by default #1174

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/css/styles.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/district-and-project-search.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/health-station-search.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/job-search.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/linkedevents.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/maternity-and-child-health-clinic-search.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/news-archive.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/ploughing-schedule.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/school-search.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/js/react/common/ResultsError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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>
Expand Down
12 changes: 11 additions & 1 deletion src/scss/06_components/pages/_cookie-compliance.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
.helfi-charts-cookie-compliance {
align-content: center;
align-items: center;
background-color: $color-black-10;;
display: flex;
justify-content: center;

Expand Down Expand Up @@ -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;
}
Expand Down
Loading