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.

Sign up for GitHub

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

[Backport 4.x][Fixes #1069] Use new config setting for supported dataset file types #1081

Merged
merged 1 commit into from
Jul 12, 2022
Merged

[Backport 4.x][Fixes #1069] Use new config setting for supported dataset file types #1081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 12 additions & 62 deletions geonode_mapstore_client/client/js/routes/UploadDataset.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,63 +24,6 @@ import UploadContainer from '@js/routes/upload/UploadContainer';
import { getConfigProp } from '@mapstore/framework/utils/ConfigUtils';
import { parseUploadResponse, processUploadResponse, parseUploadFiles } from '@js/utils/ResourceUtils';

const supportedDatasetTypes = [
{
id: 'shp',
label: 'ESRI Shapefile',
format: 'vector',
ext: ['shp'],
requires: ['shp', 'prj', 'dbf', 'shx'],
optional: ['xml', 'sld']
},
{
id: 'tiff',
label: 'GeoTIFF',
format: 'raster',
ext: ['tiff', 'tif'],
mimeType: ['image/tiff'],
optional: ['xml', 'sld']
},
{
id: 'csv',
label: 'Comma Separated Value (CSV)',
format: 'vector',
ext: ['csv'],
mimeType: ['text/csv'],
optional: ['xml', 'sld']
},
{
id: 'zip',
label: 'Zip Archive',
format: 'archive',
ext: ['zip'],
mimeType: ['application/zip'],
optional: ['xml', 'sld']
},
{
id: 'xml',
label: 'XML Metadata File',
format: 'metadata',
ext: ['xml'],
mimeType: ['application/json'],
needsFiles: ['shp', 'prj', 'dbf', 'shx', 'csv', 'tiff', 'zip', 'sld']
},
{
id: 'sld',
label: 'Styled Layer Descriptor (SLD)',
format: 'metadata',
ext: ['sld'],
mimeType: ['application/json'],
needsFiles: ['shp', 'prj', 'dbf', 'shx', 'csv', 'tiff', 'zip', 'xml']
}
];

const supportedExtensions = supportedDatasetTypes.map(({ ext }) => ext || []).flat();
const supportedMimeTypes = supportedDatasetTypes.map(({ mimeType }) => mimeType || []).flat();
const supportedRequiresExtensions = supportedDatasetTypes.map(({ requires }) => requires || []).flat();
const supportedLabels = supportedDatasetTypes.map(({ label }) => label).join(', ');
const supportedOptionalExtensions = supportedDatasetTypes.map(({ optional }) => optional || []).flat();

function getFileNameParts(file) {
const { name } = file;
const nameParts = name.split('.');
Expand All @@ -89,10 +32,10 @@ function getFileNameParts(file) {
return { ext, baseName };
}

function getDatasetFileType(file) {
function getDatasetFileType(file, supportedTypes) {
const { type } = file;
const { ext } = getFileNameParts(file);
const datasetFileType = supportedDatasetTypes.find((fileType) =>
const datasetFileType = supportedTypes.find((fileType) =>
(fileType.ext || []).includes(ext)
|| (fileType.mimeType || []).includes(type)
|| (fileType.requires || []).includes(ext)
Expand All @@ -107,6 +50,15 @@ function UploadList({
children,
onSuccess
}) {
const { maxParallelUploads, upload: uploadSettings = {} } = getConfigProp('geoNodeSettings') || {};

const { supportedDatasetFileTypes: supportedDatasetTypes } = uploadSettings;

const supportedExtensions = supportedDatasetTypes.map(({ ext }) => ext || []).flat();
const supportedMimeTypes = supportedDatasetTypes.map(({ mimeType }) => mimeType || []).flat();
const supportedRequiresExtensions = supportedDatasetTypes.map(({ requires }) => requires || []).flat();
const supportedLabels = supportedDatasetTypes.map(({ label }) => label).join(', ');
const supportedOptionalExtensions = supportedDatasetTypes.map(({ optional }) => optional || []).flat();

const [waitingUploads, setWaitingUploads] = useState({});
const [readyUploads, setReadyUploads] = useState({});
Expand Down Expand Up @@ -146,7 +98,7 @@ function UploadList({
.filter(({ supported }) => supported)
.reduce((acc, { file }) => {
const { ext, baseName } = getFileNameParts(file);
let type = getDatasetFileType(file);
let type = getDatasetFileType(file, supportedDatasetTypes);
if (!type && supportedOptionalExtensions.includes(ext)) {
type = checkedFiles.length > 1 ? acc[baseName]?.type : ext;
}
Expand Down Expand Up @@ -250,8 +202,6 @@ function UploadList({
return files.forEach((file) => sources[file].cancel());
}, []);

const { maxParallelUploads } = getConfigProp('geoNodeSettings');

return (
<UploadContainer
waitingUploads={waitingUploads}
Expand Down