github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2025-08-07 19:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: minor store level changes (#6500)" (#2327)

Browse Source 
This reverts commit c0b6abc3d5.
This commit is contained in:
Prateek Shourya
2025-01-29 12:59:18 +05:30
committed by GitHub
parent ab1b378ec6
commit f342616f34
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/core/hooks/use-issue-layout-store.ts
View File

@@ -7,7 +7,7 @@ export const IssuesStoreContext = createContext<EIssuesStoreType | undefined>(un
export const useIssueStoreType = () => {
const storeType = useContext(IssuesStoreContext);
const { globalViewId, viewId, projectId, cycleId, moduleId, userId, epicId, teamspaceId } = useParams();
const { globalViewId, viewId, projectId, cycleId, moduleId, userId, epicId, teamId } = useParams();
// If store type exists in context, use that store type
if (storeType) return storeType;
@@ -27,9 +27,9 @@ export const useIssueStoreType = () => {
if (projectId) return EIssuesStoreType.PROJECT;
if (teamspaceId) return EIssuesStoreType.TEAM;
if (teamId) return EIssuesStoreType.TEAM;
if (teamspaceId && viewId) return EIssuesStoreType.TEAM_VIEW;
if (teamId && viewId) return EIssuesStoreType.TEAM_VIEW;
return EIssuesStoreType.PROJECT;
};

9
web/core/store/issue/root.store.ts
View File

@@ -15,6 +15,7 @@ import {
// root store
import { RootStore } from "@/plane-web/store/root.store";
import { IWorkspaceMembership } from "@/store/member/workspace-member.store";
import { IStateStore, StateStore } from "../state.store";
// issues data store
import { IArchivedIssuesFilter, ArchivedIssuesFilter, IArchivedIssues, ArchivedIssues } from "./archived";
import { ICycleIssuesFilter, CycleIssuesFilter, ICycleIssues, CycleIssues } from "./cycle";
@@ -43,7 +44,7 @@ import {
export interface IIssueRootStore {
currentUserId: string | undefined;
workspaceSlug: string | undefined;
teamspaceId: string | undefined;
teamId: string | undefined;
projectId: string | undefined;
cycleId: string | undefined;
moduleId: string | undefined;
@@ -111,7 +112,7 @@ export interface IIssueRootStore {
export class IssueRootStore implements IIssueRootStore {
currentUserId: string | undefined = undefined;
workspaceSlug: string | undefined = undefined;
teamspaceId: string | undefined = undefined;
teamId: string | undefined = undefined;
projectId: string | undefined = undefined;
cycleId: string | undefined = undefined;
moduleId: string | undefined = undefined;
@@ -178,7 +179,7 @@ export class IssueRootStore implements IIssueRootStore {
constructor(rootStore: RootStore, serviceType: TIssueServiceType = EIssueServiceType.ISSUES) {
makeObservable(this, {
workspaceSlug: observable.ref,
teamspaceId: observable.ref,
teamId: observable.ref,
projectId: observable.ref,
cycleId: observable.ref,
moduleId: observable.ref,
@@ -202,7 +203,7 @@ export class IssueRootStore implements IIssueRootStore {
autorun(() => {
if (rootStore?.user?.data?.id) this.currentUserId = rootStore?.user?.data?.id;
if (this.workspaceSlug !== rootStore.router.workspaceSlug) this.workspaceSlug = rootStore.router.workspaceSlug;
if (this.teamspaceId !== rootStore.router.teamspaceId) this.teamspaceId = rootStore.router.teamspaceId;
if (this.teamId !== rootStore.router.teamId) this.teamId = rootStore.router.teamId;
if (this.projectId !== rootStore.router.projectId) this.projectId = rootStore.router.projectId;
if (this.cycleId !== rootStore.router.cycleId) this.cycleId = rootStore.router.cycleId;
if (this.moduleId !== rootStore.router.moduleId) this.moduleId = rootStore.router.moduleId;

10
web/core/store/router.store.ts
View File

@@ -9,7 +9,7 @@ export interface IRouterStore {
setQuery: (query: ParsedUrlQuery) => void;
// computed
workspaceSlug: string | undefined;
teamspaceId: string | undefined;
teamId: string | undefined;
projectId: string | undefined;
cycleId: string | undefined;
moduleId: string | undefined;
@@ -36,7 +36,7 @@ export class RouterStore implements IRouterStore {
setQuery: action.bound,
//computed
workspaceSlug: computed,
teamspaceId: computed,
teamId: computed,
projectId: computed,
cycleId: computed,
moduleId: computed,
@@ -71,11 +71,11 @@ export class RouterStore implements IRouterStore {
}
/**
* Returns the teamspace id from the query
* Returns the team id from the query
* @returns string|undefined
*/
get teamspaceId() {
return this.query?.teamspaceId?.toString();
get teamId() {
return this.query?.teamId?.toString();
}
/**