Pre-marked corpora checkbox

Author: vmonakhov

src/api/i18n.js

@@ -724,6 +724,7 @@ export const stringsToTranslate = [
   "plural",
   "Possesiv",
   "posssesiv",
+  "Pre-marked corpora",
   "precative",
   "predicative",
   "prefix",

src/ducks/dictImport.js

@@ -15,6 +15,7 @@ const COLUMN_SET_TYPE = "@import/COLUMN_SET_TYPE";
 const LANGUAGE_SET = "@import/LANGUAGE_SET";
 const LICENSE_SET = "@import/LICENSE_SET";
 const LOCALE_SET = "@import/LOCALE_SET";
+const MARKED_SET = "@import/MARKED_SET";
 
 function _getLinking(state) {
   return state.get("linking").filter(v => v.get("id"));
@@ -125,6 +126,23 @@ function updateColumnTypes(state) {
   });
 }
 
+function setMarkedTxt(state) {
+  const first = _getLinking(state).first();
+  const firstId = first.get("id");
+  const firstDataType = first.get("data_type");
+  const isTxt = (firstDataType === "txt");
+  const isMarked = (firstDataType === "marked");
+  const statePath = ["linking", firstId, "data_type"];
+
+  return (
+    isTxt
+    ? state.setIn(statePath, "marked")
+    : isMarked
+    ? state.setIn(statePath, "txt")
+    : state
+  )
+}
+
 const initial = new Map({
   step: "LINKING",
   blobs: new List(),
@@ -173,6 +191,9 @@ export default function (state = initial, { type, payload }) {
     case LICENSE_SET:
       newState = state.setIn(["licenses", payload.id], payload.license);
       break;
+    case MARKED_SET:
+      newState = setMarkedTxt(state);
+      break;
     case LOCALE_SET:
       if (payload.value) {
         return state.setIn(["linking", payload.id, "translation", payload.locale], payload.value);
@@ -326,3 +347,7 @@ export function setTranslation(id, locale, value) {
     payload: { id, locale, value }
   };
 }
+
+export function setMarked() {
+  return { type: MARKED_SET };
+}

src/pages/CorpImport/Linker.js

@@ -8,16 +8,16 @@ function Columns({ blob, index, mode, onDelete, onUpdateColumn }) {
   const getTranslation = useContext(TranslationContext);
   const color = (mode === 'json') ? "blue" : index ? "yellow" : "green";
   const name = (mode === 'json') ? "both sides" : index ? "sentence" : "base sentence";
-  const value = blob.getIn(["values", "sentence"], "dash");
-  useEffect(
-    () => {
-      onUpdateColumn("sentence", value);
-      if (mode === 'json') {
-         onUpdateColumn("to_sentence", "json");
-      }
-    },
-    []
-  );
+  // We store 'dedash' flag in 'sentence' value because its value has no matter anywhere else
+  const dedash = blob.getIn(["values", "sentence"], null) === "dedash";
+  useEffect(() => {
+    // On json format we have both sentences in one file,
+    // so to_sentence is already selected, we store a random value there
+    // to get 'Next Step' button active at once
+    if (mode === 'json') {
+      onUpdateColumn("to_sentence", "json_mode");
+    }
+  }, []);
 
   return (
     <div className="blob blob_corp">
@@ -28,34 +28,37 @@ function Columns({ blob, index, mode, onDelete, onUpdateColumn }) {
           {getTranslation(name)}
         </Button>
       </div>
-      { !index && (mode === 'txt') && (
+      { !index && (mode === 'txt' || mode === 'marker') && (
         <Checkbox className="blob-checkbox"
           label={getTranslation("Hide dashes")}
-          onClick={() => onUpdateColumn("sentence", value === "dash" ? "dedash" : "dash", value)}
-          checked={value === "dedash"} />
+          onClick={() => onUpdateColumn("sentence", dedash ? mode : "dedash")}
+          checked={dedash} />
       ) || <div className="blob-checkbox" />}
     </div>
   );
 }
 
-function Linker({ blobs, state, onSelect, onDelete, onUpdateColumn }) {
+function Linker({ blobs, state, onSelect, onSetMarked, onDelete, onUpdateColumn }) {
   const getTranslation = useContext(TranslationContext);
 
   const first = state.first();
-  const selected = first ? first.get("id").join("/") : null;
+  const firstId = first ? first.get("id") : null;
+  const selected = firstId ? firstId.join("/") : null;
   const mode = first ? first.get("data_type") : null;
+  const marked = (mode === 'marked');
 
-  const stateOptions = blobs.filter(
-    blob => (!mode || blob.get("data_type") === mode)).reduce(
-    (acc, blob) => [
-      ...acc,
+  // Filtering stored files by type on mode current value
+  // Note: 'marked' mode value means 'txt' files type
+  const stateOptions = (
+    blobs.filter(blob => !mode || blob.get("data_type") === (marked ? 'txt' : mode))
+  ).reduce((acc, blob) =>
+    [ ...acc,
       {
         key: blob.get("id").join("/"),
         value: blob.get("id").join("/"),
         text: blob.get("name")
       }
-    ],
-    []
+    ], []
   );
 
   function onChange(event, data) {
@@ -86,7 +89,17 @@ function Linker({ blobs, state, onSelect, onDelete, onUpdateColumn }) {
             onUpdateColumn={onUpdateColumn(id)}
           />
         ))
-        .toArray()}
+        .toArray()
+      }
+      { (mode === 'txt' || mode === 'marked') && (
+        <div className="container-gray">
+          <Checkbox className="blob-checkbox"
+            label={getTranslation(ff)}
+            onClick={onSetMarked}
+            checked={marked}
+          />
+        </div>
+      )}
     </div>
   );
 }

src/pages/CorpImport/api.js

@@ -33,7 +33,7 @@ export function corporaInfo({ linking, languages, licenses, mode }) {
 
 function blobExport(blob, columnType) {
   const blob_id = blob.get("id").toArray();
-  const dedash = (blob.getIn(["values", "sentence"], "dash") === "dedash");
+  const dedash = (blob.getIn(["values", "sentence"], null) === "dedash");
   const field_ids = [columnType.get("sentence", new Map()).toArray(),
                      columnType.get("to_sentence", new Map()).toArray()];
 

src/pages/CorpImport/index.js

@@ -18,7 +18,8 @@ import {
   setLanguage,
   setLicense,
   setTranslation,
-  updateColumn
+  updateColumn,
+  setMarked
 } from "ducks/dictImport";
 import TranslationContext from "Layout/TranslationContext";
 import LanguageSelection from "pages/DictImport/LanguageSelection";
@@ -72,7 +73,8 @@ class Info extends React.Component {
     updateColumn: PropTypes.func.isRequired,
     setColumnType: PropTypes.func.isRequired,
     setLanguage: PropTypes.func.isRequired,
-    setTranslation: PropTypes.func.isRequired
+    setTranslation: PropTypes.func.isRequired,
+    setMarked: PropTypes.func.isRequired
   };
 
   constructor(props) {
@@ -88,6 +90,7 @@ class Info extends React.Component {
     this.onSetLicense = this.onSetLicense.bind(this);
     this.onSetTranslation = this.onSetTranslation.bind(this);
     this.onSubmit = this.onSubmit.bind(this);
+    this.onSetMarked = this.onSetMarked.bind(this);
   }
 
   componentDidUpdate() {
@@ -107,6 +110,10 @@ class Info extends React.Component {
     this.props.linkingAdd(payload);
   }
 
+  onSetMarked() {
+    this.props.setMarked();
+  }
+
   onDelete(payload) {
     this.props.linkingDelete(payload);
   }
@@ -196,6 +203,7 @@ class Info extends React.Component {
               blobs={blobs}
               state={linking}
               onSelect={this.onSelect}
+              onSetMarked={this.onSetMarked}
               onDelete={this.onDelete}
               onUpdateColumn={this.onUpdateColumn}
             />
@@ -301,7 +309,8 @@ const mapDispatchToProps = {
   setColumnType,
   setLanguage,
   setTranslation,
-  setLicense
+  setLicense,
+  setMarked
 };
 
 Info.propTypes = {

src/pages/DashboardRoute/index.js

@@ -47,7 +47,7 @@ const DashboardRoute =  connect(state => state.user)(({user}) => {
               <img className="card-item__img card-item__img_parallel-corpora" src={imageParallelCorpora} />
             </Link>
             {allowed_users.includes(user.id) && (
-              <a className="card-item" href={window.location.origin + "/lingtrain_aligner/user/" + user.login}>
+              <a className="card-item" href={window.location.origin + "/lingtrain_aligner/user/" + user.login + "/"}>
                 <label className="card-item__label">{getTranslation("Lingtrain aligner")}</label>
                 <img className="card-item__img card-item__img_parallel-corpora" src={imageParallelCorpora} />
               </a>