π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
Fix stores syntax
Smaug673936b8a9cc038d
diff --git a/frontend/app/stores/_utils.ts b/frontend/app/stores/_utils.tsindex b7a73b50..0beb83db 100644--- a/frontend/app/stores/_utils.ts+++ b/frontend/app/stores/_utils.ts@@ -9,9 +9,10 @@ export interface FetchOptions {}let is_getting_new_token = false;-const requestQueue: { route: string; method: string; body: Object; resolve: (value: any) => void; reject: (reason?: any) => void }[] = [];+// eslint-disable-next-line @typescript-eslint/no-explicit-any+const requestQueue: { route: string; method: string; body: object; resolve: (value: APIResult<any> | PromiseLike<APIResult<any>>) => void; reject: (reason?: object) => void }[] = [];-export async function makeRequest<T>(route: string, method: string, body: Object, isTreatingQueue: boolean = false): Promise<APIResult<T>> {+export async function makeRequest<T>(route: string, method: string, body: object, isTreatingQueue: boolean = false): Promise<APIResult<T>> {console.log(`[API] Requesting [${method}] to /${route}`);if (route[route.length - 1] === '/') route = route.slice(0, -1); // Remove trailing slash if presentconst promise = new Promise<APIResult<T>>((resolve, reject) => {@@ -60,7 +61,7 @@ function treatQueue(access_token: boolean = true) {}}-function customFetch(method: string, route: string, body: Object) {+function customFetch(method: string, route: string, body: object) {return fetch(`${API}/${route}`, {method: method,body: method === 'GET' || method === 'DELETE' ? null : body instanceof FormData ? body : JSON.stringify(body),@@ -68,7 +69,7 @@ function customFetch(method: string, route: string, body: Object) {credentials: 'include',});}-async function useAPI(method: string, route: string, body: Object) {+async function useAPI(method: string, route: string, body: object) {try {const response = await customFetch(method, route, body);if (!response.ok) return { status: 'error', message: 'Failed to fetch' };diff --git a/frontend/app/stores/admin.store.ts b/frontend/app/stores/admin.store.tsindex bf7f7d8d..f316c135 100644--- a/frontend/app/stores/admin.store.ts+++ b/frontend/app/stores/admin.store.ts@@ -12,53 +12,43 @@ export const useAdminStore = defineStore('admin', {users: ref<UserData[]>(),}),actions: {- fetchAll(): Promise<UserData[] | undefined> {- return new Promise(async (resolve, reject) => {- if (this.users) return resolve(this.users);- const responce = await makeRequest<User[]>(`users`, 'GET', {});- if (responce.status === 'success') {- if (responce.result) this.users = responce.result as User[];- return resolve(this.users);- } else reject(responce.message);- });+ async fetchAll(): Promise<UserData[] | undefined> {+ if (this.users) return this.users;+ const responce = await makeRequest<User[]>(`users`, 'GET', {});+ if (responce.status === 'success') {+ if (responce.result) this.users = responce.result as User[];+ return this.users;+ } else throw responce.message;},- fetchById(id: string): Promise<User | undefined> {- return new Promise(async (resolve, reject) => {- const cachedUser = this.users?.find(user => user.id === id);- if (cachedUser) return resolve(cachedUser);- const responce = await makeRequest<{ user: User }>(`users/${id}`, 'GET', {});- if (responce.status === 'success') return resolve(responce.result?.user as User);- else reject(responce.message);- });+ async fetchById(id: string): Promise<User | undefined> {+ const cachedUser = this.users?.find(user => user.id === id);+ if (cachedUser) return cachedUser;+ const responce = await makeRequest<{ user: User }>(`users/${id}`, 'GET', {});+ if (responce.status === 'success') return responce.result?.user as User;+ else throw responce.message;},- update(user: User) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`users/${user.id}`, 'PATCH', user);- if (request.status === 'success') {- const index = this.users?.findIndex(u => u.id === user.id);- if (index !== undefined && index >= 0) this.users![index] = request.result as User;- return resolve(request.result);- } else reject(request.message);- });+ async update(user: User) {+ const request = await makeRequest(`users/${user.id}`, 'PATCH', user);+ if (request.status === 'success') {+ const index = this.users?.findIndex(u => u.id === user.id);+ if (index !== undefined && index >= 0) this.users![index] = request.result as User;+ return request.result;+ } else throw request.message;},- fetchUserDocuments(userId: string): Promise<Document[] | undefined> {- return new Promise(async (resolve, reject) => {- const cachedUser = this.users?.find(user => user.id === userId);- if (cachedUser && cachedUser.documents) return resolve(cachedUser.documents);- const responce = await makeRequest<Document[]>(`documents/${userId}`, 'GET', {});- if (responce.status === 'success') {- if (cachedUser) cachedUser.documents = responce.result;- return resolve(responce.result);- } else reject(responce.message);- });+ async fetchUserDocuments(userId: string): Promise<Document[] | undefined> {+ const cachedUser = this.users?.find(user => user.id === userId);+ if (cachedUser && cachedUser.documents) return cachedUser.documents;+ const responce = await makeRequest<Document[]>(`documents/${userId}`, 'GET', {});+ if (responce.status === 'success') {+ if (cachedUser) cachedUser.documents = responce.result;+ return responce.result;+ } else throw responce.message;},- fetchUserDocument(userId: string, docId: string): Promise<Document | undefined> {- return new Promise(async (resolve, reject) => {- const responce = await makeRequest<Document>(`documents/${userId}/${docId}`, 'GET', {});- if (responce.status === 'success') {- return resolve(responce.result);- } else reject(responce.message);- });+ async fetchUserDocument(userId: string, docId: string): Promise<Document | undefined> {+ const responce = await makeRequest<Document>(`documents/${userId}/${docId}`, 'GET', {});+ if (responce.status === 'success') {+ return responce.result;+ } else throw responce.message;},},});diff --git a/frontend/app/stores/categories.store.ts b/frontend/app/stores/categories.store.tsindex 6b326e30..79a2d634 100644--- a/frontend/app/stores/categories.store.ts+++ b/frontend/app/stores/categories.store.ts@@ -12,46 +12,38 @@ export const useCategoriesStore = defineStore('categories', {getChilds: state => (id: string) => state.categories.filter(c => c.parent_id == id),},actions: {- fetch: function (opts?: FetchOptions) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`categories/@me/${opts?.id || ''}`, 'GET', {});- if (request.status == 'success') {- if (opts?.id) {- // replace the document with the new one- const index = this.categories.findIndex(d => d.id == opts?.id);- if (index == -1) this.categories.push({ ...(request.result as DB_Category), type: 'category' });- else this.categories[index] = { ...(request.result as DB_Category), type: 'category' };- } else this.categories = (request.result as DB_Category[]).map((d: DB_Category) => ({ ...d, type: 'category' }));- resolve(this.categories);- } else reject(request.message);- });+ async fetch(opts?: FetchOptions) {+ const request = await makeRequest(`categories/@me/${opts?.id || ''}`, 'GET', {});+ if (request.status == 'success') {+ if (opts?.id) {+ // replace the document with the new one+ const index = this.categories.findIndex(d => d.id == opts?.id);+ if (index == -1) this.categories.push({ ...(request.result as DB_Category), type: 'category' });+ else this.categories[index] = { ...(request.result as DB_Category), type: 'category' };+ } else this.categories = (request.result as DB_Category[]).map((d: DB_Category) => ({ ...d, type: 'category' }));+ return this.categories;+ } else throw request.message;},- post(category: Partial<Category>): Promise<string | number> {- return new Promise(async (resolve, reject) => {- const response = await makeRequest(`categories`, 'POST', category);- if (response.status == 'success') resolve(this.categories.push({ ...(response.result as DB_Category), type: 'category' }));- else reject(response.message);- });+ async post(category: Partial<Category>): Promise<string | number> {+ const response = await makeRequest(`categories`, 'POST', category);+ if (response.status == 'success') return this.categories.push({ ...(response.result as DB_Category), type: 'category' });+ else throw response.message;},- update(category: Category) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`categories/${category.id}`, 'PUT', category);- if (request.status == 'success') {- this.categories = this.categories.map(c => {- if (c.id == category.id) return category;- return c;- });- resolve(category);- } else reject(request.message);- });+ async update(category: Category) {+ const request = await makeRequest(`categories/${category.id}`, 'PUT', category);+ if (request.status == 'success') {+ this.categories = this.categories.map(c => {+ if (c.id == category.id) return category;+ return c;+ });+ return category;+ } else throw request.message;},- delete(id: string) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`categories/${id}`, 'DELETE', {});- if (request.status == 'success') resolve((this.categories = this.categories.filter(c => c.id != id)));- else reject(request.message);- });+ async delete(id: string) {+ const request = await makeRequest(`categories/${id}`, 'DELETE', {});+ if (request.status == 'success') return (this.categories = this.categories.filter(c => c.id != id));+ else throw request.message;},},});diff --git a/frontend/app/stores/documents.store.ts b/frontend/app/stores/documents.store.tsindex aaa3463b..cfc269e9 100644--- a/frontend/app/stores/documents.store.ts+++ b/frontend/app/stores/documents.store.ts@@ -39,52 +39,44 @@ export const useDocumentsStore = defineStore('documents', {},},actions: {- fetch: function <T extends FetchOptions>(opts?: T): Promise<'id' extends keyof T ? Document : Document[]> {+ async fetch<T extends FetchOptions>(opts?: T): Promise<'id' extends keyof T ? Document : Document[]> {console.log(`[store/documents] Fetching documents with options: ${JSON.stringify(opts)}`);- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`documents/@me/${opts?.id || ''}`, 'GET', {});- if (request.status == 'success') {- if (opts?.id) {- const index = this.documents.findIndex(d => d.id == opts?.id);- const updatedDocument: Document = { ...(request.result as DB_Document), partial: false, type: 'document' };- if (index == -1) this.documents.push(updatedDocument);- else this.documents[index] = updatedDocument;- resolve(updatedDocument as 'id' extends keyof T ? Document : Document[]);- } else {- this.documents = (request.result as DB_Document[]).map((d: DB_Document) => ({ ...d, partial: true, type: 'document' }));- resolve(this.documents as 'id' extends keyof T ? Document : Document[]);- }- } else reject(request);- });+ const request = await makeRequest(`documents/@me/${opts?.id || ''}`, 'GET', {});+ if (request.status == 'success') {+ if (opts?.id) {+ const index = this.documents.findIndex(d => d.id == opts?.id);+ const updatedDocument: Document = { ...(request.result as DB_Document), partial: false, type: 'document' };+ if (index == -1) this.documents.push(updatedDocument);+ else this.documents[index] = updatedDocument;+ return updatedDocument as 'id' extends keyof T ? Document : Document[];+ } else {+ this.documents = (request.result as DB_Document[]).map((d: DB_Document) => ({ ...d, partial: true, type: 'document' }));+ return this.documents as 'id' extends keyof T ? Document : Document[];+ }+ } else throw request;},- post(doc: Document): Promise<DB_Document> {- return new Promise(async (resolve, reject) => {- const request = await makeRequest('documents', 'POST', doc);- if (request.status == 'success') {- this.documents.push({ ...(request.result as DB_Document), type: 'document', partial: false });- resolve(request.result as DB_Document);- } else reject(request.message);- });+ async post(doc: Document): Promise<DB_Document> {+ const request = await makeRequest('documents', 'POST', doc);+ if (request.status == 'success') {+ this.documents.push({ ...(request.result as DB_Document), type: 'document', partial: false });+ return request.result as DB_Document;+ } else throw request.message;},- update(doc: Document) {- return new Promise(async (resolve, reject) => {- if (doc.partial) {- console.log('[store/documents] Document is partial, cannot update it directly.');- const fullDoc = await this.fetch({ id: doc.id });- if (!fullDoc) return reject('Document not found');- doc = { ...doc, content_markdown: fullDoc.content_markdown, content_html: fullDoc.content_html, partial: false }; // Merge with full document data- }- const request = await makeRequest(`documents/${doc.id}`, 'PUT', doc);- if (request.status == 'success') resolve((this.documents = this.documents.map(d => (d.id == doc.id ? doc : d))));- else reject(request.message);- });+ async update(doc: Document) {+ if (doc.partial) {+ console.log('[store/documents] Document is partial, cannot update it directly.');+ const fullDoc = await this.fetch({ id: doc.id });+ if (!fullDoc) throw 'Document not found';+ doc = { ...doc, content_markdown: fullDoc.content_markdown, content_html: fullDoc.content_html, partial: false }; // Merge with full document data+ }+ const request = await makeRequest(`documents/${doc.id}`, 'PUT', doc);+ if (request.status == 'success') return (this.documents = this.documents.map(d => (d.id == doc.id ? doc : d)));+ else throw request.message;},- delete(id: string) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`documents/${id}`, 'DELETE', {});- if (request.status == 'success') resolve((this.documents = this.documents.filter(d => d.id != id)));- else reject(request.message);- });+ async delete(id: string) {+ const request = await makeRequest(`documents/${id}`, 'DELETE', {});+ if (request.status == 'success') return (this.documents = this.documents.filter(d => d.id != id));+ else throw request.message;},},});diff --git a/frontend/app/stores/ressources.store.ts b/frontend/app/stores/ressources.store.tsindex 77e084eb..f09b3780 100644--- a/frontend/app/stores/ressources.store.ts+++ b/frontend/app/stores/ressources.store.ts@@ -10,49 +10,40 @@ export const useRessourcesStore = defineStore('ressources', {getById: state => (id: string) => state.ressources.find(c => c.id == id),},actions: {- fetch: function () {+ async fetch(): Promise<Ressource[]> {if (this.ressources.length > 0) return this.ressources;- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`ressources/@me`, 'GET', {});- if (request.status == 'success') {- this.ressources = (request.result as DB_Ressource[]).map((d: DB_Ressource) => ({ ...d, type: 'ressource' })) as Ressource[];- resolve(this.ressources);- } else reject(request.message);- });++ const request = await makeRequest(`ressources/@me`, 'GET', {});+ if (request.status == 'success') {+ this.ressources = (request.result as DB_Ressource[]).map((d: DB_Ressource) => ({ ...d, type: 'ressource' })) as Ressource[];+ return this.ressources;+ } else throw request.message;},- post(ressource: FormData): Promise<Ressource | string> {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`ressources`, 'POST', ressource);- if (request.status == 'success') {- this.ressources.push(request.result as Ressource);- resolve(request.result as Ressource);- } else reject(request.message);- });+ async post(ressource: FormData): Promise<Ressource | string> {+ const request = await makeRequest(`ressources`, 'POST', ressource);+ if (request.status == 'success') {+ this.ressources.push(request.result as Ressource);+ return request.result as Ressource;+ } else throw request.message;},- postAvatar(ressource: FormData): Promise<{ original_path: string; transformed_path: string }> {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`ressources/avatar`, 'POST', ressource);- if (request.status == 'success') {- resolve(request.result as { original_path: string; transformed_path: string });- } else reject(request.message);- });+ async postAvatar(ressource: FormData): Promise<{ original_path: string; transformed_path: string }> {+ const request = await makeRequest(`ressources/avatar`, 'POST', ressource);+ if (request.status == 'success') {+ return request.result as { original_path: string; transformed_path: string };+ } else throw request.message;},- update(ressource: Ressource): Promise<Ressource | string> {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`ressources/${ressource.id}`, 'PUT', ressource);- if (request.status == 'success') {- const index = this.ressources.findIndex(c => c.id == ressource.id);- if (index != -1) this.ressources[index] = ressource as Ressource;- resolve(request.result as Ressource);- } else reject(request.message);- });+ async update(ressource: Ressource): Promise<Ressource | string> {+ const request = await makeRequest(`ressources/${ressource.id}`, 'PUT', ressource);+ if (request.status == 'success') {+ const index = this.ressources.findIndex(c => c.id == ressource.id);+ if (index != -1) this.ressources[index] = ressource as Ressource;+ return request.result as Ressource;+ } else throw request.message;},- delete(id: string) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`ressources/${id}`, 'DELETE', {});- if (request.status == 'success') resolve((this.ressources = this.ressources.filter(c => c.id != id)));- else reject(request.message);- });+ async delete(id: string) {+ const request = await makeRequest(`ressources/${id}`, 'DELETE', {});+ if (request.status == 'success') return (this.ressources = this.ressources.filter(c => c.id != id));+ else throw request.message;},},});diff --git a/frontend/app/stores/user.store.ts b/frontend/app/stores/user.store.tsindex dece5a51..638427d1 100644--- a/frontend/app/stores/user.store.ts+++ b/frontend/app/stores/user.store.ts@@ -19,92 +19,73 @@ export const useUserStore = defineStore('user', {}},- register(user: Omit<User, 'id' | 'created_timestamp'>) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest('users', 'POST', user);- request.status === 'success' ? resolve(true) : reject(request.message);- });+ async register(user: Omit<User, 'id' | 'created_timestamp'>) {+ const request = await makeRequest('users', 'POST', user);+ if (request.status === 'success') return true;+ throw request.message;},- fetch(): Promise<User | undefined> {- return new Promise(async (resolve, reject) => {- if (this.user) return resolve(this.user);- const responce = await makeRequest<{ user: User; last_connection: ConnectionLog }>(`users/@me`, 'GET', {});- if (responce.status === 'success') {- if (responce.result) this.user = responce.result.user as User;- if (responce.result?.last_connection) this.last_connection = responce.result.last_connection as ConnectionLog;- return resolve(this.user);- } else reject(responce.message);- });+ async fetch(): Promise<User | undefined> {+ if (this.user) return this.user;+ const responce = await makeRequest<{ user: User; last_connection: ConnectionLog }>(`users/@me`, 'GET', {});+ if (responce.status === 'success') {+ if (responce.result) this.user = responce.result.user as User;+ if (responce.result?.last_connection) this.last_connection = responce.result.last_connection as ConnectionLog;+ return this.user;+ } else throw responce.message;},- fetchById(id: string): Promise<User | undefined> {- return new Promise(async (resolve, reject) => {- const responce = await makeRequest<{ user: User }>(`users/${id}`, 'GET', {});- if (responce.status === 'success') return resolve(responce.result?.user as User);- else reject(responce.message);- });+ async fetchById(id: string): Promise<User | undefined> {+ const responce = await makeRequest<{ user: User }>(`users/${id}`, 'GET', {});+ if (responce.status === 'success') return responce.result?.user as User;+ throw responce.message;},- update(user: User) {- return new Promise(async (resolve, reject) => {- if (!this.user) return;- const request = await makeRequest(`users/${user.id}`, 'PATCH', user);- if (request.status === 'success') {- if (this.user.id == user.id) this.user = request.result as User;- return resolve(this.user);- } else reject(request.message);- });+ async update(user: User) {+ if (!this.user) return;+ const request = await makeRequest(`users/${user.id}`, 'PATCH', user);+ if (request.status === 'success') {+ if (this.user.id == user.id) this.user = request.result as User;+ return this.user;+ } else throw request.message;},- updatePassword(newPassword: string) {- return new Promise(async (resolve, reject) => {- if (!this.user) return;- const request = await makeRequest(`users/${this.user.id}/password`, 'PATCH', { password: newPassword });- if (request.status === 'success') {- return resolve(true);- } else reject(request.message);- });+ async updatePassword(newPassword: string) {+ if (!this.user) return;+ const request = await makeRequest(`users/${this.user.id}/password`, 'PATCH', { password: newPassword });+ if (request.status === 'success') {+ return true;+ } else throw request.message;},- requestReset(username: string) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`auth/request-reset`, 'POST', { username });- if (request.status === 'success') return resolve(true);- reject(request.message);- });+ async requestReset(username: string) {+ const request = await makeRequest(`auth/request-reset`, 'POST', { username });+ if (request.status === 'success') return true;+ throw request.message;},- resetPassword(token: string, newPassword: string) {- return new Promise(async (resolve, reject) => {- const request = await makeRequest(`auth/reset-password`, 'POST', { token, password: newPassword });- if (request.status === 'success') return resolve(true);- reject(request.message);- });+ async resetPassword(token: string, newPassword: string) {+ const request = await makeRequest(`auth/reset-password`, 'POST', { token, password: newPassword });+ if (request.status === 'success') return true;+ throw request.message;},- logout() {- return new Promise(async (resolve, reject) => {- if (!this.user) return;- const request = await makeRequest(`auth/logout`, 'POST', {});- if (request.status === 'success') {- return resolve(true);- } else reject(request.message);- });+ async logout() {+ if (!this.user) return;+ const request = await makeRequest(`auth/logout`, 'POST', {});+ if (request.status === 'success') {+ return true;+ } else throw request.message;},- logout_all() {- return new Promise(async (resolve, reject) => {- if (!this.user) return;- const request = await makeRequest(`auth/logout/all`, 'POST', {});- if (request.status === 'success') {- return resolve(true);- } else reject(request.message);- });+ async logout_all() {+ if (!this.user) return;+ const request = await makeRequest(`auth/logout/all`, 'POST', {});+ if (request.status === 'success') {+ return true;+ } else throw request.message;},- deleteAccount() {- return new Promise(async (resolve, reject) => {- if (!this.user) return;- const request = await makeRequest(`users/${this.user.id}`, 'DELETE', {});- if (request.status === 'success') {- this.user = undefined;- return resolve(true);- } else reject(request.message);- });+ async deleteAccount() {+ if (!this.user) return;+ const request = await makeRequest(`users/${this.user.id}`, 'DELETE', {});+ if (request.status === 'success') {+ this.user = undefined;+ return true;+ } else throw request.message;},- post_logout() {+ async post_logout() {this.user = undefined;if (import.meta.client) localStorage.removeItem('isLoggedIn');},