From 64c6361ffd3f3e8d28142648634c70fe84d23c02 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 26 Jun 2023 13:09:50 +0300 Subject: [PATCH] fix build --- .../Form/ELT/Components/ReloadButton.tsx | 2 +- .../Calculation/Form/ELT/lib/config.tsx | 4 ++-- .../Form/Insurance/InsuranceTable/config.tsx | 2 +- .../Calculation/config/elements-props.tsx | 6 +++--- .../config/elements-render/override.tsx | 2 +- apps/web/package.json | 4 ++-- packages/ui/package.json | 4 ++-- yarn.lock | 20 +++++++++++++++++-- 8 files changed, 30 insertions(+), 14 deletions(-) diff --git a/apps/web/Components/Calculation/Form/ELT/Components/ReloadButton.tsx b/apps/web/Components/Calculation/Form/ELT/Components/ReloadButton.tsx index bc8a9ec..ed142cd 100644 --- a/apps/web/Components/Calculation/Form/ELT/Components/ReloadButton.tsx +++ b/apps/web/Components/Calculation/Form/ELT/Components/ReloadButton.tsx @@ -19,7 +19,7 @@ export const ReloadButton = observer( disabled={hasErrors} loading={rows.some((x) => x.status === 'fetching')} shape="circle" - icon={} + icon={} /> ); diff --git a/apps/web/Components/Calculation/Form/ELT/lib/config.tsx b/apps/web/Components/Calculation/Form/ELT/lib/config.tsx index 7084f1e..05ee967 100644 --- a/apps/web/Components/Calculation/Form/ELT/lib/config.tsx +++ b/apps/web/Components/Calculation/Form/ELT/lib/config.tsx @@ -41,13 +41,13 @@ export const columns: ColumnsType = [ if (record.status === 'fetching') return ( - + ); if (record.status === 'error') return ( - + ); diff --git a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx index 1b9b9c3..6761ef7 100644 --- a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx +++ b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx @@ -22,7 +22,7 @@ export const columns: ColumnsType = [ (record.key === 'osago' && $tables.elt.osago.getSelectedRow?.key) || (record.key === 'kasko' && $tables.elt.kasko.getSelectedRow?.key) ) { - return ; + return ; } return null; diff --git a/apps/web/Components/Calculation/config/elements-props.tsx b/apps/web/Components/Calculation/config/elements-props.tsx index a962c31..b6e7536 100644 --- a/apps/web/Components/Calculation/config/elements-props.tsx +++ b/apps/web/Components/Calculation/config/elements-props.tsx @@ -411,12 +411,12 @@ const props: Partial = { btnCreateKP: { type: 'primary', children: 'Создать КП', - icon: , + icon: , }, btnCreateKPMini: { children: '', type: 'primary', - icon: , + icon: , block: true, }, tbxCreditRate: { @@ -503,7 +503,7 @@ const props: Partial = { width: '100%', }, }, - linkDownloadKp: { children: 'Скачать КП', icon: , type: 'primary' }, + linkDownloadKp: { children: 'Скачать КП', icon: , type: 'primary' }, tbxMileage: { min: 0, step: 100, diff --git a/apps/web/Components/Calculation/config/elements-render/override.tsx b/apps/web/Components/Calculation/config/elements-render/override.tsx index 732ec45..94a0b32 100644 --- a/apps/web/Components/Calculation/config/elements-render/override.tsx +++ b/apps/web/Components/Calculation/config/elements-render/override.tsx @@ -348,7 +348,7 @@ const overrideRender: Partial> = { } + addonBefore={isFetching && } /> diff --git a/apps/web/package.json b/apps/web/package.json index 45fd3a0..c156ee3 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -46,8 +46,8 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", "@types/node": "^18.14.2", - "@types/react": "^18.0.28", - "@types/react-dom": "^18.0.11", + "@types/react": "^18.2.14", + "@types/react-dom": "^18.2.6", "@types/styled-components": "^5.1.26", "eslint": "^8.43.0", "eslint-config-custom": "*", diff --git a/packages/ui/package.json b/packages/ui/package.json index bfb7468..0a9de69 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -8,8 +8,8 @@ "lint": "TIMING=1 eslint \"**/*.ts*\"" }, "devDependencies": { - "@types/react": "^18.0.28", - "@types/react-dom": "^18.0.11", + "@types/react": "^18.2.14", + "@types/react-dom": "^18.2.6", "@types/rebass": "^4.0.10", "@types/styled-components": "^5.1.26", "eslint": "^8.43.0", diff --git a/yarn.lock b/yarn.lock index 423b0be..bf1db35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2404,14 +2404,21 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.11": +"@types/react-dom@^18.0.0": version "18.0.11" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33" integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.28": +"@types/react-dom@^18.2.6": + version "18.2.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.6.tgz#ad621fa71a8db29af7c31b41b2ea3d8a6f4144d1" + integrity sha512-2et4PDvg6PVCyS7fuTc4gPoksV58bW0RwSxWKcPRcHZf0PRUGq03TKcD/rUHe3azfV6/5/biUBJw+HhCQjaP0A== + dependencies: + "@types/react" "*" + +"@types/react@*": version "18.0.28" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== @@ -2420,6 +2427,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^18.2.14": + version "18.2.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.14.tgz#fa7a6fecf1ce35ca94e74874f70c56ce88f7a127" + integrity sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/rebass@^4.0.10": version "4.0.10" resolved "https://registry.yarnpkg.com/@types/rebass/-/rebass-4.0.10.tgz#f7a819d039349c138f279d2104986d7604a85528"