Correct 'getNextStep'

ispras · Sep 30, 2023 · 35ce5ca · 35ce5ca
1 parent 8eea606
commit 35ce5ca
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/src/ducks/dictImport.js b/src/ducks/dictImport.js
@@ -15,6 +15,10 @@ const LANGUAGE_SET = "@import/LANGUAGE_SET";
 const LICENSE_SET = "@import/LICENSE_SET";
 const LOCALE_SET = "@import/LOCALE_SET";
 
+function _getLinking(state) {
+  return state.get("linking").filter(v => v.get("id"));
+}
+
 // Reducers
 function meta(blob) {
   return blob.set("translation", new Map());
@@ -81,7 +85,7 @@ function updateSingleSpread(result, blob) {
 }
 
 function updateSpread(state) {
-  const extractedSpreads = f(state.get("linking")).reduce((acc, blob) => updateSingleSpread(acc, blob), new Map());
+  const extractedSpreads = _getLinking(state).reduce((acc, blob) => updateSingleSpread(acc, blob), new Map());
   return state.set("spreads", extractedSpreads);
 }
 
@@ -95,7 +99,7 @@ function updateNextStep(step) {
 }
 
 function updateColumnTypes(state) {
-  const blobs = f(state.get("linking"));
+  const blobs = _getLinking(state);
   const columnTypes = state.get("columnTypes");
 
   return state.withMutations(map => {
@@ -183,48 +187,42 @@ export default function (state = initial, { type, payload }) {
 
 // Selectors
 
-// Checking for true blobs to avoid side-effect due to code reusing
-const f = linking => linking.filter(v => v.get("id"));
-
 export const selectors = {
   getStep(state) {
     return state.dictImport.get("step");
   },
   getNextStep(state, minimum=0) {
+    const linking = _getLinking(state.dictImport);
+    let result = true;
+
     switch (state.dictImport.get("step")) {
-      case "LINKING":
-        return (
-          f(state.dictImport
-            .get("linking"))
-            .toArray()
-            .reduce((count, info) => count + info.get("values").filter(value => value).size, 0) > minimum
-        );
-
-      case "COLUMNS":
-        const linking = f(state.dictImport.get("linking"));
-
-        return state.dictImport.get("columnTypes").every((field_map, blob_id) => {
+      case "LANGUAGES":
+        const languages = state.dictImport.get("languages");
+
+        result &&= linking
+          .every((item, blob_id) => languages.has(blob_id) && item.get("translation").size > 0);
+
+      case "COLUMNS" || "LANGUAGES":
+        result &&= state.dictImport.get("columnTypes").every((field_map, blob_id) => {
           const linking_map = linking.getIn([blob_id, "values"]);
 
           return field_map.every((field_id, field_name) => field_id !== null || !linking_map.get(field_name));
         });
 
-      case "LANGUAGES":
-        const languages = state.dictImport.get("languages");
-
-        return f(state.dictImport
-          .get("linking"))
-          .every((item, blob_id) => languages.has(blob_id) && item.get("translation").size > 0);
+      case "LINKING" || "COLUMNS" || "LANGUAGES":
+        result &&= linking
+                   .toArray()
+                   .reduce((count, info) => count + info.get("values").filter(value => value).size, 0) > minimum;
 
       default:
-        return false;
+        return result;
     }
   },
   getBlobs(state) {
     return state.dictImport.get("blobs");
   },
   getLinking(state) {
-    return f(state.dictImport.get("linking"));
+    return _getLinking(state.dictImport);
   },
   getSpreads(state) {
     return state.dictImport.get("spreads");