Fixes

src/components/CognateAnalysisModal/index.js

@@ -159,15 +159,11 @@ const wordsQuery = gql`
 
 const resultSuggestionsQuery = gql`
   query resultSuggestions(
-    $resultFile: Float!
+    $resultFile: String!
   ) {
     result_suggestions (
       result_file: $resultFile
-    ) {
-      suggestion_list
-      perspective_name_list
-      transcription_count
-    }
+    )
   }
 `;
 
@@ -285,7 +281,6 @@ const computeNeuroCognateAnalysisMutation = gql`
     $baseLanguageId: LingvodocID
     $inputPairs: ObjectVal
     $truthThreshold: Float
-    $stamp: Float
   ) {
     neuro_cognate_analysis(
       source_perspective_id: $sourcePerspectiveId
@@ -294,14 +289,12 @@ const computeNeuroCognateAnalysisMutation = gql`
       base_language_id: $baseLanguageId
       input_pairs: $inputPairs
       truth_threshold: $truthThreshold
-      stamp: $stamp
     ) {
       triumph
       message
       suggestion_list
       perspective_name_list
       transcription_count
-      stamp
     }
   }
 `;
@@ -1473,7 +1466,12 @@ class CognateAnalysisModal extends React.Component {
       this.props.mode === "multi_morphology" ||
       this.props.mode === "multi_neuro_suggestions";
 
-    (multi ? this.initialize_multi : this.initialize_single)();
+    const viewMode = (this.props.mode === "view_suggestions")
+
+    if (!viewMode) {
+      (multi ? this.initialize_multi : this.initialize_single)();
+    }
+
     this.setState({ lang_mode: multi ? "multi" : "single" });
   }
 
@@ -2491,15 +2489,12 @@ class CognateAnalysisModal extends React.Component {
                   sourcePerspectiveId: perspectiveId,
                   baseLanguageId: this.baseLanguageId,
                   truthThreshold,
-                  perspectiveInfoList,
-                  stamp: start
+                  perspectiveInfoList
                 }
               });
 
-              console.log(data.neuro_cognate_analysis.stamp, this.state.computing);
-
               // On Stop button click
-              if (!this.state.computing || data.neuro_cognate_analysis.stamp !== this.state.computing) {
+              if (!this.state.computing) {
                 console.log("Killed!");
                 return;
               }
@@ -3185,12 +3180,14 @@ class CognateAnalysisModal extends React.Component {
   async getResultData() {
     const {
       data: {
-        suggestion_list,
-        perspective_name_list,
-        transcription_count
+        result_suggestions: {
+          suggestion_list,
+          perspective_name_list,
+          transcription_count
+        }
       }
-    } = await client.query({
-      query: getResultSuggestions,
+    } = await this.props.client.query({
+      query: resultSuggestionsQuery,
       variables: { resultFile: this.props.resultFile }
     });
 
@@ -3220,7 +3217,7 @@ class CognateAnalysisModal extends React.Component {
     const viewMode = (mode === "view_suggestions");
 
     if (viewMode && resultFile) {
-      getResultData();
+      this.getResultData();
     }
 
     const {

src/ducks/cognateAnalysis.js

@@ -4,7 +4,7 @@ import { combineReducers } from "redux";
 export const OPEN_MODAL = "@cognateAnalysis/OPEN_MODAL";
 export const CLOSE_MODAL = "@cognateAnalysis/CLOSE_MODAL";
 
-export const openModal = (perspectiveId, mode) => ({ type: OPEN_MODAL, payload: [perspectiveId, mode, resultFile] });
+export const openModal = (perspectiveId, mode, resultFile) => ({ type: OPEN_MODAL, payload: [perspectiveId, mode, resultFile] });
 export const closeModal = () => ({ type: CLOSE_MODAL });
 
 const visible = (state = false, action) => {

src/pages/Suggestions/index.js

@@ -2,29 +2,31 @@ import React from "react";
 import { useLocation } from "react-router-dom";
 import { openModal as cognateAnalysisOpenModal } from "ducks/cognateAnalysis";
 import { matchPath } from "react-router-dom";
-import { compose } from "recompose";
 import { connect } from "react-redux";
+import { bindActionCreators } from "redux";
 
 function getSugg(location) {
   const match = matchPath(
     {
       path: "/suggestions/:sugg"
     },
-    location.path
+    location.pathname
   );
   return match && match.params && match.params.sugg;
 }
 
-const ViewSuggestions = ({ cognateAnalysisOpenModal }) => {
+const ViewSuggestions = ({ actions }) => {
   const location = useLocation();
-  cognateAnalysisOpenModal(null, "view_suggestions", getSugg(location));
+  actions.cognateAnalysisOpenModal(null, "view_suggestions", getSugg(location) || null);
   return null;
 };
 
-const ViewSuggestionsWrapper = compose(
-  connect(null, dispatch => ({
-    actions: bindActionCreators({ cognateAnalysisOpenModal }, dispatch)
-  }))
+export default connect(
+  null,
+  dispatch => ({
+    actions: bindActionCreators({
+      cognateAnalysisOpenModal,
+    },
+    dispatch)
+  })
 )(ViewSuggestions);
-
-export default ViewSuggestionsWrapper;