Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix all TypeScript errors in frontend and e2e (#1438)

Dave Earleyb4c829baf8fa
diff --git a/e2e/api/api-client.ts b/e2e/api/api-client.ts
index 8b2b85df4..935d2f33b 100644
--- a/e2e/api/api-client.ts
+++ b/e2e/api/api-client.ts
@@ -199,7 +199,7 @@ export class ApiClient {
}
getLineup(eventId: number): Promise<{
- entries: { profile: { name: string; tagline: string | null; links: { type: string; url: string }[] } }[];
+ entries: { profile: { id: number; name: string; tagline: string | null; links: { type: string; url: string }[] } }[];
schedule_items: { starts_at: string }[];
}> {
return unwrap(this.request.get(`events/${eventId}/lineup`, { headers: jsonHeaders }));
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index c52fb2273..2d36500c2 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -3,7 +3,7 @@
"target": "ES2022",
"module": "ESNext",
"moduleResolution": "bundler",
- "lib": ["ES2022", "DOM"],
+ "lib": ["ES2022", "DOM", "DOM.Iterable"],
"types": ["node"],
"strict": true,
"noEmit": true,
@@ -13,6 +13,6 @@
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true
},
- "include": ["**/*.ts"],
+ "include": ["**/*.ts", "../frontend/src/vite-env.d.ts"],
"exclude": ["node_modules"]
}
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index da98ab102..29ffad046 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -25,12 +25,6 @@ import {getConfig} from "./utilites/config.ts";
import {CookieConsentBanner} from "./components/common/CookieConsentBanner";
import {isConsentBannerEnabled} from "./utilites/cookieConsent";
-declare global {
- interface Window {
- hievents: Record<string, string>;
- }
-}
-
export const App: FC<
PropsWithChildren<{
queryClient: QueryClient;
diff --git a/frontend/src/api/attendee.client.ts b/frontend/src/api/attendee.client.ts
index eaa50ef34..31bfdda14 100644
--- a/frontend/src/api/attendee.client.ts
+++ b/frontend/src/api/attendee.client.ts
@@ -1,5 +1,5 @@
import {api} from "./client";
-import {Attendee, GenericDataResponse, GenericPaginatedResponse, IdParam, QueryFilters, TaxAndFee} from "../types";
+import {Attendee, GenericDataResponse, GenericPaginatedResponse, IdParam, QueryFilters} from "../types";
import {queryParamsHelper} from "../utilites/queryParamsHelper.ts";
import {publicApi} from "./public-client.ts";
import {SupportedLocales} from "../locales.ts";
@@ -14,10 +14,16 @@ export interface EditAttendeeRequest {
status?: string;
}
+export interface CreateAttendeeTaxOrFee {
+ tax_or_fee_id?: number,
+ amount: number,
+ name: string,
+}
+
export interface CreateAttendeeRequest extends EditAttendeeRequest {
amount_paid: number,
send_confirmation_email: boolean,
- taxes_and_fees: TaxAndFee[],
+ taxes_and_fees: CreateAttendeeTaxOrFee[],
locale: SupportedLocales,
event_occurrence_id?: number | null,
override_capacity?: boolean,
diff --git a/frontend/src/components/common/ActionMenu/index.tsx b/frontend/src/components/common/ActionMenu/index.tsx
index 47515f260..096124f40 100644
--- a/frontend/src/components/common/ActionMenu/index.tsx
+++ b/frontend/src/components/common/ActionMenu/index.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import {Button, Group, Menu} from '@mantine/core';
+import {Button, Menu} from '@mantine/core';
import {IconDotsVertical} from '@tabler/icons-react';
import {useAccess} from "../../../hooks/useAccess.ts";
diff --git a/frontend/src/components/common/ChatwootWidget/index.tsx b/frontend/src/components/common/ChatwootWidget/index.tsx
index 2bcb31e8f..2509801b7 100644
--- a/frontend/src/components/common/ChatwootWidget/index.tsx
+++ b/frontend/src/components/common/ChatwootWidget/index.tsx
@@ -4,6 +4,22 @@ import { useGetMe } from "../../../queries/useGetMe.ts";
import { User } from "../../../types.ts";
import { getConfig } from "../../../utilites/config.ts";
+interface ChatwootSdk {
+ run: (options: { websiteToken: string; baseUrl: string }) => void;
+}
+
+interface ChatwootApi {
+ setUser: (identifier: string, user: { email: string; name: string; locale: string }) => void;
+ setCustomAttributes: (attributes: Record<string, string | number | boolean | undefined>) => void;
+}
+
+declare global {
+ interface Window {
+ chatwootSDK: ChatwootSdk;
+ $chatwoot?: ChatwootApi;
+ }
+}
+
const CHATWOOT_ROUTES = ["/manage", "/settings", "/welcome"];
const ChatwootWidget = () => {
diff --git a/frontend/src/components/common/OrganizerReportTable/index.tsx b/frontend/src/components/common/OrganizerReportTable/index.tsx
index 855daba58..ae6801025 100644
--- a/frontend/src/components/common/OrganizerReportTable/index.tsx
+++ b/frontend/src/components/common/OrganizerReportTable/index.tsx
@@ -1,6 +1,6 @@
import {Button, Group, Select, Skeleton, Table as MantineTable, Text} from '@mantine/core';
import {t} from '@lingui/macro';
-import {DatePickerInput} from "@mantine/dates";
+import {DatePickerInput, DatesRangeValue} from "@mantine/dates";
import {IconArrowDown, IconArrowsSort, IconArrowUp, IconCalendar, IconDownload} from "@tabler/icons-react";
import {useMemo, useState} from "react";
import {PageTitle} from "../PageTitle";
@@ -160,7 +160,7 @@ const OrganizerReportTable = <T extends Record<string, any>>({
onDateRangeChange?.(newRange);
};
- const handleDateRangeChange = (newRange: [Date | null, Date | null]) => {
+ const handleDateRangeChange = (newRange: DatesRangeValue<string>) => {
const [start, end] = newRange;
const tzStart = start ? dayjs(start).tz(tz) : null;
const tzEnd = end ? dayjs(end).tz(tz) : null;
diff --git a/frontend/src/components/common/ProductsTable/SortableCategory/index.tsx b/frontend/src/components/common/ProductsTable/SortableCategory/index.tsx
index c9b4a3548..4f2b03696 100644
--- a/frontend/src/components/common/ProductsTable/SortableCategory/index.tsx
+++ b/frontend/src/components/common/ProductsTable/SortableCategory/index.tsx
@@ -85,13 +85,12 @@ export const SortableCategory: React.FC<SortableCategoryProps> = ({
const [movedCategory] = newCategories.splice(currentIndex, 1);
newCategories.splice(targetIndex, 0, movedCategory);
- // Prepare the sorted categories data
const sortedCategories = newCategories.map(cat =>
({
- product_category_id: cat.id as number,
+ product_category_id: cat.id,
sorted_products: (cat.products || []).map((product, index) => ({
- id: product.id as number,
- sort_order: index
+ id: product.id,
+ order: index + 1
}))
}));
diff --git a/frontend/src/components/common/PromoCodeTable/index.tsx b/frontend/src/components/common/PromoCodeTable/index.tsx
index e5dcbb864..5f22e8f22 100644
--- a/frontend/src/components/common/PromoCodeTable/index.tsx
+++ b/frontend/src/components/common/PromoCodeTable/index.tsx
@@ -15,6 +15,7 @@ import {NoResultsSplash} from "../NoResultsSplash";
import {confirmationDialog} from "../../../utilites/confirmationDialog.tsx";
import {useDeletePromoCode} from "../../../mutations/useDeletePromoCode.ts";
import {eventHomepageUrl} from "../../../utilites/urlHelper.ts";
+import {getProductsFromEvent} from "../../../utilites/helpers.ts";
interface PromoCodeTableProps {
event: Event,
@@ -27,7 +28,7 @@ export const PromoCodeTable = ({event, promoCodes, openCreateModal}: PromoCodeTa
const [editModalOpen, {open: openEditModal, close: closeEditModal}] = useDisclosure(false);
const deleteMutation = useDeletePromoCode();
const clipboard = useClipboard({ timeout: 500 });
- const eventProducts = event.product_categories?.flatMap(category => category.products);
+ const eventProducts = getProductsFromEvent(event);
const handleEditModal = (promoCodeId: number | undefined) => {
setPromoCodeId(promoCodeId);
diff --git a/frontend/src/components/common/ReportTable/index.tsx b/frontend/src/components/common/ReportTable/index.tsx
index 05597af96..db5ff0a83 100644
--- a/frontend/src/components/common/ReportTable/index.tsx
+++ b/frontend/src/components/common/ReportTable/index.tsx
@@ -1,6 +1,6 @@
import {Button, Group, Select, Skeleton, Table as MantineTable} from '@mantine/core';
import {t} from '@lingui/macro';
-import {DatePickerInput} from "@mantine/dates";
+import {DatePickerInput, DatesRangeValue} from "@mantine/dates";
import {IconArrowDown, IconArrowsSort, IconArrowUp, IconCalendar} from "@tabler/icons-react";
import React, {useMemo, useState} from "react";
import {PageTitle} from "../PageTitle";
@@ -141,7 +141,7 @@ const ReportTable = <T extends Record<string, any>>({
onDateRangeChange?.(newRange);
};
- const handleDateRangeChange = (newRange: [Date | null, Date | null]) => {
+ const handleDateRangeChange = (newRange: DatesRangeValue<string>) => {
const [start, end] = newRange;
const tzStart = start ? dayjs(start).tz(event.timezone) : null;
const tzEnd = end ? dayjs(end).tz(event.timezone) : null;
diff --git a/frontend/src/components/modals/CreateCheckInListModal/index.tsx b/frontend/src/components/modals/CreateCheckInListModal/index.tsx
index 59336ed3c..1bdebbffa 100644
--- a/frontend/src/components/modals/CreateCheckInListModal/index.tsx
+++ b/frontend/src/components/modals/CreateCheckInListModal/index.tsx
@@ -1,4 +1,4 @@
-import {CheckInList, CheckInListRequest, EventType, GenericModalProps, Product, ProductCategory} from "../../../types.ts";
+import {CheckInList, CheckInListRequest, EventType, GenericModalProps, ProductCategory} from "../../../types.ts";
import {Modal, ModalFooter} from "../../common/Modal";
import {t} from "@lingui/macro";
import {CheckInListForm} from "../../forms/CheckInListForm";
@@ -12,6 +12,7 @@ import {NoResultsSplash} from "../../common/NoResultsSplash";
import {IconPlus} from "@tabler/icons-react";
import {CheckInListSuccessModal} from "../CheckInListSuccessModal";
import {useState} from "react";
+import {getProductsFromEvent} from "../../../utilites/helpers.ts";
interface CreateCheckInListModalProps extends GenericModalProps {
initialOccurrenceId?: number | null;
@@ -36,10 +37,7 @@ export const CreateCheckInListModal = ({onClose, initialOccurrenceId}: CreateChe
}
});
const createMutation = useCreateCheckInList();
- const eventHasTickets = event?.product_categories
- && event.product_categories.some(category => category.products.length > 0)
- && event.product_categories.filter(category =>
- category?.products?.filter((product: Product) => product.product_type === 'TICKET').length > 0).length > 0
+ const eventHasTickets = getProductsFromEvent(event)?.some(product => product.product_type === 'TICKET');
const handleSubmit = (requestData: CheckInListRequest) => {
createMutation.mutate({
diff --git a/frontend/src/components/modals/EditQuestionModal/index.tsx b/frontend/src/components/modals/EditQuestionModal/index.tsx
index bc05b4d88..52bde6428 100644
--- a/frontend/src/components/modals/EditQuestionModal/index.tsx
+++ b/frontend/src/components/modals/EditQuestionModal/index.tsx
@@ -1,5 +1,5 @@
import {Button, LoadingOverlay} from "@mantine/core";
-import {GenericModalProps, IdParam, Question, QuestionRequestData, QuestionType} from "../../../types.ts";
+import {GenericModalProps, IdParam, QuestionRequestData, QuestionType} from "../../../types.ts";
import {useForm} from "@mantine/form";
import {useMutation, useQueryClient} from "@tanstack/react-query";
import {notifications} from "@mantine/notifications";
@@ -59,7 +59,7 @@ export const EditQuestionModal = ({onClose, questionId}: EditQuestionModalProps)
, [questionQuery.isFetched]);
const mutation = useMutation({
- mutationFn: (questionData: Question) => questionClient.update(eventId, questionId, questionData),
+ mutationFn: (questionData: QuestionRequestData) => questionClient.update(eventId, questionId, questionData),
onSuccess: () => {
notifications.show({
@@ -94,7 +94,7 @@ export const EditQuestionModal = ({onClose, questionId}: EditQuestionModalProps)
onClose={onClose}
heading={t`Edit Question`}
>
- <form onSubmit={form.onSubmit((values) => mutation.mutate(values as any as Question))}>
+ <form onSubmit={form.onSubmit((values) => mutation.mutate(values))}>
<QuestionForm form={form} productCategories={productsCategories}/>
{!questionQuery.isFetched && <LoadingOverlay visible/>}
<ModalFooter>
diff --git a/frontend/src/components/modals/ShareModal/index.tsx b/frontend/src/components/modals/ShareModal/index.tsx
index 93445fd12..297a50ea0 100644
--- a/frontend/src/components/modals/ShareModal/index.tsx
+++ b/frontend/src/components/modals/ShareModal/index.tsx
@@ -175,7 +175,7 @@ export const ShareModal = ({
<div className={classes.tabsContent}>
<Tabs.Panel value="share" pt="lg">
<Stack>
- {navigator.share && (
+ {'share' in navigator && (
<Button
size="lg"
variant={'outline'}
diff --git a/frontend/src/components/routes/event/TicketDesigner/TicketDesignerPrint.tsx b/frontend/src/components/routes/event/TicketDesigner/TicketDesignerPrint.tsx
index fbd4add65..af6f3c43f 100644
--- a/frontend/src/components/routes/event/TicketDesigner/TicketDesignerPrint.tsx
+++ b/frontend/src/components/routes/event/TicketDesigner/TicketDesignerPrint.tsx
@@ -8,7 +8,7 @@ import {PoweredByFooter} from '../../../common/PoweredByFooter';
import {t} from '@lingui/macro';
import {useEffect} from "react";
import {resolveEventLocation} from "../../../../utilites/effectiveLocation.ts";
-import {LocationType} from "../../../../types.ts";
+import {Attendee, LocationType, Product, ProductPriceType, ProductType} from "../../../../types.ts";
import classes from '../../../routes/product-widget/PrintOrder/PrintOrder.module.scss';
const TicketDesignerPrint = () => {
@@ -33,23 +33,18 @@ const TicketDesignerPrint = () => {
return null;
}
- const mockProduct = {
+ const mockProduct: Product = {
id: 1,
title: t`General Admission`,
price: 2500,
- type: "TICKET" as const,
- sale_start_date: null,
- sale_end_date: null,
- max_per_order: null,
- min_per_order: null,
- quantity_available: null,
+ type: ProductPriceType.Paid,
+ product_type: ProductType.Ticket,
is_hidden: false,
- sort_order: 1,
description: "",
is_hidden_without_promo_code: false
};
- const mockAttendee = {
+ const mockAttendee: Attendee = {
id: 1,
public_id: "PREVIEW12345",
short_id: "P1234",
@@ -57,20 +52,11 @@ const TicketDesignerPrint = () => {
last_name: user.last_name || "Doe",
email: user.email || "[email protected]",
status: "ACTIVE" as const,
- checked_in_at: null,
- product_id: mockProduct.id,
+ product_id: 1,
product: mockProduct,
product_price_id: 1,
seat_label: event.has_seat_map ? t`Stalls · C-14` : null,
order_id: 1,
- order: {
- id: 1,
- short_id: "ORD123",
- public_id: "ORD123",
- created_at: new Date().toISOString(),
- total_gross: 2500,
- currency: event.currency || "USD",
- }
};
const fallbackLocationDetails = {
@@ -88,10 +74,7 @@ const TicketDesignerPrint = () => {
const eventWithDesignSettings = {
...event,
event_location: resolvedEventLocation,
- settings: {
- ...event.settings,
- ticket_design_settings: settings.ticket_design_settings,
- },
+ settings,
images: images || []
};
diff --git a/frontend/src/components/routes/event/TicketDesigner/TicketPreview.tsx b/frontend/src/components/routes/event/TicketDesigner/TicketPreview.tsx
index 9ee422007..ad28f5772 100644
--- a/frontend/src/components/routes/event/TicketDesigner/TicketPreview.tsx
+++ b/frontend/src/components/routes/event/TicketDesigner/TicketPreview.tsx
@@ -1,7 +1,8 @@
import {useGetEvent} from "../../../../queries/useGetEvent.ts";
import {useGetMe} from "../../../../queries/useGetMe.ts";
import {t} from "@lingui/macro";
-import {IdParam, LocationType} from "../../../../types.ts";
+import {Attendee, IdParam, LocationType, Product, ProductPriceType, ProductType} from "../../../../types.ts";
+import {useGetEventSettings} from "../../../../queries/useGetEventSettings.ts";
import {AttendeeTicket} from "../../../common/AttendeeTicket";
import {resolveEventLocation} from "../../../../utilites/effectiveLocation.ts";
import classes from './TicketPreview.module.scss';
@@ -22,11 +23,13 @@ interface TicketPreviewProps {
export const TicketPreview = ({settings, eventId, logo}: TicketPreviewProps) => {
const eventQuery = useGetEvent(eventId);
const meQuery = useGetMe();
+ const eventSettingsQuery = useGetEventSettings(eventId);
const event = eventQuery.data;
const user = meQuery.data;
+ const eventSettings = eventSettingsQuery.data;
- if (!event || !user) {
+ if (!event || !user || !eventSettings) {
return (
<div className={classes.loadingState}>
<p>{t`Loading preview...`}</p>
@@ -34,23 +37,18 @@ export const TicketPreview = ({settings, eventId, logo}: TicketPreviewProps) =>
);
}
- const mockProduct = {
+ const mockProduct: Product = {
id: 1,
title: t`General Admission`,
price: 2500,
- type: "TICKET" as const,
- sale_start_date: null,
- sale_end_date: null,
- max_per_order: null,
- min_per_order: null,
- quantity_available: null,
+ type: ProductPriceType.Paid,
+ product_type: ProductType.Ticket,
is_hidden: false,
- sort_order: 1,
description: "",
is_hidden_without_promo_code: false
};
- const mockAttendee = {
+ const mockAttendee: Attendee = {
id: 1,
public_id: "PREVIEW12345",
short_id: "P1234",
@@ -58,19 +56,11 @@ export const TicketPreview = ({settings, eventId, logo}: TicketPreviewProps) =>
last_name: user.last_name || "Doe",
email: user.email || "[email protected]",
status: "ACTIVE" as const,
- checked_in_at: null,
- product_id: mockProduct.id,
+ product_id: 1,
product: mockProduct,
product_price_id: 1,
seat_label: event.has_seat_map ? t`Stalls · C-14` : null,
order_id: 1,
- order: {
- id: 1,
- short_id: "ORD123",
- created_at: new Date().toISOString(),
- total_gross: 2500,
- currency: event.currency || "USD",
- }
};
const fallbackLocationDetails = {
@@ -89,7 +79,7 @@ export const TicketPreview = ({settings, eventId, logo}: TicketPreviewProps) =>
...event,
event_location: resolvedEventLocation,
settings: {
- ...event.settings,
+ ...eventSettings,
ticket_design_settings: {
accent_color: settings.accent_color,
logo_image_id: logo?.id,
@@ -104,8 +94,9 @@ export const TicketPreview = ({settings, eventId, logo}: TicketPreviewProps) =>
id: logo.id,
type: 'TICKET_LOGO' as const,
url: logo.url,
- size_bytes: 0,
- filename: ''
+ file_name: '',
+ size: 0,
+ mime_type: '',
}
] : (event.images || []).filter(img => img.type !== 'TICKET_LOGO')
};
diff --git a/frontend/src/components/routes/event/products.tsx b/frontend/src/components/routes/event/products.tsx
index 071d0fc23..35d8c548b 100644
--- a/frontend/src/components/routes/event/products.tsx
+++ b/frontend/src/components/routes/event/products.tsx
@@ -34,7 +34,7 @@ export const Products = () => {
const {eventId} = useParams();
const {data: event} = useGetEvent(eventId);
const [searchTerm, setSearchTerm] = useState('');
- const [selectedCategoryId, setSelectedCategoryId] = useState<IdParam>(null);
+ const [selectedCategoryId, setSelectedCategoryId] = useState<IdParam>();
const [isExporting, setIsExporting] = useState(false);
const productCategoriesQuery = useGetEventProductCategories(eventId);
diff --git a/frontend/src/components/routes/organizer/Reports/CheckInSummaryReport/index.tsx b/frontend/src/components/routes/organizer/Reports/CheckInSummaryReport/index.tsx
index 612c0c20d..65bc14f95 100644
--- a/frontend/src/components/routes/organizer/Reports/CheckInSummaryReport/index.tsx
+++ b/frontend/src/components/routes/organizer/Reports/CheckInSummaryReport/index.tsx
@@ -58,7 +58,6 @@ const CheckInSummaryReport = () => {
title={t`Check-in Summary`}
columns={columns}
isLoading={organizerQuery.isLoading}
- downloadFileName="check_in_summary_report.csv"
showDateFilter={false}
organizer={organizer}
showCurrencyFilter={false}
diff --git a/frontend/src/components/routes/organizer/Reports/EventsPerformanceReport/index.tsx b/frontend/src/components/routes/organizer/Reports/EventsPerformanceReport/index.tsx
index 4229ce47d..f8e7cfeca 100644
--- a/frontend/src/components/routes/organizer/Reports/EventsPerformanceReport/index.tsx
+++ b/frontend/src/components/routes/organizer/Reports/EventsPerformanceReport/index.tsx
@@ -120,7 +120,6 @@ const EventsPerformanceReport = () => {
title={t`Events Performance`}
columns={columns}
isLoading={organizerQuery.isLoading}
- downloadFileName="events_performance_report.csv"
showDateFilter={false}
organizer={organizer}
showCurrencyFilter={true}
diff --git a/frontend/src/components/routes/organizer/Reports/RevenueSummaryReport/index.tsx b/frontend/src/components/routes/organizer/Reports/RevenueSummaryReport/index.tsx
index f66285b82..623ee0f47 100644
--- a/frontend/src/components/routes/organizer/Reports/RevenueSummaryReport/index.tsx
+++ b/frontend/src/components/routes/organizer/Reports/RevenueSummaryReport/index.tsx
@@ -67,7 +67,6 @@ const RevenueSummaryReport = () => {
title={t`Revenue Summary`}
columns={columns}
isLoading={organizerQuery.isLoading}
- downloadFileName="revenue_summary_report.csv"
showDateFilter={true}
organizer={organizer}
showCurrencyFilter={true}
diff --git a/frontend/src/components/routes/organizer/Reports/TaxSummaryReport/index.tsx b/frontend/src/components/routes/organizer/Reports/TaxSummaryReport/index.tsx
index 6399ff0d1..8712597a0 100644
--- a/frontend/src/components/routes/organizer/Reports/TaxSummaryReport/index.tsx
+++ b/frontend/src/components/routes/organizer/Reports/TaxSummaryReport/index.tsx
@@ -62,7 +62,6 @@ const TaxSummaryReport = () => {
title={t`Tax Summary`}
columns={columns}
isLoading={organizerQuery.isLoading}
- downloadFileName="tax_summary_report.csv"
showDateFilter={true}
organizer={organizer}
showCurrencyFilter={true}
diff --git a/frontend/src/components/routes/organizer/Settings/Sections/EmailTemplateSettings/index.tsx b/frontend/src/components/routes/organizer/Settings/Sections/EmailTemplateSettings/index.tsx
index c1af0d38f..f6fdbeb55 100644
--- a/frontend/src/components/routes/organizer/Settings/Sections/EmailTemplateSettings/index.tsx
+++ b/frontend/src/components/routes/organizer/Settings/Sections/EmailTemplateSettings/index.tsx
@@ -6,7 +6,6 @@ import {usePreviewEmailTemplateForOrganizer} from '../../../../../../mutations/u
import {useDeleteEmailTemplateForOrganizer} from "../../../../../../mutations/useDeleteEmailTemplate.ts";
import {useUpdateEmailTemplateForOrganizer} from "../../../../../../mutations/useUpdateEmailTemplate.ts";
import {EmailTemplateSettingsBase} from '../../../../../common/EmailTemplateSettings';
-import {EmailTemplateType} from '../../../../../../types';
interface EmailTemplateSettingsProps {
organizerId: string | number;
@@ -27,8 +26,7 @@ const EmailTemplateSettings = ({organizerId}: EmailTemplateSettingsProps) => {
const templates = templatesData?.data || [];
- const handleCreateTemplate = (type: EmailTemplateType) => {
- // Enable fetching default templates if not already fetched
+ const handleCreateTemplate = () => {
if (!defaultTemplatesData) {
setShouldFetchDefaults(true);
}
diff --git a/frontend/src/entry.client.tsx b/frontend/src/entry.client.tsx
index 1e4fd097f..9b89886d0 100644
--- a/frontend/src/entry.client.tsx
+++ b/frontend/src/entry.client.tsx
@@ -31,7 +31,7 @@ async function initClientApp() {
if (matches && matches.length > 0) {
await Promise.all(
matches.map(async (m) => {
- const routeModule = await m.route.lazy?.();
+ const routeModule = typeof m.route.lazy === "function" ? await m.route.lazy() : undefined;
Object.assign(m.route, {...routeModule, lazy: undefined});
})
);
diff --git a/frontend/src/mutations/useEditQuestionAnswer.ts b/frontend/src/mutations/useEditQuestionAnswer.ts
index 3ac331ed4..8c05a4a66 100644
--- a/frontend/src/mutations/useEditQuestionAnswer.ts
+++ b/frontend/src/mutations/useEditQuestionAnswer.ts
@@ -10,8 +10,5 @@ export const useEditQuestionAnswer = () => {
answerId: IdParam,
answer: string | string[]
}) => questionClient.updateAnswerQuestion(eventId, questionId, answerId, answer),
- onSuccess: (_, variables) => {
- return;
- }
});
}
diff --git a/frontend/src/queries/useGetCheckInListAttendeePublic.ts b/frontend/src/queries/useGetCheckInListAttendeePublic.ts
deleted file mode 100644
index 17a35d3d0..000000000
--- a/frontend/src/queries/useGetCheckInListAttendeePublic.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {useQuery} from '@tanstack/react-query';
-import {Attendee, GenericPaginatedResponse, IdParam} from '../types';
-import {publicCheckInClient} from "../api/check-in.client";
-
-export const GET_CHECK_IN_LIST_ATTENDEE_PUBLIC_QUERY_KEY = 'getCheckInListAttendee';
-
-export const useGetCheckInListAttendee = (checkInListShortId: IdParam, attendeePublicId: IdParam) => {
- return useQuery<GenericPaginatedResponse<Attendee>>({
- queryKey: [GET_CHECK_IN_LIST_ATTENDEE_PUBLIC_QUERY_KEY, checkInListShortId, attendeePublicId],
- queryFn: async () => {
- return await publicCheckInClient.getCheckInListAttendee(checkInListShortId, attendeePublicId);
- },
- });
-};
diff --git a/frontend/src/stores/app.store.ts b/frontend/src/stores/app.store.ts
deleted file mode 100644
index 6330e6f24..000000000
--- a/frontend/src/stores/app.store.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {create} from 'zustand'
-import {GenericDataResponse, Order} from "../types.ts";
-
-interface AppStore {
- createOrderResponse: GenericDataResponse<Order> | null
-}
-
-export const useAppStore = create<AppStore>()(() => ({
- createOrderResponse: null,
-}))
\ No newline at end of file
diff --git a/frontend/src/utilites/config.ts b/frontend/src/utilites/config.ts
index ea011f07f..ef737e484 100644
--- a/frontend/src/utilites/config.ts
+++ b/frontend/src/utilites/config.ts
@@ -2,6 +2,11 @@ import { ConfigKeys } from "../types.ts";
import { isSsr } from "./helpers.ts";
import process from "process";
+declare global {
+ interface Window {
+ hievents: Record<string, string>;
+ }
+}
export const clientBuildEnv: { [K in ConfigKeys]: string } = {
'VITE_APP_PRIMARY_COLOR': import.meta.env.VITE_APP_PRIMARY_COLOR,
diff --git a/frontend/src/utilites/eventsPageFiltersHelper.ts b/frontend/src/utilites/eventsPageFiltersHelper.ts
index 805b22979..8b640956b 100644
--- a/frontend/src/utilites/eventsPageFiltersHelper.ts
+++ b/frontend/src/utilites/eventsPageFiltersHelper.ts
@@ -11,7 +11,7 @@ export const getEventQueryFiltersWithParams = (
eventsState?: string,
organizerId?: string
) => {
- let filter = {};
+ let filter: Partial<QueryFilters> = {};
if (eventsState === 'upcoming' || !eventsState) {
filter = {
additionalParams: {
@@ -35,7 +35,6 @@ export const getEventQueryFiltersWithParams = (
}
if (organizerId) {
- // add the organizer filter on top of the other filters
filter = {
...filter,
filterFields: {
diff --git a/frontend/src/utilites/queryParamsHelper.ts b/frontend/src/utilites/queryParamsHelper.ts
index 0e913cdb4..3ead0a93f 100644
--- a/frontend/src/utilites/queryParamsHelper.ts
+++ b/frontend/src/utilites/queryParamsHelper.ts
@@ -1,4 +1,4 @@
-import {QueryFilterCondition, QueryFilters, QueryFilterOperator} from "../types.ts";
+import {QueryFilterCondition, QueryFilters} from "../types.ts";
export const queryParamsHelper = {
PER_PAGE_PARAM: "per_page",