Skip to content

Commit

Permalink
fix: code structure optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
gakshita committed Aug 7, 2024
1 parent 836c3be commit 0a6d189
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
11 changes: 10 additions & 1 deletion web/app/[workspaceSlug]/(projects)/projects/(list)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
import ProjectsPage from "@/plane-web/components/projects/page";
"use client";
import { useParams } from "next/navigation";
import { useWorkspace } from "@/hooks/store";
import ProjectsPageRoot from "@/plane-web/components/projects/page";

const ProjectsPage = () => {
const { currentWorkspace } = useWorkspace();
const { workspaceSlug } = useParams();
return <ProjectsPageRoot currentWorkspace={currentWorkspace} workspaceSlug={workspaceSlug.toString()} />;
};
export default ProjectsPage;
16 changes: 9 additions & 7 deletions web/ce/components/projects/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@

import { useCallback } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// types
import { TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types";
import { IWorkspace, TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types";
// components
import { PageHead } from "@/components/core";
import { ProjectAppliedFiltersList, ProjectCardList } from "@/components/project";
// helpers
import { calculateTotalFilters } from "@/helpers/filter.helper";
// hooks
import { useProject, useProjectFilter, useWorkspace } from "@/hooks/store";
import { useProject, useProjectFilter } from "@/hooks/store";

const ProjectsPage = observer(() => {
type Props = {
currentWorkspace: IWorkspace | null;
workspaceSlug: string | null;
};
const ProjectsPageRoot: React.FC<Props> = observer((props) => {
const { currentWorkspace, workspaceSlug } = props;
// store
const { workspaceSlug } = useParams();
const { currentWorkspace } = useWorkspace();
const { totalProjectIds, filteredProjectIds } = useProject();
const {
currentWorkspaceFilters,
Expand Down Expand Up @@ -81,4 +83,4 @@ const ProjectsPage = observer(() => {
);
});

export default ProjectsPage;
export default ProjectsPageRoot;
4 changes: 1 addition & 3 deletions web/core/components/project/create/common-attributes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
/>
)}
/>
<span className="text-xs text-red-500">
<>{errors?.name?.message}</>
</span>
<span className="text-xs text-red-500">{errors?.name?.message}</span>
</div>
<div className="relative">
<Controller
Expand Down

0 comments on commit 0a6d189

Please sign in to comment.