Clean up FileUploader

We remove the unused ImporterValidator. Comment out unused Error section and remove non-necessaru onChange handler
chairemobilite · Dec 18, 2024 · 39c63e8 · 39c63e8
1 parent faa8147
commit 39c63e8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 53 deletions.
diff --git a/packages/chaire-lib-common/src/services/importers/ImporterValidator.ts b/packages/chaire-lib-common/src/services/importers/ImporterValidator.ts
diff --git a/packages/chaire-lib-frontend/src/components/input/FileUploaderHOC.tsx b/packages/chaire-lib-frontend/src/components/input/FileUploaderHOC.tsx
@@ -8,7 +8,6 @@ import React from 'react';
 import SocketIOFileClient from 'socket.io-file-client';
 
 import serviceLocator from 'chaire-lib-common/lib/utils/ServiceLocator';
-import ImportValidator from 'chaire-lib-common/lib/services/importers/ImporterValidator';
 
 export type FileUploadStatus =
     | {
@@ -32,21 +31,14 @@ export type FileUploadStatus =
 export type FileUploaderHOCProps = {
     fileImportRef: React.RefObject<HTMLInputElement>;
     fileUploader: SocketIOFileClient;
-    onChange: React.ChangeEventHandler;
-    validator?: ImportValidator;
     uploadStatus: FileUploadStatus;
 };
 
-type FileUploaderHOCState = {
-    validator?: ImportValidator;
+interface FileUploaderHOCState {
     uploadStatus: FileUploadStatus;
-};
+}
 
-const fileUploaderHOC = <P,>(
-    WrappedComponent: React.ComponentType<P>,
-    importerValidator?: typeof ImportValidator,
-    autoImport = true
-) => {
+const fileUploaderHOC = <P,>(WrappedComponent: React.ComponentType<P>, autoImport = true) => {
     class FileUploaderHOC extends React.Component<P & FileUploaderHOCProps, FileUploaderHOCState> {
         private fileImportRef: React.RefObject<HTMLElement>;
         private fileUploader: SocketIOFileClient;
@@ -55,7 +47,6 @@ const fileUploaderHOC = <P,>(
             super(props);
 
             this.state = {
-                validator: importerValidator ? new importerValidator({}) : undefined,
                 uploadStatus: { status: 'notUploaded' }
             };
 
@@ -67,7 +58,6 @@ const fileUploaderHOC = <P,>(
             this.onFileUploadComplete = this.onFileUploadComplete.bind(this);
             this.onFileUploadError = this.onFileUploadError.bind(this);
             this.onFileUploadAbort = this.onFileUploadAbort.bind(this);
-            this.onChange = this.onChange.bind(this);
         }
 
         componentDidMount() {
@@ -86,14 +76,6 @@ const fileUploaderHOC = <P,>(
             this.fileUploader.off('abort', this.onFileUploadAbort);
         }
 
-        onChange() {
-            this.setState((state) => {
-                return {
-                    validator: state.validator
-                };
-            });
-        }
-
         onFileUploadStart(_fileInfo) {
             this.setState({ uploadStatus: { status: 'uploading', progress: 0 } });
             serviceLocator.eventManager.emit('progress', { name: 'UploadingFile', progress: 0.0 });
@@ -129,8 +111,6 @@ const fileUploaderHOC = <P,>(
                     {...this.props}
                     fileImportRef={this.fileImportRef}
                     fileUploader={this.fileUploader}
-                    onChange={this.onChange}
-                    validator={this.state.validator}
                     uploadStatus={this.state.uploadStatus}
                 />
             );

diff --git a/...s/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapBatchForm.tsx b/...s/transition-frontend/src/components/forms/accessibilityMap/AccessibilityMapBatchForm.tsx
@@ -331,4 +331,4 @@ class AccessibilityMapBatchForm extends ChangeEventsForm<
 
 // ** File upload
 //export default FileUploaderHOC(TransitRoutingForm, null, false);
-export default FileUploaderHOC(withTranslation(['transit', 'main'])(AccessibilityMapBatchForm), undefined, false);
+export default FileUploaderHOC(withTranslation(['transit', 'main'])(AccessibilityMapBatchForm), false);
diff --git a/...n-frontend/src/components/forms/batchCalculation/stepForms/ConfigureDemandFromCsvForm.tsx b/...n-frontend/src/components/forms/batchCalculation/stepForms/ConfigureDemandFromCsvForm.tsx
@@ -142,4 +142,4 @@ const ConfigureDemandFromCsvForm: React.FunctionComponent<
     );
 };
 
-export default FileUploaderHOC(withTranslation(['transit', 'main'])(ConfigureDemandFromCsvForm), undefined, false);
+export default FileUploaderHOC(withTranslation(['transit', 'main'])(ConfigureDemandFromCsvForm), false);
diff --git a/packages/transition-frontend/src/components/parts/FileImportForm.tsx b/packages/transition-frontend/src/components/parts/FileImportForm.tsx
@@ -13,7 +13,6 @@ import { faUpload } from '@fortawesome/free-solid-svg-icons/faUpload';
 import InputFile from 'chaire-lib-frontend/lib/components/input/InputFile';
 import Button from 'chaire-lib-frontend/lib/components/input/Button';
 import FormErrors from 'chaire-lib-frontend/lib/components/pageParts/FormErrors';
-import ImporterValidator from 'chaire-lib-common/lib/services/importers/ImporterValidator';
 import FileUploaderHOC, { FileUploaderHOCProps } from 'chaire-lib-frontend/lib/components/input/FileUploaderHOC';
 
 interface FileImportFormProps extends FileUploaderHOCProps {
@@ -27,26 +26,25 @@ interface FileImportFormProps extends FileUploaderHOCProps {
 const FileImportForm: React.FunctionComponent<FileImportFormProps & WithTranslation> = (
     props: FileImportFormProps & WithTranslation
 ) => {
-    const validator = props.validator as ImporterValidator;
+    const [fileSelected, setFileSelected] = React.useState(false);
+
     return (
         <form
             id={`tr__form-transit-${props.pluralizedObjectsName}-import`}
             className={`tr__form-transit-${props.pluralizedObjectsName}-import apptr__form`}
         >
             <h3>{props.t('main:Import')}</h3>
-
             <div className="tr__form-section">
                 <div className="apptr__form-input-container _two-columns">
                     <label>{props.label}</label>
                     <InputFile
-                        id={`formField${_upperFirst(props.pluralizedObjectsName)}ImporterFile${validator.get('id')}`}
+                        id={`formField${_upperFirst(props.pluralizedObjectsName)}ImporterFile`}
                         accept={props.acceptsExtension}
                         inputRef={props.fileImportRef}
-                        onChange={props.onChange}
+                        onChange={() => setFileSelected(true)}
                     />
                 </div>
             </div>
-
             <div className="tr__form-buttons-container">
                 <Button
                     icon={faUndoAlt}
@@ -74,10 +72,10 @@ const FileImportForm: React.FunctionComponent<FileImportFormProps & WithTranslat
                     />
                 )}
             </div>
-
-            <FormErrors errors={validator.getErrors()} />
+            {/* TODO Add actual upload error information when we have it
+              <FormErrors errors={validator.getErrors()} /> */}
         </form>
     );
 };
 
-export default FileUploaderHOC(withTranslation('main')(FileImportForm), ImporterValidator);
+export default FileUploaderHOC(withTranslation('main')(FileImportForm));
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,4 +142,4 @@ const ConfigureDemandFromCsvForm: React.FunctionComponent< @@
         );
     };
-    export default FileUploaderHOC(withTranslation(['transit', 'main'])(ConfigureDemandFromCsvForm), undefined, false);
+    export default FileUploaderHOC(withTranslation(['transit', 'main'])(ConfigureDemandFromCsvForm), false);