Merge pull request #385 from meaningfy-ws/feature/MWB12-33

feature/MWB12-33
meaningfy-ws · Jan 29, 2025 · 1b9755a · 1b9755a
2 parents 747b887 + a673c76
commit 1b9755a
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 29 deletions.
diff --git a/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/develop/list-table.js b/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/develop/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 
 export const ListTableRow = (props) => {
     const {

diff --git a/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/list-table.js b/mapping_workbench/frontend/src/sections/app/conceptual-mapping-rule/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 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";

diff --git a/mapping_workbench/frontend/src/sections/app/fields-registry/list-table.js b/mapping_workbench/frontend/src/sections/app/fields-registry/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
 
 

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-list-table.js b/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 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";

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/test-data-collection-list-table.js b/mapping_workbench/frontend/src/sections/app/file-manager/test-data-collection-list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 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';

diff --git a/mapping_workbench/frontend/src/sections/app/files-form/item-list.js b/mapping_workbench/frontend/src/sections/app/files-form/item-list.js
@@ -6,11 +6,11 @@ import Stack from '@mui/material/Stack';
 import Table from '@mui/material/Table';
 import TableBody from '@mui/material/TableBody';
 
+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 {ItemListCard} from './item-list-card';
-import {ItemListRow} from './item-list-row';
-import TablePagination from "../../components/table-pagination-pages";
+import TablePagination from "src/sections/components/table-pagination";
 
 export const ItemList = (props) => {
         const {

diff --git a/mapping_workbench/frontend/src/sections/app/generic-triple-map-fragment/list-table.js b/mapping_workbench/frontend/src/sections/app/generic-triple-map-fragment/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {genericTripleMapFragmentsApi} from 'src/api/triple-map-fragments/generic';
 import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
 import {

diff --git a/mapping_workbench/frontend/src/sections/app/mapping-package/list-table.js b/mapping_workbench/frontend/src/sections/app/mapping-package/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 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';

diff --git a/mapping_workbench/frontend/src/sections/app/mapping-package/state/list-table.js b/mapping_workbench/frontend/src/sections/app/mapping-package/state/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
 
 export const ListTable = (props) => {

diff --git a/mapping_workbench/frontend/src/sections/app/ontology-namespace-custom/list-table.js b/mapping_workbench/frontend/src/sections/app/ontology-namespace-custom/list-table.js
@@ -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-pages';
+import TablePagination from 'src/sections/components/table-pagination';
 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";

diff --git a/mapping_workbench/frontend/src/sections/app/ontology-namespace/list-table.js b/mapping_workbench/frontend/src/sections/app/ontology-namespace/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {toastError, toastLoad, toastSuccess} from "src/components/app-toast";
 import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
 

diff --git a/mapping_workbench/frontend/src/sections/app/ontology-term/list-table.js b/mapping_workbench/frontend/src/sections/app/ontology-term/list-table.js
@@ -12,12 +12,9 @@ import Typography from '@mui/material/Typography';
 import CardContent from '@mui/material/CardContent';
 
 import {Scrollbar} from 'src/components/scrollbar';
-import {ListItemActions} from 'src/components/app/list/list-item-actions';
-import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
-import {MenuActions} from '../../../components/menu-actions';
-import {ChevronButton} from '../../components/chevron-button';
-import TablePagination from "../../components/table-pagination-pages";
-import TableSorterHeader from "../../components/table-sorter-header";
+import {ChevronButton} from 'src/sections/components/chevron-button';
+import TablePagination from "src/sections/components/table-pagination";
+import TableSorterHeader from "src/sections/components/table-sorter-header";
 
 
 export const ListTable = (props) => {

diff --git a/mapping_workbench/frontend/src/sections/app/project/list-table.js b/mapping_workbench/frontend/src/sections/app/project/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import TableSorterHeader from "src/sections/components/table-sorter-header";
 import {ForListItemAction} from 'src/contexts/app/section/for-list-item-action';
 

diff --git a/mapping_workbench/frontend/src/sections/app/shacl-validation-report/list-table-file.js b/mapping_workbench/frontend/src/sections/app/shacl-validation-report/list-table-file.js
@@ -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-pages';
+import TablePagination from 'src/sections/components/table-pagination';
 import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
 
 const LocalHighlighter = ({text, language, theme}) => {

diff --git a/mapping_workbench/frontend/src/sections/app/shacl-validation-report/list-table.js b/mapping_workbench/frontend/src/sections/app/shacl-validation-report/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
 
 export const ListTable = (props) => {

diff --git a/mapping_workbench/frontend/src/sections/app/sparql-validation-report/list-table-file.js b/mapping_workbench/frontend/src/sections/app/sparql-validation-report/list-table-file.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
 
 const Condition = ({text, value}) => {

diff --git a/mapping_workbench/frontend/src/sections/app/sparql-validation-report/list-table.js b/mapping_workbench/frontend/src/sections/app/sparql-validation-report/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
 
 const ResultCell = ({item, onClick}) => {

diff --git a/mapping_workbench/frontend/src/sections/app/tasks/list-table.js b/mapping_workbench/frontend/src/sections/app/tasks/list-table.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {mapStatusColor, TaskActions, TaskLine, taskProgressStatus as taskStatuses} from "./task-actions";
 import {Box} from "@mui/system";
 

diff --git a/mapping_workbench/frontend/src/sections/app/xpath-validation-report/list-table-file.js b/mapping_workbench/frontend/src/sections/app/xpath-validation-report/list-table-file.js
@@ -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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 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';

diff --git a/mapping_workbench/frontend/src/sections/app/xpath-validation-report/list-table.js b/mapping_workbench/frontend/src/sections/app/xpath-validation-report/list-table.js
@@ -22,7 +22,7 @@ import DialogActions from "@mui/material/DialogActions";
 import {Scrollbar} from 'src/components/scrollbar';
 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-pages";
+import TablePagination from "src/sections/components/table-pagination";
 import {TableFilterHeader} from "src/layouts/app/table-filter-header/table-filter-header";
 import {getValidationColor} from '../mapping-package/state/utils';
 import {ValueChip} from './utils';

diff --git a/mapping_workbench/frontend/src/sections/components/table-pagination.js b/mapping_workbench/frontend/src/sections/components/table-pagination.js
@@ -1,10 +1,10 @@
 import MuiTablePagination from '@mui/material/TablePagination'
 
 const TablePagination = (props) => {
-    const {children, ...otherProps} = props
+    const {children, showTop,...otherProps} = props
     return (
         <>
-            <MuiTablePagination {...otherProps}/>
+            {showTop && <MuiTablePagination {...otherProps}/>}
                 {children}
             <MuiTablePagination {...otherProps}/>
         </>