+ setIsRepeated(e.target.checked)}
+ />
+
+
+
+
+ setRepeatedEndDate(e.target.value)}
+ />
+
+ )}
+
+ {children}
+
+
+
+
);
};
diff --git a/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx b/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
index 2e9e1cb067..b8f1e162da 100644
--- a/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
+++ b/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
@@ -21,7 +21,7 @@ export default {
openingHoursEditorCategoriesConfig: {
name: "Opening hours categories",
defaultValue:
- '[{"title":"\\u00c5bent","color":"#B3DC6C"},{"title":"Telefontid","color":"#FBE983"}]',
+ '[{"title":"\\u00c5bent","color":"#B3DC6C"},{"title":"Telefontid","color":"#FBE983"},{"title":"Borgerservice","color":"lightblue"}]',
control: { type: "text" }
},
openingHoursBranchIdConfig: {
@@ -35,9 +35,9 @@ export default {
defaultValue: new Date("2024-03-25"),
control: { type: "date" }
},
- openingHoursEventFormTitleText: {
- name: "Opening hours event form title",
- defaultValue: "Title",
+ openingHoursEventFormCategoryText: {
+ name: "Opening hours event form category",
+ defaultValue: "Opening hour",
control: { type: "text" }
},
openingHoursEventFormStartTimeText: {
@@ -54,6 +54,47 @@ export default {
name: "Opening hours event form submit",
defaultValue: "Submit",
control: { type: "text" }
+ },
+ openingHoursEventFormRepeatedText: {
+ name: "Opening hours event form repeated",
+ defaultValue:
+ "Repeat opening hour weekly every @weekDayName from @startDate",
+ control: { type: "text" }
+ },
+ openingHoursEventFormEndDateText: {
+ name: "Opening hours event to end date",
+ defaultValue: "End date",
+ control: { type: "text" }
+ },
+ openingHoursEventFormStartDateText: {
+ name: "Opening hours event form start date",
+ defaultValue: "Start date",
+ control: { type: "text" }
+ },
+ openingHoursEventFormEveryWeekdayText: {
+ name: "Opening hours event form every weekday",
+ defaultValue: "Every",
+ control: { type: "text" }
+ },
+ openingHoursConfirmAddRepeatedText: {
+ name: "Opening hours confirm add repeated",
+ defaultValue: "Do you want to add this repeated opening hour?",
+ control: { type: "text" }
+ },
+ openingHoursConfirmAddRepeatedCancelText: {
+ name: "Opening hours confirm add repeated cancel",
+ defaultValue: "Cancel",
+ control: { type: "text" }
+ },
+ openingHoursConfirmAddRepeatedSubmitText: {
+ name: "Opening hours confirm add repeated submit",
+ defaultValue: "I'm sure",
+ control: { type: "text" }
+ },
+ openingHoursRepeatedIconAltText: {
+ name: "Opening hours repeated icon alt text",
+ defaultValue: "Repeated opening hour",
+ control: { type: "text" }
}
}
} as ComponentMeta
- {event.title}
);
};
diff --git a/src/apps/opening-hours-editor/helper.ts b/src/apps/opening-hours-editor/helper.ts
index 7637ee6dd0..5b1a0feb8c 100644
--- a/src/apps/opening-hours-editor/helper.ts
+++ b/src/apps/opening-hours-editor/helper.ts
@@ -1,7 +1,10 @@
import dayjs from "dayjs";
import { EventInput } from "@fullcalendar/core";
-import { EventImpl } from "@fullcalendar/core/internal";
-import { DplOpeningHoursListGET200Item } from "../../core/dpl-cms/model";
+import {
+ DplOpeningHoursListGET200Item,
+ DplOpeningHoursCreatePOSTBody,
+ DplOpeningHoursUpdatePATCHBody
+} from "../../core/dpl-cms/model";
const formatDateTimeString = (date: string, time: string): string => {
return `${date}T${time}:00`;
@@ -10,24 +13,50 @@ const formatDateTimeString = (date: string, time: string): string => {
export const formatCmsEventsToFullCalendar = (
data: DplOpeningHoursListGET200Item[]
): EventInput[] => {
- return data.map(({ category, date, start_time, end_time, id }) => {
- return {
- id: id.toString(),
- title: category.title,
- start: formatDateTimeString(date, start_time),
- end: formatDateTimeString(date, end_time),
- color: category.color
- };
- });
+ return data.map(
+ ({ category, date, start_time, end_time, id, repetition }) => {
+ return {
+ id: id.toString(),
+ title: category.title,
+ start: formatDateTimeString(date, start_time),
+ end: formatDateTimeString(date, end_time),
+ color: category.color,
+ repetition
+ };
+ }
+ );
};
-export const formatFullCalendarEventToCmsEvent = (
- event: EventInput | EventImpl
-): DplOpeningHoursListGET200Item => {
- const isEventInput = "color" in event; // Check if it's EventInput type
- const color = isEventInput ? event.color : event.backgroundColor;
+export const formatFullCalendarEventToCmsEventAdd = (
+ event: EventInput & Pick
- {extractTime(event.start)} - {extractTime(event.end)}
+ {event.title}
+
+ {isSeries && (
+
+ {extractTime(event.start)} - {extractTime(event.end)}
+
+ 
+
+ )}
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. */ + type: DplOpeningHoursCreatePOST200RepetitionType; + weekly_data?: DplOpeningHoursCreatePOST200RepetitionWeeklyData; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionType.ts new file mode 100644 index 0000000000..b12c33c0d1 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionType.ts @@ -0,0 +1,19 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +/** + * If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. + */ +export type DplOpeningHoursCreatePOST200RepetitionType = + typeof DplOpeningHoursCreatePOST200RepetitionType[keyof typeof DplOpeningHoursCreatePOST200RepetitionType]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursCreatePOST200RepetitionType = { + none: "none", + weekly: "weekly" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionWeeklyData.ts new file mode 100644 index 0000000000..b8e8fecb21 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200RepetitionWeeklyData.ts @@ -0,0 +1,12 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursCreatePOST200RepetitionWeeklyData = { + /** The end date of the repetition. If the end date is not on the same week day as the first instance then the preceding occurrence of the weekday will be the last instance.
This field must be provided if type is 'weekly' */ + end_date?: string; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBody.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBody.ts index 580c8c3fcc..d36e3d488a 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBody.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBody.ts @@ -6,6 +6,7 @@ * OpenAPI spec version: Versioning not supported */ import type { DplOpeningHoursCreatePOSTBodyCategory } from "./dplOpeningHoursCreatePOSTBodyCategory"; +import type { DplOpeningHoursCreatePOSTBodyRepetition } from "./dplOpeningHoursCreatePOSTBodyRepetition"; export type DplOpeningHoursCreatePOSTBody = { /** The id for the branch the instance belongs to */ @@ -17,6 +18,7 @@ export type DplOpeningHoursCreatePOSTBody = { end_time: string; /** An serial unique id of the opening hours instance. */ id?: number; + repetition: DplOpeningHoursCreatePOSTBodyRepetition; /** When the opening hours start. In format HH:MM */ start_time: string; }; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetition.ts new file mode 100644 index 0000000000..949de21ab4 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetition.ts @@ -0,0 +1,17 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ +import type { DplOpeningHoursCreatePOSTBodyRepetitionType } from "./dplOpeningHoursCreatePOSTBodyRepetitionType"; +import type { DplOpeningHoursCreatePOSTBodyRepetitionWeeklyData } from "./dplOpeningHoursCreatePOSTBodyRepetitionWeeklyData"; + +export type DplOpeningHoursCreatePOSTBodyRepetition = { + /** A serial unique id of the repetition. All instances with the same id belongs to the same repetition. */ + id?: number; + /** If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. */ + type: DplOpeningHoursCreatePOSTBodyRepetitionType; + weekly_data?: DplOpeningHoursCreatePOSTBodyRepetitionWeeklyData; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionType.ts new file mode 100644 index 0000000000..08cae5159e --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionType.ts @@ -0,0 +1,19 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +/** + * If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. + */ +export type DplOpeningHoursCreatePOSTBodyRepetitionType = + typeof DplOpeningHoursCreatePOSTBodyRepetitionType[keyof typeof DplOpeningHoursCreatePOSTBodyRepetitionType]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursCreatePOSTBodyRepetitionType = { + none: "none", + weekly: "weekly" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionWeeklyData.ts new file mode 100644 index 0000000000..5d1d6c4d90 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTBodyRepetitionWeeklyData.ts @@ -0,0 +1,12 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursCreatePOSTBodyRepetitionWeeklyData = { + /** The end date of the repetition. If the end date is not on the same week day as the first instance then the preceding occurrence of the weekday will be the last instance.
This field must be provided if type is 'weekly' */ + end_date?: string; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts index 0d5b5fb743..85b6347e54 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts @@ -6,6 +6,7 @@ * OpenAPI spec version: Versioning not supported */ import type { DplOpeningHoursListGET200ItemCategory } from "./dplOpeningHoursListGET200ItemCategory"; +import type { DplOpeningHoursListGET200ItemRepetition } from "./dplOpeningHoursListGET200ItemRepetition"; export type DplOpeningHoursListGET200Item = { /** The id for the branch the instance belongs to */ @@ -17,6 +18,7 @@ export type DplOpeningHoursListGET200Item = { end_time: string; /** An serial unique id of the opening hours instance. */ id: number; + repetition: DplOpeningHoursListGET200ItemRepetition; /** When the opening hours start. In format HH:MM */ start_time: string; }; diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts new file mode 100644 index 0000000000..97a493a47d --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts @@ -0,0 +1,17 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ +import type { DplOpeningHoursListGET200ItemRepetitionType } from "./dplOpeningHoursListGET200ItemRepetitionType"; +import type { DplOpeningHoursListGET200ItemRepetitionWeeklyData } from "./dplOpeningHoursListGET200ItemRepetitionWeeklyData"; + +export type DplOpeningHoursListGET200ItemRepetition = { + /** A serial unique id of the repetition. All instances with the same id belongs to the same repetition. */ + id: number; + /** If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. */ + type: DplOpeningHoursListGET200ItemRepetitionType; + weekly_data?: DplOpeningHoursListGET200ItemRepetitionWeeklyData; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts new file mode 100644 index 0000000000..d9860d1d5c --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts @@ -0,0 +1,19 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +/** + * If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. + */ +export type DplOpeningHoursListGET200ItemRepetitionType = + typeof DplOpeningHoursListGET200ItemRepetitionType[keyof typeof DplOpeningHoursListGET200ItemRepetitionType]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursListGET200ItemRepetitionType = { + none: "none", + weekly: "weekly" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts new file mode 100644 index 0000000000..8dc61957a4 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts @@ -0,0 +1,12 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursListGET200ItemRepetitionWeeklyData = { + /** The end date of the repetition. If the end date is not on the same week day as the first instance then the preceding occurrence of the weekday will be the last instance.
This field must be provided if type is 'weekly' */ + end_date?: string; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200.ts index 3a14536dcb..4f5d1211fd 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200.ts @@ -6,6 +6,7 @@ * OpenAPI spec version: Versioning not supported */ import type { DplOpeningHoursUpdatePATCH200Category } from "./dplOpeningHoursUpdatePATCH200Category"; +import type { DplOpeningHoursUpdatePATCH200Repetition } from "./dplOpeningHoursUpdatePATCH200Repetition"; export type DplOpeningHoursUpdatePATCH200 = { /** The id for the branch the instance belongs to */ @@ -17,6 +18,7 @@ export type DplOpeningHoursUpdatePATCH200 = { end_time: string; /** An serial unique id of the opening hours instance. */ id: number; + repetition: DplOpeningHoursUpdatePATCH200Repetition; /** When the opening hours start. In format HH:MM */ start_time: string; }; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Repetition.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Repetition.ts new file mode 100644 index 0000000000..59b8f191b0 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Repetition.ts @@ -0,0 +1,17 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ +import type { DplOpeningHoursUpdatePATCH200RepetitionType } from "./dplOpeningHoursUpdatePATCH200RepetitionType"; +import type { DplOpeningHoursUpdatePATCH200RepetitionWeeklyData } from "./dplOpeningHoursUpdatePATCH200RepetitionWeeklyData"; + +export type DplOpeningHoursUpdatePATCH200Repetition = { + /** A serial unique id of the repetition. All instances with the same id belongs to the same repetition. */ + id: number; + /** If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. */ + type: DplOpeningHoursUpdatePATCH200RepetitionType; + weekly_data?: DplOpeningHoursUpdatePATCH200RepetitionWeeklyData; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionType.ts new file mode 100644 index 0000000000..e8635cdeb2 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionType.ts @@ -0,0 +1,19 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +/** + * If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. + */ +export type DplOpeningHoursUpdatePATCH200RepetitionType = + typeof DplOpeningHoursUpdatePATCH200RepetitionType[keyof typeof DplOpeningHoursUpdatePATCH200RepetitionType]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursUpdatePATCH200RepetitionType = { + none: "none", + weekly: "weekly" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionWeeklyData.ts new file mode 100644 index 0000000000..7caa2bad9e --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200RepetitionWeeklyData.ts @@ -0,0 +1,12 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursUpdatePATCH200RepetitionWeeklyData = { + /** The end date of the repetition. If the end date is not on the same week day as the first instance then the preceding occurrence of the weekday will be the last instance.
This field must be provided if type is 'weekly' */ + end_date?: string; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBody.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBody.ts index 340f793ea4..ce952cf638 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBody.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBody.ts @@ -6,6 +6,7 @@ * OpenAPI spec version: Versioning not supported */ import type { DplOpeningHoursUpdatePATCHBodyCategory } from "./dplOpeningHoursUpdatePATCHBodyCategory"; +import type { DplOpeningHoursUpdatePATCHBodyRepetition } from "./dplOpeningHoursUpdatePATCHBodyRepetition"; export type DplOpeningHoursUpdatePATCHBody = { /** The id for the branch the instance belongs to */ @@ -17,6 +18,7 @@ export type DplOpeningHoursUpdatePATCHBody = { end_time: string; /** An serial unique id of the opening hours instance. */ id: number; + repetition: DplOpeningHoursUpdatePATCHBodyRepetition; /** When the opening hours start. In format HH:MM */ start_time: string; }; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetition.ts new file mode 100644 index 0000000000..48b621fd65 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetition.ts @@ -0,0 +1,17 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ +import type { DplOpeningHoursUpdatePATCHBodyRepetitionType } from "./dplOpeningHoursUpdatePATCHBodyRepetitionType"; +import type { DplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData } from "./dplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData"; + +export type DplOpeningHoursUpdatePATCHBodyRepetition = { + /** A serial unique id of the repetition. All instances with the same id belongs to the same repetition. */ + id: number; + /** If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. */ + type: DplOpeningHoursUpdatePATCHBodyRepetitionType; + weekly_data?: DplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionType.ts new file mode 100644 index 0000000000..65beeb7e2b --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionType.ts @@ -0,0 +1,19 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +/** + * If/how the instance should be repeated in the future:
- single: The instance should not be repeated
- weekly: The instance should be repeated weekly from the first day of the repetition until the provided end date. The week day of the first instance defines which weekday should be used for the repeated instances. + */ +export type DplOpeningHoursUpdatePATCHBodyRepetitionType = + typeof DplOpeningHoursUpdatePATCHBodyRepetitionType[keyof typeof DplOpeningHoursUpdatePATCHBodyRepetitionType]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursUpdatePATCHBodyRepetitionType = { + none: "none", + weekly: "weekly" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData.ts new file mode 100644 index 0000000000..687dbecafb --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData.ts @@ -0,0 +1,12 @@ +/** + * Generated by orval v6.26.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData = { + /** The end date of the repetition. If the end date is not on the same week day as the first instance then the preceding occurrence of the weekday will be the last instance.
This field must be provided if type is 'weekly' */ + end_date?: string; +}; diff --git a/src/core/dpl-cms/model/eventsGET200Item.ts b/src/core/dpl-cms/model/eventsGET200Item.ts index ad66a897b1..e1d861fd79 100644 --- a/src/core/dpl-cms/model/eventsGET200Item.ts +++ b/src/core/dpl-cms/model/eventsGET200Item.ts @@ -30,6 +30,8 @@ export type EventsGET200Item = { series?: EventsGET200ItemSeries; /** The state of the event. */ state: EventsGET200ItemState; + /** Total number of tickets which can be sold for the event. */ + ticket_capacity?: number; /** Ticket categories used for the event. Not present for events without ticketing. */ ticket_categories?: EventsGET200ItemTicketCategoriesItem[]; /** The event title. */ diff --git a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts index a96ff5559c..70faee9881 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts @@ -5,12 +5,9 @@ * The REST API provide by the core REST module. * OpenAPI spec version: Versioning not supported */ -import type { EventsGET200ItemTicketCategoriesItemCount } from "./eventsGET200ItemTicketCategoriesItemCount"; import type { EventsGET200ItemTicketCategoriesItemPrice } from "./eventsGET200ItemTicketCategoriesItemPrice"; export type EventsGET200ItemTicketCategoriesItem = { - /** Number of tickets for the event. */ - count?: EventsGET200ItemTicketCategoriesItemCount; /** The price of a ticket in the category */ price: EventsGET200ItemTicketCategoriesItemPrice; /** The name of the ticket category. */ diff --git a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemCount.ts b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemCount.ts deleted file mode 100644 index b4adfe3f3e..0000000000 --- a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemCount.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Generated by orval v6.26.0 🍺 - * Do not edit manually. - * DPL CMS - REST API - * The REST API provide by the core REST module. - * OpenAPI spec version: Versioning not supported - */ - -/** - * Number of tickets for the event. - */ -export type EventsGET200ItemTicketCategoriesItemCount = { - /** Total number of tickets for the event. */ - total?: number; -}; diff --git a/src/core/dpl-cms/model/index.ts b/src/core/dpl-cms/model/index.ts index 9058f7e694..6dba853f46 100644 --- a/src/core/dpl-cms/model/index.ts +++ b/src/core/dpl-cms/model/index.ts @@ -15,20 +15,35 @@ export * from "./campaignMatchPOSTFormat"; export * from "./campaignMatchPOSTParams"; export * from "./dplOpeningHoursCreatePOST200"; export * from "./dplOpeningHoursCreatePOST200Category"; +export * from "./dplOpeningHoursCreatePOST200Repetition"; +export * from "./dplOpeningHoursCreatePOST200RepetitionType"; +export * from "./dplOpeningHoursCreatePOST200RepetitionWeeklyData"; export * from "./dplOpeningHoursCreatePOSTBody"; export * from "./dplOpeningHoursCreatePOSTBodyCategory"; +export * from "./dplOpeningHoursCreatePOSTBodyRepetition"; +export * from "./dplOpeningHoursCreatePOSTBodyRepetitionType"; +export * from "./dplOpeningHoursCreatePOSTBodyRepetitionWeeklyData"; export * from "./dplOpeningHoursCreatePOSTFormat"; export * from "./dplOpeningHoursCreatePOSTParams"; export * from "./dplOpeningHoursDeleteDELETEFormat"; export * from "./dplOpeningHoursDeleteDELETEParams"; export * from "./dplOpeningHoursListGET200Item"; export * from "./dplOpeningHoursListGET200ItemCategory"; +export * from "./dplOpeningHoursListGET200ItemRepetition"; +export * from "./dplOpeningHoursListGET200ItemRepetitionType"; +export * from "./dplOpeningHoursListGET200ItemRepetitionWeeklyData"; export * from "./dplOpeningHoursListGETFormat"; export * from "./dplOpeningHoursListGETParams"; export * from "./dplOpeningHoursUpdatePATCH200"; export * from "./dplOpeningHoursUpdatePATCH200Category"; +export * from "./dplOpeningHoursUpdatePATCH200Repetition"; +export * from "./dplOpeningHoursUpdatePATCH200RepetitionType"; +export * from "./dplOpeningHoursUpdatePATCH200RepetitionWeeklyData"; export * from "./dplOpeningHoursUpdatePATCHBody"; export * from "./dplOpeningHoursUpdatePATCHBodyCategory"; +export * from "./dplOpeningHoursUpdatePATCHBodyRepetition"; +export * from "./dplOpeningHoursUpdatePATCHBodyRepetitionType"; +export * from "./dplOpeningHoursUpdatePATCHBodyRepetitionWeeklyData"; export * from "./dplOpeningHoursUpdatePATCHFormat"; export * from "./dplOpeningHoursUpdatePATCHParams"; export * from "./eventPATCHBody"; @@ -44,7 +59,6 @@ export * from "./eventsGET200ItemImage"; export * from "./eventsGET200ItemSeries"; export * from "./eventsGET200ItemState"; export * from "./eventsGET200ItemTicketCategoriesItem"; -export * from "./eventsGET200ItemTicketCategoriesItemCount"; export * from "./eventsGET200ItemTicketCategoriesItemPrice"; export * from "./eventsGETFormat"; export * from "./eventsGETParams"; diff --git a/yarn.lock b/yarn.lock index a5ee285ad9..dd3704e4d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1533,10 +1533,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@danskernesdigitalebibliotek/dpl-design-system@2024.17.0-273114be2012777935c25d074706ed6187a64e74": - version "2024.17.0-273114be2012777935c25d074706ed6187a64e74" - resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2024.17.0-273114be2012777935c25d074706ed6187a64e74/68113fd26d9aec5dfdc4196ec86a8a385d9c6eff#68113fd26d9aec5dfdc4196ec86a8a385d9c6eff" - integrity sha512-gaE+WsmZCiqmwPdspqpi8RjkiUJ4WUmzvNHp7t82Q9sm5i3UfIVLNmfixuR/JYe09yngl0mC9HYZR4z0v1xZ9A== +"@danskernesdigitalebibliotek/dpl-design-system@2024.18.0-d02b9076284ebf6320a0c838eccdc62087aa2ff5": + version "2024.18.0-d02b9076284ebf6320a0c838eccdc62087aa2ff5" + resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2024.18.0-d02b9076284ebf6320a0c838eccdc62087aa2ff5/f1d5da5b17e3ac3e7763c72b9a7a88d79ba31442#f1d5da5b17e3ac3e7763c72b9a7a88d79ba31442" + integrity sha512-ve+ANGj9pphqRcFDxYanAA+2mv9y91PsvzhlOlvNXjULgwp9wHIz/lvt/Frz5i6zvE47NbX9LmbkQIy/OmzJ7A== "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3": version "0.5.7"