Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bind contributor panel #355

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Bind contributor panel #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1b4777
bing contributor panel
pixelfact Oct 9, 2024
90432c1
rename file
pixelfact Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ...butors/accordion-refused-contributors.tsx → ...butors/accordion-ignored-contributors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import { Table, TableLoading } from "@/design-system/molecules/table";

import { ScrollView } from "@/shared/components/scroll-view/scroll-view";
import { ShowMore } from "@/shared/components/show-more/show-more";
import { AccordionRefusedContributorsProps } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-refused-contributors/accordion-refused-contributors.types";
import { AccordionIgnoredContributorsProps } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-ignored-contributors/accordion-ignored-contributors.types";
import { useContributorSidePanel } from "@/shared/panels/contributor-sidepanel/contributor-sidepanel.hooks";

export function AccordionRefusedContributors({ projectId, queryParams, columns }: AccordionRefusedContributorsProps) {
export function AccordionIgnoredContributors({ projectId, queryParams, columns }: AccordionIgnoredContributorsProps) {
const { open: openContributor } = useContributorSidePanel();
const { data, isLoading, isError, hasNextPage, fetchNextPage, isFetchingNextPage } =
ApplicationReactQueryAdapter.client.useGetApplications({
queryParams: { ...queryParams, isIgnored: true },
Expand Down Expand Up @@ -45,11 +47,11 @@ export function AccordionRefusedContributors({ projectId, queryParams, columns }
}
return (
<Accordion
id={"refused-contributors"}
id={"ignored-contributors"}
titleProps={{
children: (
<div className={"flex items-center gap-md"}>
<Typo translate={{ token: "modals:manageApplicants.refused" }} size={"sm"} />
<Typo translate={{ token: "modals:manageApplicants.ignored" }} size={"sm"} />
<Badge size={"xxs"} color={"grey"}>
{totalItemNumber}
</Badge>
Expand All @@ -66,9 +68,9 @@ export function AccordionRefusedContributors({ projectId, queryParams, columns }
classNames={{
base: "min-w-[1200px]",
}}
// onRowClick={row => {
// alert(row.original.id);
// }}
onRowClick={row => {
openContributor({ login: row.original.applicant.login });
}}
/>
{hasNextPage ? <ShowMore onNext={fetchNextPage} loading={isFetchingNextPage} /> : null}
</ScrollView>
Expand Down
2 changes: 1 addition & 1 deletion ...s/accordion-refused-contributors.types.ts → ...s/accordion-ignored-contributors.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { GetApplicationsQueryParams } from "@/core/domain/application/applicatio

import { useFilterColumns } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-columns/filter-columns.hooks";

export interface AccordionRefusedContributorsProps {
export interface AccordionIgnoredContributorsProps {
projectId?: string;
queryParams: Partial<GetApplicationsQueryParams>;
columns: ReturnType<typeof useFilterColumns>["columns"];
Expand Down
8 changes: 5 additions & 3 deletions ...ts/applicants-table/_components/accordion-new-contributors/accordion-new-contributors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import { Table, TableLoading } from "@/design-system/molecules/table";
import { ScrollView } from "@/shared/components/scroll-view/scroll-view";
import { ShowMore } from "@/shared/components/show-more/show-more";
import { AccordionNewContributorsProps } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-new-contributors/accordion-new-contributors.types";
import { useContributorSidePanel } from "@/shared/panels/contributor-sidepanel/contributor-sidepanel.hooks";

export function AccordionNewContributors({ projectId, queryParams, columns }: AccordionNewContributorsProps) {
const { open: openContributor } = useContributorSidePanel();
const { data, isLoading, isError, hasNextPage, fetchNextPage, isFetchingNextPage } =
ApplicationReactQueryAdapter.client.useGetApplications({
queryParams: { ...queryParams, isApplicantProjectMember: false },
Expand Down Expand Up @@ -66,9 +68,9 @@ export function AccordionNewContributors({ projectId, queryParams, columns }: Ac
classNames={{
base: "min-w-[1200px]",
}}
// onRowClick={row => {
// alert(row.original.id);
// }}
onRowClick={row => {
openContributor({ login: row.original.applicant.login });
}}
/>
{hasNextPage ? <ShowMore onNext={fetchNextPage} loading={isFetchingNextPage} /> : null}
</ScrollView>
Expand Down
8 changes: 5 additions & 3 deletions ...cants-table/_components/accordion-project-contributors/accordion-project-contributors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import { Table, TableLoading } from "@/design-system/molecules/table";
import { ScrollView } from "@/shared/components/scroll-view/scroll-view";
import { ShowMore } from "@/shared/components/show-more/show-more";
import { AccordionProjectContributorsProps } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-project-contributors/accordion-project-contributors.types";
import { useContributorSidePanel } from "@/shared/panels/contributor-sidepanel/contributor-sidepanel.hooks";

export function AccordionProjectContributors({ projectId, queryParams, columns }: AccordionProjectContributorsProps) {
const { open: openContributor } = useContributorSidePanel();
const { data, isLoading, isError, hasNextPage, fetchNextPage, isFetchingNextPage } =
ApplicationReactQueryAdapter.client.useGetApplications({
queryParams: { ...queryParams, isApplicantProjectMember: true },
Expand Down Expand Up @@ -66,9 +68,9 @@ export function AccordionProjectContributors({ projectId, queryParams, columns }
classNames={{
base: "min-w-[1200px]",
}}
// onRowClick={row => {
// alert(row.original.id);
// }}
onRowClick={row => {
openContributor({ login: row.original.applicant.login });
}}
/>
{hasNextPage ? <ShowMore onNext={fetchNextPage} loading={isFetchingNextPage} /> : null}
</ScrollView>
Expand Down
6 changes: 4 additions & 2 deletions shared/modals/manage-applicants-modal/_components/applicants-table/applicants-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ import { Button } from "@/design-system/atoms/button/variants/button-default";
import { TableSearch } from "@/design-system/molecules/table-search";

import { ScrollView } from "@/shared/components/scroll-view/scroll-view";
import { AccordionIgnoredContributors } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-ignored-contributors/accordion-ignored-contributors";
import { AccordionNewContributors } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-new-contributors/accordion-new-contributors";
import { AccordionProjectContributors } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-project-contributors/accordion-project-contributors";
import { AccordionRefusedContributors } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/accordion-refused-contributors/accordion-refused-contributors";
import { FilterColumns } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-columns/filter-columns";
import { useFilterColumns } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-columns/filter-columns.hooks";
import { FilterData } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-data/filter-data";
import { FilterDataProvider } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-data/filter-data.context";
import { useApplicantsFilterDataSidePanel } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/_components/filter-data/filter-data.hooks";
import { ApplicantsTableProps } from "@/shared/modals/manage-applicants-modal/_components/applicants-table/applicants-table.types";
import { ContributorSidepanel } from "@/shared/panels/contributor-sidepanel/contributor-sidepanel";

export type ApplicantsTableFilters = Omit<
NonNullable<GetApplicationsPortParams["queryParams"]>,
Expand Down Expand Up @@ -64,9 +65,10 @@ export function ApplicantsTable({ projectId }: ApplicantsTableProps) {
</nav>
<AccordionProjectContributors projectId={projectId} queryParams={queryParams} columns={columns} />
<AccordionNewContributors projectId={projectId} queryParams={queryParams} columns={columns} />
<AccordionRefusedContributors projectId={projectId} queryParams={queryParams} columns={columns} />
<AccordionIgnoredContributors projectId={projectId} queryParams={queryParams} columns={columns} />
</div>
<FilterData />
<ContributorSidepanel />
</ScrollView>
</FilterDataProvider>
);
Expand Down
2 changes: 1 addition & 1 deletion shared/modals/manage-applicants-modal/_translations/manage-applicants.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"title": "Applicants",
"projectContributors": "Project contributors",
"newContributors": "New contributors",
"refused": "Refused",
"ignored": "Ignored",
"table": {
"columns": {
"contributor": "Contributor",
Expand Down