mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
chore: update workspace store accroding to the new response
This commit is contained in:
parent
47fb0da5cd
commit
0a7a2ccb13
@ -16,8 +16,6 @@ import {
|
|||||||
IUserProjectsRole,
|
IUserProjectsRole,
|
||||||
} from "types";
|
} from "types";
|
||||||
import { IWorkspaceView } from "types/workspace-views";
|
import { IWorkspaceView } from "types/workspace-views";
|
||||||
// store
|
|
||||||
import { IIssueGroupWithSubGroupsStructure, IIssueGroupedStructure, IIssueUnGroupedStructure } from "store_legacy/issue";
|
|
||||||
import { IIssueResponse } from "store_legacy/issues/types";
|
import { IIssueResponse } from "store_legacy/issues/types";
|
||||||
|
|
||||||
export class WorkspaceService extends APIService {
|
export class WorkspaceService extends APIService {
|
||||||
@ -25,7 +23,7 @@ export class WorkspaceService extends APIService {
|
|||||||
super(API_BASE_URL);
|
super(API_BASE_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
async userWorkspaces(): Promise<IWorkspace[]> {
|
async userWorkspaces(): Promise<Record<string, IWorkspace>> {
|
||||||
return this.get("/api/users/me/workspaces/")
|
return this.get("/api/users/me/workspaces/")
|
||||||
.then((response) => response?.data)
|
.then((response) => response?.data)
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import { action, computed, observable, makeObservable, runInAction } from "mobx";
|
import { action, computed, observable, makeObservable, runInAction } from "mobx";
|
||||||
import { RootStore } from "../root.store";
|
import { RootStore } from "../root.store";
|
||||||
|
import { set } from "lodash";
|
||||||
// types
|
// types
|
||||||
import { IWorkspace } from "types";
|
import { IWorkspace } from "types";
|
||||||
// services
|
// services
|
||||||
@ -12,24 +13,19 @@ export interface IWorkspaceRootStore {
|
|||||||
// states
|
// states
|
||||||
loader: boolean;
|
loader: boolean;
|
||||||
error: any | null;
|
error: any | null;
|
||||||
|
|
||||||
// observables
|
// observables
|
||||||
workspaces: IWorkspace[] | undefined;
|
workspaces: Record<string, IWorkspace>;
|
||||||
|
|
||||||
// computed
|
// computed
|
||||||
currentWorkspace: IWorkspace | null;
|
currentWorkspace: IWorkspace | null;
|
||||||
workspacesCreatedByCurrentUser: IWorkspace[] | null;
|
workspacesCreatedByCurrentUser: IWorkspace[] | null;
|
||||||
|
|
||||||
// computed actions
|
// computed actions
|
||||||
getWorkspaceBySlug: (workspaceSlug: string) => IWorkspace | null;
|
getWorkspaceBySlug: (workspaceSlug: string) => IWorkspace | null;
|
||||||
getWorkspaceById: (workspaceId: string) => IWorkspace | null;
|
getWorkspaceById: (workspaceId: string) => IWorkspace | null;
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
fetchWorkspaces: () => Promise<IWorkspace[]>;
|
fetchWorkspaces: () => Promise<Record<string, IWorkspace>>;
|
||||||
createWorkspace: (data: Partial<IWorkspace>) => Promise<IWorkspace>;
|
createWorkspace: (data: Partial<IWorkspace>) => Promise<IWorkspace>;
|
||||||
updateWorkspace: (workspaceSlug: string, data: Partial<IWorkspace>) => Promise<IWorkspace>;
|
updateWorkspace: (workspaceSlug: string, data: Partial<IWorkspace>) => Promise<IWorkspace>;
|
||||||
deleteWorkspace: (workspaceSlug: string) => Promise<void>;
|
deleteWorkspace: (workspaceSlug: string) => Promise<void>;
|
||||||
|
|
||||||
// sub-stores
|
// sub-stores
|
||||||
webhook: IWebhookStore;
|
webhook: IWebhookStore;
|
||||||
apiToken: IApiTokenStore;
|
apiToken: IApiTokenStore;
|
||||||
@ -39,10 +35,8 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
// states
|
// states
|
||||||
loader: boolean = false;
|
loader: boolean = false;
|
||||||
error: any | null = null;
|
error: any | null = null;
|
||||||
|
|
||||||
// observables
|
// observables
|
||||||
workspaces: IWorkspace[] | undefined = [];
|
workspaces: Record<string, IWorkspace> = {};
|
||||||
|
|
||||||
// services
|
// services
|
||||||
workspaceService;
|
workspaceService;
|
||||||
// root store
|
// root store
|
||||||
@ -56,18 +50,14 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
// states
|
// states
|
||||||
loader: observable.ref,
|
loader: observable.ref,
|
||||||
error: observable.ref,
|
error: observable.ref,
|
||||||
|
|
||||||
// observables
|
// observables
|
||||||
workspaces: observable,
|
workspaces: observable,
|
||||||
|
|
||||||
// computed
|
// computed
|
||||||
currentWorkspace: computed,
|
currentWorkspace: computed,
|
||||||
workspacesCreatedByCurrentUser: computed,
|
workspacesCreatedByCurrentUser: computed,
|
||||||
|
|
||||||
// computed actions
|
// computed actions
|
||||||
getWorkspaceBySlug: action,
|
getWorkspaceBySlug: action,
|
||||||
getWorkspaceById: action,
|
getWorkspaceById: action,
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
fetchWorkspaces: action,
|
fetchWorkspaces: action,
|
||||||
createWorkspace: action,
|
createWorkspace: action,
|
||||||
@ -92,7 +82,9 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
|
|
||||||
if (!workspaceSlug) return null;
|
if (!workspaceSlug) return null;
|
||||||
|
|
||||||
return this.workspaces?.find((workspace) => workspace.slug === workspaceSlug) || null;
|
const workspaceDetails = Object.values(this.workspaces ?? {})?.find((w) => w.slug === workspaceSlug);
|
||||||
|
|
||||||
|
return workspaceDetails || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -105,20 +97,23 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
|
|
||||||
if (!user) return null;
|
if (!user) return null;
|
||||||
|
|
||||||
return this.workspaces.filter((w) => w.created_by === user?.id);
|
const userWorkspaces = Object.values(this.workspaces ?? {})?.filter((w) => w.created_by === user?.id);
|
||||||
|
|
||||||
|
return userWorkspaces || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get workspace info from the array of workspaces in the store using workspace slug
|
* get workspace info from the array of workspaces in the store using workspace slug
|
||||||
* @param workspaceSlug
|
* @param workspaceSlug
|
||||||
*/
|
*/
|
||||||
getWorkspaceBySlug = (workspaceSlug: string) => this.workspaces?.find((w) => w.slug == workspaceSlug) || null;
|
getWorkspaceBySlug = (workspaceSlug: string) =>
|
||||||
|
Object.values(this.workspaces ?? {})?.find((w) => w.slug == workspaceSlug) || null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get workspace info from the array of workspaces in the store using workspace id
|
* get workspace info from the array of workspaces in the store using workspace id
|
||||||
* @param workspaceId
|
* @param workspaceId
|
||||||
*/
|
*/
|
||||||
getWorkspaceById = (workspaceId: string) => this.workspaces?.find((w) => w.id == workspaceId) || null;
|
getWorkspaceById = (workspaceId: string) => this.workspaces?.[workspaceId] || null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fetch user workspaces from API
|
* fetch user workspaces from API
|
||||||
@ -143,7 +138,7 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = false;
|
this.loader = false;
|
||||||
this.error = error;
|
this.error = error;
|
||||||
this.workspaces = [];
|
this.workspaces = {};
|
||||||
});
|
});
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
@ -163,10 +158,12 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
|
|
||||||
const response = await this.workspaceService.createWorkspace(data);
|
const response = await this.workspaceService.createWorkspace(data);
|
||||||
|
|
||||||
|
const updatedWorkspacesList = set(this.workspaces, response.id, response);
|
||||||
|
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = false;
|
this.loader = false;
|
||||||
this.error = null;
|
this.error = null;
|
||||||
this.workspaces = [...(this.workspaces ?? []), response];
|
this.workspaces = updatedWorkspacesList;
|
||||||
});
|
});
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
@ -186,8 +183,6 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
* @param data
|
* @param data
|
||||||
*/
|
*/
|
||||||
updateWorkspace = async (workspaceSlug: string, data: Partial<IWorkspace>) => {
|
updateWorkspace = async (workspaceSlug: string, data: Partial<IWorkspace>) => {
|
||||||
const newWorkspaces = this.workspaces?.map((w) => (w.slug === workspaceSlug ? { ...w, ...data } : w));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = true;
|
this.loader = true;
|
||||||
@ -196,10 +191,12 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
|
|
||||||
const response = await this.workspaceService.updateWorkspace(workspaceSlug, data);
|
const response = await this.workspaceService.updateWorkspace(workspaceSlug, data);
|
||||||
|
|
||||||
|
const updatedWorkspacesList = set(this.workspaces, response.id, data);
|
||||||
|
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = false;
|
this.loader = false;
|
||||||
this.error = null;
|
this.error = null;
|
||||||
this.workspaces = newWorkspaces;
|
this.workspaces = updatedWorkspacesList;
|
||||||
});
|
});
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
@ -218,8 +215,6 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
* @param workspaceSlug
|
* @param workspaceSlug
|
||||||
*/
|
*/
|
||||||
deleteWorkspace = async (workspaceSlug: string) => {
|
deleteWorkspace = async (workspaceSlug: string) => {
|
||||||
const newWorkspaces = this.workspaces?.filter((w) => w.slug !== workspaceSlug);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = true;
|
this.loader = true;
|
||||||
@ -228,10 +223,15 @@ export class WorkspaceRootStore implements IWorkspaceRootStore {
|
|||||||
|
|
||||||
await this.workspaceService.deleteWorkspace(workspaceSlug);
|
await this.workspaceService.deleteWorkspace(workspaceSlug);
|
||||||
|
|
||||||
|
const updatedWorkspacesList = this.workspaces;
|
||||||
|
const workspaceId = this.getWorkspaceBySlug(workspaceSlug)?.id;
|
||||||
|
|
||||||
|
delete updatedWorkspacesList[`${workspaceId}`];
|
||||||
|
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
this.loader = false;
|
this.loader = false;
|
||||||
this.error = null;
|
this.error = null;
|
||||||
this.workspaces = newWorkspaces;
|
this.workspaces = updatedWorkspacesList;
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
|
Loading…
Reference in New Issue
Block a user