Skip to content

A self-hosted media server and file management system

feat: move record api requests to tanstack

aminnausin7040a193dacf
diff --git a/resources/js/service/records/api.ts b/resources/js/service/records/api.ts
new file mode 100644
index 00000000..2077ed15
--- /dev/null
+++ b/resources/js/service/records/api.ts
@@ -0,0 +1,28 @@
+/*
+ ACTIONS for record data ?
+
+ Have get, add, and delete actions
+ Run and commit to database (store) -> ?? What does that mean?
+*/
+import type { RecordStoreRequest } from '@/types/requests';
+import type { RecordResource } from '@/types/resources';
+
+import { API } from '../api';
+
+export default {
+ createRecord(data: RecordStoreRequest) {
+ return API.post<{ data: RecordResource }>('/records', data);
+ },
+ getRecords(params?: { limit?: number; page?: number }) {
+ const queryParams = new URLSearchParams();
+ if (params?.limit) queryParams.set('limit', params.limit.toString());
+ if (params?.page) queryParams.set('page', params.page.toString());
+
+ const queryString = queryParams.toString();
+ return API.get<{ data: RecordResource[] }>(`/records${queryString ? `?${queryString}` : ''}`);
+ },
+
+ deleteRecord(id: number) {
+ return API.delete(`/records/${id}`);
+ },
+};
diff --git a/resources/js/service/records/useRecords.ts b/resources/js/service/records/useRecords.ts
new file mode 100644
index 00000000..772170d4
--- /dev/null
+++ b/resources/js/service/records/useRecords.ts
@@ -0,0 +1,87 @@
+// Eventually convert the records state in contentStore to a tanstack query composable
+import type { RecordStoreRequest } from '@/types/requests';
+import type { RecordResource } from '@/types/resources';
+
+import { useMutation, useQuery } from '@tanstack/vue-query';
+import { useAuthStore } from '@/stores/AuthStore';
+import { queryClient } from '@/service/vue-query';
+import { storeToRefs } from 'pinia';
+import { computed } from 'vue';
+import api from './api';
+
+export function useRecordsLimited(limit = 10) {
+ const { userData } = storeToRefs(useAuthStore());
+
+ const query = useQuery<RecordResource[]>({
+ queryKey: ['records', 'limited'],
+ queryFn: async () => {
+ const full = queryClient.getQueryData<RecordResource[]>(['records', 'full']);
+ if (full) {
+ return full.slice(0, limit);
+ }
+
+ const res = await api.getRecords({ limit });
+ return res.data.data;
+ },
+ staleTime: Infinity,
+ placeholderData: [],
+ enabled: computed(() => !!userData.value),
+ });
+
+ return {
+ stateRecords: query.data,
+ getRecords: () => queryClient.invalidateQueries({ queryKey: ['records', 'limited'] }),
+ ...query,
+ };
+}
+
+export function useRecords() {
+ const query = useQuery<RecordResource[]>({
+ queryKey: ['records', 'full'],
+ queryFn: async () => (await api.getRecords()).data.data ?? [],
+ staleTime: 5 * 60 * 1000, // 5 minutes
+ placeholderData: [],
+ });
+
+ return {
+ stateRecords: query.data.value,
+ ...query,
+ };
+}
+
+export function useRecord() {
+ const { userData } = storeToRefs(useAuthStore());
+
+ const createRecord = useMutation({
+ mutationFn: async (data: RecordStoreRequest) => {
+ if (!userData.value) return;
+ return api.createRecord(data);
+ },
+ onSuccess: (res) => {
+ if (!res) return;
+
+ const newRecord = res.data.data;
+
+ // dont prepend to full history if not loaded yet to prevent query blocking
+ queryClient.setQueryData<RecordResource[]>(['records', 'full'], (old) => (old ? [newRecord, ...old] : old));
+
+ queryClient.setQueryData<RecordResource[]>(['records', 'limited'], (old) => {
+ if (!old) return [newRecord];
+ return [newRecord, ...old].slice(0, 10);
+ });
+ },
+ });
+
+ const deleteRecord = useMutation({
+ mutationFn: api.deleteRecord,
+ onSuccess: (_, deletedId) => {
+ queryClient.setQueryData<RecordResource[]>(['records', 'full'], (old) => old?.filter((record) => record.id !== deletedId) ?? []);
+ queryClient.setQueryData<RecordResource[]>(['records', 'limited'], (old) => old?.filter((record) => record.id !== deletedId) ?? []);
+ },
+ });
+
+ return {
+ createRecord,
+ deleteRecord,
+ };
+}
diff --git a/resources/js/service/recordsService.ts b/resources/js/service/recordsService.ts
deleted file mode 100644
index cd376ffd..00000000
--- a/resources/js/service/recordsService.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- ACTIONS for record data ?
-
- Have get, add, and delete actions
- Run and commit to database (store) -> ?? What does that mean?
-*/
-import type { RecordStoreRequest } from '@/types/requests';
-import { API } from './api';
-
-export default {
- createRecord(data: RecordStoreRequest) {
- return API.post('/records', data);
- },
- getRecords(limit?: number) {
- if (limit) return API.get(`/records?limit=${limit}`);
-
- return API.get(`/records`);
- },
- deleteRecord(id: number) {
- return API.delete(`/records/${id}`);
- },
-};
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index d5ee0cf4..3027f6d5 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -7,7 +7,7 @@ import { sortObjectNew } from '@/service/sort/baseSort';
import { useAuthStore } from '@/stores/AuthStore';
import { toast } from '@/service/toaster/toastService';
-import recordsService from '@/service/recordsService';
+import recordsService from '@/service/records/api';
import mediaAPI from '@/service/mediaAPI.ts';
export const useContentStore = defineStore('Content', () => {
@@ -141,22 +141,25 @@ export const useContentStore = defineStore('Content', () => {
if (!userData.value) return;
if (fullRecordsLoaded.value) {
- Promise.resolve(stateRecords.value);
- return;
+ return stateRecords.value;
}
if (!limit) fullRecordsLoaded.value = true;
- const { data, error } = await recordsService.getRecords(limit);
+ try {
+ const response = await recordsService.getRecords({ limit });
+ console.log(response);
+
+ stateRecords.value = response.data?.data ?? [];
+ return stateRecords.value;
+ } catch (error) {
+ const message = error?.response?.data?.message || error?.message || 'Unknown error occurred';
+ console.error(message);
+
+ stateRecords.value = []; // always overwrite because if limit is set and results cached, no request is made. Otherwise its a full request. => idk what this meant
- if (error) {
- const message = error?.message || data?.message || 'Unknown error occurred';
- console.log(message);
throw new Error(message);
}
- stateRecords.value = data?.data ?? []; // always overwrite because if limit is set and results cached, no request is made. Otherwise its a full request.
-
- return Promise.resolve(stateRecords.value);
}
async function getCategory(URL_CATEGORY, URL_FOLDER) {