Skip to content

UHF-12620: Fix generating course url #1498

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.

Sign up for GitHub

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

Merged
jeremysteerio merged 3 commits into from
Feb 23, 2026
Merged

UHF-12620: Fix generating course url #1498

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf737d9
UHF-12620: Fix generating course url
jeremysteerio Feb 20, 2026
da2a0b2
UHF-12620: Merge remote-tracking branch 'origin/main' into UHF-12620
jeremysteerio Feb 20, 2026
b76a3d8
UHF-12620: Merge remote-tracking branch 'origin/main' into UHF-12620
jeremysteerio Feb 23, 2026
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
2 changes: 1 addition & 1 deletion dist/js/linkedevents.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/react/apps/linkedevents/modules/cross-institution-studies/components/ResultCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const ResultCard = (props: ResultCardProps) => {
const { currentLanguage } = drupalSettings.path;

const getUrl = () => {
const resolvedLanguage = name?.[currentLanguage] ? currentLanguage : 'fi';
const resolvedLanguage: 'fi' | 'sv' | 'en' = name?.[currentLanguage] ? currentLanguage : 'fi';

let courseParam = '';
switch (resolvedLanguage) {
Expand All @@ -24,7 +24,7 @@ export const ResultCard = (props: ResultCardProps) => {
courseParam = 'cross-institutional-studies';
}

return `${drupalSettings.helfi_events.baseUrl}/${resolvedLanguage}/${courseParam}/${id}`;
return `${drupalSettings.helfi_events.baseUrls[resolvedLanguage]}/${courseParam}/${id}`;
};

const getTheme = () => {
Expand Down
3 changes: 3 additions & 0 deletions src/js/types/drupalSettings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ declare namespace drupalSettings {
const path: { currentLanguage: 'fi' | 'en' | 'sv' };
const helfi_events: {
baseUrl: string;
baseUrls: {
[key in 'fi' | 'en' | 'sv']: string;
};
imagePlaceholder: string;
data: {
[key: string]: {
Expand Down