tweak(adminPanel): RN-1427: Remove .CSV from supported file types (#5862

) * Update EditSurveyPage.jsx * all file uploader updated * updated * updates --------- Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
beyondessential · Sep 30, 2024 · 64356c1 · 64356c1
1 parent d046bf8
commit 64356c1
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 1 deletion.
diff --git a/packages/admin-panel/src/importExport/ImportModal.jsx b/packages/admin-panel/src/importExport/ImportModal.jsx
@@ -190,6 +190,7 @@ export const ImportModalComponent = React.memo(
                   onChange={newFiles => setFiles(newFiles ?? [])}
                   name="file-upload"
                   multiple={actionConfig.multiple}
+                  accept={actionConfig.accept}
                 />
               </>
             )}

diff --git a/packages/admin-panel/src/pages/StrivePage.jsx b/packages/admin-panel/src/pages/StrivePage.jsx
@@ -12,6 +12,10 @@ const importConfig = {
   title: 'Import lab results or vector data',
   actionConfig: {
     importEndpoint: 'striveLabResults',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
 };
 

diff --git a/packages/admin-panel/src/pages/resources/editSurvey/EditSurveyPage.jsx b/packages/admin-panel/src/pages/resources/editSurvey/EditSurveyPage.jsx
@@ -203,7 +203,6 @@ const EditSurveyPageComponent = withConnectedEditor(
               accept={{
                 'application/vnd.ms-excel': ['.xls'],
                 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
-                'text/csv': ['.csv'],
               }}
               fileName={initialFileName}
               label="Survey questions"

diff --git a/packages/admin-panel/src/routes/entities/entities.js b/packages/admin-panel/src/routes/entities/entities.js
@@ -78,6 +78,10 @@ const IMPORT_CONFIG = {
     'Please note that if this is the first time a country is being imported, you will need to restart central-server post-import for it to sync to DHIS2.', // hope to fix one day in https://github.com/beyondessential/central-server/issues/481
   actionConfig: {
     importEndpoint: ENTITIES_ENDPOINT,
+    accept: {
+      'application/geo+json': ['.geojson'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
   queryParameters: [
     {

diff --git a/packages/admin-panel/src/routes/surveys/dataElements.js b/packages/admin-panel/src/routes/surveys/dataElements.js
@@ -11,6 +11,10 @@ const IMPORT_CONFIG = {
   title: `Import ${RESOURCE_NAME.singular}`,
   actionConfig: {
     importEndpoint: 'dataElements',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
 };
 

diff --git a/packages/admin-panel/src/routes/surveys/dataMapping.js b/packages/admin-panel/src/routes/surveys/dataMapping.js
@@ -62,6 +62,10 @@ const IMPORT_CONFIG = {
   title: `Import ${RESOURCE_NAME.singular}`,
   actionConfig: {
     importEndpoint: 'dataElementDataServices',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
 };
 

diff --git a/packages/admin-panel/src/routes/surveys/optionSets.js b/packages/admin-panel/src/routes/surveys/optionSets.js
@@ -80,6 +80,10 @@ const IMPORT_CONFIG = {
   title: `Import ${getPluralForm(RESOURCE_NAME)}`,
   actionConfig: {
     importEndpoint: 'optionSets',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
   queryParameters: [
     {

diff --git a/packages/admin-panel/src/routes/surveys/surveyResponses.jsx b/packages/admin-panel/src/routes/surveys/surveyResponses.jsx
@@ -182,6 +182,10 @@ const IMPORT_CONFIG = {
       timeZone: getBrowserTimeZone(),
       respondWithEmailTimeout: 10 * 1000, // if an import doesn't finish in 10 seconds, email results
     },
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
   queryParameters: [
     {

diff --git a/packages/admin-panel/src/routes/surveys/surveys.js b/packages/admin-panel/src/routes/surveys/surveys.js
@@ -169,6 +169,10 @@ const SURVEY_FIELDS = {
       name: 'surveyQuestions',
       labelTooltip:
         'Import a questions spreadsheet to update the questions and screens of this survey.',
+      accept: {
+        'application/vnd.ms-excel': ['.xls'],
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+      },
     },
   },
 };

diff --git a/packages/admin-panel/src/routes/users/permissions.js b/packages/admin-panel/src/routes/users/permissions.js
@@ -114,6 +114,10 @@ const IMPORT_CONFIG = {
   title: `Import user ${getPluralForm(RESOURCE_NAME)}`,
   actionConfig: {
     importEndpoint: 'userPermissions',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
 };
 

diff --git a/packages/admin-panel/src/routes/users/users.jsx b/packages/admin-panel/src/routes/users/users.jsx
@@ -178,6 +178,10 @@ const IMPORT_CONFIG = {
   title: `Import ${getPluralForm(RESOURCE_NAME)}`,
   actionConfig: {
     importEndpoint: 'users',
+    accept: {
+      'application/vnd.ms-excel': ['.xls'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+    },
   },
 };
 

diff --git a/packages/admin-panel/src/routes/visualisations/dashboardItems.jsx b/packages/admin-panel/src/routes/visualisations/dashboardItems.jsx
@@ -94,6 +94,9 @@ const IMPORT_CONFIG = {
   actionConfig: {
     importEndpoint: 'dashboardVisualisations',
     multiple: true,
+    accept: {
+      'application/json': ['.json'],
+    },
   },
   getFinishedMessage: response => (
     <>

diff --git a/packages/admin-panel/src/routes/visualisations/dataTables.js b/packages/admin-panel/src/routes/visualisations/dataTables.js
@@ -113,6 +113,9 @@ const IMPORT_CONFIG = {
   actionConfig: {
     importEndpoint: 'dataTables',
     multiple: true,
+    accept: {
+      'application/json': ['.json'],
+    },
   },
 };
 const EDITOR_CONFIG = { displayUsedBy: true };

diff --git a/packages/admin-panel/src/routes/visualisations/mapOverlays.jsx b/packages/admin-panel/src/routes/visualisations/mapOverlays.jsx
@@ -170,6 +170,9 @@ const IMPORT_CONFIG = {
   actionConfig: {
     importEndpoint: 'mapOverlayVisualisations',
     multiple: true,
+    accept: {
+      'application/json': ['.json'],
+    },
   },
   getFinishedMessage: response => (
     <>

diff --git a/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx b/packages/admin-panel/src/widgets/InputField/registerInputFields.jsx
@@ -381,6 +381,7 @@ export const registerInputFields = () => {
     <FileUploadField
       name={props.name}
       label={props.label}
+      accept={props.accept}
       required={props.required}
       onChange={({ fileName, file }) => props.onSetFormFile(props.inputKey, { fileName, file })}
     />