Frontend File Validation

tdrs-backend/tdpservice/data_files/validators.py

@@ -22,7 +22,7 @@
 def _get_unsupported_msg(_type, value, supported_options):
     """Construct a message to convey an unsupported operation."""
     return (
-        f'Unsupported {_type}: {value}, supported {pluralize(_type)} '
+        f'Unsupported {_type}: supported {pluralize(_type)} '
         f'are: {supported_options}'
     )
 

tdrs-backend/tdpservice/parsers/test/test_parse.py

@@ -15,13 +15,13 @@
 
 @pytest.fixture
 def test_datafile(stt_user, stt):
-    """Fixture for small_correct_file."""
-    return create_test_datafile('small_correct_file', stt_user, stt)
+    """Fixture for small_correct_file.txt."""
+    return create_test_datafile('small_correct_file.txt', stt_user, stt)
 
 
 @pytest.mark.django_db()
 def test_parse_small_correct_file(test_datafile):
-    """Test parsing of small_correct_file."""
+    """Test parsing of small_correct_file.txt."""
     errors = parse.parse_datafile(test_datafile)
     errors = ParserError.objects.filter(file=test_datafile)
     assert errors.count() == 0
@@ -44,7 +44,7 @@ def test_parse_small_correct_file(test_datafile):
 
 @pytest.mark.django_db()
 def test_parse_section_mismatch(test_datafile):
-    """Test parsing of small_correct_file where the DataFile section doesn't match the rawfile section."""
+    """Test parsing of small_correct_file.txt where the DataFile section doesn't match the rawfile section."""
     test_datafile.section = 'Closed Case Data'
     test_datafile.save()
 
@@ -67,7 +67,7 @@ def test_parse_section_mismatch(test_datafile):
 
 @pytest.mark.django_db()
 def test_parse_wrong_program_type(test_datafile):
-    """Test parsing of small_correct_file where the DataFile program type doesn't match the rawfile."""
+    """Test parsing of small_correct_file.txt where the DataFile program type doesn't match the rawfile."""
     test_datafile.section = 'SSP Active Case Data'
     test_datafile.save()
 
@@ -457,8 +457,8 @@ def test_parse_super_big_s1_file(super_big_s1_file):
 
 @pytest.fixture
 def super_big_s1_rollback_file(stt_user, stt):
-    """Fixture for ADS.E2J.NDM1.TS53_fake.rollback."""
-    return create_test_datafile('ADS.E2J.NDM1.TS53_fake.rollback', stt_user, stt)
+    """Fixture for ADS.E2J.NDM1.TS53_fake.rollback.txt."""
+    return create_test_datafile('ADS.E2J.NDM1.TS53_fake.rollback.txt', stt_user, stt)
 
 @pytest.mark.django_db()
 def test_parse_super_big_s1_file_with_rollback(super_big_s1_rollback_file):
@@ -487,7 +487,7 @@ def test_parse_super_big_s1_file_with_rollback(super_big_s1_rollback_file):
 @pytest.fixture
 def bad_tanf_s1__row_missing_required_field(stt_user, stt):
     """Fixture for small_tanf_section1."""
-    return create_test_datafile('small_bad_tanf_s1', stt_user, stt)
+    return create_test_datafile('small_bad_tanf_s1.txt', stt_user, stt)
 
 
 @pytest.mark.django_db()
@@ -528,7 +528,7 @@ def test_parse_bad_tfs1_missing_required(bad_tanf_s1__row_missing_required_field
 @pytest.fixture
 def bad_ssp_s1__row_missing_required_field(stt_user, stt):
     """Fixture for ssp_section1_datafile."""
-    return create_test_datafile('small_bad_ssp_s1', stt_user, stt, 'SSP Active Case Data')
+    return create_test_datafile('small_bad_ssp_s1.txt', stt_user, stt, 'SSP Active Case Data')
 
 
 @pytest.mark.django_db()

tdrs-backend/tdpservice/search_indexes/test/test_model_mapping.py

@@ -13,8 +13,8 @@
 
 @pytest.fixture
 def test_datafile(stt_user, stt):
-    """Fixture for small_correct_file."""
-    return create_test_datafile('small_correct_file', stt_user, stt)
+    """Fixture for small_correct_file.txt."""
+    return create_test_datafile('small_correct_file.txt', stt_user, stt)
 
 
 @pytest.mark.django_db

tdrs-frontend/cypress/e2e/integration/file_upload.js

@@ -5,7 +5,7 @@ Then('{string} can see Data Files page', (username) => {
     cy.visit('/data-files')
     cy.contains('Data Files').should('exist')
   })
-  
+
 Then('{string} can see search form', (username) => {
     cy.contains('Fiscal Year').should('exist')
     cy.contains('Quarter').should('exist')
@@ -19,7 +19,7 @@ Then('{string} can browse upload file form', (username) => {
 
 When('{string} uploads a file', (username) => {
     cy.get('button').contains('Search').should('exist').click()
-    cy.get('#closed-case-data').selectFile('../tdrs-backend/tdpservice/parsers/test/data/small_correct_file',{ action: 'drag-drop' })
+    cy.get('#closed-case-data').selectFile('../tdrs-backend/tdpservice/parsers/test/data/small_correct_file.txt',{ action: 'drag-drop' })
     cy.get('button').contains('Submit Data Files').should('exist').click()
 })
 

tdrs-frontend/src/actions/reports.js

@@ -11,6 +11,7 @@ export const SET_FILE = 'SET_FILE'
 export const CLEAR_FILE = 'CLEAR_FILE'
 export const CLEAR_FILE_LIST = 'CLEAR_FILE_LIST'
 export const SET_FILE_ERROR = 'SET_FILE_ERROR'
+export const FILE_EXT_ERROR = 'FILE_EXT_ERROR'
 export const SET_FILE_SUBMITTED = 'SET_FILE_SUBMITTED'
 export const CLEAR_ERROR = 'CLEAR_ERROR'
 
@@ -254,7 +255,11 @@ export const submit =
         setLocalAlertState({
           active: true,
           type: 'error',
-          message: error.message,
+          message: ''.concat(
+            error.message,
+            ': ',
+            error.response?.data?.file[0]
+          ),
         })
       )
   }

tdrs-frontend/src/actions/reports.test.js

@@ -201,7 +201,7 @@ describe('actions/reports', () => {
     expect(axios.post).toHaveBeenCalledTimes(1)
     expect(setLocalAlertState).toHaveBeenCalledWith({
       active: true,
-      message: undefined,
+      message: 'undefined: undefined',
       type: 'error',
     })
   })

tdrs-frontend/src/actions/requestAccess.js

@@ -1,6 +1,5 @@
 import { SET_AUTH } from './auth'
 import axios from 'axios'
-import axiosInstance from '../axios-instance'
 import { logErrorToServer } from '../utils/eventLogger'
 
 export const PATCH_REQUEST_ACCESS = 'PATCH_REQUEST_ACCESS'

tdrs-frontend/src/components/FileUpload/FileUpload.jsx

@@ -7,6 +7,7 @@ import {
   clearError,
   clearFile,
   SET_FILE_ERROR,
+  FILE_EXT_ERROR,
   upload,
   download,
 } from '../../actions/reports'
@@ -17,6 +18,9 @@ import { handlePreview, getTargetClassName } from './utils'
 const INVALID_FILE_ERROR =
   'We can’t process that file format. Please provide a plain text file.'
 
+const INVALID_EXT_ERROR =
+  'Invalid extension. Accepted file types are: .txt, .ms##, .ts##, or .ts###.'
+
 function FileUpload({ section, setLocalAlertState }) {
   // e.g. 'Aggregate Case Data' => 'aggregate-case-data'
   // The set of uploaded files in our Redux state
@@ -89,6 +93,25 @@ function FileUpload({ section, setLocalAlertState }) {
     filereader.onloadend = (evt) => {
       /* istanbul ignore next */
       if (!evt.target.error) {
+        // Validate file extension before proceeding
+        const re = /(\.txt|\.ms\d{2}|\.ts\d{2,3})/i
+        const filename = file.name
+        const n = filename.lastIndexOf('.')
+        const ext = filename.substring(n)
+        if (!re.exec(ext)) {
+          // reject the file and create an error message
+          createFileInputErrorState(input, dropTarget)
+
+          dispatch({
+            type: FILE_EXT_ERROR,
+            payload: {
+              error: { message: INVALID_EXT_ERROR },
+              section,
+            },
+          })
+          return
+        }
+
         // Read in the file blob "headers: and create a hex string signature
         const uint = new Uint8Array(evt.target.result)
         const bytes = []

tdrs-frontend/src/components/Paginator/Paginator.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { render, fireEvent, waitFor, screen } from '@testing-library/react'
+import { render, fireEvent, screen } from '@testing-library/react'
 import Paginator from './Paginator'
 
 describe('Paginator', () => {

tdrs-frontend/src/components/SiteMap/SiteMap.test.js

@@ -1,7 +1,6 @@
 import React from 'react'
 import { render } from '@testing-library/react'
 import SiteMap from './SiteMap'
-import { mount } from 'enzyme'
 import thunk from 'redux-thunk'
 import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'

tdrs-frontend/src/reducers/reports.js

@@ -2,6 +2,7 @@ import {
   SET_FILE,
   CLEAR_FILE,
   SET_FILE_ERROR,
+  FILE_EXT_ERROR,
   CLEAR_ERROR,
   SET_SELECTED_YEAR,
   SET_SELECTED_STT,
@@ -175,6 +176,11 @@ const reports = (state = initialState, action) => {
       const updatedFiles = getUpdatedFiles({ state, section, error })
       return { ...state, submittedFiles: updatedFiles }
     }
+    case FILE_EXT_ERROR: {
+      const { error, section } = payload
+      const updatedFiles = getUpdatedFiles({ state, section, error })
+      return { ...state, submittedFiles: updatedFiles }
+    }
     case CLEAR_ERROR: {
       const { section } = payload
       const file = getFile(state.submittedFiles, section)