binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: store level fixes (#2597)

Browse source
This commit is contained in:
sriram veeraghanta 2023-11-01 19:22:10 +05:30 • committed by GitHub
parent d46eb9c59a
commit 8c620c4f96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 233 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/pages/[workspaceSlug]/projects/[projectId]/cycles/index.tsx
View file

@ -27,6 +27,7 @@ const ProjectCyclesPage: NextPage = observer(() => {
const [createModal, setCreateModal] = useState(false);
// store
const { project: projectStore, cycle: cycleStore } = useMobxStore();
const { currentProjectDetails } = projectStore;
// router
const router = useRouter();
const { workspaceSlug, projectId, peekCycle } = router.query as {
@ -78,19 +79,18 @@ const ProjectCyclesPage: NextPage = observer(() => {
}
}, [projectId, cycleStore, handleCurrentView, handleCurrentLayout]);
const projectDetails = projectId ? projectStore.project_details[projectId] : null;
const cycleView = cycleStore?.cycleView;
const cycleLayout = cycleStore?.cycleLayout;
return (
<AppLayout header={<CyclesHeader name={projectDetails?.name} />} withProjectWrapper>
<AppLayout header={<CyclesHeader name={currentProjectDetails?.name} />} withProjectWrapper>
<CycleCreateUpdateModal
workspaceSlug={workspaceSlug}
projectId={projectId}
isOpen={createModal}
handleClose={() => setCreateModal(false)}
/>
{projectDetails?.total_cycles === 0 ? (
{currentProjectDetails?.total_cycles === 0 ? (
<div className="h-full grid place-items-center">
<EmptyState
title="Plan your project with cycles"

22
web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
View file

@ -20,14 +20,14 @@ import { useMobxStore } from "lib/mobx/store-provider";
import { observer } from "mobx-react-lite";
const GeneralSettings: NextPage = observer(() => {
// store
const { project: projectStore } = useMobxStore();
const { currentProjectDetails } = projectStore;
// states
const [selectProject, setSelectedProject] = useState<string | null>(null);
// router
const router = useRouter();
const { workspaceSlug, projectId } = router.query;
// derived values
const projectDetails = projectId ? projectStore.project_details[projectId.toString()] : null;
// api call to fetch project details
useSWR(
workspaceSlug && projectId ? "PROJECT_DETAILS" : null,
@ -39,30 +39,34 @@ const GeneralSettings: NextPage = observer(() => {
// const currentNetwork = NETWORK_CHOICES.find((n) => n.key === projectDetails?.network);
// const selectedNetwork = NETWORK_CHOICES.find((n) => n.key === watch("network"));
const isAdmin = projectDetails?.member_role === 20;
const isAdmin = currentProjectDetails?.member_role === 20;
return (
<AppLayout header={<ProjectSettingHeader title="General Settings" />} withProjectWrapper>
<ProjectSettingLayout>
{projectDetails && (
{currentProjectDetails && (
<DeleteProjectModal
project={projectDetails}
project={currentProjectDetails}
isOpen={Boolean(selectProject)}
onClose={() => setSelectedProject(null)}
/>
)}
<div className={`pr-9 py-8 w-full overflow-y-auto ${isAdmin ? "" : "opacity-60"}`}>
{projectDetails && workspaceSlug ? (
<ProjectDetailsForm project={projectDetails} workspaceSlug={workspaceSlug.toString()} isAdmin={isAdmin} />
{currentProjectDetails && workspaceSlug ? (
<ProjectDetailsForm
project={currentProjectDetails}
workspaceSlug={workspaceSlug.toString()}
isAdmin={isAdmin}
/>
) : (
<ProjectDetailsFormLoader />
)}
{isAdmin && (
<DeleteProjectSection
projectDetails={projectDetails}
handleDelete={() => setSelectedProject(projectDetails.id ?? null)}
projectDetails={currentProjectDetails}
handleDelete={() => setSelectedProject(currentProjectDetails.id ?? null)}
/>
)}
</div>