Correct Stop button

ispras · Feb 17, 2025 · a07a752 · a07a752
1 parent 98f98b1
commit a07a752
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 15 deletions.
diff --git a/src/Layout/TasksSidebar.js b/src/Layout/TasksSidebar.js
@@ -19,7 +19,7 @@ const Wrapper = styled.div`
 
 const onClearTasks = (tasks, remove) => {
   tasks.forEach(task => {
-    if (task.current_stage == task.total_stages && task.progress === 100) {
+    if (task.current_stage == task.total_stages && task.progress === 100 || task.progress < 0) {
       remove(task.id);
     }
   });
@@ -60,7 +60,7 @@ const TasksSidebar = ({ visible, tasks, toggle, remove, set, err }) => {
         {(tasks && tasks.length && (
           <Button
             onClick={() => onClearTasks(tasks, remove)}
-            disabled={!tasks.some(task => task.current_stage == task.total_stages && task.progress === 100)}
+            disabled={!tasks.some(task => task.current_stage == task.total_stages && task.progress === 100 || task.progress < 0)}
             className="lingvo-button-violet-dashed"
           >
             {getTranslation("Clear completed")}

diff --git a/src/api/i18n.js b/src/api/i18n.js
@@ -892,6 +892,8 @@ export const stringsToTranslate = [
   "Started dictionary update. Please check out tasks for details.",
   "Statistics",
   "Stop",
+  "Stopped manually",
+  "Stopping",
   "Storage",
   "Sub string",
   "Subject",

diff --git a/src/components/CognateAnalysisModal/index.js b/src/components/CognateAnalysisModal/index.js
@@ -3273,15 +3273,6 @@ class CognateAnalysisModal extends React.Component {
               { lang_mode === "none" ? this.browse_files_render() : this.language_render(lang_mode === "multi") }
 
               <Modal.Actions>
-                { (mode === "neuro_suggestions" || mode === "multi_neuro_suggestions") && computing && (
-                  <Button
-                    content={this.context("Stop")}
-                    onClick={() => {
-                      this.setState({ computing: false });
-                    }}
-                    className="lingvo-button-red"
-                  />
-                )}
                 <Button
                   content={
                     computing ? (

diff --git a/src/components/TaskList/index.js b/src/components/TaskList/index.js
@@ -1,6 +1,6 @@
-import React, { useContext } from "react";
+import React, { useContext, useState } from "react";
 import { connect } from "react-redux";
-import { Button, List, Progress } from "semantic-ui-react";
+import { Button, List, Progress, Icon } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import { branch, compose, lifecycle, renderComponent } from "recompose";
 import { bindActionCreators } from "redux";
@@ -54,6 +54,10 @@ function Task(props) {
     stopNeuroCognateAnalysis
   } = props;
 
+  const getTranslation = useContext(TranslationContext);
+
+  const [ stopping, setStopping ] = useState(false);
+
   const links = result_link_list.map(link => (
     <div key={link} className="lingvo-task__link">
       <a href={link} key={link}>
@@ -70,7 +74,7 @@ function Task(props) {
           className="lingvo-task__delete"
           onClick={() => {
             // For special tasks
-            if (/\bneuro\b/i.test(task_family) && progress < 100) {
+            if (/\bneuro\b/i.test(task_family) && progress >= 0 && progress < 100) {
               stopNeuroCognateAnalysis({
                 variables: {
                   stamp: id
@@ -91,17 +95,42 @@ function Task(props) {
             className={
               progress && progress === 100
                 ? "lingvo-task__progress lingvo-task__progress_success"
+                : progress < 0
+                ? "lingvo-task__progress lingvo-task__progress_failed"
                 : "lingvo-task__progress"
             }
           />
           <div
             className={
-              progress && progress === 100 ? "lingvo-task__label lingvo-task__label_success" : "lingvo-task__label"
+              progress && progress === 100
+              ? "lingvo-task__label lingvo-task__label_success"
+              : progress < 0
+              ? "lingvo-task__label lingvo-task__label_failed"
+              : "lingvo-task__label"
             }
           >
             {`(${current_stage}/${total_stages}) ${status}`}
           </div>
           {links}
+          { /\bneuro\b/i.test(task_family) && progress >= 0 && progress < 100 && (
+            <Button
+              content={stopping
+                ? <span>{getTranslation("Stopping")}... <Icon name="spinner" loading /></span>
+                : getTranslation("Stop")
+              }
+              disabled={stopping}
+              onClick={() => {
+                setStopping(true);
+                stopNeuroCognateAnalysis({
+                  variables: {
+                    stamp: id
+                  }
+                });
+              }}
+              className="lingvo-button-red"
+              style={{ margin: "0 auto", display: "block", marginTop: "1em" }}
+            />
+          )}
         </div>
       </div>
 

diff --git a/src/styles/main.scss b/src/styles/main.scss
@@ -1638,6 +1638,18 @@ body {
         color: #57b894 !important;
       }
     }
+
+    &_failed {
+      background: #ffe3dd !important;
+
+      & .bar {
+        background: #db4e4e !important;
+      }
+
+      & .label {
+        color: #db4e4e !important;
+      }
+    }
   }
 
   &__label {
@@ -1654,6 +1666,10 @@ body {
     &_success {
       color: #57b894 !important;
     }
+
+    &_failed {
+      color: #db4e4e !important;
+    }
   }
 
   &__link {