From 4be5a9fdaa939119593c4df8c57523b6ad3a63e1 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:08:10 +0300 Subject: [PATCH] Fix deps --- rsconcept/frontend/package.json | 3 +-- .../frontend/src/pages/RSFormsPage/RSFormsTable.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json index 7b4f8c10..2e694f91 100644 --- a/rsconcept/frontend/package.json +++ b/rsconcept/frontend/package.json @@ -54,7 +54,6 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-react": "^7.33.0", "eslint-plugin-simple-import-sort": "^10.0.0", - "tailwindcss": "^3.3.2", - "typescript": "^5.1.6" + "tailwindcss": "^3.3.2" } } diff --git a/rsconcept/frontend/src/pages/RSFormsPage/RSFormsTable.tsx b/rsconcept/frontend/src/pages/RSFormsPage/RSFormsTable.tsx index 769bfbe6..88b48952 100644 --- a/rsconcept/frontend/src/pages/RSFormsPage/RSFormsTable.tsx +++ b/rsconcept/frontend/src/pages/RSFormsPage/RSFormsTable.tsx @@ -1,16 +1,16 @@ -import { IRSForm } from '../../utils/models' -import { useNavigate } from 'react-router-dom'; import { useMemo } from 'react'; import { useIntl } from 'react-intl'; +import { useNavigate } from 'react-router-dom'; + import DataTableThemed from '../../components/Common/DataTableThemed'; import { useUsers } from '../../context/UsersContext'; - +import { type IRSForm } from '../../utils/models' interface RSFormsTableProps { schemas: IRSForm[] } -function RSFormsTable({schemas}: RSFormsTableProps) { +function RSFormsTable({ schemas }: RSFormsTableProps) { const navigate = useNavigate(); const intl = useIntl(); const { getUserLabel } = useUsers(); @@ -19,7 +19,7 @@ function RSFormsTable({schemas}: RSFormsTableProps) { navigate(`/rsforms/${schema.id}`); }; - const columns = useMemo(() => + const columns = useMemo(() => [ { name: 'Шифр', @@ -40,7 +40,7 @@ function RSFormsTable({schemas}: RSFormsTableProps) { { name: 'Владелец', id: 'owner', - selector: (schema: IRSForm) => schema.owner || 0, + selector: (schema: IRSForm) => schema.owner ?? 0, format: (schema: IRSForm) => { return getUserLabel(schema.owner); },