admin: Change everything to use the latest generated API style

Instanssi · Apr 18, 2024 · 156260c · 156260c
1 parent 21dadca
commit 156260c
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 56 deletions.
diff --git a/admin/src/components/BlogPostDialog.vue b/admin/src/components/BlogPostDialog.vue
@@ -81,10 +81,12 @@ const submit = handleSubmit(async (values) => {
 async function createItem(values: GenericObject) {
     try {
         await api.blogEntries.blogEntriesCreate({
-            event: eventId.value,
-            title: values.title,
-            text: values.text,
-            public: values.isPublic,
+            requestBody: {
+                event: eventId.value,
+                title: values.title,
+                text: values.text,
+                public: values.isPublic,
+            },
         });
         toast.success(t("BlogPostDialog.createSuccess"));
         return true;
@@ -97,10 +99,13 @@ async function createItem(values: GenericObject) {
 
 async function editItem(itemId: number, values: GenericObject) {
     try {
-        await api.blogEntries.blogEntriesPartialUpdate(itemId, {
-            title: values.title,
-            text: values.text,
-            public: values.isPublic,
+        await api.blogEntries.blogEntriesPartialUpdate({
+            id: itemId,
+            requestBody: {
+                title: values.title,
+                text: values.text,
+                public: values.isPublic,
+            },
         });
         toast.success(t("BlogPostDialog.editSuccess"));
         return true;

diff --git a/admin/src/components/EventDialog.vue b/admin/src/components/EventDialog.vue
@@ -98,11 +98,13 @@ const submit = handleSubmit(async (values) => {
 async function createItem(values: GenericObject) {
     try {
         await api.events.eventsCreate({
-            name: values.name,
-            date: values.date,
-            archived: values.archived,
-            tag: values.tag,
-            mainurl: values.mainUrl,
+            requestBody: {
+                name: values.name,
+                date: values.date,
+                archived: values.archived,
+                tag: values.tag,
+                mainurl: values.mainUrl,
+            },
         });
         toast.success(t("EventDialog.createSuccess"));
         return true;
@@ -115,12 +117,15 @@ async function createItem(values: GenericObject) {
 
 async function editItem(itemId: number, values: GenericObject) {
     try {
-        await api.events.eventsPartialUpdate(itemId, {
-            name: values.name,
-            date: values.date,
-            archived: values.archived,
-            tag: values.tag,
-            mainurl: values.mainUrl,
+        await api.events.eventsPartialUpdate({
+            id: itemId,
+            requestBody: {
+                name: values.name,
+                date: values.date,
+                archived: values.archived,
+                tag: values.tag,
+                mainurl: values.mainUrl,
+            },
         });
         toast.success(t("EventDialog.editSuccess"));
         return true;

diff --git a/admin/src/components/UserDialog.vue b/admin/src/components/UserDialog.vue
@@ -92,10 +92,12 @@ const submit = handleSubmit(async (values) => {
 async function createItem(values: GenericObject) {
     try {
         await api.users.usersCreate({
-            first_name: values.first_name,
-            last_name: values.last_name,
-            email: values.email,
-            username: values.username,
+            requestBody: {
+                first_name: values.first_name,
+                last_name: values.last_name,
+                email: values.email,
+                username: values.username,
+            },
         });
         toast.success(t("UserDialog.createSuccess"));
         return true;
@@ -108,11 +110,14 @@ async function createItem(values: GenericObject) {
 
 async function editItem(itemId: number, values: GenericObject) {
     try {
-        await api.users.usersPartialUpdate(itemId, {
-            first_name: values.first_name,
-            last_name: values.last_name,
-            email: values.email,
-            username: values.username,
+        await api.users.usersPartialUpdate({
+            id: itemId,
+            requestBody: {
+                first_name: values.first_name,
+                last_name: values.last_name,
+                email: values.email,
+                username: values.username,
+            },
         });
         toast.success(t("UserDialog.editSuccess"));
         return true;

diff --git a/admin/src/services/auth.ts b/admin/src/services/auth.ts
@@ -57,7 +57,7 @@ export function useAuth() {
 
     async function login(username: string, password: string): Promise<boolean> {
         try {
-            await api.auth.login({ username, password });
+            await api.auth.login({ requestBody: { username, password } });
             await refreshStatus();
             return true;
         } catch (e) {
@@ -70,7 +70,7 @@ export function useAuth() {
     }
 
     async function getSocialAuthURLs(): Promise<SocialAuthURL[]> {
-        return api.auth.getSocialAuthUrls("/management");
+        return api.auth.getSocialAuthUrls({ next: "/management" });
     }
 
     async function tryFetchUserData(): Promise<UserInfo | undefined> {

diff --git a/admin/src/services/events.ts b/admin/src/services/events.ts
@@ -21,7 +21,7 @@ export function useEvents() {
     }
 
     async function refreshEvents(): Promise<void> {
-        const pages = await api.events.eventsList(100);
+        const pages = await api.events.eventsList({ limit: 1000 });
         events.value = pages.results;
     }
 

diff --git a/admin/src/views/BlogView.vue b/admin/src/views/BlogView.vue
@@ -145,15 +145,11 @@ const headers: ReadonlyHeaders = [
 
 async function load(args: LoadArgs) {
     loading.value = true;
-    const { limit, offset, sortBy } = getLoadArgs(args);
     try {
-        const { count, results } = await api.blogEntries.blogEntriesList(
-            parseInt(props.eventId, 10),
-            limit,
-            offset,
-            sortBy,
-            args.search
-        );
+        const { count, results } = await api.blogEntries.blogEntriesList({
+            event: parseInt(props.eventId, 10),
+            ...getLoadArgs(args),
+        });
         blogPosts.value = results;
         totalItems.value = count;
     } catch (e) {
@@ -171,7 +167,7 @@ async function deletePost(item: BlogEntry): Promise<void> {
     const ok = await confirmDialog.value!.confirm(text);
     if (ok) {
         try {
-            await api.blogEntries.blogEntriesDestroy(item.id);
+            await api.blogEntries.blogEntriesDestroy({ id: item.id });
             toast.success(t("BlogEditorView.deleteSuccess"));
         } catch (e) {
             toast.error(t("BlogEditorView.deleteFailure"));
@@ -182,7 +178,7 @@ async function deletePost(item: BlogEntry): Promise<void> {
 }
 
 async function editPost(id: number): Promise<void> {
-    const item = await api.blogEntries.blogEntriesRetrieve(id);
+    const item = await api.blogEntries.blogEntriesRetrieve({ id });
     if (await dialog.value!.modal(eventId.value, item)) {
         refreshKey.value += 1;
     }

diff --git a/admin/src/views/EventView.vue b/admin/src/views/EventView.vue
@@ -139,9 +139,8 @@ const headers: ReadonlyHeaders = [
 
 async function load(args: LoadArgs) {
     loading.value = true;
-    const { offset, limit, sortBy } = getLoadArgs(args);
     try {
-        const { count, results } = await api.events.eventsList(limit, undefined, offset, sortBy);
+        const { count, results } = await api.events.eventsList(getLoadArgs(args));
         events.value = results;
         totalItems.value = count;
     } catch (e) {
@@ -159,7 +158,7 @@ async function deleteEvent(item: Event): Promise<void> {
     const ok = await confirmDialog.value!.confirm(text);
     if (ok) {
         try {
-            await api.events.eventsDestroy(item.id);
+            await api.events.eventsDestroy({ id: item.id });
             toast.success(t("EventView.deleteSuccess"));
         } catch (e) {
             toast.error(t("EventView.deleteFailure"));
@@ -171,7 +170,7 @@ async function deleteEvent(item: Event): Promise<void> {
 }
 
 async function editEvent(id: number): Promise<void> {
-    const item = await api.events.eventsRetrieve(id);
+    const item = await api.events.eventsRetrieve({ id });
     if (await dialog.value!.modal(item)) {
         refreshKey.value += 1;
         await eventService.refreshEvents();

diff --git a/admin/src/views/UsersView.vue b/admin/src/views/UsersView.vue
@@ -144,16 +144,8 @@ const headers: ReadonlyHeaders = [
 
 async function load(args: LoadArgs) {
     loading.value = true;
-    const { offset, limit, sortBy } = getLoadArgs(args);
     try {
-        const { count, results } = await api.users.usersList(
-            undefined,
-            limit,
-            offset,
-            sortBy,
-            args.search,
-            undefined
-        );
+        const { count, results } = await api.users.usersList(getLoadArgs(args));
         users.value = results;
         totalItems.value = count;
     } catch (e) {
@@ -171,7 +163,7 @@ async function deleteUser(item: User): Promise<void> {
     const ok = await confirmDialog.value!.confirm(text);
     if (ok) {
         try {
-            await api.users.usersDestroy(item.id);
+            await api.users.usersDestroy({ id: item.id });
             toast.success(t("UsersView.deleteSuccess"));
         } catch (e) {
             toast.error(t("UsersView.deleteFailure"));
@@ -182,7 +174,7 @@ async function deleteUser(item: User): Promise<void> {
 }
 
 async function editUser(id: number): Promise<void> {
-    const item = await api.users.usersRetrieve(id);
+    const item = await api.users.usersRetrieve({ id });
     if (await dialog.value!.modal(item)) {
         refreshKey.value += 1;
     }