Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/MWB12-33-fix1 #399

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Typography from '@mui/material/Typography';

import {Scrollbar} from 'src/components/scrollbar';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "../../components/table-pagination";
import TablePagination from "../../components/table-pagination-pages";
import {useAuth} from "../../../hooks/use-auth";
import {securityApi} from "../../../api/security";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import ConfirmDialog from "src/components/app/dialog/confirm-dialog";
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";

export const ListTableRow = (props) => {
const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import {ChevronButton} from 'src/sections/components/chevron-button';
import {FormCodeTextArea} from "src/components/app/form/code-text-area";
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
import {genericTripleMapFragmentsApi} from "src/api/triple-map-fragments/generic";
import {sparqlTestFileResourcesApi} from "src/api/sparql-test-suites/file-resources";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TableCell from '@mui/material/TableCell';
import TableHead from '@mui/material/TableHead';
import TableRow from '@mui/material/TableRow';
import {Scrollbar} from 'src/components/scrollbar';
import TablePagination from "../../components/table-pagination";
import TablePagination from "../../components/table-pagination-pages";
import TableSorterHeader from "../../components/table-sorter-header";


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import {ChevronButton} from 'src/sections/components/chevron-button';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {ChevronButton} from 'src/sections/components/chevron-button';
import {FileUploader} from "src/sections/app/file-manager/file-uploader";
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
import {ListFileCollectionActions} from "src/components/app/list/list-file-collection-actions";
import {MappingPackagesBulkAssigner} from "src/sections/app/mapping-package/components/mapping-packages-bulk-assigner";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import TableBody from '@mui/material/TableBody';
import {Scrollbar} from 'src/components/scrollbar';
import {ItemListCard} from './item-list-card';
import {ItemListRow} from './item-list-row';
import TablePagination from "../../components/table-pagination";
import TablePagination from "../../components/table-pagination-pages";

export const ItemList = (props) => {
const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {mappingPackagesApi} from "src/api/mapping-packages";
import {PropertyListItem} from "src/components/property-list-item";
import {ChevronButton} from 'src/sections/components/chevron-button';
import ConfirmDialog from "src/components/app/dialog/confirm-dialog";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {MenuActions, MenuActionButton} from 'src/components/menu-actions';
import {ListItemActions} from "src/components/app/list/list-item-actions";
import TableSorterHeader from 'src/sections/components/table-sorter-header';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ItemListRow} from './item-list-row';
import {ItemListCard} from './item-list-card';
import {Scrollbar} from 'src/components/scrollbar';
import {TableNoData} from '../shacl-validation-report/utils';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";

export const ItemList = (props) => {
const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {ChevronButton} from 'src/sections/components/chevron-button';
import CodeMirrorDefault from 'src/components/app/form/codeMirrorDefault';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {genericTripleMapFragmentsApi} from 'src/api/triple-map-fragments/generic';
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {ChevronButton} from 'src/sections/components/chevron-button';
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
import {MappingPackageProcessForm} from './components/mapping-package-process-form';
import {MappingPackagesBulkActions} from './components/mapping-packages-bulk-actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import exportPackage from "src/utils/export-mapping-package";
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';

export const ListTable = (props) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import TableHead from '@mui/material/TableHead';
import Typography from '@mui/material/Typography';

import {Scrollbar} from 'src/components/scrollbar';
import TablePagination from 'src/sections/components/table-pagination';
import TablePagination from 'src/sections/components/table-pagination-pages';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import {toastError, toastLoad, toastSuccess} from "src/components/app-toast";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {Scrollbar} from 'src/components/scrollbar';
import {MenuActions} from 'src/components/menu-actions';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import TableSorterHeader from 'src/sections/components/table-sorter-header';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {toastError, toastLoad, toastSuccess} from "src/components/app-toast";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import CardContent from '@mui/material/CardContent';

import {Scrollbar} from 'src/components/scrollbar';
import {ChevronButton} from 'src/sections/components/chevron-button';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import TableSorterHeader from "src/sections/components/table-sorter-header";


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {PropertyListItem} from 'src/components/property-list-item';
import {ChevronButton} from 'src/sections/components/chevron-button';
import {ListItemActions} from 'src/components/app/list/list-item-actions';
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import TableSorterHeader from "src/sections/components/table-sorter-header";
import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import TableRow from '@mui/material/TableRow';

import {Scrollbar} from 'src/components/scrollbar';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import TablePagination from 'src/sections/components/table-pagination';
import TablePagination from 'src/sections/components/table-pagination-pages';
import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";

export const LocalHighlighter = ({text, language, theme}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {ValueChip} from '../xpath-validation-report/utils';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import {Prism as SyntaxHighlighter} from 'react-syntax-highlighter';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
import {LocalHighlighter} from "./list-table-file";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {Scrollbar} from 'src/components/scrollbar';
import {getValidationColor} from '../mapping-package/state/utils';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme"
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";

const Condition = ({text, value}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {Scrollbar} from 'src/components/scrollbar';
import {ValueChip} from '../xpath-validation-report/utils';
import {getValidationColor} from '../mapping-package/state/utils';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";

const ResultCell = ({item, onClick}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {ListItemActions} from 'src/components/app/list/list-item-actions';

import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
import {mappingPackagesApi} from "../../../api/mapping-packages";
import TablePagination from "../../components/table-pagination";
import TablePagination from "../../components/table-pagination-pages";
import timeTransformer from "../../../utils/time-transformer";
import {useGlobalState} from "../../../hooks/use-global-state";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {SeverityPill} from "src/components/severity-pill";
import {ChevronButton} from 'src/sections/components/chevron-button';
import {MenuActionButton, MenuActions} from 'src/components/menu-actions';
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {mapStatusColor, TaskActions, TaskLine, taskProgressStatus as taskStatuses} from "./task-actions";
import {Box} from "@mui/system";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import DialogContentText from "@mui/material/DialogContentText";

import {Scrollbar} from 'src/components/scrollbar';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import TableSorterHeader from "src/sections/components/table-sorter-header";
import {TableFilterHeader} from "../../../layouts/app/table-filter-header/table-filter-header";
import {getValidationColor} from '../mapping-package/state/utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Scrollbar} from 'src/components/scrollbar';
import {getValidationColor} from '../mapping-package/state/utils';
import {useHighlighterTheme} from "src/hooks/use-highlighter-theme";
import TableSorterHeader from "src/sections/components/table-sorter-header";
import TablePagination from "src/sections/components/table-pagination";
import TablePagination from "src/sections/components/table-pagination-pages";
import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";

export const ListTable = (props) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Typography from '@mui/material/Typography';
import {useState} from 'react';

import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
Expand Down Expand Up @@ -26,6 +27,9 @@ const TablePagination = ({
setRppAnchor(null)
}

const startPagedItems = rowsPerPage * page + 1
const endPagedItems = rowsPerPage * (page + 1)

return (
<>
{/*<Pagination color='primary'*/}
Expand All @@ -34,6 +38,11 @@ const TablePagination = ({
<Stack direction='row'
alignItems='center'
justifyContent='end'>
{!!count &&
<Typography sx={{
fontSize: 14,
mb: .1
}}>{`${startPagedItems}-${endPagedItems > count ? count : endPagedItems}`}</Typography>}
<Tooltip title='rows per page'>
<Button endIcon={<KeyboardArrowDownIcon/>}
onClick={e => setRppAnchor(e.target)}>
Expand All @@ -60,7 +69,7 @@ const TablePagination = ({
</Popover>
<Pagination color='primary'
page={page + 1}
onChange={(e,page) => onPageChange(e,page - 1)}
onChange={(e, page) => onPageChange(e, page - 1)}
count={Math.ceil(count / (rowsPerPage > 0 ? rowsPerPage : count))}
{...otherProps}/>
</Stack>
Expand Down
Loading