Compare commits
15
Commits
aaee9591d7
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b94a16ae5 | ||
|
|
e2062ce837 | ||
|
|
d910d624d6 | ||
|
|
cc45352243 | ||
|
|
ed0b5388ab | ||
|
|
134c951178 | ||
|
|
2fd7d59e65 | ||
|
|
668f2ef70e | ||
|
|
cadba8d075 | ||
|
|
2db39f25d9 | ||
|
|
2d070ce2b5 | ||
|
|
5077bd4f0b | ||
|
|
e2d143df46 | ||
|
|
ad93725a84 | ||
|
|
8ce1e8e444 |
+6
-7
@@ -8,7 +8,7 @@ Vitest — отдельную JSDOM конфигурацию. Точные versi
|
||||
[package.json](../package.json), реализация — source of truth.
|
||||
|
||||
```text
|
||||
app → pages → widgets → features → entities → shared
|
||||
app → pages → features → entities → shared
|
||||
page container → page VM → entity/feature query → shared/api → backend /api/v1
|
||||
↓
|
||||
props → state/section views
|
||||
@@ -30,14 +30,13 @@ contract; frontend не читает его checkout для генерации
|
||||
| --- | --- |
|
||||
| Bootstrap, глобальные providers, routes | `app` |
|
||||
| Композиция маршрута и поведение, нужное только этому экрану | `pages/<page>` |
|
||||
| Крупная переиспользуемая композиция экрана | `widgets/<widget>` |
|
||||
| Самостоятельная пользовательская возможность с собственным смыслом | `features/<capability>` |
|
||||
| Представление/поведение бизнес-сущности | `entities/<entity>` |
|
||||
| Переиспользуемый код без WealthLedger domain meaning | `shared` |
|
||||
|
||||
Локальный FSD profile: `app → pages → widgets → features → entities → shared`.
|
||||
Widget собирает несколько нижних слоёв в самостоятельный UI-блок; компонент для
|
||||
одной page остаётся у page. Form, mutation или click handler сами по себе не
|
||||
Локальный FSD profile: `app → pages → features → entities → shared`.
|
||||
Слой `widgets` не используется: композиция экрана и компонент для одной page
|
||||
остаются у page. Form, mutation или click handler сами по себе не
|
||||
требуют feature. Два callers не делают domain helper generic shared.
|
||||
Slice именуется по ответственности, а не `helpers`, `hooks` или `types`.
|
||||
|
||||
@@ -49,12 +48,12 @@ Slice именуется по ответственности, а не `helpers`,
|
||||
|
||||
Cross-slice consumer использует `@/` и `index.ts` владельца, например
|
||||
`@/entities/portfolio`. Alias Vite и TypeScript согласован. Другой slice не
|
||||
импортирует внутренний файл напрямую. Slices `pages`, `widgets`, `features`, `entities` не зависят от соседнего slice своего слоя;
|
||||
импортирует внутренний файл напрямую. Slices `pages`, `features`, `entities` не зависят от соседнего slice своего слоя;
|
||||
композиция принадлежит вышележащему owner. Existing меж-slice исключения
|
||||
не являются разрешением добавлять новые.
|
||||
|
||||
Направление зависимостей, public imports и запрет соседних slices в
|
||||
`pages`, `widgets`, `features`, `entities` проверяет `npm run deps`. Внутренние imports
|
||||
`pages`, `features`, `entities` проверяет `npm run deps`. Внутренние imports
|
||||
одного slice и связи shared segments этот запрет не ограничивает.
|
||||
Knip проверяет использование exports, а не смысл placement.
|
||||
|
||||
|
||||
@@ -1,5 +1,30 @@
|
||||
# Changelog
|
||||
|
||||
## [1.4.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.3.0...v1.4.0) (2026-11-06)
|
||||
|
||||
### Features
|
||||
|
||||
* **investments:** warn and offer retry after exhausted read retries (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#136](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/136)) ([8ce1e8e](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/8ce1e8e44486dcc23d4c074559ca2bb517880b60))
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **account:** show source metadata on empty account and income (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#133](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/133)) ([9619dc9](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/9619dc979172dbc16391206e801ed67862d20116))
|
||||
* align audit findings for Events, currency and auth (WealthLedger/frontend[#155](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/155)) ([668f2ef](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/668f2ef70e535a1222e7f600b1be4a31fefc6f8b))
|
||||
|
||||
### Refactoring
|
||||
|
||||
* **api:** consume bank operation oneOf contract (WealthLedger/frontend[#144](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/144)) ([#152](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/152)) ([2d070ce](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2d070ce2b54bbee466ecf6cc18b437910f0c07f8))
|
||||
* drop dead query helpers and simplify read deadline (WealthLedger/frontend[#141](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/141)) ([#149](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/149)) ([5077bd4](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/5077bd4f0baa4a59643e875485c2f08253cc198d))
|
||||
* move portfolio structure into account page, drop widgets (WealthLedger/frontend[#139](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/139)) ([#140](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/140)) ([e2d143d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e2d143df46e650139e49b7c80a886008ede86d2a))
|
||||
* normalize view models and share breadcrumbs and titles (WealthLedger/frontend[#143](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/143)) ([#153](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/153)) ([2db39f2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2db39f25d9478350ad56a1b2e2ca6496068257c5))
|
||||
* replace repeated lazy page wrappers with lazyPage helper ([#131](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/131)) ([#132](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/132)) ([71fbe77](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/71fbe7774d3ed63fcb84bc644da997921bc049b2))
|
||||
* share path-root query predicate (WealthLedger/frontend[#142](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/142)) ([#154](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/154)) ([cadba8d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cadba8d075daf9b20c0c9de97ad5bd8f5a3e74fc))
|
||||
|
||||
### Maintenance
|
||||
|
||||
* **api:** update OpenAPI snapshot with UpcomingEventsDto.window (WealthLedger/frontend[#134](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/134)) ([#135](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/135)) ([aaee959](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/aaee9591d7880193ee9b0c14339e8477264e4a94))
|
||||
* **deps:** set Renovate release age, PR limit and update groups (WealthLedger/main[#6](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/6)) ([#137](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/137)) ([ad93725](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ad93725a84615ec329631b71ed8db33337085740))
|
||||
|
||||
## [1.3.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.2.1...v1.3.0) (2026-11-01)
|
||||
|
||||
### Features
|
||||
|
||||
+5
-11
@@ -29,17 +29,17 @@ module.exports = {
|
||||
},
|
||||
{
|
||||
from: {
|
||||
path: "^src/(app|pages|widgets|features|entities|shared)/([^/]+)/",
|
||||
path: "^src/(app|pages|features|entities|shared)/([^/]+)/",
|
||||
},
|
||||
name: "slices-must-use-public-api",
|
||||
severity: "error",
|
||||
to: {
|
||||
path: String.raw`^src/(app|pages|widgets|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
|
||||
path: String.raw`^src/(app|pages|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
|
||||
pathNot: "^src/$1/$2/",
|
||||
},
|
||||
},
|
||||
{
|
||||
from: { path: "^src/(pages|widgets|features|entities)/([^/]+)/" },
|
||||
from: { path: "^src/(pages|features|entities)/([^/]+)/" },
|
||||
name: "no-same-layer-cross-slice-imports",
|
||||
severity: "error",
|
||||
to: { path: "^src/$1/", pathNot: "^src/$1/$2/" },
|
||||
@@ -48,24 +48,18 @@ module.exports = {
|
||||
from: { path: "^src/shared/" },
|
||||
name: "shared-must-not-depend-on-layers",
|
||||
severity: "error",
|
||||
to: { path: "^src/(entities|features|widgets|pages|app)/" },
|
||||
to: { path: "^src/(entities|features|pages|app)/" },
|
||||
},
|
||||
{
|
||||
from: { path: "^src/entities/" },
|
||||
name: "entities-must-not-depend-on-higher-layers",
|
||||
severity: "error",
|
||||
to: { path: "^src/(features|widgets|pages|app)/" },
|
||||
to: { path: "^src/(features|pages|app)/" },
|
||||
},
|
||||
{
|
||||
from: { path: "^src/features/" },
|
||||
name: "features-must-not-depend-on-higher-layers",
|
||||
severity: "error",
|
||||
to: { path: "^src/(widgets|pages|app)/" },
|
||||
},
|
||||
{
|
||||
from: { path: "^src/widgets/" },
|
||||
name: "widgets-must-not-depend-on-higher-layers",
|
||||
severity: "error",
|
||||
to: { path: "^src/(pages|app)/" },
|
||||
},
|
||||
{
|
||||
|
||||
@@ -17,12 +17,21 @@ http {
|
||||
default $http_x_forwarded_proto;
|
||||
'' $scheme;
|
||||
}
|
||||
# One shared budget: the external proxy's client-IP forwarding is not verified.
|
||||
map "$request_method:$uri" $auth_admission_key {
|
||||
default "";
|
||||
POST:/api/v1/auth/login auth;
|
||||
POST:/api/v1/auth/register auth;
|
||||
}
|
||||
limit_req_zone $auth_admission_key zone=auth_admission:1m rate=2r/s;
|
||||
limit_req_status 429;
|
||||
server {
|
||||
listen 8080;
|
||||
server_name _;
|
||||
root /usr/share/nginx/html;
|
||||
resolver 127.0.0.11 valid=5s ipv6=off;
|
||||
location /api/ {
|
||||
limit_req zone=auth_admission burst=5 nodelay;
|
||||
set $backend http://backend:3000;
|
||||
proxy_pass $backend$request_uri;
|
||||
proxy_set_header Host $http_host;
|
||||
|
||||
+6
-1
@@ -25,7 +25,11 @@ const readability = {
|
||||
)
|
||||
context.report({ messageId: "schema", node });
|
||||
},
|
||||
FunctionDeclaration: checkParameters,
|
||||
FunctionDeclaration(node) {
|
||||
checkParameters(node);
|
||||
if (node.id?.name?.endsWith?.("ViewModel"))
|
||||
context.report({ messageId: "vmName", node: node.id });
|
||||
},
|
||||
FunctionExpression: checkParameters,
|
||||
ImportDeclaration(node) {
|
||||
if (
|
||||
@@ -95,6 +99,7 @@ const readability = {
|
||||
schema: "Declare Zod schemas in a dedicated *.schema.ts file.",
|
||||
svg: "Own SVG markup in packages/icons, and import its public component.",
|
||||
union: "Put complex union members on separate lines.",
|
||||
vmName: "Name custom hooks use*Vm, not use*ViewModel.",
|
||||
},
|
||||
schema: [],
|
||||
type: "suggestion",
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "wealth-ledger-frontend",
|
||||
"version": "1.3.0",
|
||||
"version": "1.4.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "wealth-ledger-frontend",
|
||||
"version": "1.3.0",
|
||||
"version": "1.4.0",
|
||||
"workspaces": [
|
||||
"packages/*"
|
||||
],
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "wealth-ledger-frontend",
|
||||
"private": true,
|
||||
"version": "1.3.0",
|
||||
"version": "1.4.0",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": "24.22.1"
|
||||
|
||||
+16
-1
@@ -1,15 +1,30 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": ["config:recommended", ":semanticCommitTypeAll(chore)"],
|
||||
"extends": ["config:recommended", ":semanticCommitTypeAll(chore)", "security:minimumReleaseAgeNpm"],
|
||||
"timezone": "Europe/Moscow",
|
||||
"labels": ["dependencies"],
|
||||
"dependencyDashboard": true,
|
||||
"rangeStrategy": "pin",
|
||||
"prConcurrentLimit": 5,
|
||||
"lockFileMaintenance": {
|
||||
"enabled": true,
|
||||
"schedule": ["before 4am on the first day of the month"]
|
||||
},
|
||||
"packageRules": [
|
||||
{
|
||||
"matchUpdateTypes": ["minor", "patch"],
|
||||
"groupName": "non-major dependencies"
|
||||
},
|
||||
{
|
||||
"matchManagers": ["github-actions"],
|
||||
"matchUpdateTypes": ["minor", "patch"],
|
||||
"groupName": "non-major github actions"
|
||||
},
|
||||
{
|
||||
"matchManagers": ["docker-compose", "dockerfile"],
|
||||
"matchUpdateTypes": ["minor", "patch"],
|
||||
"groupName": "non-major container images"
|
||||
},
|
||||
{
|
||||
"matchUpdateTypes": ["major"],
|
||||
"dependencyDashboardApproval": true
|
||||
|
||||
@@ -55,12 +55,12 @@ const position: Portfolio["positions"][number]
|
||||
};
|
||||
|
||||
const portfolio: Portfolio = {
|
||||
cashBalances: [],
|
||||
cash: { currency: "RUB", value: "0" },
|
||||
isStale: false,
|
||||
lastSuccessfulAt: "2026-08-15T12:00:00Z",
|
||||
positions: accounts.map(account => ({ ...position, account })),
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "RUB", value: "1200" }],
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
totals: { currency: "RUB", value: "1200" },
|
||||
};
|
||||
|
||||
const receipt: BrokerageOperation
|
||||
@@ -106,14 +106,11 @@ const analytics: IncomeAnalytics
|
||||
},
|
||||
],
|
||||
period: { from: "2026-08-01", to: "2026-08-31" },
|
||||
totalsByCurrency: [
|
||||
{
|
||||
coupon: { currency: "RUB", value: "2" },
|
||||
currency: "RUB",
|
||||
dividend: { currency: "RUB", value: "0" },
|
||||
total: { currency: "RUB", value: "2" },
|
||||
},
|
||||
],
|
||||
total: {
|
||||
coupon: { currency: "RUB", value: "2" },
|
||||
dividend: { currency: "RUB", value: "0" },
|
||||
total: { currency: "RUB", value: "2" },
|
||||
},
|
||||
};
|
||||
|
||||
const CurrentLocation: FC = () => {
|
||||
@@ -216,7 +213,8 @@ beforeEach(() => {
|
||||
type: "coupon",
|
||||
}),
|
||||
),
|
||||
incomeTotalsByCurrency: [],
|
||||
incomeTotal: { currency: "RUB", value: "0" },
|
||||
window: { from: "2026-09-01", to: "2026-10-01" },
|
||||
}),
|
||||
),
|
||||
),
|
||||
@@ -226,9 +224,9 @@ beforeEach(() => {
|
||||
describe("All accounts routes", () => {
|
||||
it.each([
|
||||
["/accounts/all", "Все счета"],
|
||||
["/accounts/all/operations", "Журнал операций"],
|
||||
["/accounts/all/operations", "История операций"],
|
||||
["/accounts/all/income?from=2026-08-01&to=2026-08-31", "Пассивный доход"],
|
||||
["/accounts/all/events", "Будущие события"],
|
||||
["/accounts/all/events", "Предстоящие события"],
|
||||
])("opens %s directly", async (path, title) => {
|
||||
renderPage(path);
|
||||
expect(
|
||||
@@ -310,9 +308,9 @@ describe("All accounts routes", () => {
|
||||
);
|
||||
|
||||
for (const [suffix, tab] of [
|
||||
["operations", "Операции"],
|
||||
["operations", "История операций"],
|
||||
["income", "Доход"],
|
||||
["events", "События"],
|
||||
["events", "Предстоящие события"],
|
||||
]) {
|
||||
fireEvent.click(screen.getByRole("tab", { name: tab }));
|
||||
expect(screen.getByRole("link", { name: "Подробнее" }))
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useDocumentTitle } from "@mantine/hooks";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useCurrentRoute } from "@/app/model";
|
||||
@@ -8,12 +7,12 @@ import { useBankCard } from "@/entities/bank-card";
|
||||
import { useBond } from "@/entities/bond";
|
||||
import { useBrokerageAccounts } from "@/entities/brokerage-account";
|
||||
import { useStock } from "@/entities/stock";
|
||||
import { useAppDocumentTitle } from "@/shared/ui";
|
||||
|
||||
type DocumentTitleProps = { title: string };
|
||||
|
||||
const DocumentTitle: FC<DocumentTitleProps> = (props): undefined => {
|
||||
const { t } = useTranslation();
|
||||
useDocumentTitle(`${props.title} — ${t("appName")}`);
|
||||
useAppDocumentTitle(props.title);
|
||||
};
|
||||
|
||||
type AccountDocumentTitleProps = {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import type { FC, PropsWithChildren } from "react";
|
||||
|
||||
import { Button, Stack, Text, Title } from "@mantine/core";
|
||||
import { useDocumentTitle } from "@mantine/hooks";
|
||||
import { Component } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link, useLocation } from "react-router";
|
||||
|
||||
import { useAuth } from "@/features/auth";
|
||||
import { useAppDocumentTitle } from "@/shared/ui";
|
||||
|
||||
type BoundaryProps = PropsWithChildren<{
|
||||
authenticated: boolean;
|
||||
@@ -37,7 +37,7 @@ class Boundary extends Component<BoundaryProps, State> {
|
||||
const RouteErrorFallback: FC<RouteErrorFallbackProps> = (props) => {
|
||||
const { authenticated } = props;
|
||||
const { t } = useTranslation();
|
||||
useDocumentTitle(`${t("routeError.title")} — ${t("appName")}`);
|
||||
useAppDocumentTitle(t("routeError.title"));
|
||||
const to = authenticated ? "/accounts" : "/login";
|
||||
|
||||
return (
|
||||
|
||||
@@ -55,9 +55,9 @@ describe("AppBreadcrumbs", () => {
|
||||
});
|
||||
|
||||
it.each([
|
||||
["operations", "Операции"],
|
||||
["OPERATIONS", "Операции"],
|
||||
["events", "Будущие события"],
|
||||
["operations", "История операций"],
|
||||
["OPERATIONS", "История операций"],
|
||||
["events", "Предстоящие события"],
|
||||
["income", "Пассивный доход"],
|
||||
])("links to the account hierarchy from %s", (section, title) => {
|
||||
renderBreadcrumbs(`/accounts/account-1/${section}`, [
|
||||
|
||||
@@ -7,10 +7,8 @@ import { useCurrentRoute } from "@/app/model";
|
||||
|
||||
import { AccountBreadcrumbs } from "./AccountBreadcrumbs";
|
||||
import { AccountScopeSwitch } from "./AccountScopeSwitch/AccountScopeSwitch";
|
||||
import { BondBreadcrumbs } from "./BondBreadcrumbs";
|
||||
import { BreadcrumbTrail } from "./BreadcrumbTrail";
|
||||
import { CardBreadcrumbs } from "./CardBreadcrumbs";
|
||||
import { StockBreadcrumbs } from "./StockBreadcrumbs";
|
||||
import { EntityBreadcrumbs } from "./EntityBreadcrumbs";
|
||||
|
||||
const AppBreadcrumbs: FC = () => {
|
||||
const { t } = useTranslation();
|
||||
@@ -26,9 +24,16 @@ const AppBreadcrumbs: FC = () => {
|
||||
stock,
|
||||
} = useCurrentRoute();
|
||||
|
||||
if (bond) return <BondBreadcrumbs identifier={bond.params.bondId ?? ""} />;
|
||||
if (stock)
|
||||
return <StockBreadcrumbs identifier={stock.params.stockId ?? ""} />;
|
||||
if (bond) {
|
||||
return <EntityBreadcrumbs identifier={bond.params.bondId ?? ""} kind="bond" />;
|
||||
}
|
||||
|
||||
if (stock) {
|
||||
return (
|
||||
<EntityBreadcrumbs identifier={stock.params.stockId ?? ""} kind="stock" />
|
||||
);
|
||||
}
|
||||
|
||||
if (account && (section || !account.params.section))
|
||||
return (
|
||||
<Stack gap={0} mb="md">
|
||||
@@ -43,8 +48,13 @@ const AppBreadcrumbs: FC = () => {
|
||||
/>
|
||||
</Stack>
|
||||
);
|
||||
if (card) return <CardBreadcrumbs identifier={card.params.cardId ?? ""} />;
|
||||
|
||||
if (card) {
|
||||
return <EntityBreadcrumbs identifier={card.params.cardId ?? ""} kind="card" />;
|
||||
}
|
||||
|
||||
if (cards) return <BreadcrumbTrail items={[{ label: t("bank.title") }]} />;
|
||||
|
||||
if (accounts)
|
||||
return <BreadcrumbTrail items={[{ label: t("breadcrumbs.accounts") }]} />;
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useBond } from "@/entities/bond";
|
||||
|
||||
import { BreadcrumbTrail } from "./BreadcrumbTrail";
|
||||
|
||||
type BondBreadcrumbsProps = { identifier: string };
|
||||
|
||||
const BondBreadcrumbs: FC<BondBreadcrumbsProps> = (props) => {
|
||||
const { data } = useBond(props.identifier);
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<BreadcrumbTrail
|
||||
items={[
|
||||
{ label: t("bond.searchTitle"), to: "/bonds" },
|
||||
{ label: data?.name ?? t("bond.instrument") },
|
||||
]}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export { BondBreadcrumbs };
|
||||
@@ -39,4 +39,4 @@ const BreadcrumbTrail: FC<BreadcrumbTrailProps> = (props) => {
|
||||
);
|
||||
};
|
||||
|
||||
export { BreadcrumbTrail };
|
||||
export { BreadcrumbTrail, type Crumb };
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useBankCard } from "@/entities/bank-card";
|
||||
|
||||
import { BreadcrumbTrail } from "./BreadcrumbTrail";
|
||||
|
||||
type CardBreadcrumbsProps = { identifier: string };
|
||||
|
||||
const CardBreadcrumbs: FC<CardBreadcrumbsProps> = (props) => {
|
||||
const { data } = useBankCard(props.identifier);
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<BreadcrumbTrail
|
||||
items={[
|
||||
{ label: t("bank.title"), to: "/cards" },
|
||||
{ label: data?.name ?? t("bank.card") },
|
||||
]}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export { CardBreadcrumbs };
|
||||
@@ -0,0 +1,48 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useBankCard } from "@/entities/bank-card";
|
||||
import { useBond } from "@/entities/bond";
|
||||
import { useStock } from "@/entities/stock";
|
||||
|
||||
import type { Crumb } from "./BreadcrumbTrail";
|
||||
|
||||
import { BreadcrumbTrail } from "./BreadcrumbTrail";
|
||||
|
||||
type EntityBreadcrumbsProps = {
|
||||
identifier: string;
|
||||
kind:
|
||||
| "bond"
|
||||
| "card"
|
||||
| "stock";
|
||||
};
|
||||
|
||||
const EntityBreadcrumbs: FC<EntityBreadcrumbsProps> = (props) => {
|
||||
const { identifier, kind } = props;
|
||||
const { t } = useTranslation();
|
||||
|
||||
const bond = useBond(kind === "bond" ? identifier : "");
|
||||
const card = useBankCard(kind === "card" ? identifier : "");
|
||||
const stock = useStock(kind === "stock" ? identifier : "");
|
||||
|
||||
let parent: Crumb;
|
||||
let name: string;
|
||||
|
||||
if (kind === "bond") {
|
||||
parent = { label: t("bond.searchTitle"), to: "/bonds" };
|
||||
name = bond.data?.name ?? t("bond.instrument");
|
||||
}
|
||||
else if (kind === "stock") {
|
||||
parent = { label: t("stock.searchTitle"), to: "/stocks" };
|
||||
name = stock.data?.name ?? t("stock.share");
|
||||
}
|
||||
else {
|
||||
parent = { label: t("bank.title"), to: "/cards" };
|
||||
name = card.data?.name ?? t("bank.card");
|
||||
}
|
||||
|
||||
return <BreadcrumbTrail items={[parent, { label: name }]} />;
|
||||
};
|
||||
|
||||
export { EntityBreadcrumbs };
|
||||
@@ -1,25 +0,0 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useStock } from "@/entities/stock";
|
||||
|
||||
import { BreadcrumbTrail } from "./BreadcrumbTrail";
|
||||
|
||||
type StockBreadcrumbsProps = { identifier: string };
|
||||
|
||||
const StockBreadcrumbs: FC<StockBreadcrumbsProps> = (props) => {
|
||||
const { data } = useStock(props.identifier);
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<BreadcrumbTrail
|
||||
items={[
|
||||
{ label: t("stock.searchTitle"), to: "/stocks" },
|
||||
{ label: data?.name ?? t("stock.share") },
|
||||
]}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export { StockBreadcrumbs };
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
ApiErrorCode,
|
||||
apiErrorCode,
|
||||
isApiErrorCode,
|
||||
isGetUnder,
|
||||
} from "@/shared/api";
|
||||
|
||||
import type {
|
||||
@@ -26,21 +27,14 @@ async function mutationData<T>(
|
||||
return data;
|
||||
}
|
||||
|
||||
const bankCardGetPredicate = isGetUnder(["/api/v1/bank-cards"]);
|
||||
|
||||
function useBankMutationOptions() {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
const invalidate = () =>
|
||||
queryClient.invalidateQueries({
|
||||
predicate: ({ queryKey }) => {
|
||||
const [method, path] = queryKey;
|
||||
|
||||
return (
|
||||
method === "get"
|
||||
&& typeof path === "string"
|
||||
&& (path === "/api/v1/bank-cards"
|
||||
|| path.startsWith("/api/v1/bank-cards/"))
|
||||
);
|
||||
},
|
||||
predicate: ({ queryKey }) => bankCardGetPredicate(queryKey),
|
||||
});
|
||||
|
||||
return {
|
||||
|
||||
@@ -49,6 +49,10 @@ function entryLabelKey(operation: BrokerageOperation): string {
|
||||
return `ledger.category.${operation.category}`;
|
||||
}
|
||||
|
||||
function isCouponPayment(operation: BrokerageOperation): boolean {
|
||||
return isOperationType(operation.type, OperationType.Coupon);
|
||||
}
|
||||
|
||||
function isIncomePayment(operation: BrokerageOperation): boolean {
|
||||
return [OperationType.Coupon, OperationType.Dividend].some(type =>
|
||||
isOperationType(operation.type, type),
|
||||
@@ -131,6 +135,7 @@ function paymentPresentation(
|
||||
export {
|
||||
brokerageOperationGroupKey,
|
||||
entryLabelKey,
|
||||
isCouponPayment,
|
||||
isIncomePayment,
|
||||
isZeroDecimal,
|
||||
operationLabelKey,
|
||||
|
||||
@@ -55,23 +55,27 @@ function renderGroup(
|
||||
}
|
||||
|
||||
describe("OperationGroup", () => {
|
||||
it("shows the header, exact total and separate card rows per account", () => {
|
||||
it("shows the received coupon and positive totals in flat account rows", () => {
|
||||
renderGroup([
|
||||
operation("1", { id: "broker", name: "Брокерский" }, "0.1"),
|
||||
{ ...operation("1", { id: "broker", name: "Брокерский" }, "0.1"), description: "Выплата купонов СФО ВТБ РКС Эталон 04" },
|
||||
operation("2", { id: "iis", name: "ИИС" }, "0.2"),
|
||||
]);
|
||||
|
||||
expect(screen.getByText("Купон · BOND")).toBeInTheDocument();
|
||||
expect(screen.getByText("Выплата купонов СФО ВТБ РКС Эталон 04")).toBeInTheDocument();
|
||||
expect(screen.getByText("+0,3 ₽")).toBeInTheDocument();
|
||||
|
||||
const accounts = within(screen.getByRole("list", {
|
||||
name: /Купон · BOND, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
|
||||
name: /Выплата купонов СФО ВТБ РКС Эталон 04, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
|
||||
}));
|
||||
|
||||
expect(accounts.getByRole("listitem", { name: "Брокерский, +0,1 ₽" }))
|
||||
.toHaveTextContent("Купон");
|
||||
expect(accounts.getByText("+0,1 ₽")).toHaveClass(/positive/);
|
||||
expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
|
||||
.toHaveTextContent("Купон");
|
||||
expect(accounts.getByText("+0,2 ₽")).toHaveClass(/positive/);
|
||||
expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
|
||||
.not.toHaveClass("EntryGroup_accountCardRow");
|
||||
expect(accounts.queryByText(/Исполнено/)).not.toBeInTheDocument();
|
||||
expect(accounts.queryByRole("link")).not.toBeInTheDocument();
|
||||
});
|
||||
@@ -83,8 +87,10 @@ describe("OperationGroup", () => {
|
||||
]);
|
||||
|
||||
expect(screen.getByRole("list", {
|
||||
name: /Купон · BOND, Исполнено .*Итог недоступен/,
|
||||
name: /Выплата купонов BOND, Исполнено .*Итог недоступен/,
|
||||
})).toBeInTheDocument();
|
||||
expect(screen.getByText("Итог недоступен")).toBeInTheDocument();
|
||||
expect(screen.getByText("—")).not.toHaveClass(/positive/);
|
||||
});
|
||||
|
||||
it.each(["0", "0.000"])(
|
||||
@@ -114,6 +120,7 @@ describe("OperationGroup", () => {
|
||||
operation("2", { id: "iis", name: "ИИС" }, "-100"),
|
||||
]);
|
||||
expect(screen.getByText("0 ₽")).toBeInTheDocument();
|
||||
expect(screen.getByText("−100 ₽")).toHaveClass(/negative/);
|
||||
});
|
||||
|
||||
it("renders repeated ids inside one group as separate rows", () => {
|
||||
@@ -123,7 +130,7 @@ describe("OperationGroup", () => {
|
||||
]);
|
||||
|
||||
expect(screen.getByText("+30 ₽")).toBeInTheDocument();
|
||||
const accounts = within(screen.getByRole("list", { name: /Купон/ }));
|
||||
const accounts = within(screen.getByRole("list", { name: /Выплата купонов/ }));
|
||||
expect(accounts.getAllByText("Брокерский")).toHaveLength(1);
|
||||
expect(accounts.getAllByText("ИИС")).toHaveLength(1);
|
||||
expect(accounts.getAllByRole("listitem")).toHaveLength(2);
|
||||
|
||||
@@ -9,12 +9,13 @@ import {
|
||||
sumMoney,
|
||||
totalText,
|
||||
} from "@/shared/lib";
|
||||
import { AccountCardRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
|
||||
import { AccountCardRow, AccountRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
|
||||
|
||||
import type { BrokerageOperation } from "../api/useBrokerageOperations";
|
||||
|
||||
import {
|
||||
entryLabelKey,
|
||||
isCouponPayment,
|
||||
isZeroDecimal,
|
||||
operationLabelKey,
|
||||
paymentPresentation,
|
||||
@@ -37,6 +38,8 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
|
||||
? entryLabelKey(first)
|
||||
: operationLabelKey(first.type));
|
||||
|
||||
const isCoupon = isCouponPayment(first);
|
||||
|
||||
const instrument
|
||||
= first.ticker ?? first.instrumentType ?? t("ledger.noInstrument");
|
||||
|
||||
@@ -52,9 +55,21 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
|
||||
: null;
|
||||
|
||||
const date = formatSnapshotDay(first.occurredAt);
|
||||
const title = `${typeLabel} · ${instrument}`;
|
||||
const description = first.description.trim();
|
||||
let title = `${typeLabel} · ${instrument}`;
|
||||
|
||||
if (isCoupon) {
|
||||
title = description && description.toLocaleLowerCase() !== "купон"
|
||||
? description
|
||||
: t("ledger.couponPayment", { instrument });
|
||||
}
|
||||
|
||||
const totalsText = totalText(totals, true);
|
||||
|
||||
const totalTone = isCoupon && totals && !isZeroDecimal(totals.value) && !totals.value.startsWith("-")
|
||||
? "positive"
|
||||
: "neutral";
|
||||
|
||||
const accessibleName = [
|
||||
title,
|
||||
t("payout.executedAt", { date }),
|
||||
@@ -63,13 +78,14 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
|
||||
|
||||
return (
|
||||
<EntryGroup
|
||||
flat={isCoupon}
|
||||
header={(
|
||||
<EntryCard
|
||||
imageSrc={instrumentLogoUrl(first.logoName)}
|
||||
initial={(first.ticker?.trim()[0] ?? "?").toUpperCase()}
|
||||
metadata={t("payout.executedAt", { date })}
|
||||
title={title}
|
||||
tone="neutral"
|
||||
tone={totalTone}
|
||||
value={<EntryGroupTotal isSigned totals={totals} />}
|
||||
valueLabel={typeLabel}
|
||||
wrap
|
||||
@@ -80,14 +96,15 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
|
||||
{props.entries.map(({ key, operation }) => {
|
||||
const payment = paymentPresentation(operation);
|
||||
|
||||
return (
|
||||
<AccountCardRow
|
||||
accountName={operation.account?.name ?? "—"}
|
||||
key={key}
|
||||
value={payment.amount}
|
||||
valueLabel={t(payment.label)}
|
||||
/>
|
||||
);
|
||||
const accountRowProps = {
|
||||
accountName: operation.account?.name ?? "—",
|
||||
value: payment.amount,
|
||||
valueLabel: t(payment.label),
|
||||
};
|
||||
|
||||
return isCoupon
|
||||
? <AccountRow key={key} {...accountRowProps} tone={payment.tone} />
|
||||
: <AccountCardRow key={key} {...accountRowProps} />;
|
||||
})}
|
||||
</EntryGroup>
|
||||
);
|
||||
|
||||
@@ -4,8 +4,6 @@ import type {
|
||||
BrokerageAccount,
|
||||
} from "../api/useBrokerageAccounts";
|
||||
|
||||
const VISIBLE_CURRENCY_LIMIT = 2;
|
||||
|
||||
type BrokerageAccountCard = {
|
||||
account: BrokerageAccount;
|
||||
positionCounts: null | PositionCounts;
|
||||
@@ -13,18 +11,13 @@ type BrokerageAccountCard = {
|
||||
summary:
|
||||
| {
|
||||
portfolio: NonNullable<BrokerageAccount["portfolioSummary"]>;
|
||||
remainingCurrencyCount: number;
|
||||
state: "available";
|
||||
totals: Money[];
|
||||
totals: NonNullable<BrokerageAccount["portfolioSummary"]>["totals"];
|
||||
}
|
||||
| { state: "empty" }
|
||||
| { state: "unavailable" };
|
||||
};
|
||||
|
||||
type Money = NonNullable<
|
||||
BrokerageAccount["portfolioSummary"]
|
||||
>["totalsByCurrency"][number];
|
||||
|
||||
type PositionCounts = { bonds: number; stocks: number; total: number };
|
||||
|
||||
function accountTypeKey(type: BrokerageAccount["type"]) {
|
||||
@@ -57,7 +50,7 @@ function brokerageAccountCards(
|
||||
total: summary.totalPositionCount,
|
||||
};
|
||||
|
||||
if (summary.totalsByCurrency.length === 0)
|
||||
if (Number(summary.totals.value) === 0)
|
||||
return { account, positionCounts, source, summary: { state: "empty" } };
|
||||
|
||||
return {
|
||||
@@ -66,12 +59,8 @@ function brokerageAccountCards(
|
||||
source,
|
||||
summary: {
|
||||
portfolio: summary,
|
||||
remainingCurrencyCount: Math.max(
|
||||
summary.totalsByCurrency.length - VISIBLE_CURRENCY_LIMIT,
|
||||
0,
|
||||
),
|
||||
state: "available",
|
||||
totals: summary.totalsByCurrency.slice(0, VISIBLE_CURRENCY_LIMIT),
|
||||
totals: summary.totals,
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
+20
-2
@@ -65,18 +65,32 @@
|
||||
|
||||
.summary {
|
||||
font-variant-numeric: tabular-nums lining-nums;
|
||||
white-space: nowrap;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
.currencySummary {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.total {
|
||||
color: var(--wl-color-text);
|
||||
font-size: var(--mantine-font-size-lg);
|
||||
line-height: var(--mantine-line-height-lg);
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.return,
|
||||
.cashValue {
|
||||
font-variant-numeric: tabular-nums lining-nums;
|
||||
}
|
||||
|
||||
.return {
|
||||
justify-content: flex-end;
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.cashValue {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
@@ -138,7 +152,11 @@
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.balance > div {
|
||||
.summary {
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.return {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
}
|
||||
|
||||
+25
-61
@@ -14,36 +14,29 @@ type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
|
||||
const rubReturn = {
|
||||
absolute: "136900",
|
||||
costBasis: "1103600.50",
|
||||
currency: "RUB",
|
||||
partial: false,
|
||||
percent: "12.40",
|
||||
};
|
||||
|
||||
const portfolioSummary = {
|
||||
bondPositionCount: 12,
|
||||
cashBalances: [
|
||||
{ currency: "RUB", value: "82500.50" },
|
||||
{ currency: "USD", value: "1500" },
|
||||
],
|
||||
cash: { currency: "RUB", value: "82500.50" },
|
||||
fundPositionCount: 2,
|
||||
stockPositionCount: 5,
|
||||
structure: {
|
||||
currencies: [{
|
||||
categories: [
|
||||
{ sharePercent: "55.000000", type: "STOCK", value: "682500" },
|
||||
{ sharePercent: "25.000000", type: "BOND", value: "310500" },
|
||||
{ sharePercent: "10.000000", type: "OTHER", value: "124200" },
|
||||
{ sharePercent: "10.000000", type: "CASH", value: "124200" },
|
||||
],
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "1241400",
|
||||
}],
|
||||
categories: [
|
||||
{ sharePercent: "55.000000", type: "STOCK", value: "682500" },
|
||||
{ sharePercent: "25.000000", type: "BOND", value: "310500" },
|
||||
{ sharePercent: "10.000000", type: "OTHER", value: "124200" },
|
||||
{ sharePercent: "10.000000", type: "CASH", value: "124200" },
|
||||
],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "1241400",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totalPositionCount: 19,
|
||||
totalsByCurrency: [{ currency: "RUB", value: "1240500.50" }],
|
||||
unrealizedReturnByCurrency: [rubReturn],
|
||||
totals: { currency: "RUB", value: "1240500.50" },
|
||||
unrealizedReturn: rubReturn,
|
||||
} satisfies PortfolioSummary;
|
||||
|
||||
function account(
|
||||
@@ -63,20 +56,25 @@ function account(
|
||||
|
||||
const negativeSummary: PortfolioSummary = {
|
||||
...portfolioSummary,
|
||||
unrealizedReturnByCurrency: [{
|
||||
unrealizedReturn: {
|
||||
...rubReturn,
|
||||
absolute: "-4200",
|
||||
percent: "-3.05",
|
||||
}],
|
||||
},
|
||||
};
|
||||
|
||||
const emptySummary: PortfolioSummary = {
|
||||
...portfolioSummary,
|
||||
cashBalances: [],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
cash: { currency: "RUB", value: "0" },
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totalPositionCount: 0,
|
||||
totalsByCurrency: [],
|
||||
unrealizedReturnByCurrency: [],
|
||||
totals: { currency: "RUB", value: "0" },
|
||||
unrealizedReturn: rubReturn,
|
||||
};
|
||||
|
||||
const meta = {
|
||||
@@ -94,7 +92,7 @@ const meta = {
|
||||
docs: {
|
||||
description: {
|
||||
component:
|
||||
"Карточки счетов: стоимость и доходность по валютам, деньги, структура и свежесть источника. Денежные и процентные значения остаются строками. Все примеры содержат вымышленные данные; ссылки работают только внутри MemoryRouter.",
|
||||
"Карточки счетов: стоимость и доходность, деньги, структура и свежесть источника. Денежные и процентные значения остаются строками. Все примеры содержат вымышленные данные; ссылки работают только внутри MemoryRouter.",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -108,40 +106,6 @@ type Story = StoryObj<typeof meta>;
|
||||
|
||||
export const Normal: Story = {};
|
||||
|
||||
export const MultiCurrency: Story = {
|
||||
args: {
|
||||
accounts: brokerageAccountCards([account("multi", "Мультивалютный", {
|
||||
...portfolioSummary,
|
||||
cashBalances: [
|
||||
{ currency: "RUB", value: "82500.50" },
|
||||
{ currency: "USD", value: "1500" },
|
||||
],
|
||||
totalsByCurrency: [
|
||||
{ currency: "RUB", value: "1240500.50" },
|
||||
{ currency: "USD", value: "3200" },
|
||||
{ currency: "EUR", value: "900" },
|
||||
],
|
||||
unrealizedReturnByCurrency: [
|
||||
...portfolioSummary.unrealizedReturnByCurrency,
|
||||
{
|
||||
absolute: "20",
|
||||
costBasis: "3180",
|
||||
currency: "USD",
|
||||
partial: false,
|
||||
percent: "2.10",
|
||||
},
|
||||
{
|
||||
absolute: "0",
|
||||
costBasis: "900",
|
||||
currency: "EUR",
|
||||
partial: false,
|
||||
percent: null,
|
||||
},
|
||||
],
|
||||
})]),
|
||||
},
|
||||
};
|
||||
|
||||
export const Negative: Story = {
|
||||
args: {
|
||||
accounts: brokerageAccountCards([
|
||||
@@ -154,10 +118,10 @@ export const Partial: Story = {
|
||||
args: {
|
||||
accounts: brokerageAccountCards([account("partial", "Частичные данные", {
|
||||
...portfolioSummary,
|
||||
unrealizedReturnByCurrency: [{
|
||||
unrealizedReturn: {
|
||||
...rubReturn,
|
||||
partial: true,
|
||||
}],
|
||||
},
|
||||
})]),
|
||||
},
|
||||
};
|
||||
|
||||
+40
-64
@@ -14,55 +14,28 @@ type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
|
||||
|
||||
const portfolioSummary = {
|
||||
bondPositionCount: 12,
|
||||
cashBalances: [
|
||||
{ currency: "RUB", value: "82500.5" },
|
||||
{ currency: "USD", value: "20" },
|
||||
],
|
||||
cash: { currency: "RUB", value: "82500.5" },
|
||||
fundPositionCount: 0,
|
||||
stockPositionCount: 5,
|
||||
structure: {
|
||||
currencies: [{
|
||||
categories: [
|
||||
{ sharePercent: "50.000000", type: "STOCK", value: "100" },
|
||||
{ sharePercent: "30.000000", type: "BOND", value: "60" },
|
||||
{ sharePercent: "0.000000", type: "OTHER", value: "0" },
|
||||
{ sharePercent: "20.000000", type: "CASH", value: "40" },
|
||||
],
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "200",
|
||||
}],
|
||||
categories: [
|
||||
{ sharePercent: "50.000000", type: "STOCK", value: "100" },
|
||||
{ sharePercent: "30.000000", type: "BOND", value: "60" },
|
||||
{ sharePercent: "0.000000", type: "OTHER", value: "0" },
|
||||
{ sharePercent: "20.000000", type: "CASH", value: "40" },
|
||||
],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "200",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totalPositionCount: 17,
|
||||
totalsByCurrency: [
|
||||
{ currency: "RUB", value: "123456789012345678901.995" },
|
||||
{ currency: "USD", value: "20" },
|
||||
{ currency: "EUR", value: "5" },
|
||||
],
|
||||
unrealizedReturnByCurrency: [
|
||||
{
|
||||
absolute: "136900",
|
||||
costBasis: "1000000",
|
||||
currency: "RUB",
|
||||
partial: true,
|
||||
percent: "12.40",
|
||||
},
|
||||
{
|
||||
absolute: "-4.2",
|
||||
costBasis: "24.2",
|
||||
currency: "USD",
|
||||
partial: false,
|
||||
percent: "-3.05",
|
||||
},
|
||||
{
|
||||
absolute: "0",
|
||||
costBasis: "5",
|
||||
currency: "EUR",
|
||||
partial: false,
|
||||
percent: null,
|
||||
},
|
||||
],
|
||||
totals: { currency: "RUB", value: "123456789012345678901.995" },
|
||||
unrealizedReturn: {
|
||||
absolute: "136900",
|
||||
costBasis: "1000000",
|
||||
partial: true,
|
||||
percent: "12.40",
|
||||
},
|
||||
} satisfies PortfolioSummary;
|
||||
|
||||
type BrokerageAccountCardInput = Parameters<typeof BrokerageAccountList>[0][
|
||||
@@ -97,16 +70,19 @@ describe("BrokerageAccountList", () => {
|
||||
it("renders returns, cash and structure with precise totals", () => {
|
||||
const nullReturnSummary: PortfolioSummary = {
|
||||
...portfolioSummary,
|
||||
cashBalances: [],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "EUR", value: "5" }],
|
||||
unrealizedReturnByCurrency: [{
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totals: { currency: "RUB", value: "5" },
|
||||
unrealizedReturn: {
|
||||
absolute: "0",
|
||||
costBasis: "5",
|
||||
currency: "EUR",
|
||||
partial: false,
|
||||
percent: null,
|
||||
}],
|
||||
},
|
||||
};
|
||||
|
||||
renderList(brokerageAccountCards([
|
||||
@@ -118,38 +94,38 @@ describe("BrokerageAccountList", () => {
|
||||
expect(link).toHaveAttribute("href", "/accounts/account-1");
|
||||
expect(within(link).getByText("123 456 789 012 345 678 902,00 ₽"))
|
||||
.toBeInTheDocument();
|
||||
expect(within(link).getByText("Еще 1 валюта")).toBeInTheDocument();
|
||||
expect(within(link).getByText("+12,40 %")).toBeInTheDocument();
|
||||
expect(within(link).getByText("+12,4 %")).toBeInTheDocument();
|
||||
expect(within(link).getByText("+136 900 ₽")).toBeInTheDocument();
|
||||
expect(within(link).getByText("−3,05 %")).toBeInTheDocument();
|
||||
expect(within(link).getByText("−4,2 USD")).toBeInTheDocument();
|
||||
const nullReturnLink = screen.getByRole("link", { name: /Без доходности/ });
|
||||
expect(within(nullReturnLink).getByText("—")).toBeInTheDocument();
|
||||
expect(within(link).getByText("частично")).toBeInTheDocument();
|
||||
expect(within(link).getByText("82 500,50 ₽")).toBeInTheDocument();
|
||||
expect(within(link).getAllByText("20,00 USD")).not.toHaveLength(0);
|
||||
expect(within(link).getByText("17 позиций")).toBeInTheDocument();
|
||||
expect(screen.getByRole("img", {
|
||||
name: "Структура в RUB: Акции 50 %; Облигации 30 %; "
|
||||
+ "Другие активы 0 %; Свободные деньги 20 %",
|
||||
name: "Структура: Акции 50,0 %; Облигации 30,0 %; "
|
||||
+ "Другие активы 0,0 %; Свободные деньги 20,0 %",
|
||||
})).toBeInTheDocument();
|
||||
const stockLegend = within(link).getByText(/Акции 50 %/);
|
||||
expect(stockLegend).toHaveTextContent("● Акции 50 %");
|
||||
const stockLegend = within(link).getByText(/Акции 50,0 %/);
|
||||
expect(stockLegend).toHaveTextContent("● Акции 50,0 %");
|
||||
// eslint-disable-next-line testing-library/no-node-access -- The legend is aria-hidden, so only DOM traversal reaches its container.
|
||||
expect(stockLegend.parentElement).toHaveAttribute("aria-hidden", "true");
|
||||
expect(within(link).queryByText(/Другие активы 0 %/)).not.toBeInTheDocument();
|
||||
expect(within(link).queryByText(/Другие активы 0,0 %/))
|
||||
.not.toBeInTheDocument();
|
||||
expect(link).toHaveTextContent("По данным брокера");
|
||||
expect(link).toHaveTextContent("Структура RUB: Акции 100");
|
||||
expect(link).toHaveTextContent("Структура: Акции 100");
|
||||
});
|
||||
|
||||
it("preserves empty, unavailable and stale states", () => {
|
||||
const emptySummary: PortfolioSummary = {
|
||||
...portfolioSummary,
|
||||
cashBalances: [],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totalPositionCount: 0,
|
||||
totalsByCurrency: [],
|
||||
unrealizedReturnByCurrency: [],
|
||||
totals: { currency: "RUB", value: "0" },
|
||||
};
|
||||
|
||||
const cards = brokerageAccountCards([
|
||||
|
||||
@@ -15,6 +15,11 @@ import classes from "./BrokerageAccountList.module.css";
|
||||
const DECIMAL_PART_COUNT = 2;
|
||||
const STRUCTURE_CATEGORY_ORDER = ["STOCK", "BOND", "OTHER", "CASH"] as const;
|
||||
|
||||
const percentFormatter = new Intl.NumberFormat("ru-RU", {
|
||||
maximumFractionDigits: 1,
|
||||
minimumFractionDigits: 1,
|
||||
});
|
||||
|
||||
type AvailableSummary = Extract<
|
||||
BrokerageAccountCard["summary"],
|
||||
{ state: "available" }
|
||||
@@ -29,28 +34,23 @@ type BrokerageAccountSummaryProps = {
|
||||
type PortfolioSummary = AvailableSummary["portfolio"];
|
||||
|
||||
type ReturnValueProps = {
|
||||
item: PortfolioSummary["unrealizedReturnByCurrency"][number];
|
||||
item: PortfolioSummary["unrealizedReturn"];
|
||||
};
|
||||
|
||||
type StructureCurrency = PortfolioSummary["structure"]["currencies"][number];
|
||||
type StructureCurrency = PortfolioSummary["structure"];
|
||||
|
||||
function formatPercent(value: null | string) {
|
||||
if (value === null) return "—";
|
||||
|
||||
const formatted = `${value.replace(".", ",")}\u{A0}%`;
|
||||
if (isZero(value))
|
||||
return value.startsWith("-") ? formatted.slice(1) : formatted;
|
||||
const rounded = percentFormatter.format(Math.abs(Number(value)));
|
||||
let sign = "";
|
||||
if (rounded !== "0,0") sign = value.startsWith("-") ? "−" : "+";
|
||||
|
||||
return value.startsWith("-") ? `−${formatted.slice(1)}` : `+${formatted}`;
|
||||
return `${sign}${rounded}\u{A0}%`;
|
||||
}
|
||||
|
||||
function formatStructurePercent(value: string) {
|
||||
let trimmed = value;
|
||||
while (trimmed.includes(".") && trimmed.endsWith("0"))
|
||||
trimmed = trimmed.slice(0, -1);
|
||||
if (trimmed.endsWith(".")) trimmed = trimmed.slice(0, -1);
|
||||
|
||||
return trimmed.replace(".", ",");
|
||||
return percentFormatter.format(Number(value));
|
||||
}
|
||||
|
||||
function isZero(value: string) {
|
||||
@@ -65,27 +65,23 @@ const ReturnValue: FC<ReturnValueProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
const { item } = props;
|
||||
|
||||
const isNegative = item.percent !== null
|
||||
&& item.percent.startsWith("-")
|
||||
&& !isZero(item.percent);
|
||||
|
||||
const isPositive = item.percent !== null
|
||||
&& !item.percent.startsWith("-")
|
||||
&& !isZero(item.percent);
|
||||
const displayedPercent = formatPercent(item.percent);
|
||||
const isNegative = displayedPercent.startsWith("−");
|
||||
const isPositive = displayedPercent.startsWith("+");
|
||||
|
||||
let toneClass = classes.neutral;
|
||||
if (isNegative) toneClass = classes.negative;
|
||||
else if (isPositive) toneClass = classes.positive;
|
||||
|
||||
return (
|
||||
<Group className={classes.return} gap="xs" wrap="nowrap">
|
||||
<Group className={classes.return} gap="xs" wrap="wrap">
|
||||
<Text className={toneClass} fw={700} size="sm">
|
||||
{formatPercent(item.percent)}
|
||||
{displayedPercent}
|
||||
</Text>
|
||||
|
||||
<Text className={toneClass} size="sm">
|
||||
{formatMoney(
|
||||
{ currency: item.currency, value: item.absolute },
|
||||
{ currency: "RUB", value: item.absolute },
|
||||
{ withSign: true },
|
||||
)}
|
||||
</Text>
|
||||
@@ -123,7 +119,6 @@ const StructureBar: FC<StructureBarProps> = (props) => {
|
||||
}).join("; ");
|
||||
|
||||
const label = t("accounts.structure.label", {
|
||||
currency: props.item.currency,
|
||||
value: description,
|
||||
});
|
||||
|
||||
@@ -200,51 +195,25 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
|
||||
|
||||
return (
|
||||
<Stack className={classes.balance} gap="xs">
|
||||
<Group align="flex-start" gap="lg" justify="flex-end" wrap="nowrap">
|
||||
<Stack className={classes.summary} gap={4}>
|
||||
{summary.totals.map(total => (
|
||||
<Text className={classes.total} fw={700} key={total.currency}>
|
||||
{formatMoney(total, { withRoundedCents: true })}
|
||||
</Text>
|
||||
))}
|
||||
|
||||
{!!summary.remainingCurrencyCount && (
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("accounts.remainingCurrencies", {
|
||||
count: summary.remainingCurrencyCount,
|
||||
})}
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
|
||||
<Stack gap={4}>
|
||||
{summary.totals.map((total) => {
|
||||
const item = summary.portfolio.unrealizedReturnByCurrency.find(
|
||||
returnItem => returnItem.currency === total.currency,
|
||||
);
|
||||
|
||||
return item
|
||||
? <ReturnValue item={item} key={total.currency} />
|
||||
: null;
|
||||
})}
|
||||
</Stack>
|
||||
</Group>
|
||||
|
||||
{summary.portfolio.cashBalances.length > 0 && (
|
||||
<Group className={classes.cash} gap="xs" justify="flex-end">
|
||||
<Text c="dimmed" size="xs">
|
||||
{t("accounts.cash")}
|
||||
<Stack className={classes.summary} gap="sm">
|
||||
<Stack className={classes.currencySummary} gap={2}>
|
||||
<Text className={classes.total} fw={700}>
|
||||
{formatMoney(summary.totals, { withRoundedCents: true })}
|
||||
</Text>
|
||||
|
||||
<Stack gap={0}>
|
||||
{summary.portfolio.cashBalances.map(cash => (
|
||||
<Text className={classes.cashValue} key={cash.currency} size="sm">
|
||||
{formatMoney(cash, { withRoundedCents: true })}
|
||||
</Text>
|
||||
))}
|
||||
</Stack>
|
||||
</Group>
|
||||
)}
|
||||
<ReturnValue item={summary.portfolio.unrealizedReturn} />
|
||||
</Stack>
|
||||
</Stack>
|
||||
|
||||
<Group className={classes.cash} gap="xs" justify="flex-end">
|
||||
<Text c="dimmed" size="xs">
|
||||
{t("accounts.cash")}
|
||||
</Text>
|
||||
|
||||
<Text className={classes.cashValue} size="sm">
|
||||
{formatMoney(summary.portfolio.cash, { withRoundedCents: true })}
|
||||
</Text>
|
||||
</Group>
|
||||
</Stack>
|
||||
);
|
||||
};
|
||||
@@ -291,39 +260,31 @@ const AccountDescription: FC<AccountDescriptionProps> = (props) => {
|
||||
const { account, summary } = props.account;
|
||||
if (summary.state !== "available") return null;
|
||||
|
||||
const returns = summary.portfolio.unrealizedReturnByCurrency.map(item =>
|
||||
t("accounts.description.return", {
|
||||
absolute: formatMoney(
|
||||
{ currency: item.currency, value: item.absolute },
|
||||
{ withSign: true },
|
||||
),
|
||||
currency: item.currency,
|
||||
percent: formatPercent(item.percent),
|
||||
}),
|
||||
);
|
||||
const returns = [t("accounts.description.return", {
|
||||
absolute: formatMoney(
|
||||
{ currency: "RUB", value: summary.portfolio.unrealizedReturn.absolute },
|
||||
{ withSign: true },
|
||||
),
|
||||
percent: formatPercent(summary.portfolio.unrealizedReturn.percent),
|
||||
})];
|
||||
|
||||
const structures = summary.portfolio.structure.currencies.map((item) => {
|
||||
const categories = item.categories.map(category =>
|
||||
const structures = (() => {
|
||||
const categories = summary.portfolio.structure.categories.map(category =>
|
||||
t("accounts.description.structureCategory", {
|
||||
category: t(portfolioCategoryPresentation[category.type].label),
|
||||
value: formatMoney(
|
||||
{ currency: item.currency, value: category.value },
|
||||
{ currency: "RUB", value: category.value },
|
||||
{ withRoundedCents: true },
|
||||
),
|
||||
}),
|
||||
).join(", ");
|
||||
|
||||
return t("accounts.description.structure", {
|
||||
currency: item.currency,
|
||||
value: categories,
|
||||
});
|
||||
});
|
||||
return t("accounts.description.structure", { value: categories });
|
||||
})();
|
||||
|
||||
const hasPartialReturn = summary.portfolio.unrealizedReturnByCurrency.some(
|
||||
item => item.partial,
|
||||
);
|
||||
const hasPartialReturn = summary.portfolio.unrealizedReturn.partial;
|
||||
|
||||
const details = [...returns, ...structures].join(". ");
|
||||
const details = [returns, structures].join(". ");
|
||||
|
||||
return (
|
||||
<VisuallyHidden>
|
||||
@@ -332,8 +293,7 @@ const AccountDescription: FC<AccountDescriptionProps> = (props) => {
|
||||
type: t(accountTypeKey(account.type)),
|
||||
})}
|
||||
{t("accounts.description.currentValue", {
|
||||
value: summary.portfolio.totalsByCurrency
|
||||
.map(total => formatMoney(total)).join(", "),
|
||||
value: formatMoney(summary.portfolio.totals),
|
||||
})}
|
||||
{details ? `${details}. ` : ""}
|
||||
{hasPartialReturn ? t("accounts.brokerDescription") : ""}
|
||||
@@ -373,9 +333,7 @@ const BrokerageAccountList: FC<BrokerageAccountListProps> = (props) => {
|
||||
|
||||
{summary.state === "available" && (
|
||||
<Stack className={classes.structure} gap={4}>
|
||||
{summary.portfolio.structure.currencies.map(item => (
|
||||
<StructureBar item={item} key={item.currency} />
|
||||
))}
|
||||
<StructureBar item={summary.portfolio.structure} />
|
||||
</Stack>
|
||||
)}
|
||||
|
||||
|
||||
@@ -97,13 +97,13 @@ describe("BrokerageEventGroup", () => {
|
||||
expect(screen.getByText("0,00 ₽")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows separate forecast totals per currency without conversion", () => {
|
||||
it("sums forecast totals exactly", () => {
|
||||
renderGroup([
|
||||
event({ id: "broker", name: "Брокерский" }, "10", "USD"),
|
||||
event({ id: "broker", name: "Брокерский" }, "10"),
|
||||
event({ id: "iis", name: "ИИС" }, "200"),
|
||||
]);
|
||||
|
||||
expect(screen.getByRole("list", { name: /10 USD.*200 ₽/ }))
|
||||
expect(screen.getByRole("list", { name: /210 ₽/ }))
|
||||
.toBeInTheDocument();
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import { apiQueryClient, type paths, useAuthenticatedQuery } from "@/shared/api";
|
||||
|
||||
type Performance = NonNullable<
|
||||
paths["/api/v1/brokerage-accounts/{accountId}/performance"]["get"]["responses"][200]["content"]["application/json"]["data"]
|
||||
>;
|
||||
|
||||
function usePerformance(accountId: string) {
|
||||
return useAuthenticatedQuery({
|
||||
meta: { accessGroup: "brokerage" },
|
||||
...apiQueryClient.queryOptions(
|
||||
"get",
|
||||
"/api/v1/brokerage-accounts/{accountId}/performance",
|
||||
{ params: { path: { accountId } } },
|
||||
),
|
||||
enabled: Boolean(accountId),
|
||||
staleTime: 30_000,
|
||||
});
|
||||
}
|
||||
|
||||
export { type Performance, usePerformance };
|
||||
@@ -0,0 +1 @@
|
||||
export { type Performance, usePerformance } from "./api/usePerformance";
|
||||
@@ -2,7 +2,7 @@ import type { Portfolio } from "../api/usePortfolio";
|
||||
|
||||
const PERCENT_SCALE = 100;
|
||||
|
||||
type Money = Portfolio["totalsByCurrency"][number];
|
||||
type Money = Portfolio["totals"];
|
||||
|
||||
function formatShare(
|
||||
numerator: Money | null,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { resource } from "@/test/resource";
|
||||
|
||||
@@ -76,4 +76,29 @@ describe("instrument source and transport presentation", () => {
|
||||
loading: false,
|
||||
});
|
||||
});
|
||||
|
||||
it("carries the retry of an exhausted read and only of that read", () => {
|
||||
const refetch = vi.fn(() => Promise.resolve());
|
||||
|
||||
const state = section({
|
||||
data: { rows: [] },
|
||||
error: { code: "TBANK_UNAVAILABLE", status: 503 },
|
||||
isError: true,
|
||||
isFetching: false,
|
||||
refetch,
|
||||
});
|
||||
|
||||
expect(state.readRetry?.exhausted).toBe(true);
|
||||
state.readRetry?.onRetry();
|
||||
expect(refetch).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("offers no retry for access loss or a healthy read", () => {
|
||||
const base = { data: undefined, isFetching: false, refetch: vi.fn() };
|
||||
|
||||
expect(section({ ...base, error: { code: "NOT_FOUND" }, isError: true })
|
||||
.readRetry?.exhausted).toBe(false);
|
||||
expect(section({ ...base, error: null, isError: false })
|
||||
.readRetry?.exhausted).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import type { InvestmentResourceMeta } from "@/shared/api";
|
||||
import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
|
||||
|
||||
type SectionState = {
|
||||
error: boolean;
|
||||
hasData: boolean;
|
||||
loading: boolean;
|
||||
partial?: boolean;
|
||||
readRetry?: ReturnType<typeof readRetry>;
|
||||
};
|
||||
|
||||
function hasSectionData(data: unknown) {
|
||||
@@ -13,8 +14,11 @@ function hasSectionData(data: unknown) {
|
||||
|
||||
function section(query: {
|
||||
data: unknown;
|
||||
error?: unknown;
|
||||
isError: boolean;
|
||||
isFetching?: boolean;
|
||||
meta?: InvestmentResourceMeta;
|
||||
refetch?: () => Promise<unknown>;
|
||||
}): SectionState {
|
||||
const isError = query.isError || query.meta?.lastAttempt.state === "failed";
|
||||
const hasData = hasSectionData(query.data);
|
||||
@@ -24,6 +28,17 @@ function section(query: {
|
||||
hasData,
|
||||
loading: !hasData && !isError,
|
||||
partial: query.meta?.completeness === "incomplete",
|
||||
// Each section retries only its own GET, so sections recover independently.
|
||||
readRetry: query.refetch
|
||||
? readRetry([
|
||||
{
|
||||
error: query.error,
|
||||
isError: query.isError,
|
||||
isFetching: query.isFetching ?? false,
|
||||
refetch: query.refetch,
|
||||
},
|
||||
])
|
||||
: undefined,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ function useInstrumentChartVm(props: InstrumentChartProps) {
|
||||
const average = vm.position?.averagePurchasePrice;
|
||||
|
||||
const averageLine = average && props.priceUnit !== "percent"
|
||||
&& average.currency === vm.candles?.currency
|
||||
? Number(average.value)
|
||||
: null;
|
||||
|
||||
@@ -47,7 +46,7 @@ function useInstrumentChartVm(props: InstrumentChartProps) {
|
||||
currency:
|
||||
props.priceUnit === "percent"
|
||||
? t("bond.percentOfNominal")
|
||||
: (vm.candles?.currency ?? ""),
|
||||
: "₽",
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@ import {
|
||||
import { LoadingSkeleton } from "@wealthledger/ui";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { ReadRetry } from "@/shared/ui";
|
||||
|
||||
import type { SectionState } from "../model/section";
|
||||
|
||||
import classes from "./InstrumentDetails.module.css";
|
||||
@@ -81,6 +83,8 @@ const InstrumentSection: FC<InstrumentSectionProps> = (props) => {
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{!!props.state.readRetry && <ReadRetry {...props.state.readRetry} />}
|
||||
|
||||
{sectionContent}
|
||||
</Paper>
|
||||
);
|
||||
|
||||
@@ -2,19 +2,18 @@ import type { QueryClient } from "@tanstack/react-query";
|
||||
|
||||
import {
|
||||
apiQueryClient,
|
||||
isGetUnder,
|
||||
type paths,
|
||||
} from "@/shared/api";
|
||||
|
||||
type TbankConnectionStatus
|
||||
= paths["/api/v1/tbank-connection"]["get"]["responses"][200]["content"]["application/json"];
|
||||
|
||||
function isInvestmentPath(path: string) {
|
||||
return [
|
||||
"/api/v1/brokerage-accounts",
|
||||
"/api/v1/stocks",
|
||||
"/api/v1/bonds",
|
||||
].some(root => path === root || path.startsWith(`${root}/`));
|
||||
}
|
||||
const investmentGetPredicate = isGetUnder([
|
||||
"/api/v1/brokerage-accounts",
|
||||
"/api/v1/stocks",
|
||||
"/api/v1/bonds",
|
||||
]);
|
||||
|
||||
const tbankConnectionQueryOptions = () =>
|
||||
apiQueryClient.queryOptions("get", "/api/v1/tbank-connection");
|
||||
@@ -27,15 +26,7 @@ function commitTbankConnectionBoundary(
|
||||
) {
|
||||
queryClient.setQueryData(tbankConnectionQueryKey, status);
|
||||
void queryClient.resetQueries({
|
||||
predicate: ({ queryKey }) => {
|
||||
const [method, path] = queryKey;
|
||||
|
||||
return (
|
||||
method === "get"
|
||||
&& typeof path === "string"
|
||||
&& isInvestmentPath(path)
|
||||
);
|
||||
},
|
||||
predicate: ({ queryKey }) => investmentGetPredicate(queryKey),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,9 @@ import { server } from "@/test/server";
|
||||
|
||||
import { useScreenSync } from "../index";
|
||||
|
||||
const TRANSPORT_ATTEMPTS = 3;
|
||||
const TRANSPORT_RECOVERY_MS = 3000;
|
||||
|
||||
function auth() {
|
||||
configureAuthClient({
|
||||
accessToken: () => "synthetic",
|
||||
@@ -28,11 +31,13 @@ describe("read-only screen synchronization", () => {
|
||||
gets += 1;
|
||||
syncModes.push(new URL(request.url).searchParams.get("sync"));
|
||||
|
||||
return gets === 1
|
||||
// The transport retries a transient read twice (1 s, 2 s) on its own.
|
||||
return gets <= TRANSPORT_ATTEMPTS
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(resource([]));
|
||||
}),
|
||||
);
|
||||
vi.useFakeTimers();
|
||||
|
||||
const { result } = renderHook(
|
||||
() => {
|
||||
@@ -46,12 +51,26 @@ describe("read-only screen synchronization", () => {
|
||||
{ wrapper: createQueryWrapper().wrapper },
|
||||
);
|
||||
|
||||
await waitFor(() => expect(gets).toBe(1));
|
||||
await act(async () => result.current.sync.retry());
|
||||
await waitFor(() => expect(result.current.accounts.data).toEqual([]));
|
||||
try {
|
||||
// Exhaust the transport back-off so the query settles in error.
|
||||
await vi.waitFor(async () => {
|
||||
await act(() => vi.advanceTimersByTimeAsync(TRANSPORT_RECOVERY_MS));
|
||||
expect(result.current.sync.transportError).toBe(true);
|
||||
});
|
||||
expect(gets).toBe(TRANSPORT_ATTEMPTS);
|
||||
|
||||
expect(gets).toBe(2);
|
||||
expect(syncModes).toEqual([null, null]);
|
||||
await act(async () => result.current.sync.retry());
|
||||
await vi.waitFor(async () => {
|
||||
await act(() => vi.advanceTimersByTimeAsync(0));
|
||||
expect(result.current.accounts.data).toEqual([]);
|
||||
});
|
||||
}
|
||||
finally {
|
||||
vi.useRealTimers();
|
||||
}
|
||||
|
||||
expect(gets).toBe(TRANSPORT_ATTEMPTS + 1);
|
||||
expect(syncModes).toEqual(Array.from({ length: gets }, () => null));
|
||||
});
|
||||
|
||||
it("refreshes the currently open resources together", async () => {
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ const meta = {
|
||||
},
|
||||
render: arguments_ => (
|
||||
<Stack>
|
||||
<Text>125 000,50 ₽ · 320 USD</Text>
|
||||
<Text>125 000,50 ₽</Text>
|
||||
|
||||
<InvestmentRefreshState {...arguments_} />
|
||||
</Stack>
|
||||
|
||||
@@ -4,16 +4,16 @@ import {
|
||||
TbankConnectionError,
|
||||
TbankConnectionLoading,
|
||||
} from "./TbankConnectionSection.view";
|
||||
import { useTbankConnectionViewModel } from "./TbankConnectionSection.vm";
|
||||
import { useTbankConnectionSectionVm } from "./TbankConnectionSection.vm";
|
||||
import { TbankConnectionSectionLoaded } from "./TbankConnectionSectionLoaded";
|
||||
|
||||
const TbankConnectionSection: FC = () => {
|
||||
const viewModel = useTbankConnectionViewModel();
|
||||
if (viewModel.state === "loading") return <TbankConnectionLoading />;
|
||||
const vm = useTbankConnectionSectionVm();
|
||||
if (vm.state === "loading") return <TbankConnectionLoading />;
|
||||
|
||||
return viewModel.state === "error"
|
||||
? <TbankConnectionError retry={viewModel.retry} />
|
||||
: <TbankConnectionSectionLoaded {...viewModel} />;
|
||||
return vm.state === "error"
|
||||
? <TbankConnectionError retry={vm.retry} />
|
||||
: <TbankConnectionSectionLoaded {...vm} />;
|
||||
};
|
||||
|
||||
export { TbankConnectionSection };
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@ import { useAuthenticatedQuery } from "@/shared/api";
|
||||
|
||||
import { tbankConnectionQueryOptions } from "../../model/connection-boundary";
|
||||
|
||||
function useTbankConnectionViewModel() {
|
||||
function useTbankConnectionSectionVm() {
|
||||
const status = useAuthenticatedQuery({
|
||||
...tbankConnectionQueryOptions(),
|
||||
});
|
||||
@@ -22,4 +22,4 @@ function useTbankConnectionViewModel() {
|
||||
};
|
||||
}
|
||||
|
||||
export { useTbankConnectionViewModel };
|
||||
export { useTbankConnectionSectionVm };
|
||||
|
||||
@@ -26,7 +26,7 @@ import { resource } from "@/test/resource";
|
||||
import { server } from "@/test/server";
|
||||
|
||||
import { AccountEventsPage } from "./AccountEventsPage";
|
||||
import { useAccountEventsPageViewModel } from "./AccountEventsPage.vm";
|
||||
import { useAccountEventsPageVm } from "./AccountEventsPage.vm";
|
||||
|
||||
const Navigation: FC = () => {
|
||||
const location = useLocation();
|
||||
@@ -100,7 +100,7 @@ describe("Upcoming event date filters", () => {
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
|
||||
const { result } = renderHook(() => useAccountEventsPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountEventsPageVm(), {
|
||||
wrapper: ({ children }) => (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MemoryRouter initialEntries={["?from=2099-02-01"]}>
|
||||
@@ -146,7 +146,7 @@ describe("Upcoming event date filters", () => {
|
||||
const queryClient = createTestQueryClient();
|
||||
|
||||
const { result } = renderHook(
|
||||
() => useAccountEventsPageViewModel(),
|
||||
() => useAccountEventsPageVm(),
|
||||
{
|
||||
wrapper: ({ children }) => (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
@@ -176,7 +176,11 @@ describe("Upcoming event date filters", () => {
|
||||
({ request }) => {
|
||||
searches.push(new URL(request.url).search);
|
||||
|
||||
return HttpResponse.json(resource({ events: [] }));
|
||||
return HttpResponse.json(resource({
|
||||
calculatedAt: "2026-08-14T00:00:00Z",
|
||||
events: [],
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
}));
|
||||
},
|
||||
),
|
||||
);
|
||||
@@ -223,7 +227,11 @@ describe("Upcoming event date filters", () => {
|
||||
"*/api/v1/brokerage-accounts/:accountId/events",
|
||||
({ request }) =>
|
||||
new URL(request.url).searchParams.get("from") === defaultFrom
|
||||
? HttpResponse.json(resource({ events: [] }))
|
||||
? HttpResponse.json(resource({
|
||||
calculatedAt: "2026-08-14T00:00:00Z",
|
||||
events: [],
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
}))
|
||||
: HttpResponse.json({ code: "VALIDATION_ERROR" }, { status: 400 }),
|
||||
),
|
||||
);
|
||||
@@ -255,7 +263,8 @@ describe("Upcoming event date filters", () => {
|
||||
accountId,
|
||||
calculatedAt: "2099-01-01T00:00:00Z",
|
||||
events: [],
|
||||
incomeTotalsByCurrency: [],
|
||||
incomeTotal: { currency: "RUB", value: "0" },
|
||||
window: { from: "2099-01-01", to: "2099-01-31" },
|
||||
}),
|
||||
);
|
||||
},
|
||||
@@ -264,6 +273,7 @@ describe("Upcoming event date filters", () => {
|
||||
renderEvents(accountId, ["?from=2026-02-01&to=2026-02-28"]);
|
||||
const from = await screen.findByLabelText("Период");
|
||||
expect(from).toHaveTextContent("01.02.2026 – 28.02.2026");
|
||||
expect(screen.getByText(/Прогноз от .* на 01\.01\.2099 – 31\.01\.2099/)).toBeVisible();
|
||||
expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
|
||||
expect(searches).toEqual(["?from=2026-02-01&to=2026-02-28"]);
|
||||
|
||||
@@ -320,7 +330,7 @@ describe("Upcoming event date filters", () => {
|
||||
expect(screen.getByLabelText("URL")).toBeEmptyDOMElement();
|
||||
expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
|
||||
expect(
|
||||
screen.getByText("За выбранный период событий не найдено"),
|
||||
screen.getByText("На выбранный период предстоящих событий не найдено"),
|
||||
).toBeVisible();
|
||||
},
|
||||
);
|
||||
@@ -343,7 +353,7 @@ it("retains the previous complete forecast when its source refresh fails", async
|
||||
];
|
||||
|
||||
const snapshot = resource(
|
||||
{ events, incomeTotalsByCurrency: [{ currency: "RUB", value: "123.45" }] },
|
||||
{ events, incomeTotal: { currency: "RUB", value: "123.45" } },
|
||||
{
|
||||
lastAttempt: {
|
||||
finishedAt: "2026-08-14T00:01:00Z",
|
||||
@@ -361,7 +371,7 @@ it("retains the previous complete forecast when its source refresh fails", async
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
|
||||
const { result } = renderHook(() => useAccountEventsPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountEventsPageVm(), {
|
||||
wrapper: ({ children }) => (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MemoryRouter initialEntries={["/accounts/all/events"]}>
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
import { MantineProvider } from "@mantine/core";
|
||||
import { QueryClientProvider } from "@tanstack/react-query";
|
||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||
import { http, HttpResponse } from "msw";
|
||||
import { MemoryRouter, Route, Routes } from "react-router";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { configureAuthClient } from "@/shared/api";
|
||||
import { createTestQueryClient } from "@/test/query";
|
||||
import { resource } from "@/test/resource";
|
||||
import { server } from "@/test/server";
|
||||
|
||||
import { AccountEventsPage } from "./AccountEventsPage";
|
||||
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
const RETRIES_EXHAUSTED_MS = 6000;
|
||||
const TEST_MS = 10_000;
|
||||
|
||||
const snapshot = resource({
|
||||
accountId: "account-1",
|
||||
calculatedAt: "2026-08-14T00:00:00Z",
|
||||
events: [
|
||||
{
|
||||
date: "2026-10-01",
|
||||
dateKind: "event",
|
||||
displayName: "Synthetic coupon",
|
||||
figi: null,
|
||||
instrumentUid: null,
|
||||
isin: null,
|
||||
logoName: null,
|
||||
projectedAmount: { currency: "RUB", value: "123.45" },
|
||||
ticker: "SYN",
|
||||
type: "coupon",
|
||||
},
|
||||
],
|
||||
incomeTotal: { currency: "RUB", value: "123.45" },
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
});
|
||||
|
||||
function renderEvents() {
|
||||
configureAuthClient({
|
||||
accessToken: () => "token",
|
||||
clear: vi.fn(),
|
||||
refresh: () => Promise.resolve(true),
|
||||
});
|
||||
const queryClient = createTestQueryClient();
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MantineProvider env="test">
|
||||
<MemoryRouter initialEntries={["/accounts/account-1/events"]}>
|
||||
<Routes>
|
||||
<Route
|
||||
element={<AccountEventsPage />}
|
||||
path="/accounts/:accountId/events"
|
||||
/>
|
||||
</Routes>
|
||||
</MemoryRouter>
|
||||
</MantineProvider>
|
||||
</QueryClientProvider>,
|
||||
);
|
||||
|
||||
return { queryClient };
|
||||
}
|
||||
|
||||
describe("AccountEventsPage read retry", () => {
|
||||
it(
|
||||
"offers retry after an initial failure and recovers in place",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = true;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/events", () => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(snapshot);
|
||||
}),
|
||||
);
|
||||
renderEvents();
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(requests).toBe(3);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
expect(await screen.findByText("Купон · Synthetic coupon")).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
},
|
||||
);
|
||||
|
||||
it(
|
||||
"keeps cached events, warns and retries the same GET",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = false;
|
||||
let requests = 0;
|
||||
let imports = 0;
|
||||
server.use(
|
||||
http.post("*/api/v1/tbank-sync", () => {
|
||||
imports += 1;
|
||||
|
||||
return HttpResponse.json({}, { status: 202 });
|
||||
}),
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/events", () => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(snapshot);
|
||||
}),
|
||||
);
|
||||
const { queryClient } = renderEvents();
|
||||
await screen.findByText("Купон · Synthetic coupon");
|
||||
expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
|
||||
isFailing = true;
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/events"],
|
||||
});
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
|
||||
expect(screen.getByText("Купон · Synthetic coupon")).toBeInTheDocument();
|
||||
expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
|
||||
expect(requests).toBe(4);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByText("Не удалось обновить данные"))
|
||||
.not.toBeInTheDocument());
|
||||
expect(requests).toBe(5);
|
||||
expect(imports).toBe(0);
|
||||
},
|
||||
);
|
||||
|
||||
it("does not offer a plain retry when the account is gone", async () => {
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/events", () =>
|
||||
HttpResponse.json({ code: "NOT_FOUND" }, { status: 404 })),
|
||||
);
|
||||
renderEvents();
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByRole("heading", { name: "Загрузка" }))
|
||||
.not.toBeInTheDocument());
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -47,6 +47,7 @@ describe("AccountEventsPage", () => {
|
||||
accountId: "account",
|
||||
calculatedAt: "2026-08-14T00:00:00Z",
|
||||
events: [],
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
},
|
||||
isError: false,
|
||||
isLoading: false,
|
||||
@@ -136,6 +137,7 @@ describe("AccountEventsPage", () => {
|
||||
type: "offer",
|
||||
},
|
||||
],
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
},
|
||||
isError: false,
|
||||
isLoading: false,
|
||||
@@ -169,15 +171,18 @@ describe("AccountEventsPage", () => {
|
||||
expect(screen.getAllByText("O")).toHaveLength(2);
|
||||
});
|
||||
|
||||
it("renders empty and quiet error states", async () => {
|
||||
it("renders empty and error states with retry", async () => {
|
||||
const { rerender } = renderPage();
|
||||
expect(
|
||||
screen.getByText("За выбранный период событий не найдено"),
|
||||
screen.getByText("На выбранный период предстоящих событий не найдено"),
|
||||
).toBeInTheDocument();
|
||||
query.mockReturnValue({
|
||||
data: undefined,
|
||||
error: { code: "TBANK_UNAVAILABLE", status: 503 },
|
||||
isError: true,
|
||||
isFetching: false,
|
||||
isLoading: false,
|
||||
refetch: vi.fn(),
|
||||
} as never);
|
||||
rerender(
|
||||
<MantineProvider>
|
||||
@@ -187,7 +192,7 @@ describe("AccountEventsPage", () => {
|
||||
</MantineProvider>,
|
||||
);
|
||||
expect(await screen.findByRole("button", { name: "Сбросить" })).toBeVisible();
|
||||
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "Повторить" })).toBeVisible();
|
||||
});
|
||||
|
||||
it("shows a structural busy state before events are available", () => {
|
||||
@@ -234,7 +239,7 @@ describe("AccountEventsPage", () => {
|
||||
"true",
|
||||
);
|
||||
expect(
|
||||
screen.queryByText("За выбранный период событий не найдено"),
|
||||
screen.queryByText("На выбранный период предстоящих событий не найдено"),
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
@@ -273,6 +278,7 @@ describe("AccountEventsPage", () => {
|
||||
accountId: "all",
|
||||
calculatedAt: "2026-08-14T00:00:00Z",
|
||||
events: [...events],
|
||||
window: { from: "2026-08-14", to: "2026-09-13" },
|
||||
},
|
||||
isError: false,
|
||||
isLoading: false,
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useAccountEventsPageViewModel } from "./AccountEventsPage.vm";
|
||||
import { useAccountEventsPageVm } from "./AccountEventsPage.vm";
|
||||
import { AccountEventsPageError } from "./components/AccountEventsPageError.view";
|
||||
import { AccountEventsPageLoaded } from "./components/AccountEventsPageLoaded.view";
|
||||
import { AccountEventsPageLoading } from "./components/AccountEventsPageLoading.view";
|
||||
|
||||
const AccountEventsPage: FC = () => {
|
||||
const viewModel = useAccountEventsPageViewModel();
|
||||
if (viewModel.state === "loading") return <AccountEventsPageLoading />;
|
||||
const vm = useAccountEventsPageVm();
|
||||
if (vm.state === "loading") return <AccountEventsPageLoading />;
|
||||
|
||||
return viewModel.state === "error"
|
||||
? <AccountEventsPageError {...viewModel} />
|
||||
: <AccountEventsPageLoaded {...viewModel} />;
|
||||
return vm.state === "error"
|
||||
? <AccountEventsPageError {...vm} />
|
||||
: <AccountEventsPageLoaded {...vm} />;
|
||||
};
|
||||
|
||||
export { AccountEventsPage };
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { useState } from "react";
|
||||
import { useParams } from "react-router";
|
||||
|
||||
import type { InvestmentResourceMeta } from "@/shared/api";
|
||||
|
||||
import {
|
||||
type BrokerageEvent,
|
||||
useBrokerageEvents,
|
||||
} from "@/entities/brokerage-event";
|
||||
import { useScreenSync } from "@/features/tbank-connection";
|
||||
import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
|
||||
import {
|
||||
defaultPeriod,
|
||||
isValidPeriod,
|
||||
@@ -19,6 +18,7 @@ import {
|
||||
type AccountEventsPageViewModel
|
||||
= | {
|
||||
allAccounts: boolean;
|
||||
calculatedAt: string;
|
||||
canApply: boolean;
|
||||
draftPeriod: [null | string, null | string];
|
||||
events: BrokerageEvent[];
|
||||
@@ -28,14 +28,20 @@ type AccountEventsPageViewModel
|
||||
onPeriodPopoverOpen: () => void;
|
||||
onReset: () => void;
|
||||
partial?: boolean;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
source?: InvestmentResourceMeta;
|
||||
state: "loaded";
|
||||
totalVisible: boolean;
|
||||
window: { from: string; to: string };
|
||||
}
|
||||
| {
|
||||
onReset: () => void;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
state: "error";
|
||||
}
|
||||
| { onReset: () => void; state: "error" }
|
||||
| { state: "loading" };
|
||||
|
||||
function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
|
||||
function useAccountEventsPageVm(): AccountEventsPageViewModel {
|
||||
const { accountId = "" } = useParams();
|
||||
|
||||
const {
|
||||
@@ -83,6 +89,8 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
|
||||
isFetching: events.isFetching,
|
||||
});
|
||||
|
||||
const retry = readRetry([events]);
|
||||
|
||||
if (availability === "loading" && events.isLoading)
|
||||
return { state: "loading" };
|
||||
|
||||
@@ -94,15 +102,17 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
|
||||
if ((events.isError || events.meta?.lastAttempt.state === "failed") && !events.data)
|
||||
return {
|
||||
onReset,
|
||||
readRetry: retry,
|
||||
state: "error",
|
||||
};
|
||||
if (!events.data)
|
||||
return availability === "unavailable"
|
||||
? { onReset, state: "error" }
|
||||
? { onReset, readRetry: retry, state: "error" }
|
||||
: { state: "loading" };
|
||||
|
||||
return {
|
||||
allAccounts: accountId === "all",
|
||||
calculatedAt: events.data.calculatedAt,
|
||||
canApply:
|
||||
(draftFrom !== appliedFrom || draftTo !== appliedTo)
|
||||
&& isValidPeriod(draftFrom, draftTo),
|
||||
@@ -122,10 +132,12 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
|
||||
onPeriodPopoverOpen: () => setMinDate(moscowDate(new Date())),
|
||||
onReset,
|
||||
partial: events.meta?.completeness === "incomplete",
|
||||
readRetry: retry,
|
||||
source: events.meta,
|
||||
state: "loaded",
|
||||
totalVisible: events.meta?.completeness === "complete",
|
||||
window: events.data.window,
|
||||
};
|
||||
}
|
||||
|
||||
export { type AccountEventsPageViewModel, useAccountEventsPageViewModel };
|
||||
export { type AccountEventsPageViewModel, useAccountEventsPageVm };
|
||||
|
||||
+13
-1
@@ -4,7 +4,12 @@ import { Button, Group } from "@mantine/core";
|
||||
import { StateView } from "@wealthledger/ui";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
type AccountEventsPageErrorProps = { onReset: () => void };
|
||||
import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
|
||||
|
||||
type AccountEventsPageErrorProps = {
|
||||
onReset: () => void;
|
||||
readRetry: ReadRetryProps;
|
||||
};
|
||||
|
||||
const AccountEventsPageError: FC<AccountEventsPageErrorProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
@@ -13,6 +18,13 @@ const AccountEventsPageError: FC<AccountEventsPageErrorProps> = (props) => {
|
||||
<StateView
|
||||
action={(
|
||||
<Group>
|
||||
{props.readRetry.exhausted && (
|
||||
<ReadRetryButton
|
||||
onRetry={props.readRetry.onRetry}
|
||||
retrying={props.readRetry.retrying}
|
||||
/>
|
||||
)}
|
||||
|
||||
<Button onClick={props.onReset} variant="default">
|
||||
{t("ledger.reset")}
|
||||
</Button>
|
||||
|
||||
+12
-2
@@ -17,8 +17,8 @@ import {
|
||||
brokerageEventGroupKey,
|
||||
brokerageEventKey,
|
||||
} from "@/entities/brokerage-event";
|
||||
import { groupItems } from "@/shared/lib";
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
|
||||
import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
|
||||
|
||||
@@ -83,10 +83,20 @@ const AccountEventsPageLoaded: FC<AccountEventsPageLoadedProps> = (props) => {
|
||||
stale={props.source?.freshness === "stale"}
|
||||
/>
|
||||
|
||||
<ReadRetry {...props.readRetry} />
|
||||
|
||||
{!!props.partial && <Alert role="status">{t("investment.partial")}</Alert>}
|
||||
|
||||
<Text c="dimmed">{t("events.hint")}</Text>
|
||||
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("events.forecastWindow", {
|
||||
date: formatSnapshotTime(props.calculatedAt),
|
||||
from: formatDate(props.window.from),
|
||||
to: formatDate(props.window.to),
|
||||
})}
|
||||
</Text>
|
||||
|
||||
<Group align="end">
|
||||
<DatePickerInput
|
||||
allowSingleDateInRange
|
||||
|
||||
@@ -34,10 +34,14 @@ import { server } from "@/test/server";
|
||||
import { toIncomeDisplayModel } from "../../model/display";
|
||||
import { AccountIncomePage } from "./AccountIncomePage";
|
||||
import {
|
||||
useAccountIncomePageViewModel,
|
||||
useAccountIncomePageVm,
|
||||
} from "./AccountIncomePage.vm";
|
||||
import { IncomePayments } from "./components/IncomePayments.view";
|
||||
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
const RETRIES_EXHAUSTED_MS = 6000;
|
||||
const TEST_MS = 10_000;
|
||||
|
||||
const analytics
|
||||
= {
|
||||
accountId: "account-1",
|
||||
@@ -45,7 +49,7 @@ const analytics
|
||||
buckets: [
|
||||
{
|
||||
period: { from: "2026-08-01", to: "2026-08-01" },
|
||||
totalsByCurrency: [summary("RUB", "10", "2")],
|
||||
total: summary("10", "2"),
|
||||
},
|
||||
],
|
||||
calculatedAt: "2026-08-27T00:00:00Z",
|
||||
@@ -73,7 +77,7 @@ const analytics
|
||||
},
|
||||
],
|
||||
period: { from: "2026-08-01", to: "2026-08-27" },
|
||||
totalsByCurrency: [summary("RUB", "10", "2")],
|
||||
total: summary("10", "2"),
|
||||
} satisfies IncomeAnalytics & { instruments: [unknown] };
|
||||
|
||||
function entry(): IncomeAnalytics["entries"][number] {
|
||||
@@ -141,12 +145,11 @@ function renderPage(
|
||||
return { ...view, queryClient };
|
||||
}
|
||||
|
||||
function summary(currency: string, coupon: string, dividend: string) {
|
||||
function summary(coupon: string, dividend: string) {
|
||||
return {
|
||||
coupon: money(currency, coupon),
|
||||
currency,
|
||||
dividend: money(currency, dividend),
|
||||
total: money(currency, String(Number(coupon) + Number(dividend))),
|
||||
coupon: money("RUB", coupon),
|
||||
dividend: money("RUB", dividend),
|
||||
total: money("RUB", String(Number(coupon) + Number(dividend))),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -167,7 +170,7 @@ describe("AccountIncomePage", () => {
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
|
||||
const { result } = renderHook(() => useAccountIncomePageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountIncomePageVm(), {
|
||||
wrapper: ({ children }) => (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MemoryRouter initialEntries={["?from=2024-02-29&to=2024-03-01"]}>
|
||||
@@ -304,7 +307,7 @@ describe("AccountIncomePage", () => {
|
||||
buckets: [],
|
||||
entries: [],
|
||||
instruments: [],
|
||||
totalsByCurrency: [],
|
||||
total: summary("0", "0"),
|
||||
}),
|
||||
),
|
||||
),
|
||||
@@ -406,7 +409,7 @@ describe("AccountIncomePage", () => {
|
||||
|
||||
it.each([
|
||||
["full", analytics],
|
||||
["empty", { ...analytics, buckets: [], entries: [], instruments: [], totalsByCurrency: [] }],
|
||||
["empty", { ...analytics, buckets: [], entries: [], instruments: [], total: summary("0", "0") }],
|
||||
])("shows the server source time and last attempt for a %s result", async (_name, data) => {
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
|
||||
@@ -433,21 +436,95 @@ describe("AccountIncomePage", () => {
|
||||
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows a quiet realized error", async () => {
|
||||
server.use(
|
||||
http.get(
|
||||
"*/api/v1/brokerage-accounts/account-1/income-analytics",
|
||||
() => new HttpResponse(null, { status: 503 }),
|
||||
),
|
||||
);
|
||||
renderPage();
|
||||
expect(
|
||||
await screen.findByText("Не удалось рассчитать пассивный доход", undefined, {
|
||||
timeout: 4000,
|
||||
}),
|
||||
).toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
|
||||
});
|
||||
it(
|
||||
"offers retry after an initial failure and recovers in place",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = true;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get(
|
||||
"*/api/v1/brokerage-accounts/account-1/income-analytics",
|
||||
() => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? new HttpResponse(null, { status: 503 })
|
||||
: HttpResponse.json(resource(analytics));
|
||||
},
|
||||
),
|
||||
);
|
||||
renderPage();
|
||||
expect(
|
||||
await screen.findByText(
|
||||
"Не удалось рассчитать пассивный доход",
|
||||
undefined,
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
),
|
||||
).toBeInTheDocument();
|
||||
const retry = screen.getByRole("button", { name: "Повторить" });
|
||||
expect(requests).toBe(3);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
expect(
|
||||
await screen.findByRole("region", { name: "Выплаты" }),
|
||||
).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
},
|
||||
);
|
||||
|
||||
it(
|
||||
"keeps cached income, warns and retries the same GET",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = false;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get(
|
||||
"*/api/v1/brokerage-accounts/account-1/income-analytics",
|
||||
() => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json(
|
||||
{ code: "TBANK_UNAVAILABLE" },
|
||||
{ status: 503 },
|
||||
)
|
||||
: HttpResponse.json(resource(analytics));
|
||||
},
|
||||
),
|
||||
);
|
||||
const { queryClient } = renderPage();
|
||||
await screen.findByRole("region", { name: "Выплаты" });
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
|
||||
isFailing = true;
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/income-analytics"],
|
||||
});
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
|
||||
expect(screen.getByRole("region", { name: "Выплаты" })).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByText("Не удалось обновить данные"))
|
||||
.not.toBeInTheDocument());
|
||||
expect(requests).toBe(5);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
const LocationProbe: FC = () => {
|
||||
@@ -659,11 +736,11 @@ describe("income period and snapshot boundary", () => {
|
||||
const instruments = [
|
||||
{
|
||||
...analytics.instruments[0],
|
||||
coupon: money("USD", "10"),
|
||||
dividend: money("USD", "0"),
|
||||
key: "usd",
|
||||
coupon: money("RUB", "10"),
|
||||
dividend: money("RUB", "0"),
|
||||
key: "rub-positive",
|
||||
receiptCount: 1,
|
||||
total: money("USD", "10"),
|
||||
total: money("RUB", "10"),
|
||||
},
|
||||
{
|
||||
...analytics.instruments[0],
|
||||
@@ -692,7 +769,7 @@ describe("income period and snapshot boundary", () => {
|
||||
payment: instrument.total,
|
||||
})),
|
||||
instruments,
|
||||
totalsByCurrency: [summary("RUB", "-5", "0"), summary("USD", "10", "0")],
|
||||
total: summary("-5", "0"),
|
||||
});
|
||||
|
||||
render(
|
||||
@@ -704,10 +781,9 @@ describe("income period and snapshot boundary", () => {
|
||||
screen.getByRole("heading", { name: "Выплаты" }),
|
||||
).toBeInTheDocument();
|
||||
expect(screen.queryByText("RUB")).not.toBeInTheDocument();
|
||||
expect(screen.queryByText("USD")).not.toBeInTheDocument();
|
||||
const cards = screen.getAllByRole("listitem");
|
||||
expect(cards).toHaveLength(3);
|
||||
expect(cards[0]).toHaveTextContent("+10 USD");
|
||||
expect(cards[0]).toHaveTextContent("+10 ₽");
|
||||
expect(cards[1]).toHaveTextContent("−2 ₽");
|
||||
expect(cards[2]).toHaveTextContent("−3 ₽");
|
||||
expect(screen.queryByText(/Итого:|Выплат:/)).not.toBeInTheDocument();
|
||||
@@ -739,11 +815,11 @@ describe("income period and snapshot boundary", () => {
|
||||
);
|
||||
renderPage(undefined, "all");
|
||||
|
||||
expect(await screen.findByText("Купон · BOND")).toBeInTheDocument();
|
||||
expect(await screen.findByText("Выплата купонов BOND")).toBeInTheDocument();
|
||||
expect(screen.getByText("+30 ₽")).toBeInTheDocument();
|
||||
|
||||
const accounts = within(screen.getByRole("list", {
|
||||
name: /Купон · BOND, Исполнено/,
|
||||
name: /Выплата купонов BOND, Исполнено/,
|
||||
}));
|
||||
|
||||
expect(accounts.getByText("Брокерский")).toBeInTheDocument();
|
||||
@@ -778,7 +854,7 @@ describe("income period and snapshot boundary", () => {
|
||||
expect(await screen.findByText("+30 ₽")).toBeInTheDocument();
|
||||
|
||||
const accounts = within(screen.getByRole("list", {
|
||||
name: /Купон · BOND/,
|
||||
name: /Выплата купонов BOND/,
|
||||
}));
|
||||
|
||||
expect(accounts.getAllByRole("listitem")).toHaveLength(2);
|
||||
@@ -811,7 +887,7 @@ describe("income period and snapshot boundary", () => {
|
||||
);
|
||||
const view = renderPage(undefined, "all");
|
||||
|
||||
await screen.findByText("Купон · BOND");
|
||||
await screen.findByText("Выплата купонов BOND");
|
||||
expect(screen.queryByText("+30 ₽")).not.toBeInTheDocument();
|
||||
view.unmount();
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useAccountIncomePageViewModel } from "./AccountIncomePage.vm";
|
||||
import { useAccountIncomePageVm } from "./AccountIncomePage.vm";
|
||||
import { AccountIncomePageError } from "./components/AccountIncomePageError.view";
|
||||
import { AccountIncomePageLoaded } from "./components/AccountIncomePageLoaded.view";
|
||||
import { AccountIncomePageLoading } from "./components/AccountIncomePageLoading.view";
|
||||
|
||||
const AccountIncomePage: FC = () => {
|
||||
const viewModel = useAccountIncomePageViewModel();
|
||||
if (viewModel.state === "loading") return <AccountIncomePageLoading />;
|
||||
const vm = useAccountIncomePageVm();
|
||||
if (vm.state === "loading") return <AccountIncomePageLoading />;
|
||||
|
||||
return viewModel.state === "error"
|
||||
? <AccountIncomePageError {...viewModel} />
|
||||
: <AccountIncomePageLoaded {...viewModel} />;
|
||||
return vm.state === "error"
|
||||
? <AccountIncomePageError {...vm} />
|
||||
: <AccountIncomePageLoaded {...vm} />;
|
||||
};
|
||||
|
||||
export { AccountIncomePage };
|
||||
|
||||
@@ -3,10 +3,9 @@ import { useEffect, useMemo, useState } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { useParams, useSearchParams } from "react-router";
|
||||
|
||||
import type { InvestmentResourceMeta } from "@/shared/api";
|
||||
|
||||
import { type IncomeAnalytics, useIncomeAnalytics } from "@/entities/income";
|
||||
import { useScreenSync } from "@/features/tbank-connection";
|
||||
import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
|
||||
import { isValidPeriod, moscowDate, useInitialAvailability } from "@/shared/lib";
|
||||
|
||||
import {
|
||||
@@ -32,17 +31,19 @@ type AccountIncomePageViewModel
|
||||
onReset: () => void;
|
||||
onSubmit: (values: IncomeForm) => void;
|
||||
partial?: boolean;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
source?: InvestmentResourceMeta;
|
||||
state: "loaded";
|
||||
totalVisible: boolean;
|
||||
}
|
||||
| {
|
||||
period: IncomePeriod;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
state: "error";
|
||||
}
|
||||
| { state: "loading" };
|
||||
|
||||
const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
|
||||
const useAccountIncomePageVm = (): AccountIncomePageViewModel => {
|
||||
const { accountId = "" } = useParams();
|
||||
const [searchParameters, setSearchParameters] = useSearchParams();
|
||||
|
||||
@@ -87,12 +88,14 @@ const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
|
||||
isFetching: analytics.isFetching,
|
||||
});
|
||||
|
||||
const retry = readRetry([analytics]);
|
||||
|
||||
if (availability === "loading" && analytics.isLoading)
|
||||
return { state: "loading" };
|
||||
|
||||
if (!analytics.data)
|
||||
return availability === "unavailable"
|
||||
? { period, state: "error" }
|
||||
? { period, readRetry: retry, state: "error" }
|
||||
: { state: "loading" };
|
||||
|
||||
const display = toIncomeDisplayModel(analytics.data);
|
||||
@@ -119,6 +122,7 @@ const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
|
||||
onReset,
|
||||
onSubmit,
|
||||
partial: analytics.meta?.completeness === "incomplete",
|
||||
readRetry: retry,
|
||||
source: analytics.meta,
|
||||
state: "loaded",
|
||||
totalVisible: analytics.meta?.completeness === "complete",
|
||||
@@ -142,5 +146,5 @@ function isValidIncomePeriod(period: IncomePeriod): boolean {
|
||||
|
||||
export {
|
||||
type AccountIncomePageViewModel,
|
||||
useAccountIncomePageViewModel,
|
||||
useAccountIncomePageVm,
|
||||
};
|
||||
|
||||
+13
-1
@@ -3,15 +3,27 @@ import type { FC } from "react";
|
||||
import { StateView } from "@wealthledger/ui";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { ReadRetryButton } from "@/shared/ui";
|
||||
|
||||
import type { AccountIncomePageViewModel } from "../AccountIncomePage.vm";
|
||||
|
||||
type ErrorProps = Extract<AccountIncomePageViewModel, { state: "error" }>;
|
||||
|
||||
const AccountIncomePageError: FC<ErrorProps> = () => {
|
||||
const AccountIncomePageError: FC<ErrorProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const retry = props.readRetry.exhausted
|
||||
? (
|
||||
<ReadRetryButton
|
||||
onRetry={props.readRetry.onRetry}
|
||||
retrying={props.readRetry.retrying}
|
||||
/>
|
||||
)
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<StateView
|
||||
action={retry}
|
||||
error
|
||||
text={t("income.errorText")}
|
||||
title={t("income.errorTitle")}
|
||||
|
||||
+6
-9
@@ -5,11 +5,10 @@ import {
|
||||
Stack,
|
||||
Title,
|
||||
} from "@mantine/core";
|
||||
import { StateView } from "@wealthledger/ui";
|
||||
import { FormProvider } from "react-hook-form";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import type { AccountIncomePageViewModel } from "../AccountIncomePage.vm";
|
||||
|
||||
@@ -25,13 +24,9 @@ const AccountIncomePageLoadedSummary: FC<LoadedProps> = (props) => {
|
||||
|
||||
const { analytics } = props;
|
||||
|
||||
if (props.partial) {
|
||||
return <Alert role="status">{t("investment.partial")}</Alert>;
|
||||
}
|
||||
|
||||
return analytics.totalsByCurrency.length > 0
|
||||
? <IncomeSummary totals={analytics.totalsByCurrency} />
|
||||
: <StateView text={t("income.emptyText")} title={t("income.emptyTitle")} />;
|
||||
return props.partial
|
||||
? <Alert role="status">{t("investment.partial")}</Alert>
|
||||
: <IncomeSummary totals={analytics.total} />;
|
||||
};
|
||||
|
||||
const AccountIncomePageLoaded: FC<LoadedProps> = (props) => {
|
||||
@@ -57,6 +52,8 @@ const AccountIncomePageLoaded: FC<LoadedProps> = (props) => {
|
||||
stale={props.source?.freshness === "stale"}
|
||||
/>
|
||||
|
||||
<ReadRetry {...props.readRetry} />
|
||||
|
||||
<AccountIncomePageLoadedSummary {...props} />
|
||||
|
||||
<Alert color="blue">{t("income.taxBoundary")}</Alert>
|
||||
|
||||
@@ -7,7 +7,7 @@ import type { IncomeAnalytics } from "@/entities/income";
|
||||
|
||||
import { formatMoney } from "@/shared/lib";
|
||||
|
||||
type IncomeSummaryProps = { totals: IncomeAnalytics["totalsByCurrency"] };
|
||||
type IncomeSummaryProps = { totals: IncomeAnalytics["total"] };
|
||||
|
||||
const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
@@ -16,16 +16,14 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
||||
<Stack>
|
||||
<Title order={2}>{t("income.summaryTitle")}</Title>
|
||||
|
||||
{props.totals.map(total => (
|
||||
<Paper key={total.currency} p="md" radius="md" withBorder>
|
||||
<Text fw={700}>{formatMoney(total.total)}</Text>
|
||||
<Paper p="md" radius="md" withBorder>
|
||||
<Text fw={700}>{formatMoney(props.totals.total)}</Text>
|
||||
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("income.coupon")}: {formatMoney(total.coupon)} ·{" "}
|
||||
{t("income.dividend")}: {formatMoney(total.dividend)}
|
||||
</Text>
|
||||
</Paper>
|
||||
))}
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("income.coupon")}: {formatMoney(props.totals.coupon)} ·{" "}
|
||||
{t("income.dividend")}: {formatMoney(props.totals.dividend)}
|
||||
</Text>
|
||||
</Paper>
|
||||
</Stack>
|
||||
);
|
||||
};
|
||||
|
||||
+104
-21
@@ -90,9 +90,13 @@ function configureTestAuth() {
|
||||
});
|
||||
}
|
||||
|
||||
function renderPage(search = "", accountId = "account-1") {
|
||||
function renderPage(
|
||||
search = "",
|
||||
accountId = "account-1",
|
||||
queryClient = createTestQueryClient(),
|
||||
) {
|
||||
return render(
|
||||
<QueryClientProvider client={createTestQueryClient()}>
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<MantineProvider>
|
||||
<MemoryRouter
|
||||
initialEntries={[`/accounts/${accountId}/operations${search}`]}
|
||||
@@ -109,6 +113,18 @@ function renderPage(search = "", accountId = "account-1") {
|
||||
);
|
||||
}
|
||||
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
const RETRIES_EXHAUSTED_MS = 6000;
|
||||
const TEST_MS = 10_000;
|
||||
|
||||
const loadedOperations = {
|
||||
accountId: "account-1",
|
||||
hasNext: false,
|
||||
items: [operation],
|
||||
nextCursor: null,
|
||||
observedAt: "2026-08-14T00:00:00Z",
|
||||
};
|
||||
|
||||
describe("LedgerEntryRow", () => {
|
||||
it("marks cashless operations without rendering operation details", () => {
|
||||
render(
|
||||
@@ -424,7 +440,7 @@ describe("AccountOperationsPage", () => {
|
||||
renderPage();
|
||||
|
||||
expect(
|
||||
await screen.findByRole("heading", { name: "Журнал операций" }),
|
||||
await screen.findByRole("heading", { name: "История операций" }),
|
||||
).toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByRole("link", { name: "К счету" }),
|
||||
@@ -466,7 +482,7 @@ describe("AccountOperationsPage", () => {
|
||||
renderPage();
|
||||
|
||||
expect(
|
||||
await screen.findByRole("heading", { name: "Журнал операций" }),
|
||||
await screen.findByRole("heading", { name: "История операций" }),
|
||||
).toBeInTheDocument();
|
||||
await waitFor(() => expect(searches.length).toBeGreaterThan(0));
|
||||
const countBefore = searches.length;
|
||||
@@ -505,7 +521,7 @@ describe("AccountOperationsPage", () => {
|
||||
renderPage();
|
||||
|
||||
expect(
|
||||
await screen.findByRole("heading", { name: "Журнал операций" }),
|
||||
await screen.findByRole("heading", { name: "История операций" }),
|
||||
).toBeInTheDocument();
|
||||
fireEvent.click(screen.getByRole("combobox", { name: "Категории" }));
|
||||
fireEvent.click(await screen.findByText("Налог"));
|
||||
@@ -545,20 +561,87 @@ describe("AccountOperationsPage", () => {
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("renders an error state", async () => {
|
||||
configureTestAuth();
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/operations", () =>
|
||||
HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 }),
|
||||
),
|
||||
);
|
||||
renderPage();
|
||||
expect(
|
||||
await screen.findByText("Не удалось загрузить журнал", undefined, {
|
||||
timeout: 4000,
|
||||
}),
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
it(
|
||||
"renders an error state with retry that recovers in place",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
configureTestAuth();
|
||||
let isFailing = true;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/operations", () => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(resource(loadedOperations));
|
||||
}),
|
||||
);
|
||||
renderPage();
|
||||
expect(
|
||||
await screen.findByText("Не удалось загрузить историю операций", undefined, {
|
||||
timeout: RETRIES_EXHAUSTED_MS,
|
||||
}),
|
||||
).toBeInTheDocument();
|
||||
expect(requests).toBe(3);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
|
||||
|
||||
expect(await screen.findByText("Покупка акций")).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
},
|
||||
);
|
||||
|
||||
it(
|
||||
"keeps cached operations, warns and retries the same GET",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
configureTestAuth();
|
||||
let isFailing = false;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/operations", () => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(resource(loadedOperations));
|
||||
}),
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
renderPage("", "account-1", queryClient);
|
||||
await screen.findByText("Покупка акций");
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
|
||||
isFailing = true;
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: [
|
||||
"get",
|
||||
"/api/v1/brokerage-accounts/{accountId}/operations",
|
||||
],
|
||||
});
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
|
||||
expect(screen.getByText("Покупка акций")).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByText("Не удалось обновить данные"))
|
||||
.not.toBeInTheDocument());
|
||||
expect(requests).toBe(5);
|
||||
},
|
||||
);
|
||||
|
||||
it("keeps a null operations envelope loading instead of a confirmed empty period", async () => {
|
||||
configureTestAuth();
|
||||
@@ -704,10 +787,10 @@ describe("all-account operation groups", () => {
|
||||
fireEvent.click(screen.getByRole("button", { name: "Далее" }));
|
||||
|
||||
const accounts = await screen.findByRole("list", {
|
||||
name: /Купон · BOND, Исполнено/,
|
||||
name: /Выплата купонов BOND, Исполнено/,
|
||||
});
|
||||
|
||||
expect(screen.getByText("Купон · BOND")).toBeInTheDocument();
|
||||
expect(screen.getByText("Выплата купонов BOND")).toBeInTheDocument();
|
||||
expect(screen.getByText("+200 ₽")).toBeInTheDocument();
|
||||
expect(within(accounts).getAllByRole("listitem")).toHaveLength(2);
|
||||
|
||||
|
||||
@@ -6,15 +6,15 @@ import { AccountOperationsPageLoaded } from "./components/AccountOperationsPageL
|
||||
import { AccountOperationsPageLoading } from "./components/AccountOperationsPageLoading.view";
|
||||
|
||||
const AccountOperationsPage: FC = () => {
|
||||
const viewModel = useAccountOperationsPageVm();
|
||||
const vm = useAccountOperationsPageVm();
|
||||
|
||||
if (viewModel.state === "loading") {
|
||||
if (vm.state === "loading") {
|
||||
return <AccountOperationsPageLoading />;
|
||||
}
|
||||
|
||||
return viewModel.state === "error"
|
||||
? <AccountOperationsPageError {...viewModel} />
|
||||
: <AccountOperationsPageLoaded {...viewModel} />;
|
||||
return vm.state === "error"
|
||||
? <AccountOperationsPageError {...vm} />
|
||||
: <AccountOperationsPageLoaded {...vm} />;
|
||||
};
|
||||
|
||||
export { AccountOperationsPage };
|
||||
|
||||
@@ -12,7 +12,12 @@ import {
|
||||
useBrokerageOperationHistory,
|
||||
} from "@/entities/broker-operation";
|
||||
import { useScreenSync } from "@/features/tbank-connection";
|
||||
import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
|
||||
import {
|
||||
ApiErrorCode,
|
||||
apiErrorCode,
|
||||
isApiErrorCode,
|
||||
readRetry,
|
||||
} from "@/shared/api";
|
||||
import {
|
||||
defaultPeriod,
|
||||
isValidPeriod,
|
||||
@@ -42,11 +47,16 @@ type AccountOperationsPageViewModel
|
||||
onPrevious: () => void;
|
||||
onReset: () => void;
|
||||
partial?: boolean;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
source?: InvestmentResourceMeta;
|
||||
state: "loaded";
|
||||
totalVisible: boolean;
|
||||
}
|
||||
| { onReset: () => void; state: "error" }
|
||||
| {
|
||||
onReset: () => void;
|
||||
readRetry: ReturnType<typeof readRetry>;
|
||||
state: "error";
|
||||
}
|
||||
| { state: "loading" };
|
||||
|
||||
const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
|
||||
@@ -107,6 +117,8 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
|
||||
isFetching: operations.isFetching,
|
||||
});
|
||||
|
||||
const retry = readRetry([operations]);
|
||||
|
||||
if (availability === "loading" && operations.isLoading)
|
||||
return { state: "loading" };
|
||||
|
||||
@@ -134,11 +146,11 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
|
||||
(isInvalidCursor || !operations.data)
|
||||
&& (operations.isError || operations.meta?.lastAttempt.state === "failed")
|
||||
)
|
||||
return { onReset, state: "error" };
|
||||
return { onReset, readRetry: retry, state: "error" };
|
||||
|
||||
if (!operations.data)
|
||||
return availability === "unavailable"
|
||||
? { onReset, state: "error" }
|
||||
? { onReset, readRetry: retry, state: "error" }
|
||||
: { state: "loading" };
|
||||
|
||||
const nextCursor = operations.data.nextCursor;
|
||||
@@ -182,6 +194,7 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
|
||||
onPrevious: history.onPrevious,
|
||||
onReset,
|
||||
partial: operations.meta?.completeness === "incomplete",
|
||||
readRetry: retry,
|
||||
source: operations.meta,
|
||||
state: "loaded",
|
||||
totalVisible: operations.meta?.completeness === "complete",
|
||||
|
||||
+15
-4
@@ -1,9 +1,11 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { Button } from "@mantine/core";
|
||||
import { Button, Group } from "@mantine/core";
|
||||
import { StateView } from "@wealthledger/ui";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { ReadRetryButton } from "@/shared/ui";
|
||||
|
||||
import type { AccountOperationsPageViewModel } from "../AccountOperationsPage.vm";
|
||||
|
||||
type AccountOperationsPageErrorProps = Extract<
|
||||
@@ -19,9 +21,18 @@ const AccountOperationsPageError: FC<AccountOperationsPageErrorProps> = (
|
||||
return (
|
||||
<StateView
|
||||
action={(
|
||||
<Button onClick={props.onReset} variant="default">
|
||||
{t("ledger.reset")}
|
||||
</Button>
|
||||
<Group gap="sm" justify="center">
|
||||
{props.readRetry.exhausted && (
|
||||
<ReadRetryButton
|
||||
onRetry={props.readRetry.onRetry}
|
||||
retrying={props.readRetry.retrying}
|
||||
/>
|
||||
)}
|
||||
|
||||
<Button onClick={props.onReset} variant="default">
|
||||
{t("ledger.reset")}
|
||||
</Button>
|
||||
</Group>
|
||||
)}
|
||||
text={t("ledger.errorText")}
|
||||
title={t("ledger.errorTitle")}
|
||||
|
||||
+3
-1
@@ -19,7 +19,7 @@ import {
|
||||
OperationGroup,
|
||||
} from "@/entities/broker-operation";
|
||||
import { groupItems } from "@/shared/lib";
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import type { AccountOperationsPageViewModel } from "../AccountOperationsPage.vm";
|
||||
|
||||
@@ -102,6 +102,8 @@ const AccountOperationsPageLoaded: FC<AccountOperationsPageLoadedProps> = (
|
||||
stale={props.source?.freshness === "stale"}
|
||||
/>
|
||||
|
||||
<ReadRetry {...props.readRetry} />
|
||||
|
||||
{!!props.partial && <Alert role="status">{t("investment.partial")}</Alert>}
|
||||
|
||||
{!!props.historyLoading && <Alert>{t("investment.history")}</Alert>}
|
||||
|
||||
@@ -35,15 +35,13 @@ describe("account concentration", () => {
|
||||
const model = toConcentration(snapshot([
|
||||
stock("A", "1"), stock("B", "15"),
|
||||
stock("C", "0"), stock("D", "-50"), stock("E", null),
|
||||
stock("F", null, "USD"), stock("G", "-3", "USD"),
|
||||
]), "stocks", "RUB", labels);
|
||||
]), "stocks", labels);
|
||||
|
||||
expect(model.currencies).toEqual(["RUB", "USD"]);
|
||||
expect(model.total).toBe("16");
|
||||
expect(model.items.map(item => item.share)).toEqual(["93,8 %", "6,3 %"]);
|
||||
expect(model.unaccounted).toBe(3);
|
||||
const negative = snapshot([stock("A", "-3", "USD")]);
|
||||
expect(toConcentration(negative, "stocks", "USD", labels))
|
||||
expect(model.unaccounted).toBe(2);
|
||||
const negative = snapshot([stock("A", "-3")]);
|
||||
expect(toConcentration(negative, "stocks", labels))
|
||||
.toMatchObject({ empty: true, unaccounted: 1 });
|
||||
});
|
||||
|
||||
@@ -52,7 +50,7 @@ describe("account concentration", () => {
|
||||
stock("A", "400"), stock("B", "250"), stock("C", "150"),
|
||||
stock("D", "100"), stock("E", "50"), stock("F", "30"),
|
||||
stock("G", "20"),
|
||||
]), "stocks", "RUB", labels);
|
||||
]), "stocks", labels);
|
||||
|
||||
expect(model.items.map(item => item.amount)).toEqual([
|
||||
"400", "250", "150", "100", "50",
|
||||
@@ -71,7 +69,7 @@ describe("account concentration", () => {
|
||||
stock("Сбер", "100"), stock("X5", "100"),
|
||||
stock("VK", "100"), stock("D", "100"),
|
||||
stock("E", "100"), stock("F", "100"),
|
||||
]), "stocks", "RUB", labels);
|
||||
]), "stocks", labels);
|
||||
|
||||
expect(model.items).toHaveLength(6);
|
||||
expect(model.other).toBeNull();
|
||||
@@ -83,7 +81,7 @@ describe("account concentration", () => {
|
||||
stock("Large", "100000000"), stock("Small", "1"),
|
||||
]);
|
||||
|
||||
expect(toConcentration(tiny, "stocks", "RUB", labels).items[1]?.share)
|
||||
expect(toConcentration(tiny, "stocks", labels).items[1]?.share)
|
||||
.toBe("< 0,1 %");
|
||||
});
|
||||
|
||||
@@ -103,9 +101,9 @@ describe("account concentration", () => {
|
||||
stock("D", "50", "RUB", { issuer: null, sector: null }),
|
||||
];
|
||||
|
||||
expect(toConcentration(snapshot(positions), "sectors", "RUB", labels)
|
||||
expect(toConcentration(snapshot(positions), "sectors", labels)
|
||||
.items.map(item => item.amount)).toEqual(["500", "100", "50"]);
|
||||
expect(toConcentration(snapshot(positions), "issuers", "RUB", labels)
|
||||
expect(toConcentration(snapshot(positions), "issuers", labels)
|
||||
.items.map(item => [item.name, item.amount])).toEqual([
|
||||
["Сбербанк", "500"], ["", "50"],
|
||||
]);
|
||||
@@ -123,7 +121,7 @@ describe("account concentration", () => {
|
||||
stock("D", "100", "RUB", { issuer: null, sector: "energy" }),
|
||||
]);
|
||||
|
||||
expect(toConcentration(issuers, "issuers", "RUB", labels)
|
||||
expect(toConcentration(issuers, "issuers", labels)
|
||||
.items.map(item => [item.label, item.amount])).toEqual([
|
||||
["Газпром", "300"], ["Сбер", "300"], ["Эмитент не указан", "300"],
|
||||
]);
|
||||
@@ -140,7 +138,7 @@ describe("account concentration", () => {
|
||||
: "Энергетика",
|
||||
};
|
||||
|
||||
expect(toConcentration(sectors, "sectors", "RUB", sectorLabels)
|
||||
expect(toConcentration(sectors, "sectors", sectorLabels)
|
||||
.items.map(item => item.label))
|
||||
.toEqual(["Информационные технологии", "Энергетика"]);
|
||||
});
|
||||
@@ -158,7 +156,7 @@ describe("account concentration", () => {
|
||||
}),
|
||||
]);
|
||||
|
||||
expect(toConcentration(data, "issuers", "RUB", labels).items
|
||||
expect(toConcentration(data, "issuers", labels).items
|
||||
.map(item => [item.name, item.label, item.amount])).toEqual([
|
||||
["Альфа", "Альфа", "400"], ["Бета", "Бета", "400"],
|
||||
]);
|
||||
@@ -169,7 +167,7 @@ describe("account concentration", () => {
|
||||
isin: "RU000A0JX0J2", ticker: "BOND", type: "BOND",
|
||||
})]);
|
||||
|
||||
expect(toConcentration(data, "bonds", "RUB", labels)
|
||||
expect(toConcentration(data, "bonds", labels)
|
||||
.items[0]?.logo?.subtitle).toBe("RU000A0JX0J2");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
} from "@/shared/lib";
|
||||
|
||||
type Concentration = {
|
||||
currencies: string[];
|
||||
empty: boolean;
|
||||
items: ConcentrationItem[];
|
||||
other: ConcentrationOther | null;
|
||||
@@ -83,11 +82,9 @@ function addPosition(
|
||||
index: number,
|
||||
slice: Slice,
|
||||
labels: ConcentrationLabels,
|
||||
selected: null | string,
|
||||
): number {
|
||||
if (!isIncluded(slice, position.type)) return 0;
|
||||
if (!position.currentValue) return 1;
|
||||
if (position.currentValue.currency !== selected) return 0;
|
||||
const value = decimalFromString(position.currentValue.value);
|
||||
if (value.value < 0n) return 1;
|
||||
if (value.value === 0n) return 0;
|
||||
@@ -135,16 +132,6 @@ function compareDecimal(a: Decimal, b: Decimal): number {
|
||||
return left < right ? -1 : 0;
|
||||
}
|
||||
|
||||
function concentrationCurrencies(portfolio: Portfolio): string[] {
|
||||
return [...new Set(portfolio.positions
|
||||
.filter(position => eligibleTypes.has(position.type))
|
||||
.filter(position => position.currentValue
|
||||
&& decimalFromString(position.currentValue.value).value !== 0n)
|
||||
.map(position => position.currentValue?.currency)
|
||||
.filter((value): value is string => !!value))]
|
||||
.toSorted((a, b) => a.localeCompare(b));
|
||||
}
|
||||
|
||||
function groupIdentity(
|
||||
position: Position,
|
||||
slice: Slice,
|
||||
@@ -214,22 +201,13 @@ function share(part: Decimal, total: Decimal): string {
|
||||
function toConcentration(
|
||||
portfolio: Portfolio,
|
||||
slice: Slice,
|
||||
currency: null | string,
|
||||
labels: ConcentrationLabels,
|
||||
): Concentration {
|
||||
const currencies = concentrationCurrencies(portfolio);
|
||||
|
||||
const selected = currency && currencies.includes(currency)
|
||||
? currency
|
||||
: currencies[0] ?? null;
|
||||
|
||||
const groups = new Map<string, Group>();
|
||||
let unaccounted = 0;
|
||||
|
||||
for (const [index, position] of portfolio.positions.entries()) {
|
||||
unaccounted += addPosition(
|
||||
groups, position, index, slice, labels, selected,
|
||||
);
|
||||
unaccounted += addPosition(groups, position, index, slice, labels);
|
||||
}
|
||||
|
||||
const ranked = Array.from(groups.values(), group => ({
|
||||
@@ -278,7 +256,6 @@ function toConcentration(
|
||||
: null;
|
||||
|
||||
return {
|
||||
currencies,
|
||||
empty: !total,
|
||||
items: other ? entries.slice(0, TOP) : entries,
|
||||
other,
|
||||
@@ -289,7 +266,6 @@ function toConcentration(
|
||||
}
|
||||
|
||||
export {
|
||||
concentrationCurrencies,
|
||||
toConcentration,
|
||||
};
|
||||
export type {
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
import type { Performance } from "@/entities/performance";
|
||||
|
||||
import { formatDate, formatMoney, formatPercentagePoints, formatSignedPercent } from "@/shared/lib";
|
||||
|
||||
type TextValue = { tone: Tone; value: string };
|
||||
|
||||
type Tone
|
||||
= | "negative"
|
||||
| "neutral"
|
||||
| "positive";
|
||||
|
||||
const reasonLabels: Record<string, string> = {
|
||||
ACCOUNT_VALUATION_DATES_DIFFER: "Оценки счетов сделаны в разные дни",
|
||||
AMBIGUOUS_RETURN: "У расчёта доходности несколько возможных решений",
|
||||
HISTORY_START_UNKNOWN: "Начало истории счёта неизвестно",
|
||||
INDEX_HISTORY_UNAVAILABLE: "История индекса временно недоступна",
|
||||
NO_SOLUTION: "Расчёт доходности не сходится",
|
||||
OPERATIONS_HISTORY_INCOMPLETE: "История операций ещё не получена полностью",
|
||||
PORTFOLIO_VALUATION_INCOMPLETE: "Нет полной оценки портфеля",
|
||||
UNCONFIRMED_TRANSFER: "Перевод между счетами не удалось подтвердить",
|
||||
UNVALUED_SECURITIES_TRANSFER: "Бумаги переведены без денежной оценки",
|
||||
};
|
||||
|
||||
const unknownReason = "Причину недоступности не удалось определить";
|
||||
|
||||
function performanceVm(data: Performance) {
|
||||
return {
|
||||
basis: data.return.basis,
|
||||
comparison: data.outperformance
|
||||
? {
|
||||
money: signedMoney(data.outperformance.money),
|
||||
points: valueText(
|
||||
data.outperformance.percentagePoints,
|
||||
formatPercentagePoints,
|
||||
),
|
||||
}
|
||||
: null,
|
||||
current: formatMoney(data.currentValue),
|
||||
currentPoint: data.series.length > 0
|
||||
? { date: formatDate(`${data.series.at(-1)?.date ?? data.period.to}T00:00:00Z`) }
|
||||
: null,
|
||||
days: data.period.days,
|
||||
excluded: data.excludedAccounts.map(item => ({
|
||||
id: item.accountId,
|
||||
name: item.name,
|
||||
reason: reasonText(item.reason),
|
||||
})),
|
||||
from: data.period.from,
|
||||
indexReason: data.benchmark.unavailableReason
|
||||
? reasonText(data.benchmark.unavailableReason)
|
||||
: null,
|
||||
indexReturn: valueText(data.benchmark.return.value, formatSignedPercent),
|
||||
indexValue: data.benchmark.value ? formatMoney(data.benchmark.value) : "—",
|
||||
invested: formatMoney(data.netInvested),
|
||||
profit: signedMoney(data.profit),
|
||||
returnReason: data.return.unavailableReason
|
||||
? reasonText(data.return.unavailableReason)
|
||||
: null,
|
||||
returnValue: valueText(data.return.value, formatSignedPercent),
|
||||
series: data.series.map(item => ({
|
||||
benchmarkValue: Number(item.benchmarkValue),
|
||||
date: item.date,
|
||||
label: formatDate(`${item.date}T00:00:00Z`),
|
||||
netInvested: Number(item.netInvested),
|
||||
referenceValue: item.referenceValue === null
|
||||
? null
|
||||
: Number(item.referenceValue),
|
||||
})),
|
||||
to: data.period.to,
|
||||
};
|
||||
}
|
||||
|
||||
function reasonText(reason: string): string {
|
||||
// eslint-disable-next-line security/detect-object-injection -- Lookup accepts only an API reason, with a safe fallback.
|
||||
return reasonLabels[reason] ?? unknownReason;
|
||||
}
|
||||
|
||||
function signedMoney(value: Performance["profit"]): TextValue {
|
||||
return {
|
||||
tone: tone(value.value),
|
||||
value: formatMoney(value, { withSign: true }),
|
||||
};
|
||||
}
|
||||
|
||||
function tone(value: string): Tone {
|
||||
const number = Number(value);
|
||||
if (number > 0) return "positive";
|
||||
|
||||
return number < 0 ? "negative" : "neutral";
|
||||
}
|
||||
|
||||
// Tone follows the displayed text, so "0,0 %" is never coloured.
|
||||
function valueText(
|
||||
value: null | string,
|
||||
format: (value: string) => string,
|
||||
): TextValue {
|
||||
if (value === null) return { tone: "neutral", value: "—" };
|
||||
const text = format(value);
|
||||
if (text.startsWith("+")) return { tone: "positive", value: text };
|
||||
|
||||
return { tone: text.startsWith("−") ? "negative" : "neutral", value: text };
|
||||
}
|
||||
|
||||
export { performanceVm, reasonText };
|
||||
@@ -2,7 +2,7 @@ import type { Portfolio } from "@/entities/portfolio";
|
||||
|
||||
const portfolio
|
||||
= {
|
||||
cashBalances: [{ currency: "USD", value: "1" }],
|
||||
cash: { currency: "RUB", value: "1" },
|
||||
isStale: true,
|
||||
lastSuccessfulAt: "2026-08-13T10:00:00Z",
|
||||
positions: [
|
||||
@@ -49,8 +49,13 @@ const portfolio
|
||||
type: "FUND",
|
||||
},
|
||||
] satisfies [Portfolio["positions"][number], ...Portfolio["positions"]],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "RUB", value: "150" }],
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totals: { currency: "RUB", value: "150" },
|
||||
} satisfies Portfolio;
|
||||
|
||||
const position: Portfolio["positions"][number] = {
|
||||
|
||||
@@ -23,7 +23,7 @@ function sections(positions: Portfolio["positions"]) {
|
||||
}
|
||||
|
||||
describe("account position sections", () => {
|
||||
it("excludes currency instruments only from display, preserving order and share denominators", () => {
|
||||
it("excludes currency mirrors from display and share denominators", () => {
|
||||
const otherTypes = [
|
||||
"OPTION",
|
||||
"OTHER",
|
||||
@@ -35,7 +35,7 @@ describe("account position sections", () => {
|
||||
|
||||
const snapshot: Portfolio = {
|
||||
...portfolio,
|
||||
cashBalances: [{ currency: "RUB", value: "1000" }],
|
||||
cash: { currency: "RUB", value: "1000" },
|
||||
positions: [
|
||||
...portfolio.positions,
|
||||
{
|
||||
@@ -56,8 +56,8 @@ describe("account position sections", () => {
|
||||
}),
|
||||
),
|
||||
],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "RUB", value: "1250" }],
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
totals: { currency: "RUB", value: "1250" },
|
||||
};
|
||||
|
||||
const original = structuredClone(snapshot);
|
||||
@@ -73,12 +73,30 @@ describe("account position sections", () => {
|
||||
"FIGI-FUND",
|
||||
...otherTypes.map(type => `FIGI-${type}-NEXT`),
|
||||
]);
|
||||
expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("40 %");
|
||||
expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("20 %");
|
||||
expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("20 %");
|
||||
expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("50 %");
|
||||
expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("25 %");
|
||||
expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("25 %");
|
||||
expect(snapshot).toEqual(original);
|
||||
});
|
||||
|
||||
it("keeps all-account positions from both accounts without counting mirrored cash", () => {
|
||||
const result = sections([
|
||||
makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "100" } }),
|
||||
makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "50" }, type: "CURRENCY" }),
|
||||
makePosition({ account: { id: "b", name: "ИИС" }, currentValue: { currency: "RUB", value: "100" } }),
|
||||
]);
|
||||
|
||||
const visible = result.flatMap(section =>
|
||||
section.groups.flatMap(group => group.positions));
|
||||
|
||||
expect(visible)
|
||||
.toEqual(expect.arrayContaining([
|
||||
expect.objectContaining({ account: { id: "a", name: "Основной" }, shareText: "50 %" }),
|
||||
expect.objectContaining({ account: { id: "b", name: "ИИС" }, shareText: "50 %" }),
|
||||
]));
|
||||
expect(visible).toHaveLength(2);
|
||||
});
|
||||
|
||||
it("prepares grouped position sections with derived display data", () => {
|
||||
expect(
|
||||
toAccountPagePositionSections(portfolio).map(({ groups, kind }) => ({
|
||||
@@ -175,13 +193,13 @@ describe("account position sections", () => {
|
||||
).toHaveLength(2);
|
||||
});
|
||||
|
||||
it("keeps currencies and purchase prices attached to their source positions", () => {
|
||||
it("keeps values and purchase prices attached to their source positions", () => {
|
||||
const source = [
|
||||
position,
|
||||
{
|
||||
...second,
|
||||
averagePurchasePrice: { currency: "USD", value: "0.99" },
|
||||
currentValue: { currency: "USD", value: "1.01" },
|
||||
averagePurchasePrice: { currency: "RUB", value: "0.99" },
|
||||
currentValue: { currency: "RUB", value: "1.01" },
|
||||
},
|
||||
];
|
||||
|
||||
@@ -246,10 +264,6 @@ describe("account position returns", () => {
|
||||
{ name: "zero quantity", overrides: { quantity: "0" } },
|
||||
{ name: "negative quantity", overrides: { quantity: "-1" } },
|
||||
{ name: "missing average price", overrides: { averagePurchasePrice: null } },
|
||||
{
|
||||
name: "currency mismatch",
|
||||
overrides: { averagePurchasePrice: { currency: "USD", value: "280" } },
|
||||
},
|
||||
{ name: "zero cost", overrides: { averagePurchasePrice: { currency: "RUB", value: "0" } } },
|
||||
])("returns null for $name", ({ overrides }) => {
|
||||
const result = sections([makePosition({
|
||||
@@ -283,29 +297,24 @@ describe("account position returns", () => {
|
||||
expect(formatPositionReturnPercent(testCase.value)).toBe(testCase.expected);
|
||||
});
|
||||
|
||||
it("sums complete unrealized returns by currency", () => {
|
||||
it("sums complete unrealized returns", () => {
|
||||
const result = toUnrealizedReturns([
|
||||
makePosition({ absoluteReturn: { currency: "RUB", value: "0.1" } }),
|
||||
makePosition({ absoluteReturn: { currency: "RUB", value: "0.2" } }),
|
||||
makePosition({ absoluteReturn: { currency: "USD", value: "-2.5" } }),
|
||||
]);
|
||||
|
||||
expect(result).toEqual([
|
||||
{ currency: "RUB", value: "0.3" },
|
||||
{ currency: "USD", value: "-2.5" },
|
||||
]);
|
||||
expect(result).toEqual({ currency: "RUB", value: "0.3" });
|
||||
});
|
||||
|
||||
it("omits only currencies with incomplete returns", () => {
|
||||
it("returns null when any return is incomplete", () => {
|
||||
const result = toUnrealizedReturns([
|
||||
makePosition({ absoluteReturn: { currency: "RUB", value: "10" } }),
|
||||
makePosition({
|
||||
absoluteReturn: null,
|
||||
currentValue: { currency: "RUB", value: "100" },
|
||||
}),
|
||||
makePosition({ absoluteReturn: { currency: "USD", value: "2" } }),
|
||||
]);
|
||||
|
||||
expect(result).toEqual([{ currency: "USD", value: "2" }]);
|
||||
expect(result).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -152,7 +152,7 @@ function toAccountPagePositionSections(
|
||||
const denominators = new Map<string, number>();
|
||||
|
||||
for (const position of portfolio.positions) {
|
||||
if (!position.currentValue) continue;
|
||||
if (position.type === "CURRENCY" || !position.currentValue) continue;
|
||||
const currency = position.currentValue.currency;
|
||||
denominators.set(
|
||||
currency,
|
||||
@@ -249,37 +249,23 @@ function toSection(
|
||||
|
||||
function toUnrealizedReturns(
|
||||
positions: Portfolio["positions"],
|
||||
): Money[] {
|
||||
const totals = new Map<string, {
|
||||
complete: boolean;
|
||||
values: Decimal[];
|
||||
}>();
|
||||
): Money | null {
|
||||
const values: Decimal[] = [];
|
||||
|
||||
for (const position of positions) {
|
||||
const currencies = position.absoluteReturn
|
||||
? [position.absoluteReturn.currency]
|
||||
: [...new Set([
|
||||
position.averagePurchasePrice?.currency,
|
||||
position.currentValue?.currency,
|
||||
].filter((currency): currency is string => !!currency))];
|
||||
if (!position.absoluteReturn) {
|
||||
// A position without any valuation has nothing to contribute.
|
||||
|
||||
for (const currency of currencies) {
|
||||
const total = totals.get(currency) ?? { complete: true, values: [] };
|
||||
if (!position.averagePurchasePrice && !position.currentValue)
|
||||
continue;
|
||||
|
||||
if (position.absoluteReturn) {
|
||||
total.values.push(decimalFromString(position.absoluteReturn.value));
|
||||
}
|
||||
else {
|
||||
total.complete = false;
|
||||
}
|
||||
|
||||
totals.set(currency, total);
|
||||
return null;
|
||||
}
|
||||
|
||||
values.push(decimalFromString(position.absoluteReturn.value));
|
||||
}
|
||||
|
||||
return [...totals].flatMap(([currency, total]) => total.complete
|
||||
? [{ currency, value: decimalToString(sumDecimals(total.values)) }]
|
||||
: []);
|
||||
return { currency: "RUB", value: decimalToString(sumDecimals(values)) };
|
||||
}
|
||||
|
||||
export {
|
||||
|
||||
@@ -64,7 +64,7 @@ function toIncomeSummary(
|
||||
if (income.meta?.completeness === "incomplete") return { state: "partial", to };
|
||||
if (!income.data && (income.isError || income.meta?.lastAttempt.state === "failed"))
|
||||
return { state: "error", to };
|
||||
if (!income.data?.totalsByCurrency.length) return { state: "empty", to };
|
||||
if (!income.data) return { state: "empty", to };
|
||||
|
||||
return {
|
||||
state: "loaded",
|
||||
|
||||
@@ -60,6 +60,10 @@ function configureTestAuth() {
|
||||
});
|
||||
}
|
||||
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
const RETRIES_EXHAUSTED_MS = 6000;
|
||||
const TEST_MS = 10_000;
|
||||
|
||||
function renderAccountRoute(queryClient: QueryClient, accountId = "account-1") {
|
||||
configureTestAuth();
|
||||
|
||||
@@ -92,7 +96,7 @@ function renderPage(ui: React.ReactNode) {
|
||||
|
||||
const portfolio
|
||||
= {
|
||||
cashBalances: [{ currency: "USD", value: "0.5" }],
|
||||
cash: { currency: "RUB", value: "0.5" },
|
||||
isStale: true,
|
||||
lastSuccessfulAt: "2026-08-13T10:00:00Z",
|
||||
positions: [
|
||||
@@ -125,8 +129,8 @@ const portfolio
|
||||
type: "BOND",
|
||||
},
|
||||
] satisfies [Portfolio["positions"][number], ...Portfolio["positions"]],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "RUB", value: "1234.5" }],
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
totals: { currency: "RUB", value: "1234.5" },
|
||||
} satisfies Portfolio;
|
||||
|
||||
function position(
|
||||
@@ -197,8 +201,6 @@ const LoadedHarness = (
|
||||
function loadedProps(nextPortfolio: Portfolio = portfolio) {
|
||||
return {
|
||||
concentration: null,
|
||||
currency: null,
|
||||
onCurrencyChange: vi.fn(),
|
||||
onSliceChange: vi.fn(),
|
||||
portfolio: nextPortfolio,
|
||||
positionSections: toAccountPagePositionSections(nextPortfolio),
|
||||
@@ -238,10 +240,10 @@ describe("AccountPage states", () => {
|
||||
HttpResponse.json(resource(
|
||||
{
|
||||
...portfolio,
|
||||
cashBalances: [],
|
||||
cash: { currency: "RUB", value: "0" },
|
||||
isStale: false,
|
||||
positions: [],
|
||||
totalsByCurrency: [],
|
||||
totals: { currency: "RUB", value: "0" },
|
||||
},
|
||||
{
|
||||
lastAttempt: {
|
||||
@@ -274,7 +276,7 @@ describe("AccountPage states", () => {
|
||||
const data = { ...portfolio, positions };
|
||||
|
||||
const model = toConcentration(
|
||||
data, "stocks", "RUB", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
);
|
||||
|
||||
const props = loadedProps(data);
|
||||
@@ -283,7 +285,6 @@ describe("AccountPage states", () => {
|
||||
{...props}
|
||||
accountId="a"
|
||||
concentration={model}
|
||||
currency="RUB"
|
||||
tab="concentration"
|
||||
/>,
|
||||
);
|
||||
@@ -322,10 +323,8 @@ describe("AccountPage states", () => {
|
||||
concentration={toConcentration(
|
||||
{ ...portfolio, positions },
|
||||
"stocks",
|
||||
"RUB",
|
||||
concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
tab="concentration"
|
||||
/>,
|
||||
);
|
||||
@@ -350,9 +349,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "stocks", "RUB", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
tab="concentration"
|
||||
/>,
|
||||
);
|
||||
@@ -366,9 +364,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "issuers", "RUB", concentrationLabels(),
|
||||
data, "issuers", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
slice="issuers"
|
||||
tab="concentration"
|
||||
/>,
|
||||
@@ -388,9 +385,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "stocks", "RUB", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
tab="concentration"
|
||||
/>,
|
||||
);
|
||||
@@ -420,9 +416,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "sectors", "RUB", concentrationLabels(),
|
||||
data, "sectors", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
slice="sectors"
|
||||
tab="concentration"
|
||||
/>,
|
||||
@@ -453,9 +448,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "stocks", "RUB", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
tab="concentration"
|
||||
/>,
|
||||
);
|
||||
@@ -480,9 +474,8 @@ describe("AccountPage states", () => {
|
||||
{...loadedProps(data)}
|
||||
accountId="a"
|
||||
concentration={toConcentration(
|
||||
data, "stocks", "RUB", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
)}
|
||||
currency="RUB"
|
||||
partial
|
||||
tab="concentration"
|
||||
/>,
|
||||
@@ -492,16 +485,14 @@ describe("AccountPage states", () => {
|
||||
.toHaveLength(1);
|
||||
});
|
||||
|
||||
it("keeps slice and currency while switching page tabs and resets on account change", async () => {
|
||||
it("keeps the slice while switching page tabs and resets on account change", async () => {
|
||||
const multiCurrency = { ...portfolio, positions:
|
||||
["RUB", "USD"].flatMap(currency =>
|
||||
[400, 250, 150, 100, 50, 30, 20].map((value, index) =>
|
||||
position({
|
||||
currentValue: { currency, value: String(value) },
|
||||
displayName: `${currency} акция ${index + 1}`,
|
||||
sector: "energy", type: "STOCK",
|
||||
}),
|
||||
),
|
||||
[400, 250, 150, 100, 50, 30, 20].map((value, index) =>
|
||||
position({
|
||||
currentValue: { currency: "RUB", value: String(value) },
|
||||
displayName: `Акция ${index + 1}`,
|
||||
sector: "energy", type: "STOCK",
|
||||
}),
|
||||
) };
|
||||
|
||||
server.use(
|
||||
@@ -516,37 +507,27 @@ describe("AccountPage states", () => {
|
||||
fireEvent.click(screen.getByRole("button", { name: /Прочее/ }));
|
||||
expect(screen.getByRole("button", { name: /Прочее/ }))
|
||||
.toHaveAttribute("aria-expanded", "true");
|
||||
fireEvent.click(screen.getByRole("combobox", { name: "Валюта концентрации" }));
|
||||
fireEvent.click(screen.getByRole("option", { name: "USD" }));
|
||||
expect(screen.getByRole("button", { name: /Прочее/ }))
|
||||
.toHaveAttribute("aria-expanded", "false");
|
||||
fireEvent.click(screen.getByRole("button", { name: /Прочее/ }));
|
||||
fireEvent.click(screen.getByRole("radio", { name: "Секторы" }));
|
||||
fireEvent.click(screen.getByRole("radio", { name: "Акции" }));
|
||||
expect(screen.getByRole("button", { name: /Прочее/ }))
|
||||
.toHaveAttribute("aria-expanded", "false");
|
||||
fireEvent.click(screen.getByRole("radio", { name: "Секторы" }));
|
||||
expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
|
||||
.toHaveValue("USD");
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Концентрация" }));
|
||||
|
||||
expect(screen.getByRole("radio", { name: "Секторы" }))
|
||||
.toBeChecked();
|
||||
expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
|
||||
.toHaveValue("USD");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Другой счёт" }));
|
||||
fireEvent.click(await screen.findByRole("tab", { name: "Концентрация" }));
|
||||
expect(screen.getByRole("radio", { name: "Акции" })).toBeChecked();
|
||||
expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
|
||||
.toHaveValue("RUB");
|
||||
});
|
||||
|
||||
it("falls back to the first currency when the selected one disappears", () => {
|
||||
it("includes all ruble positions in concentration", () => {
|
||||
const data = { ...portfolio, positions: [
|
||||
position({
|
||||
currentValue: { currency: "USD", value: "200" },
|
||||
currentValue: { currency: "RUB", value: "200" },
|
||||
}),
|
||||
position({
|
||||
currentValue: { currency: "RUB", value: "100" },
|
||||
@@ -554,12 +535,11 @@ describe("AccountPage states", () => {
|
||||
] };
|
||||
|
||||
const model = toConcentration(
|
||||
data, "stocks", "EUR", concentrationLabels(),
|
||||
data, "stocks", concentrationLabels(),
|
||||
);
|
||||
|
||||
expect(model.currencies).toEqual(["RUB", "USD"]);
|
||||
expect(model.total).toBe("100");
|
||||
expect(model.items.map(item => item.amount)).toEqual(["100"]);
|
||||
expect(model.total).toBe("300");
|
||||
expect(model.items.map(item => item.amount)).toEqual(["200", "100"]);
|
||||
});
|
||||
it("shows the loaded portfolio source sync status", async () => {
|
||||
server.use(
|
||||
@@ -675,7 +655,7 @@ describe("AccountPage states", () => {
|
||||
).toHaveTextContent("Данные о структуре портфеля пока недоступны.");
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["1 234,5 ₽"]);
|
||||
).toEqual(["1 234,50 ₽"]);
|
||||
});
|
||||
it("keeps initial placeholders decorative without amounts or focus targets", () => {
|
||||
const { container } = renderPage(<AccountPageLoading />);
|
||||
@@ -718,11 +698,7 @@ describe("AccountPage states", () => {
|
||||
<LoadedHarness
|
||||
{...loadedProps({
|
||||
...portfolio,
|
||||
cashBalances: [
|
||||
{ currency: "RUB", value: "234.500000000000000001" },
|
||||
{ currency: "USD", value: "-0.5" },
|
||||
{ currency: "XYZ", value: "3.00" },
|
||||
],
|
||||
cash: { currency: "RUB", value: "234.500000000000000001" },
|
||||
positions: [
|
||||
...portfolio.positions,
|
||||
{
|
||||
@@ -733,7 +709,7 @@ describe("AccountPage states", () => {
|
||||
type: "CURRENCY",
|
||||
},
|
||||
],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
})}
|
||||
/>,
|
||||
);
|
||||
@@ -746,14 +722,12 @@ describe("AccountPage states", () => {
|
||||
|
||||
expect(
|
||||
balances.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
|
||||
).toEqual(["234,50 ₽"]);
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual([
|
||||
"1 234,5 ₽",
|
||||
"234,500000000000000001 ₽",
|
||||
"-0,5 $",
|
||||
"3,00 XYZ",
|
||||
"1 234,50 ₽",
|
||||
"234,50 ₽",
|
||||
]);
|
||||
expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
|
||||
expect(
|
||||
@@ -770,7 +744,7 @@ describe("AccountPage states", () => {
|
||||
resource({
|
||||
...portfolio,
|
||||
positions: hasPositions ? portfolio.positions : [],
|
||||
totalsByCurrency: [],
|
||||
totals: { currency: "RUB", value: "0" },
|
||||
}),
|
||||
),
|
||||
),
|
||||
@@ -778,20 +752,20 @@ describe("AccountPage states", () => {
|
||||
renderAccountRoute(createTestQueryClient());
|
||||
await screen.findByRole("heading", { level: 1, name: "Портфель" });
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
|
||||
expect(screen.getByRole("definition")).toHaveTextContent("0,5 $");
|
||||
expect(screen.getByText("0,50 ₽")).toBeInTheDocument();
|
||||
expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
|
||||
},
|
||||
);
|
||||
|
||||
it.each([
|
||||
{ totalsByCurrency: [] },
|
||||
{ totalsByCurrency: [{ currency: "RUB", value: "100" }] },
|
||||
{ empty: true, totals: { currency: "RUB", value: "0" } },
|
||||
{ empty: false, totals: { currency: "RUB", value: "100" } },
|
||||
])(
|
||||
"hides the empty other section without emptying a currency-only portfolio (totals: $totalsByCurrency)",
|
||||
async ({ totalsByCurrency }) => {
|
||||
"hides the empty other section without emptying a currency-only portfolio (totals: $totals.value)",
|
||||
async ({ empty, totals }) => {
|
||||
const snapshot: Portfolio = {
|
||||
...portfolio,
|
||||
cashBalances: [],
|
||||
cash: { currency: "RUB", value: "0" },
|
||||
positions: [
|
||||
{
|
||||
...portfolio.positions[0],
|
||||
@@ -800,8 +774,8 @@ describe("AccountPage states", () => {
|
||||
type: "CURRENCY",
|
||||
},
|
||||
],
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency,
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
totals,
|
||||
};
|
||||
|
||||
server.use(
|
||||
@@ -822,11 +796,11 @@ describe("AccountPage states", () => {
|
||||
expect(
|
||||
within(
|
||||
screen.getByRole("tabpanel", { name: "Деньги" }),
|
||||
).queryByRole("definition"),
|
||||
).not.toBeInTheDocument();
|
||||
).getByRole("definition"),
|
||||
).toHaveTextContent("0,00 ₽");
|
||||
expect(
|
||||
screen.queryAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(totalsByCurrency.length > 0 ? ["100 ₽"] : []);
|
||||
).toEqual([empty ? "0,00 ₽" : "100,00 ₽", "0,00 ₽"]);
|
||||
expect(
|
||||
queryClient.getQueryData(portfolioQueryOptions("account-1").queryKey),
|
||||
).toEqual(resource(snapshot));
|
||||
@@ -846,9 +820,9 @@ describe("AccountPage states", () => {
|
||||
expect(
|
||||
screen.getByRole("heading", { name: "Портфель пока пуст" }),
|
||||
).toBeInTheDocument();
|
||||
expect(screen.getByRole("link", { name: "Открыть журнал" }))
|
||||
expect(screen.getByRole("link", { name: "Открыть историю операций" }))
|
||||
.toBeInTheDocument();
|
||||
expect(screen.getByRole("link", { name: "Открыть будущие события" }))
|
||||
expect(screen.getByRole("link", { name: "Открыть предстоящие события" }))
|
||||
.toBeInTheDocument();
|
||||
expect(screen.getByRole("link", { name: "Открыть пассивный доход" }))
|
||||
.toBeInTheDocument();
|
||||
@@ -889,10 +863,10 @@ describe("AccountPage states", () => {
|
||||
}),
|
||||
).toBeVisible();
|
||||
expect(
|
||||
screen.getByRole("status", { name: "Загрузка будущих событий" }),
|
||||
screen.getByRole("status", { name: "Загрузка предстоящих событий" }),
|
||||
).toBeVisible();
|
||||
expect(
|
||||
screen.queryByText("На ближайшие 30 дней событий не найдено."),
|
||||
screen.queryByText("На ближайшие 30 дней предстоящих событий не найдено."),
|
||||
).not.toBeInTheDocument();
|
||||
expect(screen.getByText("Загрузка дохода текущего месяца")).toBeVisible();
|
||||
expect(screen.queryByText("Нет текущих сумм")).not.toBeInTheDocument();
|
||||
@@ -1072,7 +1046,7 @@ describe("AccountPage states", () => {
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
|
||||
expect(
|
||||
screen.getByText("Пока недоступно"),
|
||||
).toBeInTheDocument();
|
||||
@@ -1111,7 +1085,7 @@ describe("AccountPage states", () => {
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
|
||||
expect(screen.getByText("Сделка")).toBeInTheDocument();
|
||||
expect(screen.getByText("−12 ₽")).toBeInTheDocument();
|
||||
});
|
||||
@@ -1143,7 +1117,7 @@ describe("AccountPage states", () => {
|
||||
date: "2026-09-11",
|
||||
dateKind: "registry",
|
||||
displayName: "Акция",
|
||||
projectedAmount: { currency: "USD", value: "0" },
|
||||
projectedAmount: { currency: "RUB", value: "0" },
|
||||
type: "dividend",
|
||||
},
|
||||
{
|
||||
@@ -1165,8 +1139,8 @@ describe("AccountPage states", () => {
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||
const section = screen.getByRole("tabpanel", { name: "События" });
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
|
||||
const section = screen.getByRole("tabpanel", { name: "Предстоящие события" });
|
||||
const content = within(section);
|
||||
const text = section.textContent ?? "";
|
||||
|
||||
@@ -1187,7 +1161,7 @@ describe("AccountPage states", () => {
|
||||
expect(
|
||||
content.getByText("11.09.2026 · Дата реестра · RU000A0JX0J2"),
|
||||
).toBeVisible();
|
||||
for (const amount of ["850,50 ₽", "0 USD", "1 000 ₽", "Сумма неизвестна"])
|
||||
for (const amount of ["850,50 ₽", "0 ₽", "1 000 ₽", "Сумма неизвестна"])
|
||||
expect(content.getByText(amount)).toBeVisible();
|
||||
expect(content.getAllByText("Прогноз")).toHaveLength(4);
|
||||
expect(content.queryByText("Без движения денег")).not.toBeInTheDocument();
|
||||
@@ -1207,15 +1181,15 @@ describe("AccountPage states", () => {
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
|
||||
|
||||
const content = within(
|
||||
screen.getByRole("tabpanel", { name: "События" }),
|
||||
screen.getByRole("tabpanel", { name: "Предстоящие события" }),
|
||||
);
|
||||
|
||||
if (state === "loading") {
|
||||
const skeleton = content.getByRole("status", {
|
||||
name: "Загрузка будущих событий",
|
||||
name: "Загрузка предстоящих событий",
|
||||
});
|
||||
|
||||
// eslint-disable-next-line vitest/no-conditional-expect -- The fixed table case selects the expected outcome; every case asserts its own branch.
|
||||
@@ -1226,7 +1200,7 @@ describe("AccountPage states", () => {
|
||||
else {
|
||||
// eslint-disable-next-line vitest/no-conditional-expect -- The table case deterministically selects the empty state.
|
||||
expect(
|
||||
content.getByText("На ближайшие 30 дней событий не найдено."),
|
||||
content.getByText("На ближайшие 30 дней предстоящих событий не найдено."),
|
||||
).toBeVisible();
|
||||
}
|
||||
|
||||
@@ -1247,7 +1221,7 @@ describe("AccountPage states", () => {
|
||||
/>,
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
|
||||
expect(
|
||||
screen.getByText("Данные появятся здесь, когда чтение восстановится."),
|
||||
).toBeInTheDocument();
|
||||
@@ -1255,6 +1229,110 @@ describe("AccountPage states", () => {
|
||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it(
|
||||
"keeps cached totals, then warns and retries the same portfolio GET",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = false;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
|
||||
requests += 1;
|
||||
if (isFailing)
|
||||
return HttpResponse.json(
|
||||
{ code: "TBANK_UNAVAILABLE" },
|
||||
{ status: 503 },
|
||||
);
|
||||
|
||||
return HttpResponse.json(resource(
|
||||
requests === 1
|
||||
? portfolio
|
||||
: { ...portfolio, totals: { currency: "RUB", value: "999" } },
|
||||
{ resourceKey: "portfolio" },
|
||||
));
|
||||
}),
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
renderAccountRoute(queryClient);
|
||||
await screen.findByText("Вторая");
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
|
||||
isFailing = true;
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: portfolioQueryOptions("account-1").queryKey,
|
||||
});
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
|
||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||
expect(screen.getByText("1 234,50 ₽")).toBeInTheDocument();
|
||||
// One cached read plus the three automatic attempts.
|
||||
expect(requests).toBe(4);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
expect(await screen.findByText("999,00 ₽")).toBeInTheDocument();
|
||||
expect(requests).toBe(5);
|
||||
expect(screen.queryByText("Не удалось обновить данные"))
|
||||
.not.toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
},
|
||||
);
|
||||
|
||||
it(
|
||||
"offers retry after an initial temporary failure and recovers in place",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = true;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
|
||||
requests += 1;
|
||||
|
||||
return isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(resource(portfolio, { resourceKey: "portfolio" }));
|
||||
}),
|
||||
);
|
||||
renderAccountRoute(createTestQueryClient());
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(requests).toBe(3);
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
expect(await screen.findByText("Вторая")).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
},
|
||||
);
|
||||
|
||||
it.each(["NOT_FOUND", "UNAUTHORIZED"])(
|
||||
"does not offer a plain retry for %s after a cached portfolio",
|
||||
async (code) => {
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
|
||||
HttpResponse.json({ code }, { status: code === "NOT_FOUND" ? 404 : 401 })),
|
||||
);
|
||||
renderAccountRoute(createTestQueryClient());
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByRole("heading", { name: "Загрузка" })).not.toBeInTheDocument());
|
||||
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
|
||||
},
|
||||
);
|
||||
|
||||
it.each([503])(
|
||||
"preserves totals quietly through refresh error %i and success",
|
||||
async (status) => {
|
||||
@@ -1262,14 +1340,9 @@ describe("AccountPage states", () => {
|
||||
= {
|
||||
...portfolio,
|
||||
structure: {
|
||||
currencies: [
|
||||
{
|
||||
categories: [{ sharePercent: null, type: "BOND", value: "10" }],
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "10",
|
||||
},
|
||||
],
|
||||
categories: [{ sharePercent: null, type: "BOND", value: "10" }],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "10",
|
||||
unvaluedCategories: [{ count: 1, type: "STOCK" }],
|
||||
},
|
||||
};
|
||||
@@ -1320,7 +1393,7 @@ describe("AccountPage states", () => {
|
||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["1 234,5 ₽"]);
|
||||
).toEqual(["1 234,50 ₽"]);
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
void queryClient.invalidateQueries({
|
||||
@@ -1330,17 +1403,17 @@ describe("AccountPage states", () => {
|
||||
expect(structure).toHaveTextContent("10 ₽");
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["1 234,5 ₽"]);
|
||||
).toEqual(["1 234,50 ₽"]);
|
||||
resolveRetry?.(
|
||||
HttpResponse.json(
|
||||
resource(
|
||||
{
|
||||
...portfolio,
|
||||
cashBalances: [{ currency: "EUR", value: "2.50" }],
|
||||
cash: { currency: "RUB", value: "2.50" },
|
||||
isStale: false,
|
||||
lastSuccessfulAt: "2026-08-14T11:30:00Z",
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
totalsByCurrency: [{ currency: "USD", value: "-0.5" }],
|
||||
structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
|
||||
totals: { currency: "RUB", value: "-0.5" },
|
||||
},
|
||||
{ dataRevision: "2", resourceKey: "portfolio" },
|
||||
),
|
||||
@@ -1349,7 +1422,7 @@ describe("AccountPage states", () => {
|
||||
await waitFor(() =>
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["-0,5 $"]),
|
||||
).toEqual(["-0,50 ₽"]),
|
||||
);
|
||||
expect(screen.getByText(/^Данные на /)).toHaveTextContent("Данные на");
|
||||
expect(structure).not.toHaveTextContent("10 ₽");
|
||||
@@ -1391,7 +1464,7 @@ describe("AccountPage states", () => {
|
||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||
expect(
|
||||
screen.getAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(["1 234,5 ₽"]);
|
||||
).toEqual(["1 234,50 ₽"]);
|
||||
expect(screen.getByText(/^Данные на /)).toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByRole("status", { name: "Загрузка" }),
|
||||
@@ -1414,8 +1487,8 @@ describe("AccountPage states", () => {
|
||||
.toBeVisible();
|
||||
expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||
expect(screen.getByText("Последних событий пока нет.")).toBeVisible();
|
||||
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
|
||||
expect(screen.getByText("Последних операций пока нет.")).toBeVisible();
|
||||
});
|
||||
|
||||
it("links operation, event and income previews to their detail pages", () => {
|
||||
@@ -1430,8 +1503,8 @@ describe("AccountPage states", () => {
|
||||
);
|
||||
|
||||
for (const [tab, href] of [
|
||||
["Операции", "/accounts/account-1/operations"],
|
||||
["События", "/accounts/account-1/events"],
|
||||
["История операций", "/accounts/account-1/operations"],
|
||||
["Предстоящие события", "/accounts/account-1/events"],
|
||||
["Доход", "/accounts/account-1/income"],
|
||||
]) {
|
||||
fireEvent.click(screen.getByRole("tab", { name: tab }));
|
||||
@@ -1547,7 +1620,7 @@ describe("AccountPage states", () => {
|
||||
await screen.findByRole("heading", { level: 1, name: "Все счета" });
|
||||
|
||||
const operationGroup = screen.getByRole("list", {
|
||||
name: /Купон · BOND, Исполнено/,
|
||||
name: /Выплата купонов BOND, Исполнено/,
|
||||
});
|
||||
|
||||
expect(screen.getByText("+500 ₽")).toBeInTheDocument();
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useAccountPageViewModel } from "./AccountPage.vm";
|
||||
import { useAccountPageVm } from "./AccountPage.vm";
|
||||
import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
|
||||
import { AccountPageError } from "./components/AccountPageError.view";
|
||||
import { AccountPageLoaded } from "./components/AccountPageLoaded.view";
|
||||
import { AccountPageLoading } from "./components/AccountPageLoading/AccountPageLoading.view";
|
||||
|
||||
const AccountPage: FC = () => {
|
||||
const viewModel = useAccountPageViewModel();
|
||||
if (viewModel.state === "loading") return <AccountPageLoading />;
|
||||
if (viewModel.state === "error") return <AccountPageError {...viewModel} />;
|
||||
if (viewModel.state === "empty")
|
||||
const vm = useAccountPageVm();
|
||||
if (vm.state === "loading") return <AccountPageLoading />;
|
||||
if (vm.state === "error") return <AccountPageError {...vm} />;
|
||||
if (vm.state === "empty")
|
||||
return (
|
||||
<AccountPageEmpty
|
||||
account={viewModel.account}
|
||||
accountId={viewModel.accountId}
|
||||
incomeSummary={viewModel.incomeSummary}
|
||||
recentEvents={viewModel.recentEvents}
|
||||
recentOperations={viewModel.recentOperations}
|
||||
source={viewModel.source}
|
||||
account={vm.account}
|
||||
accountId={vm.accountId}
|
||||
incomeSummary={vm.incomeSummary}
|
||||
readRetry={vm.readRetry}
|
||||
recentEvents={vm.recentEvents}
|
||||
recentOperations={vm.recentOperations}
|
||||
source={vm.source}
|
||||
/>
|
||||
);
|
||||
|
||||
return (
|
||||
<AccountPageLoaded
|
||||
account={viewModel.account}
|
||||
accountId={viewModel.accountId}
|
||||
concentration={viewModel.concentration}
|
||||
currency={viewModel.currency}
|
||||
incomeSummary={viewModel.incomeSummary}
|
||||
onCurrencyChange={viewModel.onCurrencyChange}
|
||||
onSliceChange={viewModel.onSliceChange}
|
||||
onTabChange={viewModel.onTabChange}
|
||||
partial={viewModel.partial}
|
||||
portfolio={viewModel.portfolio}
|
||||
positionSections={viewModel.positionSections}
|
||||
recentEvents={viewModel.recentEvents}
|
||||
recentOperations={viewModel.recentOperations}
|
||||
slice={viewModel.slice}
|
||||
source={viewModel.source}
|
||||
tab={viewModel.tab}
|
||||
unrealizedReturns={viewModel.unrealizedReturns}
|
||||
account={vm.account}
|
||||
accountId={vm.accountId}
|
||||
concentration={vm.concentration}
|
||||
incomeSummary={vm.incomeSummary}
|
||||
onSliceChange={vm.onSliceChange}
|
||||
onTabChange={vm.onTabChange}
|
||||
partial={vm.partial}
|
||||
portfolio={vm.portfolio}
|
||||
positionSections={vm.positionSections}
|
||||
readRetry={vm.readRetry}
|
||||
recentEvents={vm.recentEvents}
|
||||
recentOperations={vm.recentOperations}
|
||||
slice={vm.slice}
|
||||
source={vm.source}
|
||||
tab={vm.tab}
|
||||
unrealizedReturns={vm.unrealizedReturns}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@ import { resource } from "@/test/resource";
|
||||
import { server } from "@/test/server";
|
||||
|
||||
import { portfolio } from "../../model/positions.fixtures";
|
||||
import { useAccountPageViewModel } from "./AccountPage.vm";
|
||||
import { useAccountPageVm } from "./AccountPage.vm";
|
||||
|
||||
function configureTestAuth() {
|
||||
configureAuthClient({
|
||||
@@ -102,12 +102,12 @@ function mockLoadedAccountPage() {
|
||||
);
|
||||
}
|
||||
|
||||
describe("useAccountPageViewModel", () => {
|
||||
describe("useAccountPageVm", () => {
|
||||
it("prepares recent operations and events state for presentation views", async () => {
|
||||
configureTestAuth();
|
||||
mockLoadedAccountPage();
|
||||
|
||||
const { result } = renderHook(() => useAccountPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountPageVm(), {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
@@ -154,7 +154,7 @@ describe("useAccountPageViewModel", () => {
|
||||
),
|
||||
);
|
||||
|
||||
const { result } = renderHook(() => useAccountPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountPageVm(), {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
@@ -187,14 +187,14 @@ it("keeps overview sections independent when their source data is incomplete", a
|
||||
http.get("*/api/v1/brokerage-accounts/:accountId/events", () =>
|
||||
HttpResponse.json(
|
||||
resource(
|
||||
{ events: [], incomeTotalsByCurrency: [] },
|
||||
{ events: [], incomeTotal: { currency: "RUB", value: "0" } },
|
||||
{ completeness: "incomplete" },
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
const { result } = renderHook(() => useAccountPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountPageVm(), {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
@@ -213,8 +213,8 @@ it("keeps overview sections loaded without exposing technical retry", async () =
|
||||
|
||||
const sections: Record<string, unknown>
|
||||
= {
|
||||
"events": { events: [], incomeTotalsByCurrency: [] },
|
||||
"income-summary": { totalsByCurrency: [] },
|
||||
"events": { events: [], incomeTotal: { currency: "RUB", value: "0" } },
|
||||
"income-summary": { total: { coupon: { currency: "RUB", value: "0" }, dividend: { currency: "RUB", value: "0" }, total: { currency: "RUB", value: "0" } } },
|
||||
"operations": { hasNext: false, items: [], nextCursor: null },
|
||||
portfolio,
|
||||
};
|
||||
@@ -232,13 +232,13 @@ it("keeps overview sections loaded without exposing technical retry", async () =
|
||||
),
|
||||
);
|
||||
|
||||
const { result } = renderHook(() => useAccountPageViewModel(), {
|
||||
const { result } = renderHook(() => useAccountPageVm(), {
|
||||
wrapper: createWrapper(),
|
||||
});
|
||||
|
||||
await waitFor(() =>
|
||||
expect(result.current).toMatchObject({
|
||||
incomeSummary: { state: "empty" },
|
||||
incomeSummary: { state: "loaded" },
|
||||
recentEvents: { state: "empty" },
|
||||
recentOperations: { state: "empty" },
|
||||
state: "loaded",
|
||||
|
||||
@@ -16,12 +16,11 @@ import {
|
||||
import { useIncomeSummary } from "@/entities/income";
|
||||
import { usePortfolio } from "@/entities/portfolio";
|
||||
import { useScreenSync } from "@/features/tbank-connection";
|
||||
import { apiErrorCode, isBrokerageAccessLoss } from "@/shared/api";
|
||||
import { apiErrorCode, isBrokerageAccessLoss, readRetry } from "@/shared/api";
|
||||
import { useInitialAvailability } from "@/shared/lib";
|
||||
|
||||
import {
|
||||
type Concentration,
|
||||
concentrationCurrencies,
|
||||
type ConcentrationLabels,
|
||||
type Slice,
|
||||
toConcentration,
|
||||
@@ -45,6 +44,7 @@ type AccountPageContent = {
|
||||
accountId?: string;
|
||||
incomeSummary: AccountPageIncomeSummary;
|
||||
partial?: boolean;
|
||||
readRetry: AccountPageReadRetry;
|
||||
recentEvents: AccountPageRecentEvents;
|
||||
recentOperations: AccountPageRecentOperations;
|
||||
source?: InvestmentResourceMeta;
|
||||
@@ -56,8 +56,6 @@ type AccountPageEmptyViewModel = AccountPageContent & {
|
||||
|
||||
type AccountPageLoadedViewModel = AccountPageContent & {
|
||||
concentration: Concentration | null;
|
||||
currency: null | string;
|
||||
onCurrencyChange: (currency: null | string) => void;
|
||||
onSliceChange: (slice: Slice) => void;
|
||||
onTabChange: (tab: null | string) => void;
|
||||
portfolio: Portfolio;
|
||||
@@ -65,30 +63,33 @@ type AccountPageLoadedViewModel = AccountPageContent & {
|
||||
slice: Slice;
|
||||
state: "loaded";
|
||||
tab: string;
|
||||
unrealizedReturns: Portfolio["totalsByCurrency"];
|
||||
unrealizedReturns:
|
||||
| null
|
||||
| { currency: string; value: string };
|
||||
};
|
||||
|
||||
type AccountPageReadRetry = ReturnType<typeof readRetry>;
|
||||
|
||||
type AccountPageViewModel
|
||||
= | AccountPageEmptyViewModel
|
||||
| AccountPageLoadedViewModel
|
||||
| { code?: string; state: "error" }
|
||||
| { code?: string; readRetry: AccountPageReadRetry; state: "error" }
|
||||
| { state: "loading" };
|
||||
|
||||
function useAccountPageViewModel(): AccountPageViewModel {
|
||||
function useAccountPageVm(): AccountPageViewModel {
|
||||
const { accountId } = useParams();
|
||||
const { t } = useTranslation();
|
||||
|
||||
const [selection, setSelection] = useState<{
|
||||
accountId?: string;
|
||||
currency: null | string;
|
||||
slice: Slice;
|
||||
tab: string;
|
||||
}>({ accountId, currency: null, slice: "stocks", tab: "positions" });
|
||||
}>({ accountId, slice: "stocks", tab: "positions" });
|
||||
|
||||
const current = selection.accountId === accountId
|
||||
? selection
|
||||
: {
|
||||
accountId, currency: null, slice: "stocks" as const, tab: "positions",
|
||||
accountId, slice: "stocks" as const, tab: "positions",
|
||||
};
|
||||
|
||||
const updateSelection = (change: Partial<typeof selection>) =>
|
||||
@@ -113,6 +114,8 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
]);
|
||||
|
||||
const code = apiErrorCode(portfolio.error);
|
||||
// The portfolio drives this screen; the retry repeats only its GET.
|
||||
const retry = readRetry([portfolio]);
|
||||
const isAccessFailure = isBrokerageAccessLoss(code);
|
||||
|
||||
const availability = useInitialAvailability({
|
||||
@@ -122,12 +125,13 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
isFetching: portfolio.isFetching,
|
||||
});
|
||||
|
||||
if (isAccessFailure) return { code, state: "error" as const };
|
||||
if (isAccessFailure)
|
||||
return { code, readRetry: retry, state: "error" as const };
|
||||
|
||||
if (!portfolio.data)
|
||||
return {
|
||||
state: availability === "unavailable" ? "error" : "loading",
|
||||
} as const;
|
||||
return availability === "unavailable"
|
||||
? { code, readRetry: retry, state: "error" as const }
|
||||
: { state: "loading" as const };
|
||||
|
||||
const account = accounts.data?.find(item => item.id === accountId);
|
||||
const recentOperations = toRecentOperations(accountId, operations);
|
||||
@@ -138,12 +142,13 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
if (
|
||||
portfolio.meta?.availability === "available"
|
||||
&& portfolio.data.positions.length === 0
|
||||
&& portfolio.data.cashBalances.length === 0
|
||||
&& Number(portfolio.data.cash.value) === 0
|
||||
)
|
||||
return {
|
||||
account,
|
||||
accountId,
|
||||
incomeSummary,
|
||||
readRetry: retry,
|
||||
recentEvents,
|
||||
recentOperations,
|
||||
source: portfolio.meta,
|
||||
@@ -151,11 +156,6 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
};
|
||||
|
||||
const isPartial = portfolio.meta?.completeness === "incomplete";
|
||||
const currencies = concentrationCurrencies(portfolio.data);
|
||||
|
||||
const currency = current.currency && currencies.includes(current.currency)
|
||||
? current.currency
|
||||
: currencies[0] ?? null;
|
||||
|
||||
const labels: ConcentrationLabels = {
|
||||
missingIssuer: t("portfolio.concentration.missingIssuer"),
|
||||
@@ -166,21 +166,20 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
|
||||
const concentration = accountId !== "all"
|
||||
&& current.tab === "concentration"
|
||||
? toConcentration(portfolio.data, current.slice, currency, labels)
|
||||
? toConcentration(portfolio.data, current.slice, labels)
|
||||
: null;
|
||||
|
||||
return {
|
||||
account,
|
||||
accountId,
|
||||
concentration,
|
||||
currency,
|
||||
incomeSummary,
|
||||
onCurrencyChange: value => updateSelection({ currency: value }),
|
||||
onSliceChange: slice => updateSelection({ slice }),
|
||||
onTabChange: tab => updateSelection({ tab: tab ?? "positions" }),
|
||||
partial: isPartial,
|
||||
portfolio: portfolio.data,
|
||||
positionSections: toAccountPagePositionSections(portfolio.data),
|
||||
readRetry: retry,
|
||||
recentEvents,
|
||||
recentOperations,
|
||||
slice: current.slice,
|
||||
@@ -191,4 +190,4 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
||||
};
|
||||
}
|
||||
|
||||
export { useAccountPageViewModel };
|
||||
export { useAccountPageVm };
|
||||
|
||||
@@ -8,8 +8,7 @@ import type { BrokerageAccount } from "@/entities/brokerage-account";
|
||||
import type { InvestmentResourceMeta } from "@/shared/api";
|
||||
|
||||
import { BrokerageEventsPreview } from "@/entities/brokerage-event";
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { PortfolioStructure } from "@/widgets/portfolio-structure";
|
||||
import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import type {
|
||||
AccountPageIncomeSummary,
|
||||
@@ -19,12 +18,14 @@ import type {
|
||||
|
||||
import { AccountHeading } from "./AccountHeading.view";
|
||||
import { IncomeSummary } from "./IncomeSummary.view";
|
||||
import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
|
||||
import { RecentOperations } from "./RecentOperations.view";
|
||||
|
||||
type AccountPageEmptyProps = {
|
||||
account?: BrokerageAccount;
|
||||
accountId?: string;
|
||||
incomeSummary?: AccountPageIncomeSummary;
|
||||
readRetry?: ReadRetryProps;
|
||||
recentEvents: AccountPageRecentEvents;
|
||||
recentOperations: AccountPageRecentOperations;
|
||||
source?: InvestmentResourceMeta;
|
||||
@@ -49,10 +50,17 @@ const AccountPageEmpty: FC<AccountPageEmptyProps> = (props) => {
|
||||
stale={props.source?.freshness === "stale"}
|
||||
/>
|
||||
|
||||
{!!props.readRetry && <ReadRetry {...props.readRetry} />}
|
||||
|
||||
<StateView text={text} title={t("portfolio.emptyTitle")} />
|
||||
|
||||
<PortfolioStructure
|
||||
structure={{ currencies: [], unvaluedCategories: [] }}
|
||||
structure={{
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
}}
|
||||
/>
|
||||
|
||||
<RecentOperations
|
||||
|
||||
@@ -6,8 +6,12 @@ import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router";
|
||||
|
||||
import { ApiErrorCode, isApiErrorCode } from "@/shared/api";
|
||||
import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
|
||||
|
||||
type AccountPageErrorProps = { code?: string };
|
||||
type AccountPageErrorProps = {
|
||||
code?: string;
|
||||
readRetry?: ReadRetryProps;
|
||||
};
|
||||
|
||||
const AccountPageError: FC<AccountPageErrorProps> = (props) => {
|
||||
const { code } = props;
|
||||
@@ -43,8 +47,18 @@ const AccountPageError: FC<AccountPageErrorProps> = (props) => {
|
||||
/>
|
||||
);
|
||||
|
||||
const retry = props.readRetry?.exhausted
|
||||
? (
|
||||
<ReadRetryButton
|
||||
onRetry={props.readRetry.onRetry}
|
||||
retrying={props.readRetry.retrying}
|
||||
/>
|
||||
)
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<StateView
|
||||
action={retry}
|
||||
text={t("states.unavailableText")}
|
||||
title={t("states.unavailableTitle")}
|
||||
/>
|
||||
|
||||
@@ -15,8 +15,7 @@ import type { InvestmentResourceMeta } from "@/shared/api";
|
||||
|
||||
import { BrokerageEventsPreview } from "@/entities/brokerage-event";
|
||||
import { formatMoney } from "@/shared/lib";
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { PortfolioStructure } from "@/widgets/portfolio-structure";
|
||||
import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import type { Concentration as ConcentrationModel, Slice } from "../../../model/concentration";
|
||||
import type { AccountPagePositionSection } from "../../../model/positions";
|
||||
@@ -29,8 +28,9 @@ import type {
|
||||
import classes from "../AccountPage.module.css";
|
||||
import { AccountHeading } from "./AccountHeading.view";
|
||||
import { Concentration } from "./Concentration/Concentration.view";
|
||||
import { CurrencyCards } from "./CurrencyCards/CurrencyCards.view";
|
||||
import { IncomeSummary } from "./IncomeSummary.view";
|
||||
import { PerformanceTab } from "./Performance/PerformanceTab";
|
||||
import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
|
||||
import { PositionSection } from "./PositionSection.view";
|
||||
import { RecentOperations } from "./RecentOperations.view";
|
||||
|
||||
@@ -38,20 +38,21 @@ type AccountPageLoadedProps = {
|
||||
account?: BrokerageAccount;
|
||||
accountId?: string;
|
||||
concentration: ConcentrationModel | null;
|
||||
currency: null | string;
|
||||
incomeSummary?: AccountPageIncomeSummary;
|
||||
onCurrencyChange: (currency: null | string) => void;
|
||||
onSliceChange: (slice: Slice) => void;
|
||||
onTabChange: (tab: null | string) => void;
|
||||
partial?: boolean;
|
||||
portfolio: Portfolio;
|
||||
positionSections: AccountPagePositionSection[];
|
||||
readRetry?: ReadRetryProps;
|
||||
recentEvents: AccountPageRecentEvents;
|
||||
recentOperations: AccountPageRecentOperations;
|
||||
slice: Slice;
|
||||
source?: InvestmentResourceMeta;
|
||||
tab: string;
|
||||
unrealizedReturns: Portfolio["totalsByCurrency"];
|
||||
unrealizedReturns:
|
||||
| null
|
||||
| { currency: string; value: string };
|
||||
};
|
||||
|
||||
const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
@@ -86,13 +87,29 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
stale={props.source?.freshness === "stale"}
|
||||
/>
|
||||
|
||||
{!!props.readRetry && <ReadRetry {...props.readRetry} />}
|
||||
|
||||
{props.partial
|
||||
? tab !== "concentration" && (
|
||||
<Alert role="status">{t("investment.partial")}</Alert>
|
||||
)
|
||||
: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
|
||||
: (
|
||||
<Stack component="dl" gap={4} m={0}>
|
||||
<dt>
|
||||
<Text fw={600}>{t("portfolio.total")}</Text>
|
||||
</dt>
|
||||
|
||||
{!props.partial && props.unrealizedReturns.length > 0 && (
|
||||
<dd style={{ margin: 0 }}>
|
||||
<Text className={classes.totalAmount}>
|
||||
{formatMoney(props.portfolio.totals, {
|
||||
withRoundedCents: true,
|
||||
})}
|
||||
</Text>
|
||||
</dd>
|
||||
</Stack>
|
||||
)}
|
||||
|
||||
{!props.partial && props.unrealizedReturns && (
|
||||
<Stack
|
||||
aria-label={t("portfolio.unrealizedResult")}
|
||||
component="section"
|
||||
@@ -101,9 +118,7 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
<Text fw={600}>{t("portfolio.unrealizedResult")}</Text>
|
||||
|
||||
<Group gap="md">
|
||||
{props.unrealizedReturns.map(total => (
|
||||
<Text key={total.currency}>{formatMoney(total)}</Text>
|
||||
))}
|
||||
<Text>{formatMoney(props.unrealizedReturns)}</Text>
|
||||
</Group>
|
||||
|
||||
<Text c="dimmed" size="xs">
|
||||
@@ -145,6 +160,8 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
<Tabs.Tab value="events">{t("portfolio.tabs.events")}</Tabs.Tab>
|
||||
|
||||
<Tabs.Tab value="income">{t("portfolio.tabs.income")}</Tabs.Tab>
|
||||
|
||||
<Tabs.Tab value="performance">{t("portfolio.tabs.performance")}</Tabs.Tab>
|
||||
</Tabs.List>
|
||||
|
||||
<Tabs.Panel value="positions">
|
||||
@@ -168,10 +185,8 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
<Tabs.Panel value="concentration">
|
||||
{props.concentration && (
|
||||
<Concentration
|
||||
currency={props.currency}
|
||||
key={`${props.slice}-${props.currency}`}
|
||||
key={props.slice}
|
||||
model={props.concentration}
|
||||
onCurrencyChange={props.onCurrencyChange}
|
||||
onSliceChange={props.onSliceChange}
|
||||
partial={!!props.partial}
|
||||
slice={props.slice}
|
||||
@@ -181,7 +196,17 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
)}
|
||||
|
||||
<Tabs.Panel value="cash">
|
||||
<CurrencyCards amounts={props.portfolio.cashBalances} />
|
||||
<Stack component="dl" gap={4} m={0}>
|
||||
<dt>
|
||||
<Text fw={600}>{t("portfolio.cashTitle")}</Text>
|
||||
</dt>
|
||||
|
||||
<dd style={{ margin: 0 }}>
|
||||
<Text>
|
||||
{formatMoney(props.portfolio.cash, { withRoundedCents: true })}
|
||||
</Text>
|
||||
</dd>
|
||||
</Stack>
|
||||
</Tabs.Panel>
|
||||
|
||||
<Tabs.Panel value="operations">
|
||||
@@ -208,6 +233,10 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||
/>
|
||||
)}
|
||||
</Tabs.Panel>
|
||||
|
||||
<Tabs.Panel value="performance">
|
||||
{props.accountId && <PerformanceTab accountId={props.accountId} />}
|
||||
</Tabs.Panel>
|
||||
</Tabs>
|
||||
</Stack>
|
||||
);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { DonutChart } from "@mantine/charts";
|
||||
import {
|
||||
Alert, Box, Group, Paper, SegmentedControl, Select, Stack,
|
||||
Alert, Box, Group, Paper, SegmentedControl, Stack,
|
||||
Text, Title,
|
||||
} from "@mantine/core";
|
||||
import { type FC, useId, useState } from "react";
|
||||
@@ -18,9 +18,7 @@ import { PositionLogo } from "../PositionLogo.view";
|
||||
import classes from "./Concentration.module.css";
|
||||
|
||||
type Props = {
|
||||
currency: null | string;
|
||||
model: ConcentrationModel;
|
||||
onCurrencyChange: (currency: null | string) => void;
|
||||
onSliceChange: (slice: Slice) => void;
|
||||
partial: boolean;
|
||||
slice: Slice;
|
||||
@@ -35,7 +33,6 @@ const sliceLabels = {
|
||||
|
||||
type RowProps = {
|
||||
color: string;
|
||||
currency: string;
|
||||
index: number;
|
||||
item: ConcentrationItem;
|
||||
logo?: ConcentrationItem["logo"];
|
||||
@@ -50,8 +47,8 @@ const colors = [
|
||||
const PERCENT = 100;
|
||||
const OTHER_START = 6;
|
||||
|
||||
function amountFor(item: ConcentrationItem, currency: string): string {
|
||||
return formatMoney({ currency, value: item.amount });
|
||||
function amountFor(item: ConcentrationItem): string {
|
||||
return formatMoney({ currency: "RUB", value: item.amount });
|
||||
}
|
||||
|
||||
const ConcentrationRow: FC<RowProps> = props => (
|
||||
@@ -83,7 +80,7 @@ const ConcentrationRow: FC<RowProps> = props => (
|
||||
</span>
|
||||
|
||||
<span className={classes.value}>
|
||||
<strong>{amountFor(props.item, props.currency)}</strong>
|
||||
<strong>{amountFor(props.item)}</strong>
|
||||
|
||||
<Text c="dimmed" size="sm">{props.item.share}</Text>
|
||||
</span>
|
||||
@@ -131,7 +128,6 @@ const Concentration: FC<Props> = (props) => {
|
||||
const [expanded, setExpanded] = useState(false);
|
||||
const otherId = useId();
|
||||
const chartId = useId();
|
||||
const currency = props.currency ?? "";
|
||||
|
||||
const rows = props.model.other
|
||||
? [...props.model.items, props.model.other]
|
||||
@@ -147,10 +143,8 @@ const Concentration: FC<Props> = (props) => {
|
||||
props.model.top5Share && t("portfolio.concentration.top5", {
|
||||
share: props.model.top5Share,
|
||||
}),
|
||||
props.model.total && formatMoney({
|
||||
currency, value: props.model.total,
|
||||
}),
|
||||
...rows.map(item => `${item.label}: ${amountFor(item, currency)}, ${item.share}`),
|
||||
props.model.total && formatMoney({ currency: "RUB", value: props.model.total }),
|
||||
...rows.map(item => `${item.label}: ${amountFor(item)}, ${item.share}`),
|
||||
].filter(Boolean).join("; ");
|
||||
|
||||
const slices = [
|
||||
@@ -170,7 +164,7 @@ const Concentration: FC<Props> = (props) => {
|
||||
const pieProps = { isAnimationActive: false, label: rankLabel };
|
||||
|
||||
const tooltipRows = rows.map(item => ({
|
||||
amount: amountFor(item, currency),
|
||||
amount: amountFor(item),
|
||||
label: item.label,
|
||||
share: item.share,
|
||||
}));
|
||||
@@ -178,7 +172,7 @@ const Concentration: FC<Props> = (props) => {
|
||||
const tooltipProps = { content: <ChartTooltip rows={tooltipRows} /> };
|
||||
|
||||
const totalText = props.model.total
|
||||
? formatMoney({ currency, value: props.model.total })
|
||||
? formatMoney({ currency: "RUB", value: props.model.total })
|
||||
: "";
|
||||
|
||||
return (
|
||||
@@ -192,16 +186,6 @@ const Concentration: FC<Props> = (props) => {
|
||||
value={props.slice}
|
||||
/>
|
||||
|
||||
{props.model.currencies.length > 1 && (
|
||||
<Select
|
||||
allowDeselect={false}
|
||||
aria-label={t("portfolio.concentration.currency")}
|
||||
data={props.model.currencies}
|
||||
onChange={props.onCurrencyChange}
|
||||
value={props.currency}
|
||||
w={130}
|
||||
/>
|
||||
)}
|
||||
</Group>
|
||||
|
||||
{props.partial && (
|
||||
@@ -211,9 +195,7 @@ const Concentration: FC<Props> = (props) => {
|
||||
{props.model.empty
|
||||
? (
|
||||
<Stack gap="xs">
|
||||
<Text fw={600}>{t(sliceLabels[props.slice])}
|
||||
{props.currency && ` · ${props.currency}`}
|
||||
</Text>
|
||||
<Text fw={600}>{t(sliceLabels[props.slice])}</Text>
|
||||
|
||||
<Text>{t("portfolio.concentration.empty")}</Text>
|
||||
</Stack>
|
||||
@@ -260,7 +242,6 @@ const Concentration: FC<Props> = (props) => {
|
||||
{props.model.items.map((item, index) => (
|
||||
<ConcentrationRow
|
||||
color={colors[index % colors.length] ?? "blue"}
|
||||
currency={currency}
|
||||
index={index + 1}
|
||||
item={item}
|
||||
key={item.key}
|
||||
@@ -285,7 +266,7 @@ const Concentration: FC<Props> = (props) => {
|
||||
)}
|
||||
</span>
|
||||
|
||||
<span>{amountFor(props.model.other, currency)} · {
|
||||
<span>{amountFor(props.model.other)} · {
|
||||
props.model.other.share
|
||||
}
|
||||
</span>
|
||||
@@ -301,7 +282,6 @@ const Concentration: FC<Props> = (props) => {
|
||||
<ConcentrationRow
|
||||
color={colors[(index + OTHER_START) % colors.length]
|
||||
?? "blue"}
|
||||
currency={currency}
|
||||
index={index + OTHER_START}
|
||||
item={item}
|
||||
key={item.key}
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
import { MantineProvider } from "@mantine/core";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { CurrencyCards } from "./CurrencyCards.view";
|
||||
|
||||
describe("CurrencyCards currency presentation", () => {
|
||||
it.each([0, 5])(
|
||||
"renders only the %i supplied totals in upstream order",
|
||||
(count) => {
|
||||
const totals = [
|
||||
{ currency: "EUR", value: "3.00" },
|
||||
{ currency: "USD", value: "2.00" },
|
||||
{ currency: "RUB", value: "1.00" },
|
||||
{ currency: "CAD", value: "4.00" },
|
||||
{ currency: "XYZ", value: "5.00" },
|
||||
].slice(0, count);
|
||||
|
||||
const { container } = render(
|
||||
<MantineProvider>
|
||||
<CurrencyCards amounts={totals} />
|
||||
</MantineProvider>,
|
||||
);
|
||||
|
||||
expect(
|
||||
screen.queryAllByRole("definition").map(node => node.textContent),
|
||||
).toEqual(
|
||||
["3,00 €", "2,00 $", "1,00 ₽", "4,00 CAD", "5,00 XYZ"].slice(0, count),
|
||||
);
|
||||
// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
|
||||
expect(container.querySelectorAll("dl")).toHaveLength(count);
|
||||
expect(
|
||||
// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
|
||||
container.querySelector("[tabindex], button, a, input"),
|
||||
).toBeNull();
|
||||
},
|
||||
);
|
||||
|
||||
it.each([
|
||||
["RUB", "125000.50", "125 000,50 ₽", "Российский рубль", "₽"],
|
||||
["USD", "320.00", "320,00 $", "Доллар США", "$"],
|
||||
["EUR", "9876.54321", "9 876,54321 €", "Евро", "€"],
|
||||
[
|
||||
"RUB",
|
||||
"123456789012.345678901",
|
||||
"123 456 789 012,345678901 ₽",
|
||||
"Российский рубль",
|
||||
"₽",
|
||||
],
|
||||
["USD", "-1234567.890123", "-1 234 567,890123 $", "Доллар США", "$"],
|
||||
["EUR", "987654321.000001", "987 654 321,000001 €", "Евро", "€"],
|
||||
["USD", "-0.5", "-0,5 $", "Доллар США", "$"],
|
||||
["CAD", "20.00", "20,00 CAD", "CAD", "CAD"],
|
||||
["XYZ", "1.000", "1,000 XYZ", "XYZ", "XYZ"],
|
||||
])(
|
||||
"preserves %s %s and its currency identity",
|
||||
(currency, value, expected, name, symbol) => {
|
||||
render(
|
||||
<MantineProvider>
|
||||
<CurrencyCards amounts={[{ currency, value }]} />
|
||||
</MantineProvider>,
|
||||
);
|
||||
const term = screen.getByRole("term");
|
||||
expect(term).toHaveTextContent(name);
|
||||
// eslint-disable-next-line testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
|
||||
expect(term.querySelector("[aria-hidden=\"true\"]")).toHaveTextContent(
|
||||
symbol,
|
||||
);
|
||||
expect(screen.getByRole("definition")).toHaveTextContent(expected);
|
||||
// eslint-disable-next-line testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
|
||||
expect(term.parentElement).toBe(
|
||||
// eslint-disable-next-line testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
|
||||
screen.getByRole("definition").parentElement,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
@@ -1,74 +0,0 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { Paper, SimpleGrid, Text, VisuallyHidden } from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import type { Portfolio } from "@/entities/portfolio";
|
||||
|
||||
import { formatDecimal } from "@/shared/lib";
|
||||
|
||||
import classes from "../../AccountPage.module.css";
|
||||
|
||||
const SIGN_PREFIX_LENGTH = 2;
|
||||
|
||||
type CurrencyCardsProps = {
|
||||
amounts: Portfolio["totalsByCurrency"];
|
||||
};
|
||||
|
||||
const CurrencyCards: FC<CurrencyCardsProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
const { amounts } = props;
|
||||
|
||||
const currencies: Record<string, { name: string; symbol: string }> = {
|
||||
EUR: { name: t("portfolio.currencies.EUR"), symbol: "€" },
|
||||
RUB: { name: t("portfolio.currencies.RUB"), symbol: "₽" },
|
||||
USD: { name: t("portfolio.currencies.USD"), symbol: "$" },
|
||||
};
|
||||
|
||||
return (
|
||||
<SimpleGrid cols={{ base: 1, md: 3, sm: 2 }} spacing={10}>
|
||||
{amounts.map((money) => {
|
||||
const amount = formatDecimal(money.value);
|
||||
|
||||
return (
|
||||
<Paper
|
||||
className={classes.total}
|
||||
component="dl"
|
||||
key={money.currency}
|
||||
m={0}
|
||||
withBorder
|
||||
>
|
||||
<Text className={classes.totalBadge} component="dt">
|
||||
<span aria-hidden="true">
|
||||
{currencies[money.currency]?.symbol ?? money.currency}
|
||||
</span>
|
||||
|
||||
<VisuallyHidden>
|
||||
{currencies[money.currency]?.name ?? money.currency}
|
||||
</VisuallyHidden>
|
||||
</Text>
|
||||
|
||||
<Text className={classes.totalAmount} component="dd" m={0}>
|
||||
{amount.startsWith("-")
|
||||
? (
|
||||
<>
|
||||
<span className={classes.totalLeadingDigits}>
|
||||
{amount.slice(0, SIGN_PREFIX_LENGTH)}
|
||||
</span>
|
||||
|
||||
{amount.slice(SIGN_PREFIX_LENGTH)}
|
||||
</>
|
||||
)
|
||||
: (
|
||||
amount
|
||||
)}{" "}
|
||||
{currencies[money.currency]?.symbol ?? money.currency}
|
||||
</Text>
|
||||
</Paper>
|
||||
);
|
||||
})}
|
||||
</SimpleGrid>
|
||||
);
|
||||
};
|
||||
|
||||
export { CurrencyCards };
|
||||
@@ -64,16 +64,14 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
||||
|
||||
return (
|
||||
<Stack gap="xs">
|
||||
{props.summary.totalsByCurrency.map(total => (
|
||||
<Paper key={total.currency} p="sm" withBorder>
|
||||
<Text fw={700}>{formatMoney(total.total)}</Text>
|
||||
<Paper p="sm" withBorder>
|
||||
<Text fw={700}>{formatMoney(props.summary.total.total)}</Text>
|
||||
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("income.coupon")}: {formatMoney(total.coupon)} ·{" "}
|
||||
{t("income.dividend")}: {formatMoney(total.dividend)}
|
||||
</Text>
|
||||
</Paper>
|
||||
))}
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("income.coupon")}: {formatMoney(props.summary.total.coupon)} ·{" "}
|
||||
{t("income.dividend")}: {formatMoney(props.summary.total.dividend)}
|
||||
</Text>
|
||||
</Paper>
|
||||
|
||||
<Button component={Link} to={props.to} variant="subtle">
|
||||
{props.moreLabel ?? t("income.open")}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
.positive { color: var(--wl-color-positive); }
|
||||
.negative { color: var(--wl-color-negative); }
|
||||
.neutral { color: var(--mantine-color-dark-7); }
|
||||
@@ -0,0 +1,106 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
|
||||
import type { Performance } from "@/entities/performance";
|
||||
|
||||
import { PerformanceView } from "./Performance.view";
|
||||
|
||||
const rub = (value: string) => ({ currency: "RUB", value });
|
||||
|
||||
const series = Array.from({ length: 24 }, (_, month) => {
|
||||
const date = new Date(Date.UTC(2024, month, 1)).toISOString().slice(0, 10);
|
||||
const invested = 300_000 + Math.floor(month / 6) * 150_000;
|
||||
|
||||
return {
|
||||
benchmarkValue: String(Math.round(invested * (1 + month * 0.009))),
|
||||
date,
|
||||
netInvested: String(invested),
|
||||
referenceValue: String(Math.round(invested * (1 + month * 0.004))),
|
||||
};
|
||||
});
|
||||
|
||||
const data: Performance = {
|
||||
accountId: "account-1",
|
||||
benchmark: {
|
||||
asOf: "2025-12-01",
|
||||
code: "MCFTRR",
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.108" },
|
||||
unavailableReason: null,
|
||||
value: rub("1387973"),
|
||||
},
|
||||
calculatedAt: "2025-12-01T00:00:00Z",
|
||||
completeness: "complete",
|
||||
currentValue: rub("1536400"),
|
||||
excludedAccounts: [],
|
||||
netInvested: rub("1060000"),
|
||||
outperformance: { money: rub("148427"), percentagePoints: "0.043" },
|
||||
period: { days: 700, from: "2024-01-01", to: "2025-12-01" },
|
||||
profit: rub("476400"),
|
||||
reference: {
|
||||
asOf: "2025-12-01",
|
||||
code: "IMOEX",
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.047" },
|
||||
unavailableReason: null,
|
||||
value: rub("1150000"),
|
||||
},
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.151" },
|
||||
series,
|
||||
};
|
||||
|
||||
const meta = {
|
||||
args: { data },
|
||||
component: PerformanceView,
|
||||
parameters: {
|
||||
docs: {
|
||||
description: {
|
||||
component:
|
||||
"Вкладка «Результат»: доходность, прибыль, те же деньги в индексе Мосбиржи и опережение. Синтетический серверный ответ без расчётов на клиенте.",
|
||||
},
|
||||
},
|
||||
},
|
||||
tags: ["autodocs"],
|
||||
title: "Product/Performance",
|
||||
} satisfies Meta<typeof PerformanceView>;
|
||||
|
||||
export default meta;
|
||||
|
||||
type Story = StoryObj<typeof meta>;
|
||||
|
||||
export const Ahead: Story = {};
|
||||
|
||||
export const Behind: Story = {
|
||||
args: {
|
||||
data: {
|
||||
...data,
|
||||
currentValue: rub("1172400"),
|
||||
outperformance: { money: rub("-215573"), percentagePoints: "-0.068" },
|
||||
profit: rub("112400"),
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.04" },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export const ShortHistory: Story = {
|
||||
args: {
|
||||
data: {
|
||||
...data,
|
||||
benchmark: {
|
||||
...data.benchmark,
|
||||
return: { basis: "period", unavailableReason: null, value: "0.112" },
|
||||
},
|
||||
period: { days: 277, from: "2025-02-27", to: "2025-12-01" },
|
||||
return: { basis: "period", unavailableReason: null, value: "0.074" },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export const Incomplete: Story = {
|
||||
args: {
|
||||
data: {
|
||||
...data,
|
||||
completeness: "incomplete",
|
||||
excludedAccounts: [
|
||||
{ accountId: "usd", name: "Валютный", reason: "PORTFOLIO_VALUATION_INCOMPLETE" },
|
||||
],
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,185 @@
|
||||
import { LineChart } from "@mantine/charts";
|
||||
import {
|
||||
Accordion,
|
||||
ActionIcon,
|
||||
Alert,
|
||||
Group,
|
||||
Paper,
|
||||
SimpleGrid,
|
||||
Stack,
|
||||
Text,
|
||||
Title,
|
||||
Tooltip,
|
||||
} from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import type { Performance } from "@/entities/performance";
|
||||
|
||||
import { formatChartValue, formatDate } from "@/shared/lib";
|
||||
|
||||
import { performanceVm } from "../../../../model/performance";
|
||||
import classes from "./Performance.module.css";
|
||||
|
||||
const formatRub = (value: number) => `${formatChartValue(Math.round(value))} ₽`;
|
||||
|
||||
function PerformanceView({ data }: Readonly<{ data: Performance }>) {
|
||||
const { t } = useTranslation();
|
||||
const vm = performanceVm(data);
|
||||
|
||||
const basis = vm.basis === "annual"
|
||||
? t("portfolio.performance.yearly")
|
||||
: t("portfolio.performance.periodLabel", { days: vm.days });
|
||||
|
||||
const comparisonTone = vm.comparison?.points.tone ?? "neutral";
|
||||
let comparisonTitle = t("portfolio.performance.marketEqual");
|
||||
if (comparisonTone === "positive") comparisonTitle = t("portfolio.performance.marketAhead");
|
||||
else if (comparisonTone === "negative") comparisonTitle = t("portfolio.performance.marketBehind");
|
||||
const percentText = vm.returnValue.value;
|
||||
const indexText = vm.indexReturn.value;
|
||||
|
||||
const currentLines = vm.currentPoint
|
||||
? [{ color: "blue.6", label: t("portfolio.performance.current"), x: vm.currentPoint.date }]
|
||||
: [];
|
||||
|
||||
const profitCaption = t("portfolio.performance.profitCaption", { current: vm.current, invested: vm.invested });
|
||||
|
||||
const chartLabel = [
|
||||
`${t("portfolio.performance.invested")}: ${vm.invested}`,
|
||||
`${t("portfolio.performance.benchmark")}: ${vm.indexValue}`,
|
||||
`${t("portfolio.performance.current")}: ${vm.current}`,
|
||||
`${t("portfolio.performance.returnLabel")}: ${percentText}`,
|
||||
].join("; ");
|
||||
|
||||
return (
|
||||
<Stack gap="md">
|
||||
{vm.excluded.length > 0 && (
|
||||
<Alert role="status" title={t("portfolio.performance.incomplete")}>
|
||||
{vm.excluded.map(item => (
|
||||
<Text key={item.id} size="sm">
|
||||
{t("portfolio.performance.unavailableReason", item)}
|
||||
</Text>
|
||||
))}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{vm.basis === "period" && (
|
||||
<Alert role="status">
|
||||
{t("portfolio.performance.periodNote", { days: vm.days })}
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<SimpleGrid cols={{ base: 1, lg: 4, sm: 2 }}>
|
||||
<Paper component="dl" m={0} p="md" withBorder>
|
||||
<Text component="dt" size="sm">{t("portfolio.performance.returnLabel")}</Text>
|
||||
|
||||
<Text className={classes[vm.returnValue.tone]} component="dd" fw={700} m={0} size="xl">
|
||||
{percentText}
|
||||
</Text>
|
||||
|
||||
<Text c="dimmed" size="xs">{vm.returnReason ?? basis}</Text>
|
||||
</Paper>
|
||||
|
||||
<Paper component="dl" m={0} p="md" withBorder>
|
||||
<Text component="dt" size="sm">{t("portfolio.performance.profit")}</Text>
|
||||
|
||||
<Text className={classes[vm.profit.tone]} component="dd" fw={700} m={0} size="xl">
|
||||
{vm.profit.value}
|
||||
</Text>
|
||||
|
||||
<Text c="dimmed" size="xs">{profitCaption}</Text>
|
||||
</Paper>
|
||||
|
||||
<Paper component="dl" m={0} p="md" withBorder>
|
||||
<Group gap="xs">
|
||||
<Text component="dt" size="sm">{t("portfolio.performance.benchmark")}</Text>
|
||||
|
||||
<Tooltip
|
||||
events={{ focus: true, hover: true, touch: true }}
|
||||
label={t("portfolio.performance.benchmarkHint")}
|
||||
multiline
|
||||
w={280}
|
||||
>
|
||||
<ActionIcon
|
||||
aria-label={t("portfolio.performance.benchmarkHint")}
|
||||
size="xs"
|
||||
variant="subtle"
|
||||
>?
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
|
||||
<Text component="dd" fw={700} m={0} size="xl">{indexText}</Text>
|
||||
|
||||
<Text c="dimmed" size="xs">
|
||||
{vm.indexReason ?? `${basis} · ${vm.indexValue}`}
|
||||
</Text>
|
||||
</Paper>
|
||||
|
||||
<Paper component="dl" m={0} p="md" withBorder>
|
||||
<Text component="dt" size="sm">
|
||||
{comparisonTitle}
|
||||
</Text>
|
||||
|
||||
<Text
|
||||
className={classes[vm.comparison?.points.tone ?? "neutral"]}
|
||||
component="dd"
|
||||
fw={700}
|
||||
m={0}
|
||||
size="xl"
|
||||
>
|
||||
{vm.comparison?.points.value ?? "—"}
|
||||
</Text>
|
||||
|
||||
<Text c="dimmed" size="xs">{vm.comparison?.money.value ?? vm.indexReason ?? vm.returnReason}</Text>
|
||||
</Paper>
|
||||
</SimpleGrid>
|
||||
|
||||
<Paper component="section" p="md" withBorder>
|
||||
<Title mb="sm" order={2} size="h4">{t("portfolio.performance.chartTitle")}</Title>
|
||||
|
||||
{vm.series.length > 0
|
||||
? (
|
||||
<LineChart
|
||||
aria-label={chartLabel}
|
||||
curveType="linear"
|
||||
data={vm.series}
|
||||
dataKey="label"
|
||||
gridAxis="y"
|
||||
h={{ base: 220, sm: 300 }}
|
||||
lineProps={{ isAnimationActive: false }}
|
||||
referenceLines={currentLines}
|
||||
series={[
|
||||
{ color: "dark.4", label: t("portfolio.performance.invested"), name: "netInvested" },
|
||||
{ color: "orange.6", label: t("portfolio.performance.benchmark"), name: "benchmarkValue" },
|
||||
{ color: "gray.5", label: t("portfolio.performance.reference"), name: "referenceValue", strokeDasharray: "4 3" },
|
||||
]}
|
||||
tooltipAnimationDuration={0}
|
||||
valueFormatter={formatRub}
|
||||
yAxisProps={{ domain: [0, "auto"], width: 70 }}
|
||||
/>
|
||||
)
|
||||
: <Text c="dimmed">{t("portfolio.performance.benchmarkUnavailable")}</Text>}
|
||||
|
||||
<Text c="dimmed" mt="sm" size="sm">
|
||||
{t("portfolio.performance.missingHistory")}
|
||||
</Text>
|
||||
</Paper>
|
||||
|
||||
<Accordion variant="contained">
|
||||
<Accordion.Item value="method">
|
||||
<Accordion.Control>{t("portfolio.performance.calculation")}</Accordion.Control>
|
||||
|
||||
<Accordion.Panel>
|
||||
<Text size="sm">
|
||||
{t("portfolio.performance.datePeriod", { from: formatDate(`${vm.from}T00:00:00Z`), to: formatDate(`${vm.to}T00:00:00Z`) })}
|
||||
</Text>
|
||||
|
||||
<Text mt="sm" size="sm">{t("portfolio.performance.method")}</Text>
|
||||
</Accordion.Panel>
|
||||
</Accordion.Item>
|
||||
</Accordion>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
export { PerformanceView };
|
||||
@@ -0,0 +1,193 @@
|
||||
import { MantineProvider } from "@mantine/core";
|
||||
import { QueryClientProvider } from "@tanstack/react-query";
|
||||
import { fireEvent, render, screen } from "@testing-library/react";
|
||||
import { http, HttpResponse, type JsonBodyType } from "msw";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
|
||||
import type { Performance } from "@/entities/performance";
|
||||
|
||||
import { configureAuthClient } from "@/shared/api";
|
||||
import { createTestQueryClient } from "@/test/query";
|
||||
import { server } from "@/test/server";
|
||||
|
||||
import { PerformanceTab } from "./PerformanceTab";
|
||||
|
||||
const url = "*/api/v1/brokerage-accounts/:accountId/performance";
|
||||
|
||||
const rub = (value: string) => ({ currency: "RUB", value });
|
||||
|
||||
function performance(overrides: Partial<Performance> = {}): Performance {
|
||||
return {
|
||||
accountId: "account-1",
|
||||
benchmark: {
|
||||
asOf: "2025-12-31",
|
||||
code: "MCFTRR",
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.048809" },
|
||||
unavailableReason: null,
|
||||
value: rub("110000"),
|
||||
},
|
||||
calculatedAt: "2026-01-01T00:00:00Z",
|
||||
completeness: "complete",
|
||||
currentValue: rub("121000"),
|
||||
excludedAccounts: [],
|
||||
netInvested: rub("100000"),
|
||||
outperformance: { money: rub("11000"), percentagePoints: "0.051191" },
|
||||
period: { days: 730, from: "2024-01-01", to: "2025-12-31" },
|
||||
profit: rub("21000"),
|
||||
reference: {
|
||||
asOf: "2025-12-31",
|
||||
code: "IMOEX",
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.02" },
|
||||
unavailableReason: null,
|
||||
value: rub("105000"),
|
||||
},
|
||||
return: { basis: "annual", unavailableReason: null, value: "0.1" },
|
||||
series: [
|
||||
{ benchmarkValue: "100000", date: "2024-01-01", netInvested: "100000", referenceValue: "100000" },
|
||||
{ benchmarkValue: "110000", date: "2025-12-31", netInvested: "100000", referenceValue: "105000" },
|
||||
],
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
function renderTab(body: JsonBodyType, status = 200) {
|
||||
configureAuthClient({
|
||||
accessToken: () => "test-token",
|
||||
clear: vi.fn(),
|
||||
refresh: () => Promise.resolve(true),
|
||||
});
|
||||
server.use(http.get(url, () => HttpResponse.json(body, { status })));
|
||||
|
||||
return render(
|
||||
<QueryClientProvider client={createTestQueryClient()}>
|
||||
<MantineProvider>
|
||||
<PerformanceTab accountId="account-1" />
|
||||
</MantineProvider>
|
||||
</QueryClientProvider>,
|
||||
);
|
||||
}
|
||||
|
||||
const meta = { dependencies: [], unavailable: [] };
|
||||
|
||||
describe("PerformanceTab", () => {
|
||||
it("shows return, profit, the same money in the index and outperformance with signs", async () => {
|
||||
renderTab({ data: performance(), meta });
|
||||
|
||||
expect(await screen.findByText("+10,0 %")).toBeInTheDocument();
|
||||
expect(screen.getByText("+21 000 ₽")).toBeInTheDocument();
|
||||
expect(screen.getByText("+4,9 %")).toBeInTheDocument();
|
||||
expect(screen.getByText("Опережение рынка")).toBeInTheDocument();
|
||||
expect(screen.getByText("+5,1 п.п.")).toBeInTheDocument();
|
||||
expect(screen.getByText("+11 000 ₽")).toBeInTheDocument();
|
||||
// Index codes are allowed only inside "Как считали", not as captions.
|
||||
expect(screen.getByText("Те же деньги в индексе Мосбиржи")).toBeInTheDocument();
|
||||
expect(screen.queryByText("MCFTRR")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("labels lagging the market without colour-only meaning", async () => {
|
||||
renderTab({
|
||||
data: performance({
|
||||
outperformance: { money: rub("-5000"), percentagePoints: "-0.02" },
|
||||
}),
|
||||
meta,
|
||||
});
|
||||
|
||||
expect(await screen.findByText("Отставание от рынка")).toBeInTheDocument();
|
||||
expect(screen.getByText("−2,0 п.п.")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("never says annual when history is shorter than a year", async () => {
|
||||
renderTab({
|
||||
data: performance({
|
||||
benchmark: { ...performance().benchmark, return: { basis: "period", unavailableReason: null, value: "0.05" } },
|
||||
period: { days: 200, from: "2025-06-14", to: "2025-12-31" },
|
||||
return: { basis: "period", unavailableReason: null, value: "0.07" },
|
||||
}),
|
||||
meta,
|
||||
});
|
||||
|
||||
expect(await screen.findByText(/проценты показаны за 200 дн\./)).toBeInTheDocument();
|
||||
expect(screen.queryByText(/годовых/)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("lists excluded accounts when the all-accounts result is incomplete", async () => {
|
||||
renderTab({
|
||||
data: performance({
|
||||
completeness: "incomplete",
|
||||
excludedAccounts: [{ accountId: "usd", name: "Валютный", reason: "PORTFOLIO_VALUATION_INCOMPLETE" }],
|
||||
}),
|
||||
meta,
|
||||
});
|
||||
|
||||
expect(await screen.findByText("Результат неполный")).toBeInTheDocument();
|
||||
expect(screen.getByText("Валютный: Нет полной оценки портфеля")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("explains unavailability instead of showing zeros, including unknown reasons", async () => {
|
||||
renderTab({
|
||||
data: null,
|
||||
meta: {
|
||||
dependencies: [],
|
||||
unavailable: [
|
||||
{ accountId: "iis", name: "ИИС", reason: "HISTORY_START_UNKNOWN" },
|
||||
{ accountId: "x", name: "Новый", reason: "SOMETHING_NEW" },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
expect(await screen.findByText("Доходность недоступна")).toBeInTheDocument();
|
||||
expect(screen.getByText("ИИС: Начало истории счёта неизвестно")).toBeInTheDocument();
|
||||
expect(screen.getByText("Новый: Причину недоступности не удалось определить")).toBeInTheDocument();
|
||||
expect(screen.queryByText(/0,0 %/)).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("keeps profit and hides the comparison when the index is unavailable", async () => {
|
||||
renderTab({
|
||||
data: performance({
|
||||
benchmark: {
|
||||
asOf: null,
|
||||
code: "MCFTRR",
|
||||
return: { basis: "annual", unavailableReason: "INDEX_HISTORY_UNAVAILABLE", value: null },
|
||||
unavailableReason: "INDEX_HISTORY_UNAVAILABLE",
|
||||
value: null,
|
||||
},
|
||||
outperformance: null,
|
||||
series: [],
|
||||
}),
|
||||
meta,
|
||||
});
|
||||
|
||||
expect(await screen.findByText("+21 000 ₽")).toBeInTheDocument();
|
||||
expect(screen.getByText("Сравнение с индексом сейчас недоступно")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("does not colour or call a rounded-to-zero difference outperformance", async () => {
|
||||
renderTab({
|
||||
data: performance({
|
||||
outperformance: { money: rub("0"), percentagePoints: "-0.0004" },
|
||||
}),
|
||||
meta,
|
||||
});
|
||||
|
||||
expect(await screen.findByText("Сравнение с рынком")).toBeInTheDocument();
|
||||
expect(screen.getByText("0,0 п.п.")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("explains a pending sync when no account reasons are available", async () => {
|
||||
renderTab({ data: null, meta });
|
||||
|
||||
expect(await screen.findByText(/ещё синхронизируются/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows a local error with retry", async () => {
|
||||
renderTab({ code: "INTERNAL_SERVER_ERROR", status: 500 }, 500);
|
||||
|
||||
expect(await screen.findByText("Не удалось загрузить результат инвестирования", {}, { timeout: 8000 })).toBeInTheDocument();
|
||||
server.use(http.get(
|
||||
url,
|
||||
() => HttpResponse.json({ data: performance(), meta }),
|
||||
));
|
||||
fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
|
||||
expect(await screen.findByText("+10,0 %")).toBeInTheDocument();
|
||||
}, 10_000);
|
||||
});
|
||||
@@ -0,0 +1,66 @@
|
||||
import { Button, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { usePerformance } from "@/entities/performance";
|
||||
|
||||
import { reasonText } from "../../../../model/performance";
|
||||
import { PerformanceView } from "./Performance.view";
|
||||
|
||||
function PerformanceTab({ accountId }: Readonly<{ accountId: string }>) {
|
||||
const { t } = useTranslation();
|
||||
const query = usePerformance(accountId);
|
||||
|
||||
if (query.isPending) return (
|
||||
<Stack aria-label={t("portfolio.performance.returnLabel")} gap="md">
|
||||
<SimpleGrid cols={{ base: 1, lg: 4, sm: 2 }}>
|
||||
{["rate", "profit", "benchmark", "difference"].map(key => (
|
||||
<Paper key={key} p="md" withBorder>
|
||||
<Skeleton h={14} mb="sm" w="60%" />
|
||||
|
||||
<Skeleton h={28} w="80%" />
|
||||
</Paper>
|
||||
))}
|
||||
</SimpleGrid>
|
||||
|
||||
<Skeleton h={220} />
|
||||
</Stack>
|
||||
);
|
||||
|
||||
const onRetry = () => {
|
||||
void query.refetch();
|
||||
};
|
||||
|
||||
if (query.isError) return (
|
||||
<Paper p="lg" withBorder>
|
||||
<Stack align="flex-start" gap="sm">
|
||||
<Text>{t("portfolio.performance.error")}</Text>
|
||||
|
||||
<Button onClick={onRetry} variant="light">
|
||||
{t("portfolio.performance.retry")}
|
||||
</Button>
|
||||
</Stack>
|
||||
</Paper>
|
||||
);
|
||||
if (!query.data.data) return (
|
||||
<Paper p="xl" withBorder>
|
||||
<Title order={2} size="h4">{t("portfolio.performance.unavailable")}</Title>
|
||||
|
||||
{query.data.meta.unavailable.length === 0 && (
|
||||
<Text c="dimmed" mt="sm">{t("portfolio.performance.syncing")}</Text>
|
||||
)}
|
||||
|
||||
{query.data.meta.unavailable.map(item => (
|
||||
<Text c="dimmed" key={item.accountId} mt="sm">
|
||||
{t("portfolio.performance.unavailableReason", {
|
||||
name: item.name,
|
||||
reason: reasonText(item.reason),
|
||||
})}
|
||||
</Text>
|
||||
))}
|
||||
</Paper>
|
||||
);
|
||||
|
||||
return <PerformanceView data={query.data.data} />;
|
||||
}
|
||||
|
||||
export { PerformanceTab };
|
||||
+32
-65
@@ -4,20 +4,20 @@ import type { Portfolio } from "@/entities/portfolio";
|
||||
|
||||
import { PortfolioStructure } from "./PortfolioStructure";
|
||||
|
||||
const rub: Portfolio["structure"]["currencies"][number] = {
|
||||
const rub: Portfolio["structure"] = {
|
||||
categories: [
|
||||
{ sharePercent: "52", type: "STOCK", value: "650000" },
|
||||
{ sharePercent: "30", type: "BOND", value: "375000" },
|
||||
{ sharePercent: "10", type: "OTHER", value: "125000" },
|
||||
{ sharePercent: "8", type: "CASH", value: "100000" },
|
||||
],
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "1250000",
|
||||
unvaluedCategories: [],
|
||||
};
|
||||
|
||||
const meta = {
|
||||
args: { structure: { currencies: [rub], unvaluedCategories: [] } },
|
||||
args: { structure: rub },
|
||||
component: PortfolioStructure,
|
||||
parameters: {
|
||||
docs: {
|
||||
@@ -28,7 +28,7 @@ const meta = {
|
||||
},
|
||||
},
|
||||
tags: ["autodocs"],
|
||||
title: "Widgets/PortfolioStructure",
|
||||
title: "Product/PortfolioStructure",
|
||||
} satisfies Meta<typeof PortfolioStructure>;
|
||||
|
||||
export default meta;
|
||||
@@ -36,60 +36,34 @@ export default meta;
|
||||
type Story = StoryObj<typeof meta>;
|
||||
|
||||
export const Regular: Story = {};
|
||||
export const MultipleCurrencies: Story = {
|
||||
args: {
|
||||
structure: {
|
||||
currencies: [
|
||||
rub,
|
||||
{
|
||||
categories: [{ sharePercent: "100", type: "CASH", value: "500" }],
|
||||
currency: "USD",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "500",
|
||||
},
|
||||
],
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
},
|
||||
};
|
||||
export const CashOnly: Story = {
|
||||
args: {
|
||||
structure: {
|
||||
currencies: [
|
||||
{
|
||||
categories: rub.categories.map(row => ({
|
||||
...row,
|
||||
sharePercent: row.type === "CASH" ? "100" : "0",
|
||||
value: row.type === "CASH" ? "100000" : "0",
|
||||
})),
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "100000",
|
||||
},
|
||||
],
|
||||
unvaluedCategories: [],
|
||||
...rub,
|
||||
categories: rub.categories.map(row => ({
|
||||
...row,
|
||||
sharePercent: row.type === "CASH" ? "100" : "0",
|
||||
value: row.type === "CASH" ? "100000" : "0",
|
||||
})),
|
||||
totalValue: "100000",
|
||||
},
|
||||
},
|
||||
};
|
||||
export const Empty: Story = {
|
||||
args: { structure: { currencies: [], unvaluedCategories: [] } },
|
||||
args: {
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
},
|
||||
};
|
||||
export const Incomplete: Story = {
|
||||
args: {
|
||||
structure: {
|
||||
currencies: [
|
||||
{
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
}),
|
||||
),
|
||||
},
|
||||
],
|
||||
...rub,
|
||||
categories: rub.categories.map(row => ({ ...row, sharePercent: null })),
|
||||
unvaluedCategories: [{ count: 2, type: "STOCK" }],
|
||||
},
|
||||
},
|
||||
@@ -97,7 +71,9 @@ export const Incomplete: Story = {
|
||||
export const UnknownOnly: Story = {
|
||||
args: {
|
||||
structure: {
|
||||
currencies: [],
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [{ count: 1, type: "BOND" }],
|
||||
},
|
||||
},
|
||||
@@ -105,23 +81,14 @@ export const UnknownOnly: Story = {
|
||||
export const Negative: Story = {
|
||||
args: {
|
||||
structure: {
|
||||
currencies: [
|
||||
{
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
value: row.type === "OTHER" ? "25000" : row.value,
|
||||
}),
|
||||
),
|
||||
hasNegativeValues: true,
|
||||
totalValue: "1150000",
|
||||
},
|
||||
],
|
||||
unvaluedCategories: [],
|
||||
...rub,
|
||||
categories: rub.categories.map(row => ({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
value: row.type === "OTHER" ? "25000" : row.value,
|
||||
})),
|
||||
hasNegativeValues: true,
|
||||
totalValue: "1150000",
|
||||
},
|
||||
},
|
||||
};
|
||||
+38
-65
@@ -1,21 +1,21 @@
|
||||
import { MantineProvider } from "@mantine/core";
|
||||
import { fireEvent, render, screen, within } from "@testing-library/react";
|
||||
import { render, screen, within } from "@testing-library/react";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import type { Portfolio } from "@/entities/portfolio";
|
||||
|
||||
import { PortfolioStructure } from "./PortfolioStructure";
|
||||
|
||||
const rub: Portfolio["structure"]["currencies"][number] = {
|
||||
const rub: Portfolio["structure"] = {
|
||||
categories: [
|
||||
{ sharePercent: "60", type: "STOCK", value: "60" },
|
||||
{ sharePercent: "20", type: "BOND", value: "20" },
|
||||
{ sharePercent: "0", type: "OTHER", value: "0" },
|
||||
{ sharePercent: "20", type: "CASH", value: "20" },
|
||||
],
|
||||
currency: "RUB",
|
||||
hasNegativeValues: false,
|
||||
totalValue: "100",
|
||||
unvaluedCategories: [],
|
||||
};
|
||||
|
||||
const ui = (structure: null | Portfolio["structure"] | undefined) => (
|
||||
@@ -39,7 +39,7 @@ describe("portfolio structure", () => {
|
||||
screen.queryByText(/Нет положительной стоимости/),
|
||||
).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole("list")).not.toBeInTheDocument();
|
||||
view.rerender(ui({ currencies: [rub], unvaluedCategories: [] }));
|
||||
view.rerender(ui(rub));
|
||||
expect(screen.getByRole("list")).toHaveTextContent("Акции60 ₽60 %");
|
||||
expect(
|
||||
screen.queryByText("Данные о структуре портфеля пока недоступны."),
|
||||
@@ -47,41 +47,23 @@ describe("portfolio structure", () => {
|
||||
},
|
||||
);
|
||||
it("shows exact server amounts and cash-inclusive shares without hovering", () => {
|
||||
render(ui({ currencies: [rub], unvaluedCategories: [] }));
|
||||
render(ui(rub));
|
||||
const list = screen.getByRole("list", { name: "Категории активов" });
|
||||
expect(list).toHaveTextContent("Акции60 ₽60 %");
|
||||
expect(list).toHaveTextContent("Свободные деньги20 ₽20 %");
|
||||
expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
|
||||
});
|
||||
it("switches currencies and falls back when a refresh removes the selection", () => {
|
||||
const usd = { ...rub, currency: "USD" };
|
||||
const view = render(ui({ currencies: [rub, usd], unvaluedCategories: [] }));
|
||||
fireEvent.click(
|
||||
screen.getByRole("combobox", { name: "Валюта структуры портфеля" }),
|
||||
);
|
||||
fireEvent.click(screen.getByRole("option", { name: "USD" }));
|
||||
expect(screen.getByRole("list")).toHaveTextContent("60 USD");
|
||||
expect(screen.getByRole("list")).not.toHaveTextContent("₽");
|
||||
view.rerender(ui({ currencies: [rub], unvaluedCategories: [] }));
|
||||
expect(screen.getByRole("list")).toHaveTextContent("60 ₽");
|
||||
expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
|
||||
});
|
||||
it("retains known amounts and names unvalued categories without inventing a zero", () => {
|
||||
render(
|
||||
ui({
|
||||
currencies: [
|
||||
{
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
}),
|
||||
),
|
||||
},
|
||||
],
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
}),
|
||||
),
|
||||
unvaluedCategories: [
|
||||
{ count: 2, type: "OTHER" },
|
||||
{ count: 1, type: "STOCK" },
|
||||
@@ -89,10 +71,8 @@ describe("portfolio structure", () => {
|
||||
}),
|
||||
);
|
||||
expect(screen.getByText(/Оценка неполная/)).toBeInTheDocument();
|
||||
expect(screen.getByRole("list")).toHaveTextContent("Известно: 60 ₽");
|
||||
expect(screen.getByRole("list")).toHaveTextContent(
|
||||
"Другие активыНет оценки",
|
||||
);
|
||||
expect(screen.getByRole("list")).toHaveTextContent("АкцииИзвестно: 60 ₽");
|
||||
expect(screen.getByRole("list")).toHaveTextContent("Другие активы");
|
||||
expect(
|
||||
screen.queryByLabelText(/Структура по типам/),
|
||||
).not.toBeInTheDocument();
|
||||
@@ -100,22 +80,16 @@ describe("portfolio structure", () => {
|
||||
it("keeps negative amounts visible without a donut or invented positive shares", () => {
|
||||
render(
|
||||
ui({
|
||||
currencies: [
|
||||
{
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
value: row.type === "STOCK" ? "-60" : row.value,
|
||||
}),
|
||||
),
|
||||
hasNegativeValues: true,
|
||||
},
|
||||
],
|
||||
unvaluedCategories: [],
|
||||
...rub,
|
||||
categories: rub.categories.map(
|
||||
row =>
|
||||
({
|
||||
...row,
|
||||
sharePercent: null,
|
||||
value: row.type === "STOCK" ? "-60" : row.value,
|
||||
}),
|
||||
),
|
||||
hasNegativeValues: true,
|
||||
}),
|
||||
);
|
||||
expect(screen.getByText(/Есть отрицательные/)).toBeInTheDocument();
|
||||
@@ -128,31 +102,30 @@ describe("portfolio structure", () => {
|
||||
).not.toBeInTheDocument();
|
||||
});
|
||||
it("handles unknown-only and empty compositions", () => {
|
||||
const view = render(
|
||||
ui({ currencies: [], unvaluedCategories: [{ count: 1, type: "BOND" }] }),
|
||||
render(
|
||||
ui({
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [{ count: 1, type: "BOND" }],
|
||||
}),
|
||||
);
|
||||
|
||||
expect(screen.getByText("Облигации: без оценки — 1")).toBeInTheDocument();
|
||||
expect(screen.queryByRole("list")).not.toBeInTheDocument();
|
||||
view.rerender(ui({ currencies: [], unvaluedCategories: [] }));
|
||||
expect(screen.getByText(/Нет положительной стоимости/)).toBeInTheDocument();
|
||||
});
|
||||
it("keeps full decimal amounts and describes tiny shares", () => {
|
||||
render(
|
||||
ui({
|
||||
currencies: [
|
||||
...rub,
|
||||
categories: [
|
||||
{
|
||||
...rub,
|
||||
categories: [
|
||||
{
|
||||
sharePercent: "0.000001",
|
||||
type: "CASH",
|
||||
value: "9007199254740993.000000001",
|
||||
},
|
||||
],
|
||||
sharePercent: "0.000001",
|
||||
type: "CASH",
|
||||
value: "9007199254740993.000000001",
|
||||
},
|
||||
],
|
||||
unvaluedCategories: [],
|
||||
totalValue: "9007199254740993.000000001",
|
||||
}),
|
||||
);
|
||||
expect(screen.getByRole("list")).toHaveTextContent(
|
||||
+3
-17
@@ -1,5 +1,5 @@
|
||||
import { DonutChart } from "@mantine/charts";
|
||||
import { Box, Group, Paper, Select, Stack, Text, Title } from "@mantine/core";
|
||||
import { Box, Group, Paper, Stack, Text, Title } from "@mantine/core";
|
||||
import { type FC, useId } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
@@ -7,11 +7,8 @@ import classes from "./PortfolioStructure.module.css";
|
||||
|
||||
type PortfolioStructureViewProps = {
|
||||
chartData: StructureRow[];
|
||||
currencies: string[];
|
||||
currency: null | string;
|
||||
incomplete: boolean;
|
||||
negative: boolean;
|
||||
onCurrencyChange: (currency: null | string) => void;
|
||||
rows: StructureRow[];
|
||||
unavailable: boolean;
|
||||
unvalued: string[];
|
||||
@@ -64,17 +61,6 @@ const PortfolioStructureView: FC<PortfolioStructureViewProps> = (props) => {
|
||||
<Title id={titleId} order={2} size="h4">
|
||||
{t("portfolio.structure.title")}
|
||||
</Title>
|
||||
|
||||
{props.currencies.length > 1 && (
|
||||
<Select
|
||||
allowDeselect={false}
|
||||
aria-label={t("portfolio.structure.currency")}
|
||||
data={props.currencies}
|
||||
onChange={props.onCurrencyChange}
|
||||
value={props.currency}
|
||||
w={112}
|
||||
/>
|
||||
)}
|
||||
</Group>
|
||||
|
||||
<Text c="dimmed" size="sm">
|
||||
@@ -110,11 +96,11 @@ const PortfolioStructureView: FC<PortfolioStructureViewProps> = (props) => {
|
||||
</Text>
|
||||
)}
|
||||
|
||||
<div className={appearanceClass} key={props.currency}>
|
||||
<div className={appearanceClass}>
|
||||
{props.chartData.length > 0 && (
|
||||
<DonutChart
|
||||
aria-label={t("portfolio.structure.chartLabel")}
|
||||
chartLabel={props.currency ?? undefined}
|
||||
chartLabel="₽"
|
||||
data={props.chartData}
|
||||
endAngle={-270}
|
||||
pieChartProps={{ title: t("portfolio.structure.chartLabel") }}
|
||||
+7
-22
@@ -1,6 +1,5 @@
|
||||
import type { TFunction } from "i18next";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import type { Portfolio } from "@/entities/portfolio";
|
||||
@@ -15,24 +14,15 @@ type PortfolioStructureProps = { structure?: null | Portfolio["structure"] };
|
||||
const usePortfolioStructureVm = (props: PortfolioStructureProps) => {
|
||||
const { structure } = props;
|
||||
const { t } = useTranslation();
|
||||
const [currency, setCurrency] = useState<null | string>(null);
|
||||
|
||||
const selected
|
||||
= structure?.currencies.find(item => item.currency === currency)
|
||||
?? structure?.currencies[0];
|
||||
|
||||
const isIncomplete = (structure?.unvaluedCategories.length ?? 0) > 0;
|
||||
const rows = portfolioRows(selected, structure, t);
|
||||
const rows = portfolioRows(structure, t);
|
||||
const chartData = rows.filter(row => row.value > 0);
|
||||
|
||||
return {
|
||||
chartData,
|
||||
currencies: structure?.currencies.map(item => item.currency) ?? [],
|
||||
|
||||
currency: selected?.currency ?? null,
|
||||
incomplete: isIncomplete,
|
||||
negative: selected?.hasNegativeValues ?? false,
|
||||
onCurrencyChange: setCurrency,
|
||||
negative: structure?.hasNegativeValues ?? false,
|
||||
rows,
|
||||
unavailable: !structure,
|
||||
unvalued:
|
||||
@@ -46,14 +36,12 @@ const usePortfolioStructureVm = (props: PortfolioStructureProps) => {
|
||||
};
|
||||
|
||||
function portfolioRows(
|
||||
selected:
|
||||
NonNullable<Portfolio["structure"]>["currencies"][number] | undefined,
|
||||
structure: PortfolioStructureProps["structure"],
|
||||
t: TFunction,
|
||||
) {
|
||||
if (!selected) return [];
|
||||
if (!structure) return [];
|
||||
|
||||
return selected.categories.map((category) => {
|
||||
return structure.categories.map((category) => {
|
||||
const presentation = portfolioCategoryPresentation[category.type];
|
||||
|
||||
const percentage
|
||||
@@ -61,16 +49,13 @@ function portfolioRows(
|
||||
? undefined
|
||||
: Number(category.sharePercent);
|
||||
|
||||
const unknown = structure?.unvaluedCategories.some(
|
||||
const isUnknown = structure.unvaluedCategories.some(
|
||||
item => item.type === category.type,
|
||||
);
|
||||
|
||||
let amount = formatMoney({
|
||||
currency: selected.currency,
|
||||
value: category.value,
|
||||
});
|
||||
let amount = formatMoney({ currency: "RUB", value: category.value });
|
||||
|
||||
if (unknown) {
|
||||
if (isUnknown) {
|
||||
amount
|
||||
= category.value === "0"
|
||||
? t("portfolio.structure.unvalued")
|
||||
@@ -1,6 +1,6 @@
|
||||
import { MantineProvider } from "@mantine/core";
|
||||
import { type QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
import { render, screen, waitFor } from "@testing-library/react";
|
||||
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||
import { http, HttpResponse } from "msw";
|
||||
import { MemoryRouter } from "react-router";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
@@ -31,16 +31,26 @@ function configureTestAuth() {
|
||||
});
|
||||
}
|
||||
|
||||
function portfolioSummary(totals: { currency: string; value: string }[]) {
|
||||
function portfolioSummary(totals: { currency: string; value: string }) {
|
||||
return {
|
||||
bondPositionCount: 1,
|
||||
cashBalances: [],
|
||||
cash: { currency: "RUB", value: "0" },
|
||||
fundPositionCount: 0,
|
||||
stockPositionCount: 0,
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
structure: {
|
||||
categories: [],
|
||||
hasNegativeValues: false,
|
||||
totalValue: "0",
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
totalPositionCount: 1,
|
||||
totalsByCurrency: totals,
|
||||
unrealizedReturnByCurrency: [],
|
||||
totals,
|
||||
unrealizedReturn: {
|
||||
absolute: "0",
|
||||
costBasis: "0",
|
||||
partial: false,
|
||||
percent: null,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -59,23 +69,18 @@ function renderPage(queryClient: QueryClient) {
|
||||
}
|
||||
|
||||
describe("AccountsPage", () => {
|
||||
it("summarizes currencies separately and reports excluded accounts", async () => {
|
||||
it("summarizes account totals and reports excluded accounts", async () => {
|
||||
server.use(http.get("*/api/v1/brokerage-accounts", () =>
|
||||
HttpResponse.json(resource([
|
||||
{
|
||||
...account,
|
||||
portfolioSummary: portfolioSummary([
|
||||
{ currency: "RUB", value: "100.10" },
|
||||
{ currency: "USD", value: "20" },
|
||||
]),
|
||||
portfolioSummary: portfolioSummary({ currency: "RUB", value: "100.10" }),
|
||||
},
|
||||
{
|
||||
...account,
|
||||
id: "account-2",
|
||||
name: "Второй",
|
||||
portfolioSummary: portfolioSummary([
|
||||
{ currency: "RUB", value: "50.20" },
|
||||
]),
|
||||
portfolioSummary: portfolioSummary({ currency: "RUB", value: "50.20" }),
|
||||
},
|
||||
{
|
||||
...account,
|
||||
@@ -88,9 +93,9 @@ describe("AccountsPage", () => {
|
||||
id: "account-4",
|
||||
name: "Только деньги",
|
||||
portfolioSummary: {
|
||||
...portfolioSummary([{ currency: "RUB", value: "25" }]),
|
||||
...portfolioSummary({ currency: "RUB", value: "25" }),
|
||||
bondPositionCount: 0,
|
||||
cashBalances: [{ currency: "RUB", value: "25" }],
|
||||
cash: { currency: "RUB", value: "25" },
|
||||
totalPositionCount: 0,
|
||||
},
|
||||
},
|
||||
@@ -99,7 +104,7 @@ describe("AccountsPage", () => {
|
||||
id: "account-5",
|
||||
name: "Без сумм",
|
||||
portfolioSummary: {
|
||||
...portfolioSummary([]),
|
||||
...portfolioSummary({ currency: "RUB", value: "0" }),
|
||||
totalPositionCount: 0,
|
||||
},
|
||||
},
|
||||
@@ -110,7 +115,8 @@ describe("AccountsPage", () => {
|
||||
renderPage(client);
|
||||
|
||||
expect(await screen.findByText("175,30 ₽")).toBeInTheDocument();
|
||||
expect(screen.getAllByText("20,00 USD")).not.toHaveLength(0);
|
||||
expect(screen.queryByText("Ваши инвестиции по счетам"))
|
||||
.not.toBeInTheDocument();
|
||||
expect(screen.getByText("5 счетов")).toBeInTheDocument();
|
||||
expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
|
||||
expect(screen.getByText(
|
||||
@@ -261,6 +267,101 @@ describe("AccountsPage", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
const RETRIES_EXHAUSTED_MS = 6000;
|
||||
const TEST_MS = 10_000;
|
||||
|
||||
describe("exhausted read retries", () => {
|
||||
it(
|
||||
"keeps the cached list, warns and retries the same accounts GET",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = false;
|
||||
let requests = 0;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts", () => {
|
||||
requests += 1;
|
||||
if (isFailing)
|
||||
return HttpResponse.json(
|
||||
{ code: "TBANK_UNAVAILABLE" },
|
||||
{ status: 503 },
|
||||
);
|
||||
|
||||
return HttpResponse.json(resource([account]));
|
||||
}),
|
||||
);
|
||||
const queryClient = createTestQueryClient();
|
||||
renderPage(queryClient);
|
||||
await screen.findByText("Основной");
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
|
||||
isFailing = true;
|
||||
void queryClient.invalidateQueries({
|
||||
queryKey: brokerageAccountsQueryKey,
|
||||
});
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
|
||||
expect(screen.getByText("Основной")).toBeInTheDocument();
|
||||
expect(requests).toBe(4);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.queryByText("Не удалось обновить данные"))
|
||||
.not.toBeInTheDocument());
|
||||
expect(requests).toBe(5);
|
||||
expect(screen.getByText("Основной")).toBeInTheDocument();
|
||||
},
|
||||
);
|
||||
|
||||
it(
|
||||
"offers retry on the unavailable state after an initial failure",
|
||||
{ timeout: TEST_MS },
|
||||
async () => {
|
||||
let isFailing = true;
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts", () =>
|
||||
isFailing
|
||||
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
|
||||
: HttpResponse.json(resource([account]))),
|
||||
);
|
||||
renderPage(createTestQueryClient());
|
||||
|
||||
const retry = await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: RETRIES_EXHAUSTED_MS },
|
||||
);
|
||||
|
||||
isFailing = false;
|
||||
fireEvent.click(retry);
|
||||
|
||||
expect(await screen.findByText("Основной")).toBeInTheDocument();
|
||||
},
|
||||
);
|
||||
|
||||
it("does not offer a plain retry when the connection is lost", async () => {
|
||||
server.use(
|
||||
http.get("*/api/v1/brokerage-accounts", () =>
|
||||
HttpResponse.json({ code: "TBANK_NOT_CONNECTED" }, { status: 409 })),
|
||||
);
|
||||
renderPage(createTestQueryClient());
|
||||
|
||||
expect(await screen.findByRole("link", { name: "Открыть настройки T-Bank" }))
|
||||
.toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||
.not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
it.each(["none", "failed"] as const)(
|
||||
"keeps incomplete empty membership distinct from no accounts (attempt=%s)",
|
||||
async (state) => {
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useAccountsPageViewModel } from "./AccountsPage.vm";
|
||||
import { useAccountsPageVm } from "./AccountsPage.vm";
|
||||
import { AccountsPageEmpty } from "./components/AccountsPageEmpty.view";
|
||||
import { AccountsPageError } from "./components/AccountsPageError.view";
|
||||
import { AccountsPageLoaded } from "./components/AccountsPageLoaded.view";
|
||||
import { AccountsPageLoading } from "./components/AccountsPageLoading.view";
|
||||
|
||||
const AccountsPage: FC = () => {
|
||||
const viewModel = useAccountsPageViewModel();
|
||||
if (viewModel.state === "loading") return <AccountsPageLoading />;
|
||||
if (viewModel.state === "error") return <AccountsPageError {...viewModel} />;
|
||||
if (viewModel.state === "empty") return <AccountsPageEmpty />;
|
||||
const vm = useAccountsPageVm();
|
||||
if (vm.state === "loading") return <AccountsPageLoading />;
|
||||
if (vm.state === "error") return <AccountsPageError {...vm} />;
|
||||
if (vm.state === "empty") return <AccountsPageEmpty />;
|
||||
|
||||
return (
|
||||
<AccountsPageLoaded
|
||||
accounts={viewModel.accounts}
|
||||
meta={viewModel.meta}
|
||||
accounts={vm.accounts}
|
||||
meta={vm.meta}
|
||||
readRetry={vm.readRetry}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -4,25 +4,38 @@ import {
|
||||
useBrokerageAccounts,
|
||||
} from "@/entities/brokerage-account";
|
||||
import { useScreenSync } from "@/features/tbank-connection";
|
||||
import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
|
||||
import {
|
||||
ApiErrorCode,
|
||||
apiErrorCode,
|
||||
isApiErrorCode,
|
||||
readRetry,
|
||||
} from "@/shared/api";
|
||||
import { useInitialAvailability } from "@/shared/lib";
|
||||
|
||||
type AccountsPageReadRetry = ReturnType<typeof readRetry>;
|
||||
|
||||
type AccountsPageViewModel
|
||||
= | { accounts: BrokerageAccountCard[]; meta: NonNullable<ReturnType<typeof useBrokerageAccounts>["meta"]>; state: "loaded" }
|
||||
| { code?: string; state: "error" }
|
||||
| { state: "empty" }
|
||||
| { state: "loading" };
|
||||
= | {
|
||||
accounts: BrokerageAccountCard[];
|
||||
meta: NonNullable<ReturnType<typeof useBrokerageAccounts>["meta"]>;
|
||||
readRetry: AccountsPageReadRetry;
|
||||
state: "loaded";
|
||||
}
|
||||
| { code?: string; readRetry: AccountsPageReadRetry; state: "error" }
|
||||
| { state: "empty" }
|
||||
| { state: "loading" };
|
||||
|
||||
function isAccountsAccessFailure(code?: string) {
|
||||
return isApiErrorCode(code, ApiErrorCode.InvalidTbankToken)
|
||||
|| isApiErrorCode(code, ApiErrorCode.TbankNotConnected);
|
||||
}
|
||||
|
||||
function useAccountsPageViewModel(): AccountsPageViewModel {
|
||||
function useAccountsPageVm(): AccountsPageViewModel {
|
||||
const accounts = useBrokerageAccounts();
|
||||
useScreenSync({ screen: "accounts" }, [accounts]);
|
||||
|
||||
const code = apiErrorCode(accounts.error);
|
||||
const retry = readRetry([accounts]);
|
||||
const isAccessFailure = isAccountsAccessFailure(code);
|
||||
|
||||
const hasResult = !!accounts.data
|
||||
@@ -36,12 +49,13 @@ function useAccountsPageViewModel(): AccountsPageViewModel {
|
||||
isFetching: accounts.isFetching,
|
||||
});
|
||||
|
||||
if (isAccessFailure) return { code, state: "error" as const };
|
||||
if (isAccessFailure)
|
||||
return { code, readRetry: retry, state: "error" as const };
|
||||
|
||||
if (!hasResult || !accounts.data)
|
||||
return {
|
||||
state: availability === "unavailable" ? "error" : "loading",
|
||||
} as const;
|
||||
return availability === "unavailable"
|
||||
? { code, readRetry: retry, state: "error" as const }
|
||||
: { state: "loading" as const };
|
||||
|
||||
if (accounts.data.length === 0)
|
||||
return {
|
||||
@@ -54,8 +68,9 @@ function useAccountsPageViewModel(): AccountsPageViewModel {
|
||||
return {
|
||||
accounts: brokerageAccountCards(accounts.data, meta.dependencies),
|
||||
meta,
|
||||
readRetry: retry,
|
||||
state: "loaded" as const,
|
||||
};
|
||||
}
|
||||
|
||||
export { useAccountsPageViewModel };
|
||||
export { useAccountsPageVm };
|
||||
|
||||
@@ -6,8 +6,12 @@ import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router";
|
||||
|
||||
import { ApiErrorCode, isApiErrorCode } from "@/shared/api";
|
||||
import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
|
||||
|
||||
type AccountsPageErrorProps = { code?: string };
|
||||
type AccountsPageErrorProps = {
|
||||
code?: string;
|
||||
readRetry?: ReadRetryProps;
|
||||
};
|
||||
|
||||
const AccountsPageError: FC<AccountsPageErrorProps> = (props) => {
|
||||
const { code } = props;
|
||||
@@ -38,8 +42,18 @@ const AccountsPageError: FC<AccountsPageErrorProps> = (props) => {
|
||||
/>
|
||||
);
|
||||
|
||||
const retry = props.readRetry?.exhausted
|
||||
? (
|
||||
<ReadRetryButton
|
||||
onRetry={props.readRetry.onRetry}
|
||||
retrying={props.readRetry.retrying}
|
||||
/>
|
||||
)
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<StateView
|
||||
action={retry}
|
||||
text={t("states.unavailableText")}
|
||||
title={t("states.unavailableTitle")}
|
||||
/>
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
.summary {
|
||||
min-width: 0;
|
||||
padding-bottom: var(--mantine-spacing-lg);
|
||||
border-bottom: 1px solid var(--wl-color-border);
|
||||
}
|
||||
|
||||
.primaryTotal {
|
||||
font-size: clamp(1.75rem, 4vw, 2.25rem);
|
||||
font-variant-numeric: tabular-nums;
|
||||
line-height: 1.2;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.otherTotal {
|
||||
font-variant-numeric: tabular-nums;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.meta {
|
||||
padding-top: var(--mantine-spacing-xs);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { Button, SimpleGrid, Stack, Text, Title } from "@mantine/core";
|
||||
import { Button, Group, Stack, Text, Title } from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router";
|
||||
|
||||
@@ -11,7 +11,9 @@ import {
|
||||
BrokerageAccountList,
|
||||
} from "@/entities/brokerage-account";
|
||||
import { formatMoney } from "@/shared/lib";
|
||||
import { SourceSyncStatus } from "@/shared/ui";
|
||||
import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
|
||||
|
||||
import classes from "./AccountsPageLoaded.module.css";
|
||||
|
||||
const DECIMAL_BASE = 10n;
|
||||
const DECIMAL_PART_COUNT = 2;
|
||||
@@ -20,36 +22,19 @@ const ZERO = 0n;
|
||||
type AccountsPageLoadedProps = {
|
||||
accounts: BrokerageAccountCard[];
|
||||
meta: InvestmentResourceMeta;
|
||||
readRetry?: ReadRetryProps;
|
||||
};
|
||||
|
||||
type Money = { currency: string; value: string };
|
||||
|
||||
function accountTotals(accounts: BrokerageAccountCard[]) {
|
||||
const values = new Map<string, string[]>();
|
||||
let excludedCount = 0;
|
||||
function accountTotals(accounts: BrokerageAccountCard[]): null | string {
|
||||
const values: string[] = [];
|
||||
|
||||
for (const { summary } of accounts) {
|
||||
if (summary.state === "empty") continue;
|
||||
if (summary.state !== "available") continue;
|
||||
|
||||
if (summary.state === "unavailable") {
|
||||
excludedCount += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
for (const total of summary.portfolio.totalsByCurrency) {
|
||||
values.set(total.currency, [
|
||||
...values.get(total.currency) ?? [],
|
||||
total.value,
|
||||
]);
|
||||
}
|
||||
values.push(summary.portfolio.totals.value);
|
||||
}
|
||||
|
||||
const totals: Money[] = Array.from(values, ([currency, amounts]) => ({
|
||||
currency,
|
||||
value: sumDecimals(amounts),
|
||||
}));
|
||||
|
||||
return { excludedCount, totals };
|
||||
return values.length > 0 ? sumDecimals(values) : null;
|
||||
}
|
||||
|
||||
function sumDecimals(values: string[]) {
|
||||
@@ -85,53 +70,50 @@ function sumDecimals(values: string[]) {
|
||||
|
||||
const AccountsPageLoaded: FC<AccountsPageLoadedProps> = (props) => {
|
||||
const { t } = useTranslation();
|
||||
const { excludedCount, totals } = accountTotals(props.accounts);
|
||||
const total = accountTotals(props.accounts);
|
||||
|
||||
const excludedCount = props.accounts.filter(
|
||||
account => account.summary.state === "unavailable",
|
||||
).length;
|
||||
|
||||
return (
|
||||
<Stack gap="lg">
|
||||
<Stack gap={4}>
|
||||
<Title order={1}>{t("accounts.title")}</Title>
|
||||
<Title order={1}>{t("accounts.title")}</Title>
|
||||
|
||||
<Stack className={classes.summary} gap="xs">
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("accounts.subtitle")}
|
||||
{t("accounts.currentValue")}
|
||||
</Text>
|
||||
</Stack>
|
||||
|
||||
<Stack gap="xs">
|
||||
<SimpleGrid cols={{ base: 1, xs: 2 }} spacing="xs">
|
||||
<Stack gap={4}>
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("accounts.currentValue")}
|
||||
</Text>
|
||||
|
||||
{totals.length > 0
|
||||
? totals.map(total => (
|
||||
<Text fw={700} key={total.currency} size="lg">
|
||||
{formatMoney(total, { withRoundedCents: true })}
|
||||
</Text>
|
||||
))
|
||||
: <Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>}
|
||||
</Stack>
|
||||
|
||||
<Stack gap={4}>
|
||||
<Text fw={600}>{t("accounts.count", {
|
||||
count: props.accounts.length,
|
||||
})}
|
||||
</Text>
|
||||
|
||||
{excludedCount > 0 && (
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("accounts.summaryExcluded", { count: excludedCount })}
|
||||
{total === null
|
||||
? (
|
||||
<Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>
|
||||
)
|
||||
: (
|
||||
<Text className={classes.primaryTotal} fw={700}>
|
||||
{formatMoney({ currency: "RUB", value: total }, { withRoundedCents: true })}
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</SimpleGrid>
|
||||
|
||||
<SourceSyncStatus
|
||||
lastAttempt={props.meta.lastAttempt}
|
||||
lastSuccessfulAt={props.meta.lastSuccessfulAt}
|
||||
stale={props.meta.freshness === "stale"}
|
||||
/>
|
||||
<Group className={classes.meta} gap="xs" wrap="wrap">
|
||||
<Text c="dimmed" size="xs">
|
||||
{t("accounts.count", { count: props.accounts.length })}
|
||||
</Text>
|
||||
|
||||
<SourceSyncStatus
|
||||
lastAttempt={props.meta.lastAttempt}
|
||||
lastSuccessfulAt={props.meta.lastSuccessfulAt}
|
||||
stale={props.meta.freshness === "stale"}
|
||||
/>
|
||||
</Group>
|
||||
|
||||
{excludedCount > 0 && (
|
||||
<Text c="dimmed" size="sm">
|
||||
{t("accounts.summaryExcluded", { count: excludedCount })}
|
||||
</Text>
|
||||
)}
|
||||
|
||||
{!!props.readRetry && <ReadRetry {...props.readRetry} />}
|
||||
</Stack>
|
||||
|
||||
<Button
|
||||
|
||||
@@ -347,14 +347,29 @@ describe("bond page", () => {
|
||||
it("keeps market content and sold-position history when coupons fail", async () => {
|
||||
setup({ failCoupons: true, noPosition: true });
|
||||
await screen.findByText("98,125 %");
|
||||
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
|
||||
expect(
|
||||
screen.queryByRole("heading", { name: "Моя позиция" }),
|
||||
).not.toBeInTheDocument();
|
||||
expect(
|
||||
screen.getByRole("heading", { name: "Моя история событий" }),
|
||||
screen.getByRole("heading", { name: "История операций" }),
|
||||
).toBeVisible();
|
||||
});
|
||||
it(
|
||||
"offers a local retry for the failed coupons section only",
|
||||
{ timeout: 10_000 },
|
||||
async () => {
|
||||
setup({ failCoupons: true });
|
||||
await screen.findByText("98,125 %");
|
||||
// Automatic read retries wait 1s + 2s before the failure is final.
|
||||
await screen.findByRole(
|
||||
"button",
|
||||
{ name: "Повторить" },
|
||||
{ timeout: 6000 },
|
||||
);
|
||||
expect(screen.getAllByRole("button", { name: "Повторить" })).toHaveLength(1);
|
||||
expect(screen.getByText("98,125 %")).toBeVisible();
|
||||
},
|
||||
);
|
||||
it("preserves cached quote without manual refresh", async () => {
|
||||
const controls = setup({ path: `/bonds/${uid}?period=year&events=trades` });
|
||||
await screen.findByText("98,125 %");
|
||||
|
||||
@@ -120,11 +120,52 @@ const useOperationFormVm = (props: OperationFormProps) => {
|
||||
body: { ...body, version },
|
||||
id: props.operation.id,
|
||||
});
|
||||
else
|
||||
await operationCreation.mutateAsync({
|
||||
else {
|
||||
const base = {
|
||||
amount: body.amount,
|
||||
cardId: values.cardId,
|
||||
date: values.date,
|
||||
description: values.description,
|
||||
id: intent,
|
||||
...body,
|
||||
});
|
||||
};
|
||||
|
||||
switch (values.kind) {
|
||||
case "expense": {
|
||||
await operationCreation.mutateAsync({
|
||||
...base,
|
||||
categoryId: values.categoryId || defaultCategoryId,
|
||||
kind: values.kind,
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
case "refund": {
|
||||
await operationCreation.mutateAsync({
|
||||
...base,
|
||||
kind: values.kind,
|
||||
originalExpenseId: values.originalExpenseId,
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
case "topup": {
|
||||
await operationCreation.mutateAsync({
|
||||
...base,
|
||||
kind: values.kind,
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
case "transfer": {
|
||||
await operationCreation.mutateAsync({
|
||||
...base,
|
||||
kind: values.kind,
|
||||
targetCardId: values.targetCardId,
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
notifications.show({
|
||||
id: "bank-operation-saved-" + actionId,
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useDocumentTitle } from "@mantine/hooks";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { AuthPageLayout, LoginForm } from "@/features/auth";
|
||||
import { useAppDocumentTitle } from "@/shared/ui";
|
||||
|
||||
const LoginPage: FC = () => {
|
||||
const { t } = useTranslation();
|
||||
useDocumentTitle(`${t("auth.login")} — ${t("appName")}`);
|
||||
useAppDocumentTitle(t("auth.login"));
|
||||
|
||||
return (
|
||||
<AuthPageLayout title={t("auth.login")}>
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { Button, Stack, Title } from "@mantine/core";
|
||||
import { useDocumentTitle } from "@mantine/hooks";
|
||||
import { StateView } from "@wealthledger/ui";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router";
|
||||
|
||||
import { useAppDocumentTitle } from "@/shared/ui";
|
||||
|
||||
const NotFoundPage: FC = () => {
|
||||
const { t } = useTranslation();
|
||||
useDocumentTitle(`${t("notFound.title")} — ${t("appName")}`);
|
||||
useAppDocumentTitle(t("notFound.title"));
|
||||
|
||||
return (
|
||||
<Stack>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { useDocumentTitle } from "@mantine/hooks";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { AuthPageLayout, RegisterForm } from "@/features/auth";
|
||||
import { useAppDocumentTitle } from "@/shared/ui";
|
||||
|
||||
const RegisterPage: FC = () => {
|
||||
const { t } = useTranslation();
|
||||
useDocumentTitle(`${t("auth.register")} — ${t("appName")}`);
|
||||
useAppDocumentTitle(t("auth.register"));
|
||||
|
||||
return (
|
||||
<AuthPageLayout title={t("auth.register")}>
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
import type { FC } from "react";
|
||||
|
||||
import { Button, Stack, Title } from "@mantine/core";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useAuth } from "@/features/auth";
|
||||
import { TbankConnectionSection } from "@/features/tbank-connection";
|
||||
|
||||
import { useSettingsPageVm } from "./SettingsPage.vm";
|
||||
|
||||
const SettingsPage: FC = () => {
|
||||
const { onLogout, t } = useSettingsPageVm();
|
||||
const { t } = useTranslation();
|
||||
const { logout } = useAuth();
|
||||
|
||||
// eslint-disable-next-line frontend/readability -- the page VM was removed as degenerate (frontend#143); a one-off error-swallowing logout is not a ViewModel.
|
||||
const onLogout = async () => {
|
||||
try {
|
||||
await logout();
|
||||
}
|
||||
catch {
|
||||
// The session is already cleared; the route guard owns navigation.
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Stack>
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { useAuth } from "@/features/auth";
|
||||
|
||||
function useSettingsPageVm() {
|
||||
const { t } = useTranslation();
|
||||
const { logout } = useAuth();
|
||||
|
||||
const onLogout = async () => {
|
||||
try {
|
||||
await logout();
|
||||
}
|
||||
catch {
|
||||
// The session is already cleared; the route guard owns navigation.
|
||||
}
|
||||
};
|
||||
|
||||
return { onLogout, t };
|
||||
}
|
||||
|
||||
export { useSettingsPageVm };
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user