ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 04:50:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/IRBorisov/ConceptPortal

Browse Source
This commit is contained in:
Ulle9 2023-07-26 11:01:29 +03:00
commit a669f70efc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rsconcept/frontend/package.json
View File

@ -54,7 +54,6 @@
"eslint-plugin-promise": "^6.1.1", "eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.0", "eslint-plugin-react": "^7.33.0",
"eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-simple-import-sort": "^10.0.0",
"tailwindcss": "^3.3.2", "tailwindcss": "^3.3.2"
"typescript": "^5.1.6"
} }
} }

10
rsconcept/frontend/src/pages/RSFormsPage/RSFormsTable.tsx
View File

@ -1,10 +1,10 @@
import { IRSForm } from '../../utils/models'
import { useNavigate } from 'react-router-dom';
import { useMemo } from 'react'; import { useMemo } from 'react';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import { useNavigate } from 'react-router-dom';
import DataTableThemed from '../../components/Common/DataTableThemed'; import DataTableThemed from '../../components/Common/DataTableThemed';
import { useUsers } from '../../context/UsersContext'; import { useUsers } from '../../context/UsersContext';
import { type IRSForm } from '../../utils/models'
interface RSFormsTableProps { interface RSFormsTableProps {
schemas: IRSForm[] schemas: IRSForm[]
@ -19,7 +19,7 @@ function RSFormsTable({ schemas }: RSFormsTableProps) {
navigate(`/rsforms/${schema.id}`); navigate(`/rsforms/${schema.id}`);
}; };
const columns = useMemo(() => const columns = useMemo(() =>
[ [
{ {
name: 'Шифр', name: 'Шифр',
@ -40,7 +40,7 @@ function RSFormsTable({ schemas }: RSFormsTableProps) {
{ {
name: 'Владелец', name: 'Владелец',
id: 'owner', id: 'owner',
selector: (schema: IRSForm) => schema.owner || 0, selector: (schema: IRSForm) => schema.owner ?? 0,
format: (schema: IRSForm) => { format: (schema: IRSForm) => {
return getUserLabel(schema.owner); return getUserLabel(schema.owner);
}, },