fix #282

SkalskiP · Oct 12, 2022 · 4261a28 · 4261a28
1 parent 282ce34
commit 4261a28
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/src/views/PopupView/LoadLabelNamesPopup/LoadLabelNamesPopup.tsx b/src/views/PopupView/LoadLabelNamesPopup/LoadLabelNamesPopup.tsx
@@ -1,21 +1,21 @@
 import React, { useState } from 'react';
 import './LoadLabelNamesPopup.scss';
-import { AppState } from "../../../store";
-import { connect } from "react-redux";
-import { updateLabelNames } from "../../../store/labels/actionCreators";
-import { GenericYesNoPopup } from "../GenericYesNoPopup/GenericYesNoPopup";
-import { PopupWindowType } from "../../../data/enums/PopupWindowType";
-import { updateActivePopupType as storeUpdateActivePopupType } from "../../../store/general/actionCreators";
-import { useDropzone } from "react-dropzone";
-import { LabelName } from "../../../store/labels/types";
-import { YOLOUtils } from "../../../logic/import/yolo/YOLOUtils";
+import { AppState } from '../../../store';
+import { connect } from 'react-redux';
+import { updateLabelNames } from '../../../store/labels/actionCreators';
+import { GenericYesNoPopup } from '../GenericYesNoPopup/GenericYesNoPopup';
+import { PopupWindowType } from '../../../data/enums/PopupWindowType';
+import { updateActivePopupType } from '../../../store/general/actionCreators';
+import { useDropzone } from 'react-dropzone';
+import { LabelName } from '../../../store/labels/types';
+import { YOLOUtils } from '../../../logic/import/yolo/YOLOUtils';
 
 interface IProps {
-    updateActivePopupType: (activePopupType: PopupWindowType) => any;
-    updateLabels: (labels: LabelName[]) => any;
+    updateActivePopupTypeAction: (activePopupType: PopupWindowType) => any;
+    updateLabelNamesAction: (labels: LabelName[]) => any;
 }
 
-const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupType, updateLabels }) => {
+const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupTypeAction, updateLabelNamesAction }) => {
     const [labelsList, setLabelsList] = useState([]);
     const [invalidFileLoadedStatus, setInvalidFileLoadedStatus] = useState(false);
 
@@ -29,7 +29,7 @@ const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupType, updateLa
     };
 
     const { acceptedFiles, getRootProps, getInputProps } = useDropzone({
-        accept: { "text/plain": [".txt"] },
+        accept: { 'text/plain': ['.txt'] },
         multiple: false,
         onDrop: (accepted) => {
             if (accepted.length === 1) {
@@ -41,12 +41,13 @@ const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupType, updateLa
 
     const onAccept = () => {
         if (labelsList.length > 0) {
-            updateLabels(labelsList);
+            updateLabelNamesAction(labelsList);
+            updateActivePopupTypeAction(null);
         }
     };
 
     const onReject = () => {
-        updateActivePopupType(PopupWindowType.INSERT_LABEL_NAMES);
+        updateActivePopupTypeAction(PopupWindowType.INSERT_LABEL_NAMES);
     };
 
     const getDropZoneContent = () => {
@@ -55,47 +56,47 @@ const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupType, updateLa
                 <input {...getInputProps()} />
                 <img
                     draggable={false}
-                    alt={"upload"}
-                    src={"ico/box-opened.png"}
+                    alt={'upload'}
+                    src={'ico/box-opened.png'}
                 />
-                <p className="extraBold">Loading of labels file was unsuccessful</p>
-                <p className="extraBold">Try again</p>
+                <p className='extraBold'>Loading of labels file was unsuccessful</p>
+                <p className='extraBold'>Try again</p>
             </>;
         else if (acceptedFiles.length === 0)
             return <>
                 <input {...getInputProps()} />
                 <img
                     draggable={false}
-                    alt={"upload"}
-                    src={"ico/box-opened.png"}
+                    alt={'upload'}
+                    src={'ico/box-opened.png'}
                 />
-                <p className="extraBold">Drop labels file</p>
+                <p className='extraBold'>Drop labels file</p>
                 <p>or</p>
-                <p className="extraBold">Click here to select it</p>
+                <p className='extraBold'>Click here to select it</p>
             </>;
         else if (labelsList.length === 1)
             return <>
                 <img
                     draggable={false}
-                    alt={"uploaded"}
-                    src={"ico/box-closed.png"}
+                    alt={'uploaded'}
+                    src={'ico/box-closed.png'}
                 />
-                <p className="extraBold">only 1 label found</p>
+                <p className='extraBold'>only 1 label found</p>
             </>;
         else
             return <>
                 <img
                     draggable={false}
-                    alt={"uploaded"}
-                    src={"ico/box-closed.png"}
+                    alt={'uploaded'}
+                    src={'ico/box-closed.png'}
                 />
-                <p className="extraBold">{labelsList.length} labels found</p>
+                <p className='extraBold'>{labelsList.length} labels found</p>
             </>;
     };
 
     const renderContent = () => {
-        return (<div className="LoadLabelsPopupContent">
-            <div className="Message">
+        return (<div className='LoadLabelsPopupContent'>
+            <div className='Message'>
                 Load a text file with a list of labels you are planning to use. The names of
                 each label should be separated by new line. If you don&apos;t have a prepared file, no problem. You can
                 create your own list now.
@@ -108,25 +109,25 @@ const LoadLabelNamesPopup: React.FC<IProps> = ({ updateActivePopupType, updateLa
 
     return (
         <GenericYesNoPopup
-            title={"Load file with labels description"}
+            title={'Load file with labels description'}
             renderContent={renderContent}
-            acceptLabel={"Start project"}
+            acceptLabel={'Start project'}
             onAccept={onAccept}
             disableAcceptButton={labelsList.length === 0}
-            rejectLabel={"Create labels list"}
+            rejectLabel={'Create labels list'}
             onReject={onReject}
         />
     );
 };
 
 const mapDispatchToProps = {
-    updateActivePopupType: storeUpdateActivePopupType,
-    updateLabels: updateLabelNames
+    updateActivePopupTypeAction: updateActivePopupType,
+    updateLabelNamesAction: updateLabelNames
 };
 
 const mapStateToProps = (state: AppState) => ({});
 
 export default connect(
     mapStateToProps,
     mapDispatchToProps
-)(LoadLabelNamesPopup);
+)(LoadLabelNamesPopup);