Merge pull request #384 from meaningfy-ws/feature/MWB12-39

feature/MWB12-39
meaningfy-ws · Jan 29, 2025 · 747b887 · 747b887
2 parents 8ef8f28 + aa0d18f
commit 747b887
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/mapping_workbench/frontend/src/api/mapping-packages/index.js b/mapping_workbench/frontend/src/api/mapping-packages/index.js
@@ -32,6 +32,10 @@ class MappingPackagesApi extends SectionApi {
         return [ACTION.VIEW, ACTION.EDIT];
     }
 
+    get FILE_UPLOAD_FORMATS() {
+        return {'application/zip': ['.zip']}
+    }
+
     constructor() {
         super("mapping_packages");
         this.isProjectResource = true;

diff --git a/mapping_workbench/frontend/src/api/test-data-suites/index.js b/mapping_workbench/frontend/src/api/test-data-suites/index.js
@@ -25,7 +25,7 @@ class TestDataSuitesApi extends FileCollectionsApi {
     }
 
     get FILE_UPLOAD_FORMATS() {
-        return {'ZIP': 'application/zip'}
+          return {'application/zip': ['.zip']}
     }
 
     get MAPPING_PACKAGE_LINK_FIELD() {

diff --git a/mapping_workbench/frontend/src/api/triple-map-fragments/generic.js b/mapping_workbench/frontend/src/api/triple-map-fragments/generic.js
@@ -6,6 +6,12 @@ class GenericTripleMapFragmentsApi extends TripleMapFragmentsApi {
         return "Triple Map Fragments";
     }
 
+    get FILE_UPLOAD_FORMATS() {
+        return {'TTL': {['text/ttl']: ['.ttl']},
+                'YAML': {['text/yaml']: ['.yaml']}
+        }
+    }
+
     get SECTION_ITEM_TITLE() {
         return "Triple Map Fragment";
     }

diff --git a/mapping_workbench/frontend/src/api/triple-map-fragments/specific.js b/mapping_workbench/frontend/src/api/triple-map-fragments/specific.js
@@ -15,6 +15,8 @@ class SpecificTripleMapFragmentsApi extends TripleMapFragmentsApi {
         return [ACTION.EDIT, ACTION.DELETE]
     }
 
+    get
+
     constructor() {
         super("specific_triple_map_fragments");
         this.hasMappingPackage = true;

diff --git a/mapping_workbench/frontend/src/components/file-dropzone.js b/mapping_workbench/frontend/src/components/file-dropzone.js
@@ -18,8 +18,7 @@ import Typography from '@mui/material/Typography';
 import { FileIcon } from 'src/components/file-icon';
 import { bytesToSize } from 'src/utils/bytes-to-size';
 
-export const FileDropzone = (props) => {
-  const { caption, files = [], onRemove, onRemoveAll, onUpload, disabled, ...other } = props;
+export const FileDropzone = ({ caption, files = [], onRemove, onRemoveAll, onUpload, disabled, ...other }) => {
   const { getRootProps, getInputProps, isDragActive } = useDropzone(other);
 
   const hasAnyFiles = files.length > 0;

diff --git a/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-uploader.js b/mapping_workbench/frontend/src/sections/app/file-manager/file-collection-uploader.js
@@ -98,7 +98,7 @@ export const FileCollectionUploader = (props) => {
             </Stack>
             <DialogContent id="drop-zone">
                 <FileDropzone
-                    accept={{'*/*': []}}
+                    accept={{'application/zip': ['.zip']}}
                     caption="ZIP archive with Test Data Suites"
                     files={files}
                     onDrop={handleDrop}

diff --git a/mapping_workbench/frontend/src/sections/app/generic-triple-map-fragment/file-uploader.js b/mapping_workbench/frontend/src/sections/app/generic-triple-map-fragment/file-uploader.js
@@ -106,6 +106,8 @@ export const FileUploader = (props) => {
         );
     }
 
+    const acceptedFormat = sectionApi.FILE_UPLOAD_FORMATS?.[format] ?? {'*/*': []}
+
     return (
         <Dialog
             fullWidth
@@ -178,8 +180,9 @@ export const FileUploader = (props) => {
                     />
                     <Box sx={{mb: 3}}/>
                 </>}
+
                 <FileDropzone
-                    accept={{'*/*': []}}
+                    accept={acceptedFormat}
                     caption="Max file size is 3 MB"
                     disabled={uploading}
                     files={files}

diff --git a/mapping_workbench/frontend/src/sections/app/mapping-package/package-importer.js b/mapping_workbench/frontend/src/sections/app/mapping-package/package-importer.js
@@ -22,9 +22,7 @@ import {toastError, toastLoad, toastSuccess} from "src/components/app-toast";
 import Divider from "@mui/material/Divider";
 
 
-export const PackageImporter = (props) => {
-    const {onClose, open = false, sectionApi} = props;
-
+export const PackageImporter = ({onClose, open = false, sectionApi}) => {
     const defaultPackageTypeValue = DEFAULT_PACKAGE_TYPE;
 
     const [files, setFiles] = useState([]);
@@ -142,7 +140,7 @@ export const PackageImporter = (props) => {
                     <Divider sx={{mt: 1}}/>
                 </FormGroup>
                 <FileDropzone
-                    accept={{'*/*': []}}
+                    accept={sectionApi.FILE_UPLOAD_FORMATS}
                     caption="Required name: {PACKAGE_NAME}.zip"
                     files={files}
                     onDrop={handleDrop}