Skip to content

fix feedback email url #452

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
merged 1 commit into from
May 26, 2025
Merged

fix feedback email url #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 public/app.js
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 27 additions & 4 deletions src/components/Meeting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import { Link as RouterLink } from 'react-router-dom';

import {
formatDirectionsUrl,
formatFeedbackEmail,
formatIcs,
formatString as i18n,
formatUrl,
formatString as i18n,
useSettings,
} from '../helpers';
import {
Expand Down Expand Up @@ -47,6 +48,28 @@ export default function Meeting({
url: meeting.url ?? location.href,
};

let feedback_emails = settings.feedback_emails;
if (Array.isArray(meeting.feedback_emails)) {
feedback_emails = meeting.feedback_emails;
}
if ('string' === typeof meeting.feedback_emails) {
feedback_emails = (meeting.feedback_emails as string)
.split(',')
.map(e => e.trim())
.filter(e => e);
}

let feedback_url;
if (!meeting.feedback_url && feedback_emails.length) {
feedback_url = formatFeedbackEmail({
feedback_emails,
name: meeting.name,
edit_url: meeting.edit_url,
settings,
strings,
});
}

// format time string (duration? or appointment?)
const formatTime = (start?: DateTime, end?: DateTime) => {
if (!start) {
Expand Down Expand Up @@ -420,7 +443,7 @@ export default function Meeting({
{formatWeekdays(groupWeekdays, meeting.slug, state, setState)}
</div>
)}
{(meeting.updated || meeting.feedback_url || meeting.entity) && (
{(meeting.updated || feedback_url || meeting.entity) && (
<div>
{meeting.entity && (
<>
Expand Down Expand Up @@ -451,9 +474,9 @@ export default function Meeting({
</>
)}

{meeting.feedback_url && (
{feedback_url && (
<Button
href={meeting.feedback_url}
href={feedback_url}
icon="edit"
text={strings.feedback}
/>
Expand Down
24 changes: 1 addition & 23 deletions src/helpers/load-meeting-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import { DateTime, WeekdayNumbers } from 'luxon';
import { flattenAndSortIndexes } from './flatten-and-sort-indexes';
import { formatAddress } from './format-address';
import { formatConferenceProvider } from './format-conference-provider';
import { formatFeedbackEmail } from './format-feedback-email';
import { formatSlug } from './format-slug';
import { states } from './states';

import type { JSONData, JSONDataFlat, State, Meeting, Index } from '../types';
import type { Index, JSONData, JSONDataFlat, Meeting, State } from '../types';

// set up meeting data; this is only run once when the app loads
export function loadMeetingData(
Expand Down Expand Up @@ -428,27 +427,6 @@ export function loadMeetingData(
.join('\t')
.toLowerCase();

let feedback_emails = settings.feedback_emails;
if (Array.isArray(meeting.feedback_emails)) {
feedback_emails = meeting.feedback_emails;
}
if ('string' === typeof meeting.feedback_emails) {
feedback_emails = meeting.feedback_emails
.split(',')
.map(e => e.trim())
.filter(e => e);
}

if (!feedback_url && feedback_emails.length) {
feedback_url = formatFeedbackEmail({
feedback_emails,
name,
edit_url,
settings,
strings,
});
}

meetings[slug] = {
address,
approximate,
Expand Down