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.

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

Jump to bottom

Develop #1123

Merged
merged 5 commits into from
May 23, 2024
Merged

Develop #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1a980d
fix: removed twice percent encoding.
May 14, 2024
3a57b82
Merge branch 'develop' of github.com:culturecreates/footlight-app int…
May 15, 2024
78a6e01
Merge pull request #1121 from culturecreates/bugfix/issue-1099
AbhishekPAnil May 20, 2024
b606d9c
Merge pull request #1110 from culturecreates/feature/issue-28
AbhishekPAnil May 23, 2024
dc8b021
fix: corrected the key for edit in orgs readonly
AbhishekPAnil May 23, 2024
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 src/locales/fr/transalationFr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
"email": "Courriel",
"memberOf": "Membre de",
"location": "Endroit",
"Edit": "Éditer",
"edit": "Éditer",
"socialMediaLinks": "Liens vers les réseaux sociaux"
},
"createNew": {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function OrganizationsReadOnly() {
<div className="button-container">
<OutlinedButton
data-cy="button-edit-organization"
label={t('dashboard.organization.readOnly.Edit')}
label={t('dashboard.organization.readOnly.edit')}
size="middle"
style={{ height: '40px', width: '60px' }}
onClick={() =>
Expand Down
30 changes: 14 additions & 16 deletions src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ const WidgetSettings = () => {
const { eventDetailsUrlTemplate = '', listEventsUrlTemplate = '' } = currentCalendarData?.widgetSettings || {};
const calendarSlug = currentCalendarData?.slug;
const calendarName = currentCalendarData?.name[user?.interfaceLanguage?.toLowerCase()];
const encodedCalendarLogoUri = encodeURIComponent(currentCalendarData?.image?.uri || '');
const encodedEventDetailsUrlTemplate = encodeURIComponent(eventDetailsUrlTemplate);
const encodedListEventsUrlTemplate = encodeURIComponent(listEventsUrlTemplate);
const calendarLogoUri = currentCalendarData?.image?.uri || '';

const [color, setColor] = useState('#607EFC');
const [locationOptions, setLocationOptions] = useState([]);
Expand Down Expand Up @@ -151,7 +149,7 @@ const WidgetSettings = () => {
arrayToQueryParam(allValues?.region ?? [], 'region') +
arrayToQueryParam([...(allValues?.person ?? []), ...(allValues?.organizer ?? [])], 'person-organization');

const searchEventsFilters = encodeURIComponent(filtersParam);
const searchEventsFilters = filtersParam;

const locale = onLanguageSelect(allValues?.language);
const urlCopy = new URL(widgetUrl);
Expand All @@ -163,9 +161,9 @@ const WidgetSettings = () => {
urlCopy.searchParams.append('limit', limit);
urlCopy.searchParams.append('calendar', calendarSlug);
urlCopy.searchParams.append('calendarName', calendarName);
urlCopy.searchParams.append('logo', encodedCalendarLogoUri);
urlCopy.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
urlCopy.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
urlCopy.searchParams.append('logo', calendarLogoUri);
urlCopy.searchParams.append('eventUrl', eventDetailsUrlTemplate);
urlCopy.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
urlCopy.searchParams.append('searchEventsFilters', searchEventsFilters);
urlCopy.searchParams.append('locale', locale?.key.toLowerCase());

Expand All @@ -177,9 +175,9 @@ const WidgetSettings = () => {
urlCopyMobile.searchParams.append('limit', limit);
urlCopyMobile.searchParams.append('calendar', calendarSlug);
urlCopyMobile.searchParams.append('calendarName', calendarName);
urlCopyMobile.searchParams.append('logo', encodedCalendarLogoUri);
urlCopyMobile.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
urlCopyMobile.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
urlCopyMobile.searchParams.append('logo', calendarLogoUri);
urlCopyMobile.searchParams.append('eventUrl', eventDetailsUrlTemplate);
urlCopyMobile.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
urlCopyMobile.searchParams.append('searchEventsFilters', searchEventsFilters);
urlCopyMobile.searchParams.append('locale', locale?.key.toLowerCase());
urlCopyMobile.searchParams.append('height', '600');
Expand Down Expand Up @@ -329,9 +327,9 @@ const WidgetSettings = () => {
const limit = form.getFieldValue('limit') ?? 9;
const locale = form.getFieldValue('locale') ?? languageOptions[0].value;

urlCopy.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
urlCopy.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
urlCopy.searchParams.append('logo', encodedCalendarLogoUri);
urlCopy.searchParams.append('eventUrl', eventDetailsUrlTemplate);
urlCopy.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
urlCopy.searchParams.append('logo', calendarLogoUri);
urlCopy.searchParams.append('locale', onLanguageSelect(locale)?.key.toLowerCase());
urlCopy.searchParams.append('limit', limit);
urlCopy.searchParams.append('color', color);
Expand All @@ -340,9 +338,9 @@ const WidgetSettings = () => {
urlCopy.searchParams.append('height', height);
setUrl(urlCopy);

urlCopyMobile.searchParams.append('eventUrl', encodedEventDetailsUrlTemplate);
urlCopyMobile.searchParams.append('searchEventsUrl', encodedListEventsUrlTemplate);
urlCopyMobile.searchParams.append('logo', encodedCalendarLogoUri);
urlCopyMobile.searchParams.append('eventUrl', eventDetailsUrlTemplate);
urlCopyMobile.searchParams.append('searchEventsUrl', listEventsUrlTemplate);
urlCopyMobile.searchParams.append('logo', calendarLogoUri);
urlCopyMobile.searchParams.append('locale', onLanguageSelect(locale)?.key.toLowerCase());
urlCopyMobile.searchParams.append('limit', limit);
urlCopyMobile.searchParams.append('color', color);
Expand Down
Loading