Merge pull request #297 from meaningfy-ws/feature/MWB-794-bis

Updates
meaningfy-ws · Sep 17, 2024 · 7b6f628 · 7b6f628
2 parents 61dd003 + d414487
commit 7b6f628
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 22 deletions.
diff --git a/mapping_workbench/frontend/src/pages/app/mapping-packages/[id]/view.js b/mapping_workbench/frontend/src/pages/app/mapping-packages/[id]/view.js
@@ -222,7 +222,7 @@ const Page = () => {
                             <FileResourceCollectionsCard
                                 collectionApi={testDataSuitesApi}
                                 filters={{
-                                    mapping_package_id: item.id
+                                    mapping_package_id: item._id
                                 }}
                             />
                             <Divider sx={{m: 3}}/>

diff --git a/...ng_workbench/frontend/src/pages/app/shacl-test-suites/[id]/resource-manager/[fid]/view.js b/...ng_workbench/frontend/src/pages/app/shacl-test-suites/[id]/resource-manager/[fid]/view.js
@@ -1,8 +1,6 @@
 import {useCallback, useState} from 'react';
 import ArrowLeftIcon from '@untitled-ui/icons-react/build/esm/ArrowLeft';
-import Box from '@mui/material/Box';
 import Chip from '@mui/material/Chip';
-import Container from '@mui/material/Container';
 import Divider from '@mui/material/Divider';
 import Grid from '@mui/material/Unstable_Grid2';
 import Link from '@mui/material/Link';
@@ -137,9 +135,10 @@ const Page = () => {
                                 lg={12}
                             >
                                 <FileCollectionBasicDetails
-                                    id={item.id}
+                                    id={item._id}
                                     title={item.title}
                                     description={item.description}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/mapping_workbench/frontend/src/pages/app/shacl-test-suites/[id]/view.js b/mapping_workbench/frontend/src/pages/app/shacl-test-suites/[id]/view.js
@@ -1,8 +1,6 @@
 import {useCallback, useState} from 'react';
 import ArrowLeftIcon from '@untitled-ui/icons-react/build/esm/ArrowLeft';
-import Box from '@mui/material/Box';
 import Chip from '@mui/material/Chip';
-import Container from '@mui/material/Container';
 import Divider from '@mui/material/Divider';
 import Grid from '@mui/material/Unstable_Grid2';
 import Link from '@mui/material/Link';
@@ -140,7 +138,7 @@ const Page = () => {
                                     id={item._id}
                                     title={item.title}
                                     description={item.description}
-                                    sectionApi={sectionApi.section}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/...g_workbench/frontend/src/pages/app/sparql-test-suites/[id]/resource-manager/[fid]/view.js b/...g_workbench/frontend/src/pages/app/sparql-test-suites/[id]/resource-manager/[fid]/view.js
@@ -1,8 +1,6 @@
 import {useCallback, useState} from 'react';
 import ArrowLeftIcon from '@untitled-ui/icons-react/build/esm/ArrowLeft';
-import Box from '@mui/material/Box';
 import Chip from '@mui/material/Chip';
-import Container from '@mui/material/Container';
 import Divider from '@mui/material/Divider';
 import Grid from '@mui/material/Unstable_Grid2';
 import Link from '@mui/material/Link';
@@ -137,9 +135,10 @@ const Page = () => {
                                 lg={12}
                             >
                                 <FileCollectionBasicDetails
-                                    id={item.id}
+                                    id={item._id}
                                     title={item.title}
                                     description={item.description}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/mapping_workbench/frontend/src/pages/app/sparql-test-suites/[id]/view.js b/mapping_workbench/frontend/src/pages/app/sparql-test-suites/[id]/view.js
@@ -140,7 +140,7 @@ const Page = () => {
                                     id={item._id}
                                     title={item.title}
                                     description={item.description}
-                                    sectionApi={sectionApi.section}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/...ing_workbench/frontend/src/pages/app/test-data-suites/[id]/resource-manager/[fid]/view.js b/...ing_workbench/frontend/src/pages/app/test-data-suites/[id]/resource-manager/[fid]/view.js
@@ -1,8 +1,6 @@
 import {useCallback, useState} from 'react';
 import ArrowLeftIcon from '@untitled-ui/icons-react/build/esm/ArrowLeft';
-import Box from '@mui/material/Box';
 import Chip from '@mui/material/Chip';
-import Container from '@mui/material/Container';
 import Divider from '@mui/material/Divider';
 import Grid from '@mui/material/Unstable_Grid2';
 import Link from '@mui/material/Link';
@@ -137,9 +135,10 @@ const Page = () => {
                                 lg={12}
                             >
                                 <FileCollectionBasicDetails
-                                    id={item.id}
+                                    id={item._id}
                                     title={item.title}
                                     description={item.description}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/mapping_workbench/frontend/src/pages/app/test-data-suites/[id]/view.js b/mapping_workbench/frontend/src/pages/app/test-data-suites/[id]/view.js
@@ -139,7 +139,7 @@ const Page = () => {
                                     id={item._id}
                                     title={item.title}
                                     description={item.description}
-                                    sectionApi={sectionApi.section}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/...kbench/frontend/src/pages/app/value-mapping-resources/[id]/resource-manager/[fid]/view.js b/...kbench/frontend/src/pages/app/value-mapping-resources/[id]/resource-manager/[fid]/view.js
@@ -137,9 +137,10 @@ const Page = () => {
                                 lg={12}
                             >
                                 <FileCollectionBasicDetails
-                                    id={item.id}
+                                    id={item._id}
                                     title={item.title}
                                     description={item.description}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/mapping_workbench/frontend/src/pages/app/value-mapping-resources/[id]/view.js b/mapping_workbench/frontend/src/pages/app/value-mapping-resources/[id]/view.js
@@ -165,7 +165,7 @@ const Page = () => {
                                     id={item._id}
                                     title={item.title}
                                     description={item.description}
-                                    sectionApi={sectionApi.section}
+                                    sectionApi={sectionApi}
                                 />
                             </Grid>
                         </Grid>

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-basic-details.js b/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-basic-details.js
@@ -18,15 +18,13 @@ import {useRouter} from "../../../hooks/use-router";
 export const FileCollectionBasicDetails = (props) => {
   const { id, name, title, description, sectionApi, version, ...other } = props;
   const router = useRouter();
-  const section = props.sectionApi;
+  const section = sectionApi.section;
   let editCustomPathName = "";
   let deleteCutomPathName = "";
 
   //const itemctx = new ForListItemAction(id, testDataSuitesApi);
   let itemctx = {};
 
-  //console.log("section: ", section);
-  //console.log("ID: ", id);
 
   switch(section) {
             case 'test_data_suites':

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/file-resource-collections-card.js b/mapping_workbench/frontend/src/sections/app/file-manager/file-resource-collections-card.js
@@ -22,7 +22,6 @@ import {tokens} from "../../../locales/tokens";
 export const FileResourceCollectionsCard = (props) => {
     const {collectionApi, filters = {}, ...other} = props;
     const {t} = useTranslation();
-
     const collectionTitle = t(tokens.nav[collectionApi.section]);
     const collectionPath = paths.app[collectionApi.section].index;
 

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/item-list-row.js b/mapping_workbench/frontend/src/sections/app/file-manager/item-list-row.js
@@ -36,7 +36,7 @@ export const ItemListRow = (props) => {
     return (
         <>
             <TableRow
-                key={item.id}
+                key={item._id}
                 sx={{
                     backgroundColor: 'transparent',
                     borderRadius: 1.5,