refactor: manage projects routes

onlydustxyz · Nov 25, 2024 · 43e3aee · 43e3aee
1 parent 3771e5c
commit 43e3aee
Show file tree

Hide file tree

Showing 58 changed files with 334 additions and 307 deletions.
diff --git a/app/manage-projects/[projectSlug]/_features/contributions/contributions.tsx b/app/manage-projects/[projectSlug]/_features/contributions/contributions.tsx
@@ -1,8 +1,12 @@
 import { useQueryClient } from "@tanstack/react-query";
 import { Columns4, Table } from "lucide-react";
-import { useParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
 
+import { FilterData } from "@/app/manage-projects/[projectSlug]/contributions/_components/filter-data/filter-data";
+import { useContributionsFilterDataSidePanel } from "@/app/manage-projects/[projectSlug]/contributions/_components/filter-data/filter-data.hooks";
+import { KanbanView } from "@/app/manage-projects/[projectSlug]/contributions/_features/kanban-view/kanban-view";
+import { ListView } from "@/app/manage-projects/[projectSlug]/contributions/_features/list-view/list-view";
+
 import { bootstrap } from "@/core/bootstrap";
 import {
   GetContributionsPortParams,
@@ -19,10 +23,6 @@ import { FilterDataProvider } from "@/shared/features/filters/_contexts/filter-d
 import { useActionPooling } from "@/shared/hooks/action-pooling/action-pooling.context";
 import { useContributionsSidepanel } from "@/shared/panels/contribution-sidepanel/contributions-sidepanel.hooks";
 
-import { FilterData } from "./_components/filter-data/filter-data";
-import { useContributionsFilterDataSidePanel } from "./_components/filter-data/filter-data.hooks";
-import { KanbanView } from "./_features/kanban-view/kanban-view";
-import { ListView } from "./_features/list-view/list-view";
 import { ContributionsProps } from "./contributions.types";
 
 const LIST = "list";
@@ -33,12 +33,11 @@ export type ContributionKanbanFilters = Omit<
   "pageSize" | "pageIndex"
 >;
 
-export function Contributions(_: ContributionsProps) {
+export function Contributions({ projectSlug }: ContributionsProps) {
   const [toggleViews, setToggleViews] = useState<typeof LIST | typeof KANBAN>(KANBAN);
   const [filters, setFilters] = useState<ContributionKanbanFilters>({});
   const [search, setSearch] = useState<string>();
   const [debouncedSearch, setDebouncedSearch] = useState<string>();
-  const { projectSlug } = useParams<{ projectSlug: string }>();
   const { open: openFilterPanel } = useContributionsFilterDataSidePanel();
   const { open: openContribution } = useContributionsSidepanel();
 

diff --git a/app/manage-projects/[projectSlug]/_features/contributions/contributions.types.ts b/app/manage-projects/[projectSlug]/_features/contributions/contributions.types.ts
@@ -1,3 +1,3 @@
 export interface ContributionsProps {
-  projectId?: string;
+  projectSlug: string;
 }
diff --git a/app/manage-projects/[projectSlug]/_sections/activity-section/activity-section.tsx b/app/manage-projects/[projectSlug]/_sections/activity-section/activity-section.tsx
diff --git a/app/manage-projects/[projectSlug]/_sections/activity-section/activity-section.types.ts b/app/manage-projects/[projectSlug]/_sections/activity-section/activity-section.types.ts
diff --git a/app/manage-projects/[projectSlug]/_translations/manage-project-detail.en.json b/app/manage-projects/[projectSlug]/_translations/manage-project-detail.en.json
@@ -1,10 +1,10 @@
 {
+  "views": {
+    "contributors": "Contributors",
+    "contributions": "Contributions",
+    "financial": "Financial"
+  },
   "activity": {
-    "buttons": {
-      "contributors": "Contributors",
-      "contributions": "Contributions",
-      "financial": "Financial"
-    },
     "kanban": {
       "columns": {
         "notAssigned": "Not assigned",

diff --git a/...ponents/filter-data/filter-data.hooks.tsx → ...ponents/filter-data/filter-data.hooks.tsx b/...ponents/filter-data/filter-data.hooks.tsx → ...ponents/filter-data/filter-data.hooks.tsx
diff --git a/...s/_components/filter-data/filter-data.tsx → ...s/_components/filter-data/filter-data.tsx b/...s/_components/filter-data/filter-data.tsx → ...s/_components/filter-data/filter-data.tsx
@@ -1,4 +1,5 @@
 import { ContributionKanbanFilters } from "@/app/manage-projects/[projectSlug]/_features/contributions/contributions";
+import { useContributionsFilterDataSidePanel } from "@/app/manage-projects/[projectSlug]/contributions/_components/filter-data/filter-data.hooks";
 
 import { RewardedFilterType } from "@/core/kernel/filters/filters-facade-port";
 
@@ -15,8 +16,6 @@ import { SidePanelHeader } from "@/shared/features/side-panels/side-panel-header
 import { useSidePanel } from "@/shared/features/side-panels/side-panel/side-panel";
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { useContributionsFilterDataSidePanel } from "./filter-data.hooks";
-
 export function FilterData() {
   const { name } = useContributionsFilterDataSidePanel();
   const { Panel } = useSidePanel({ name });

diff --git a/...ons/_features/kanban-view/kanban-view.tsx → ...ons/_features/kanban-view/kanban-view.tsx b/...ons/_features/kanban-view/kanban-view.tsx → ...ons/_features/kanban-view/kanban-view.tsx
@@ -2,6 +2,8 @@ import { Plus } from "lucide-react";
 import { useParams } from "next/navigation";
 import { useMemo } from "react";
 
+import { KanbanViewProps } from "@/app/manage-projects/[projectSlug]/contributions/_features/kanban-view/kanban-view.types";
+
 import { ContributionReactQueryAdapter } from "@/core/application/react-query-adapter/contribution";
 import { ProjectReactQueryAdapter } from "@/core/application/react-query-adapter/project";
 import { GetContributionsQueryParams } from "@/core/domain/contribution/contribution-contract.types";
@@ -23,8 +25,6 @@ import { KanbanColumn } from "@/shared/features/kanban/kanban-column/kanban-colu
 import { KanbanColumnProps } from "@/shared/features/kanban/kanban-column/kanban-column.types";
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { KanbanViewProps } from "./kanban-view.types";
-
 function Column({
   type,
   queryParams,

diff --git a/...features/kanban-view/kanban-view.types.ts → ...features/kanban-view/kanban-view.types.ts b/...features/kanban-view/kanban-view.types.ts → ...features/kanban-view/kanban-view.types.ts
diff --git a/...butions/_features/list-view/list-view.tsx → ...butions/_features/list-view/list-view.tsx b/...butions/_features/list-view/list-view.tsx → ...butions/_features/list-view/list-view.tsx
@@ -1,5 +1,7 @@
 import { useMemo } from "react";
 
+import { ListViewProps } from "@/app/manage-projects/[projectSlug]/contributions/_features/list-view/list-view.types";
+
 import { ContributionReactQueryAdapter } from "@/core/application/react-query-adapter/contribution";
 import { GetContributionsQueryParams } from "@/core/domain/contribution/contribution-contract.types";
 import {
@@ -16,8 +18,6 @@ import { ShowMore } from "@/shared/components/show-more/show-more";
 import { CardContributionKanban } from "@/shared/features/card-contribution-kanban/card-contribution-kanban";
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { ListViewProps } from "./list-view.types";
-
 function useAccordionItem({
   type,
   queryParams,

diff --git a/...ns/_features/list-view/list-view.types.ts → ...ns/_features/list-view/list-view.types.ts b/...ns/_features/list-view/list-view.types.ts → ...ns/_features/list-view/list-view.types.ts
diff --git a/app/manage-projects/[projectSlug]/contributions/page.tsx b/app/manage-projects/[projectSlug]/contributions/page.tsx
@@ -0,0 +1,11 @@
+"use client";
+
+import { Contributions } from "@/app/manage-projects/[projectSlug]/_features/contributions/contributions";
+
+export default function ManageProgramsContributionsPage({
+  params: { projectSlug },
+}: {
+  params: { projectSlug: string };
+}) {
+  return <Contributions projectSlug={projectSlug} />;
+}
diff --git a/...s/filter-columns/filter-columns.hooks.tsx → ...s/filter-columns/filter-columns.hooks.tsx b/...s/filter-columns/filter-columns.hooks.tsx → ...s/filter-columns/filter-columns.hooks.tsx
@@ -5,6 +5,8 @@ import Flag from "react-flagpack";
 import { useTranslation } from "react-i18next";
 import { useLocalStorage } from "react-use";
 
+import { TableColumns } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-columns/filter-columns.types";
+
 import { ProjectReactQueryAdapter } from "@/core/application/react-query-adapter/project";
 import { bootstrap } from "@/core/bootstrap";
 import { GetBiContributorsQueryParams } from "@/core/domain/bi/bi-contract.types";
@@ -28,8 +30,6 @@ import { useRewardFlow } from "@/shared/panels/_flows/reward-flow/reward-flow.co
 import { useContributorSidePanel } from "@/shared/panels/contributor-sidepanel/contributor-sidepanel.hooks";
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { TableColumns } from "./filter-columns.types";
-
 export function useFilterColumns() {
   const { t } = useTranslation();
   const { projectSlug = "" } = useParams<{ projectSlug: string }>();

diff --git a/...ponents/filter-columns/filter-columns.tsx → ...ponents/filter-columns/filter-columns.tsx b/...ponents/filter-columns/filter-columns.tsx → ...ponents/filter-columns/filter-columns.tsx
@@ -1,9 +1,12 @@
+import {
+  FilterColumnsProps,
+  TableColumns,
+} from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-columns/filter-columns.types";
+
 import { TableColumnList } from "@/design-system/molecules/table-column-list";
 
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { FilterColumnsProps, TableColumns } from "./filter-columns.types";
-
 export function FilterColumns({ selectedIds, setSelectedIds }: FilterColumnsProps) {
   return (
     <TableColumnList

diff --git a/...ts/filter-columns/filter-columns.types.ts → ...ts/filter-columns/filter-columns.types.ts b/...ts/filter-columns/filter-columns.types.ts → ...ts/filter-columns/filter-columns.types.ts
diff --git a/...ponents/filter-data/filter-data.hooks.tsx → ...ponents/filter-data/filter-data.hooks.tsx b/...ponents/filter-data/filter-data.hooks.tsx → ...ponents/filter-data/filter-data.hooks.tsx
diff --git a/...e/_components/filter-data/filter-data.tsx → ...e/_components/filter-data/filter-data.tsx b/...e/_components/filter-data/filter-data.tsx → ...e/_components/filter-data/filter-data.tsx
@@ -1,4 +1,4 @@
-import { ContributorsTableFilters } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/contributors-table";
+import { ContributorsTableFilters } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/contributors-table";
 
 import { bootstrap } from "@/core/bootstrap";
 

diff --git a/...mponents/filter-data/filter-data.types.ts → ...mponents/filter-data/filter-data.types.ts b/...mponents/filter-data/filter-data.types.ts → ...mponents/filter-data/filter-data.types.ts
diff --git a/...panel/contributors-bulk-sidepanel.en.json → ...panel/contributors-bulk-sidepanel.en.json b/...panel/contributors-bulk-sidepanel.en.json → ...panel/contributors-bulk-sidepanel.en.json
diff --git a/...nel/contributors-bulk-sidepanel.hooks.tsx → ...nel/contributors-bulk-sidepanel.hooks.tsx b/...nel/contributors-bulk-sidepanel.hooks.tsx → ...nel/contributors-bulk-sidepanel.hooks.tsx
@@ -1,4 +1,4 @@
-import { ContributorsBulkSidepanelData } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.types";
+import { ContributorsBulkSidepanelData } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.types";
 
 import { useSinglePanelContext } from "@/shared/features/side-panels/side-panel/side-panel";
 

diff --git a/...sidepanel/contributors-bulk-sidepanel.tsx → ...sidepanel/contributors-bulk-sidepanel.tsx b/...sidepanel/contributors-bulk-sidepanel.tsx → ...sidepanel/contributors-bulk-sidepanel.tsx
@@ -1,9 +1,10 @@
 import { useContext, useEffect, useMemo, useState } from "react";
 
-import { useContributorsBulkSidePanel } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.hooks";
-import { LabelSelector } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/label-selector/label-selector";
-import { LabelSelectorProps } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/label-selector/label-selector.types";
-import { ContributorsTableContext } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/contributors-table.context";
+import { useContributorsBulkSidePanel } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.hooks";
+import { ContributorsBulkSidepanelData } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.types";
+import { LabelSelector } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/label-selector/label-selector";
+import { LabelSelectorProps } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/label-selector/label-selector.types";
+import { ContributorsTableContext } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/contributors-table.context";
 
 import { ProjectReactQueryAdapter } from "@/core/application/react-query-adapter/project";
 
@@ -22,8 +23,6 @@ import { useCanReward } from "@/shared/hooks/rewards/use-can-reward";
 import { useRewardFlow } from "@/shared/panels/_flows/reward-flow/reward-flow.context";
 import { Translate } from "@/shared/translation/components/translate/translate";
 
-import { ContributorsBulkSidepanelData } from "./contributors-bulk-sidepanel.types";
-
 type label = { id: string; for: number[] };
 
 export function ContributorsBulkSidepanel() {

diff --git a/...anel/contributors-bulk-sidepanel.types.ts → ...anel/contributors-bulk-sidepanel.types.ts b/...anel/contributors-bulk-sidepanel.types.ts → ...anel/contributors-bulk-sidepanel.types.ts
diff --git a/...eatures/label-selector/label-selector.tsx → ...eatures/label-selector/label-selector.tsx b/...eatures/label-selector/label-selector.tsx → ...eatures/label-selector/label-selector.tsx
@@ -1,12 +1,12 @@
 import { useMemo } from "react";
 
+import { LabelSelectorProps } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/label-selector/label-selector.types";
+
 import { ProjectReactQueryAdapter } from "@/core/application/react-query-adapter/project";
 
 import { MenuItemPort } from "@/design-system/molecules/menu-item";
 import { Select } from "@/design-system/molecules/select";
 
-import { LabelSelectorProps } from "./label-selector.types";
-
 export function LabelSelector({ selectedLabels, onAction, projectSlug }: LabelSelectorProps) {
   const { data } = ProjectReactQueryAdapter.client.useGetProjectContributorLabels({
     pathParams: { projectIdOrSlug: projectSlug },

diff --git a/...es/label-selector/label-selector.types.ts → ...es/label-selector/label-selector.types.ts b/...es/label-selector/label-selector.types.ts → ...es/label-selector/label-selector.types.ts
diff --git a/...tors-table/contributors-table.context.tsx → ...tors-table/contributors-table.context.tsx b/...tors-table/contributors-table.context.tsx → ...tors-table/contributors-table.context.tsx
@@ -3,8 +3,8 @@
 import { OnChangeFn, RowSelectionState } from "@tanstack/react-table";
 import { PropsWithChildren, createContext, useContext, useEffect, useState } from "react";
 
-import { ContributorsBulkSidepanel } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel";
-import { useContributorsBulkSidePanel } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.hooks";
+import { ContributorsBulkSidepanel } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel";
+import { useContributorsBulkSidePanel } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_features/contributors-bulk-sidepanel/contributors-bulk-sidepanel.hooks";
 
 import { BiContributorInterface } from "@/core/domain/bi/models/bi-contributor-model";
 

diff --git a/...contributors-table/contributors-table.tsx → ...contributors-table/contributors-table.tsx b/...contributors-table/contributors-table.tsx → ...contributors-table/contributors-table.tsx
@@ -2,14 +2,15 @@ import { RowSelectionState, Updater, getCoreRowModel, useReactTable } from "@tan
 import { useParams } from "next/navigation";
 import { useContext, useMemo, useState } from "react";
 
-import { FilterColumns } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_components/filter-columns/filter-columns";
-import { useFilterColumns } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_components/filter-columns/filter-columns.hooks";
-import { FilterData } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_components/filter-data/filter-data";
-import { useContributorFilterDataSidePanel } from "@/app/manage-projects/[projectSlug]/_features/contributors-table/_components/filter-data/filter-data.hooks";
+import { FilterColumns } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-columns/filter-columns";
+import { useFilterColumns } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-columns/filter-columns.hooks";
+import { FilterData } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-data/filter-data";
+import { useContributorFilterDataSidePanel } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/_components/filter-data/filter-data.hooks";
 import {
   ContributorsTableContext,
   ContributorsTableProvider,
-} from "@/app/manage-projects/[projectSlug]/_features/contributors-table/contributors-table.context";
+} from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/contributors-table.context";
+import { ContributorsTableProps } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/contributors-table.types";
 
 import { BiReactQueryAdapter } from "@/core/application/react-query-adapter/bi";
 import { GetBiContributorsPortParams, GetBiContributorsQueryParams } from "@/core/domain/bi/bi-contract.types";
@@ -150,9 +151,7 @@ function SafeContributorsTable() {
   );
 }
 
-export function ContributorsTable() {
-  const { projectSlug = "" } = useParams<{ projectSlug: string }>();
-
+export function ContributorsTable({ projectSlug }: ContributorsTableProps) {
   return (
     <ContributorsTableProvider projectSlug={projectSlug}>
       <SafeContributorsTable />

diff --git a/...jects/[projectSlug]/contributors/_features/contributors-table/contributors-table.types.ts b/...jects/[projectSlug]/contributors/_features/contributors-table/contributors-table.types.ts
@@ -0,0 +1,3 @@
+export interface ContributorsTableProps {
+  projectSlug: string;
+}
diff --git a/app/manage-projects/[projectSlug]/contributors/page.tsx b/app/manage-projects/[projectSlug]/contributors/page.tsx
@@ -0,0 +1,11 @@
+"use client";
+
+import { ContributorsTable } from "@/app/manage-projects/[projectSlug]/contributors/_features/contributors-table/contributors-table";
+
+export default function ManageProgramsContributorsPage({
+  params: { projectSlug },
+}: {
+  params: { projectSlug: string };
+}) {
+  return <ContributorsTable projectSlug={projectSlug} />;
+}
diff --git a/...vailable-cards/budget-available-cards.tsx → ...vailable-cards/budget-available-cards.tsx b/...vailable-cards/budget-available-cards.tsx → ...vailable-cards/budget-available-cards.tsx
@@ -1,6 +1,6 @@
 import { useParams } from "next/navigation";
 
-import { FinancialColumnChart } from "@/app/manage-projects/[projectSlug]/_features/financial/financial-column-chart/financial-column-chart";
+import { FinancialColumnChart } from "@/app/manage-projects/[projectSlug]/financial/_features/financial-column-chart/financial-column-chart";
 
 import { ProjectReactQueryAdapter } from "@/core/application/react-query-adapter/project";
 

diff --git a/...-available-cards/budget-available.en.json → ...-available-cards/budget-available.en.json b/...-available-cards/budget-available.en.json → ...-available-cards/budget-available.en.json
diff --git a/...lumn-chart/financial-column-chart.en.json → ...lumn-chart/financial-column-chart.en.json b/...lumn-chart/financial-column-chart.en.json → ...lumn-chart/financial-column-chart.en.json
diff --git a/...mn-chart/financial-column-chart.hooks.tsx → ...mn-chart/financial-column-chart.hooks.tsx b/...mn-chart/financial-column-chart.hooks.tsx → ...mn-chart/financial-column-chart.hooks.tsx