From 897120d3da3c4bdaeab95586837afb2b85d16337 Mon Sep 17 00:00:00 2001
From: Mira Weller <weller@rami.io>
Date: Tue, 12 May 2026 13:04:08 +0200
Subject: [PATCH] add ts model definitions

---
 .../js/ui/questionnaires/App.vue              | 29 ++++-----
 .../{Question.vue => QuestionElement.vue}     |  0
 ...tionnaire.vue => QuestionnaireElement.vue} |  4 +-
 .../pretixcontrol/js/ui/questionnaires/api.ts | 22 +++++--
 .../js/ui/questionnaires/model.ts             | 64 +++++++++++++++++++
 5 files changed, 98 insertions(+), 21 deletions(-)
 rename src/pretix/static/pretixcontrol/js/ui/questionnaires/{Question.vue => QuestionElement.vue} (100%)
 rename src/pretix/static/pretixcontrol/js/ui/questionnaires/{Questionnaire.vue => QuestionnaireElement.vue} (98%)
 create mode 100644 src/pretix/static/pretixcontrol/js/ui/questionnaires/model.ts

diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue b/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
index 1b61f55fa7..f70a60d350 100644
--- a/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/App.vue
@@ -1,29 +1,28 @@
-<script>
-import Questionnaire from './Questionnaire.vue';
+<script lang="ts">
+import QuestionnaireElement from './QuestionnaireElement.vue';
 import {create_questionnaire, get_datafields, get_items, get_questionnaires, update_questionnaire} from './api';
+import { Questionnaire } from './model';
 import { i18n_any, QUESTION_TYPE } from './helper';
-import { ref } from 'vue';
+import {Ref, ref} from 'vue';
 import { SlickList, SlickItem } from 'vue-slicksort';
 
-const datafields_response = await get_datafields();
-const questionnaires_response = await get_questionnaires();
-const items_response = await get_items();
+const items_list = await get_items();
 
-const questionnaires = ref(questionnaires_response.results);
-const datafields = ref(datafields_response.results);
+const questionnaires: Ref<(Omit<Questionnaire, 'id'> & { _new_id?: number, id?: number })[]> = ref(await get_questionnaires());
+const datafields = ref(await get_datafields());
 
 export default {
   components: {
-    Questionnaire, SlickList, SlickItem
+    QuestionnaireElement, SlickList, SlickItem,
   },
   methods: {
     i18n_any,
     addQuestionnaire() {
       questionnaires.value.push({
-        items: [], internal_name: "Unnamed questionnaire",
-        type: 'PS',
-				_new_id: Date.now(),
-      });
+	      all_sales_channels: false, children: [], limit_sales_channels: [], position: 0,
+				items: [], internal_name: "Unnamed questionnaire",
+				_new_id: Date.now()
+			});
     },
 		saveData() {
 			console.log(JSON.parse(JSON.stringify(questionnaires.value)));
@@ -40,7 +39,7 @@ export default {
     return {
       questionnaires,
       datafields,
-      items: items_response.results,
+      items: items_list,
       selected_product: ref(""),
     }
   }
@@ -72,7 +71,7 @@ export default {
 	<div class="question-editor">
 		<SlickList axis="y" v-model:list="questionnaires" useDragHandle appendTo="#questionnaireListParent" id="questionnaireListParent">
 			<SlickItem v-for="(questionnaire, index) in questionnaires" :key="questionnaire.id || questionnaire._new_id" :index="index">
-        <Questionnaire
+        <QuestionnaireElement
           :questionnaire="questionnaire"
           :datafields="datafields"
           :items="items"
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/Question.vue b/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionElement.vue
similarity index 100%
rename from src/pretix/static/pretixcontrol/js/ui/questionnaires/Question.vue
rename to src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionElement.vue
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/Questionnaire.vue b/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
similarity index 98%
rename from src/pretix/static/pretixcontrol/js/ui/questionnaires/Questionnaire.vue
rename to src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
index 1360e8f7c6..33d85bca75 100644
--- a/src/pretix/static/pretixcontrol/js/ui/questionnaires/Questionnaire.vue
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/QuestionnaireElement.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import {useId, ref, computed} from 'vue'
-import Question from "./Question.vue";
+import QuestionElement from "./QuestionElement.vue";
 import {i18n_any, QUESTION_TYPE, QUESTION_TYPE_LABEL} from "./helper";
 import I18nTextField from "./I18nTextField.vue";
 import NativeDialog from "./NativeDialog.vue";
@@ -79,7 +79,7 @@ const isEditable = computed(() => props.selected_product && props.questionnaire.
       <div class="form-horizontal" :id="`questionListParent${props.questionnaire.id}`">
 				<SlickList axis="y" v-model:list="props.questionnaire.children" useDragHandle :appendTo="`#questionListParent${props.questionnaire.id}`">
 					<SlickItem v-for="(child, index) in props.questionnaire.children" :key="child.id" :index="index">
-						<Question
+						<QuestionElement
 										:datafields="props.datafields"
 										:question="child"
 										:editable="true"
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/api.ts b/src/pretix/static/pretixcontrol/js/ui/questionnaires/api.ts
index 9ccddb1c71..7ed8fb35e4 100644
--- a/src/pretix/static/pretixcontrol/js/ui/questionnaires/api.ts
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/api.ts
@@ -1,3 +1,5 @@
+import {ApiListResponse, Datafield, Questionnaire, Item} from "./model";
+
 const organizer_slug = document.body.getAttribute('data-organizer'),
 	event_slug = document.body.getAttribute('data-event');
 
@@ -5,23 +7,35 @@ async function api_get(resource) {
 	return await $.getJSON(`/api/v1/${resource}?_nocache=${+new Date()}`);
 }
 
+async function api_get_all<T>(resource): Promise<T[]> {
+	let next = `/api/v1/${resource}?_nocache=${+new Date()}`;
+	const result: T[] = [];
+	while (next) {
+		const response: ApiListResponse<T> = await $.getJSON(next);
+		result.push(...response.results);
+		next = response.next;
+		console.log('api_get_all: '+ resource, next, response, result)
+	}
+	return result;
+}
+
 async function api_json_request(resource, method, json_body) {
 	return await (await fetch(`/api/v1/${resource}`, {
 		body: JSON.stringify(json_body),
 		method: method,
 		headers: {
 				"Content-Type": "application/json",
-				"X-CSRFToken": $('[name=csrfmiddlewaretoken]').val(),
+				"X-CSRFToken": $('[name=csrfmiddlewaretoken]').val() as string,
 		},
 	})).json();
 }
 
 export async function get_datafields() {
-	return await api_get(`organizers/${organizer_slug}/events/${event_slug}/datafields/`);
+	return await api_get_all<Datafield>(`organizers/${organizer_slug}/events/${event_slug}/datafields/`);
 }
 
 export async function get_questionnaires() {
-	return await api_get(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/`);
+	return await api_get_all<Questionnaire>(`organizers/${organizer_slug}/events/${event_slug}/questionnaires/`);
 }
 
 export async function update_questionnaire(id, data) {
@@ -33,7 +47,7 @@ export async function create_questionnaire(data) {
 }
 
 export async function get_items() {
-	return await api_get(`organizers/${organizer_slug}/events/${event_slug}/items/`);
+	return await api_get_all<Item>(`organizers/${organizer_slug}/events/${event_slug}/items/`);
 }
 
 function get_json_script_value(id) {
diff --git a/src/pretix/static/pretixcontrol/js/ui/questionnaires/model.ts b/src/pretix/static/pretixcontrol/js/ui/questionnaires/model.ts
new file mode 100644
index 0000000000..f88296e82e
--- /dev/null
+++ b/src/pretix/static/pretixcontrol/js/ui/questionnaires/model.ts
@@ -0,0 +1,64 @@
+
+export type ApiListResponse<T> = {
+	count: number,
+	next: string | null,
+	previous: string | null,
+	results: T[],
+};
+
+// from webcheckin/i18n.ts
+export type I18nString = string | Record<string, string> | null | undefined;
+
+export type Datafield = {
+	id: number,
+	// question: I18nString,
+	type: string,
+	required: boolean,
+	//items: number[],
+	options: any[],
+	// position: number,
+	ask_during_checkin: boolean,
+	show_during_checkin: boolean,
+	identifier: string,
+	// dependency_question: string | null,
+	// dependency_values	[]
+	hidden: boolean,
+	// dependency_value	null
+	print_on_invoice: boolean,
+	// help_text: I18nString,
+	valid_number_min: null | number,
+	valid_number_max: null | number,
+	valid_date_min: null | string,
+	valid_date_max: null | string,
+	valid_datetime_min: null | string,
+	valid_datetime_max: null | string,
+	valid_string_length_max: null | number,
+	valid_file_portrait: boolean,
+	internal_name: string,
+};
+
+export type Questionnaire = {
+	id: number,
+	internal_name: string,
+	items: number[],
+	position: number,
+	all_sales_channels: boolean,
+	limit_sales_channels: string[],
+	children: QuestionnaireChild[],
+};
+
+export type QuestionnaireChild = {
+	question: string | number,
+	required: boolean,
+	label: I18nString,
+	help_text: I18nString,
+	dependency_question: number | null,
+	dependency_values: null | string[],
+};
+
+export type Item = {
+	id: number,
+	category: number,
+	name: I18nString,
+	internal_name: string | null,
+};