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.

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

E 2487 move financial section in a dedicated financial tabs #694

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"header": {
"title": "Financial"
"views": {
"programs": "Programs",
"financial": "Financial"
},
"financial": {
"title": "Financials",
"buttons": {
"budgetAvailable": "Budget",
"budgetChart": "Chart",
Expand All @@ -12,7 +12,6 @@
}
},
"programs": {
"title": "Programs",
"actions": {
"allocate": {
"button": "Allocate a Program",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { DepositButtonProps } from "@/app/financials/[sponsorId]/_views/financial/deposit-button/deposit-button.types";

import { Button } from "@/design-system/atoms/button/variants/button-default";

import { useCurrencyListSidepanel } from "@/shared/panels/currency-list-sidepanel/currency-list-sidepanel.hooks";

export function DepositButton({ sponsorId }: DepositButtonProps) {
const { open: openCurrencyListSidepanel } = useCurrencyListSidepanel();

return (
<Button
variant={"primary"}
size={"sm"}
translate={{ token: "financials:details.financial.buttons.makeDeposit" }}
classNames={{
base: "max-w-full overflow-hidden",
label: "whitespace-nowrap text-ellipsis overflow-hidden",
}}
onClick={() => openCurrencyListSidepanel({ sponsorId })}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface DepositButtonProps {
sponsorId: string;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useParams } from "next/navigation";
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";

import { useFinancialColumnChart } from "@/app/financials/[sponsorId]/_sections/financial-section/components/financial-column-chart/financial-column-chart.hooks";
import { useFinancialColumnChart } from "@/app/financials/[sponsorId]/_views/financial/financial-column-chart/financial-column-chart.hooks";

import { BiReactQueryAdapter } from "@/core/application/react-query-adapter/bi";
import { bootstrap } from "@/core/bootstrap";
Expand Down
9 changes: 9 additions & 0 deletions app/financials/[sponsorId]/_views/financial/financial.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { BudgetAvailableCards } from "@/app/financials/[sponsorId]/_views/financial/budget-available-cards/budget-available-cards";

export function Financial() {
return (
<div>
<BudgetAvailableCards />
</div>
);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { createContext, useContext, useEffect, useMemo, useState } from "react";
import { useDebounce } from "react-use";

import { BiReactQueryAdapter } from "@/core/application/react-query-adapter/bi";
import { bootstrap } from "@/core/bootstrap";

import {
DEFAULT_FILTER,
TransactionsContextFilter,
Expand All @@ -12,7 +9,10 @@ import {
TransactionsContextProps,
TransactionsContextQueryParams,
TransactionsContextReturn,
} from "./transactions.context.types";
} from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context.types";

import { BiReactQueryAdapter } from "@/core/application/react-query-adapter/bi";
import { bootstrap } from "@/core/bootstrap";

export const TransactionsContext = createContext<TransactionsContextReturn>({
sponsorId: "",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTransactionsContext } from "@/app/financials/[sponsorId]/_sections/financial-section/components/transactions-sidepanel/context/transactions.context";
import { TransactionsContextFilterTypes } from "@/app/financials/[sponsorId]/_sections/financial-section/components/transactions-sidepanel/context/transactions.context.types";
import { useTransactionsContext } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";
import { TransactionsContextFilterTypes } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context.types";

import { bootstrap } from "@/core/bootstrap";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useTransactionsContext } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";
import { ExportCsv } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/export-csv/export-csv";
import { Transactions } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/transactions/transactions";

import { Button } from "@/design-system/atoms/button/variants/button-default";

import { SidePanelBody } from "@/shared/features/side-panels/side-panel-body/side-panel-body";
import { SidePanelHeader } from "@/shared/features/side-panels/side-panel-header/side-panel-header";
import { useSidePanel } from "@/shared/features/side-panels/side-panel/side-panel";

import { useTransactionsContext } from "./context/transactions.context";
import { ExportCsv } from "./export-csv/export-csv";
import { Transactions } from "./transactions/transactions";

export function TransactionsSidepanel() {
const { Panel, open } = useSidePanel({ name: "sponsor-transaction-export" });
const {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Filter, Search } from "lucide-react";
import { useTranslation } from "react-i18next";

import { useTransactionsContext } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";
import { TransactionsContextFilterTypes } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context.types";

import { Badge } from "@/design-system/atoms/badge";
import { Button } from "@/design-system/atoms/button/variants/button-default";
import { DateRangePicker, DateRangePickerValue } from "@/design-system/atoms/date-range-picker";
Expand All @@ -12,9 +15,6 @@ import { CheckboxButton } from "@/design-system/molecules/checkbox-button";

import { Translate } from "@/shared/translation/components/translate/translate";

import { useTransactionsContext } from "../../../context/transactions.context";
import { TransactionsContextFilterTypes } from "../../../context/transactions.context.types";

export function Header() {
const { t } = useTranslation("financials");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Check, LoaderCircle, X } from "lucide-react";
import { useMemo } from "react";

import { useTransactionsContext } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";

import { SponsorReactQueryAdapter } from "@/core/application/react-query-adapter/sponsor";
import { bootstrap } from "@/core/bootstrap";
import { SponsorTransactionListItemResponse } from "@/core/domain/sponsor/models/sponsor-transaction-list-item-model";
Expand All @@ -13,8 +15,6 @@ import {
CardTransactionPort,
} from "@/design-system/molecules/cards/card-transaction";

import { useTransactionsContext } from "../../../context/transactions.context";

export function TransactionsWrapper({ date }: { date: Date }) {
const dateKernelPort = bootstrap.getDateKernelPort();
const { sponsorId, queryParams } = useTransactionsContext();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { useMemo } from "react";

import { useTransactionsContext } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";
import { Header } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/transactions/components/header/header";
import { TransactionsWrapper } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/transactions/components/transactions-wrapper/transactions-wrapper";

import { bootstrap } from "@/core/bootstrap";

import { Accordion, AccordionItemProps } from "@/design-system/molecules/accordion";

import { EmptyStateLite } from "@/shared/components/empty-state-lite/empty-state-lite";

import { useTransactionsContext } from "../context/transactions.context";
import { Header } from "./components/header/header";
import { TransactionsWrapper } from "./components/transactions-wrapper/transactions-wrapper";

export function Transactions() {
const dateKernelPort = bootstrap.getDateKernelPort();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChevronRight } from "lucide-react";
import { useParams } from "next/navigation";

import { TransactionsContextProvider } from "@/app/financials/[sponsorId]/_sections/financial-section/components/transactions-sidepanel/context/transactions.context";
import { TransactionsSidepanel } from "@/app/financials/[sponsorId]/_sections/financial-section/components/transactions-sidepanel/transactions-sidepanel";
import { TransactionsContextProvider } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/context/transactions.context";
import { TransactionsSidepanel } from "@/app/financials/[sponsorId]/_views/financial/transactions-sidepanel/transactions-sidepanel";

import { Button } from "@/design-system/atoms/button/variants/button-default";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { ChevronRight } from "lucide-react";
import { AllocateButtonProps } from "@/app/financials/[sponsorId]/_views/programs/allocate-button/allocate-button.types";

import { SponsorReactQueryAdapter } from "@/core/application/react-query-adapter/sponsor";

import { Button } from "@/design-system/atoms/button/variants/button-default";
import { Tooltip } from "@/design-system/atoms/tooltip";

import { useProgramListSidepanel } from "@/shared/panels/program-list-sidepanel/program-list-sidepanel.context";
import { useProgramListSidepanel } from "@/shared/panels/program-list-sidepanel/program-list-sidepanel.hooks";
import { Translate } from "@/shared/translation/components/translate/translate";

export function AllocateButton({ sponsorId }: { sponsorId: string }) {
export function AllocateButton({ sponsorId }: AllocateButtonProps) {
const { open } = useProgramListSidepanel();

const { data, isLoading, isError } = SponsorReactQueryAdapter.client.useGetSponsor({
Expand All @@ -29,14 +29,11 @@ export function AllocateButton({ sponsorId }: { sponsorId: string }) {
>
<Button
variant={"primary"}
endIcon={{ component: ChevronRight }}
isTextButton
size={"md"}
onClick={() => open()}
size={"sm"}
onClick={open}
isDisabled={isDisabled}
>
<Translate token={"financials:details.programs.actions.allocate.button"} />
</Button>
translate={{ token: "financials:details.programs.actions.allocate.button" }}
/>
</Tooltip>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface AllocateButtonProps {
sponsorId: string;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { useCreateProgramPanel } from "@/app/financials/[sponsorId]/_features/create-program-panel/create-program-panel.hooks";
import { CreateButtonProps } from "@/app/financials/[sponsorId]/_views/programs/create-button/create-button.types";

import { Button } from "@/design-system/atoms/button/variants/button-default";

export function CreateButton({ sponsorId }: CreateButtonProps) {
const { open: openCreateProgram } = useCreateProgramPanel();

return (
<Button
variant={"secondary"}
size={"sm"}
onClick={() => openCreateProgram({ sponsorId })}
translate={{ token: "financials:details.programs.actions.create" }}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface CreateButtonProps {
sponsorId: string;
}
Loading