matecat · piedicianni · Nov 20, 2024 · Nov 20, 2024
diff --git a/lib/Controller/newProjectController.php b/lib/Controller/newProjectController.php
@@ -267,7 +267,6 @@ public function setTemplateVars() {
 
         //Enable tag projection at instance level
         $this->template->show_tag_projection    = true;
-        $this->template->tag_projection_enabled = true;
         $this->template->tag_projection_default = true;
 
         $this->template->globalMessage = Utils::getGlobalMessage()[ 'messages' ];

diff --git a/lib/Decorator/CatDecorator.php b/lib/Decorator/CatDecorator.php
@@ -119,8 +119,6 @@ private function assignOptions() {
 
         //show Tag Projection
         $this->template->show_tag_projection = true;
-
-        $this->template->tag_projection_enabled = $chunk_options_model->isEnabled( 'tag_projection' );
         $this->template->speech2text_enabled    = $chunk_options_model->isEnabled( 'speech2text' );
 
         LexiQADecorator::getInstance( $this->template )->checkJobHasLexiQAEnabled( $chunk_options_model )->decorateViewLexiQA();

diff --git a/lib/Model/LexiQA/LexiQADecorator.php b/lib/Model/LexiQA/LexiQADecorator.php
@@ -57,7 +57,6 @@ public function decorateViewLexiQA() {
             $this->template->lexiqa_languages = json_encode( ProjectOptionsSanitizer::$lexiQA_allowed_languages );
         }
 
-        $this->template->lxq_enabled  = $this->lexiqa_enabled;
         $this->template->lexiqaServer = $this->lexiqa_server;
 
     }

diff --git a/lib/View/templates/_index.html b/lib/View/templates/_index.html
@@ -103,15 +103,13 @@
                 */
                 lxq_license: '${lxq_license | string:}',
                 lxq_partnerid: '${lxq_partnerid | string:}',
-                lxq_enabled:  ${lxq_enabled},
                 lexiqa_languages: ${lexiqa_languages | string:[]},
                 lexiqaServer: '${lexiqaServer | string:}',
 
                 qa_check_glossary_enabled : ${qa_check_glossary_enabled | string:false },
                 qa_check_blacklist_enabled : ${qa_check_blacklist_enabled | string:false },
                 support_mail : '${support_mail}',
                 speech2text_enabled: ${speech2text_enabled | string:false},
-                tag_projection_enabled: ${tag_projection_enabled | string:false},
                 tag_projection_languages: ${tag_projection_languages},
                 segmentation_rule : '${segmentation_rule}',
                 segmentFilterEnabled: true,

diff --git a/public/js/cat_source/es6/actions/SegmentActions.js b/public/js/cat_source/es6/actions/SegmentActions.js
@@ -491,7 +491,6 @@ const SegmentActions = {
   },
   changeTagProjectionStatus: function (enabled) {
     //TODO: transform paremeter to bool
-    config.tag_projection_enabled = enabled ? 1 : 0
     toggleTagProjectionJob({enabled}).then(() => {
       AppDispatcher.dispatch({
         actionType: SegmentConstants.SET_GUESS_TAGS,

diff --git a/public/js/cat_source/es6/components/header/cattol/Header.js b/public/js/cat_source/es6/components/header/cattol/Header.js
@@ -37,7 +37,7 @@ export const Header = ({
   openTmPanel,
   jobMetadata,
 }) => {
-  const {isUserLogged} = useContext(ApplicationWrapperContext)
+  const {isUserLogged, userInfo} = useContext(ApplicationWrapperContext)
 
   useEffect(() => {
     if (isUserLogged) {
@@ -136,7 +136,10 @@ export const Header = ({
         <UserMenu />
       </div>
       <div id="header-bars-wrapper">
-        <SubHeaderContainer filtersEnabled={SegmentFilter.enabled()} />
+        <SubHeaderContainer
+          userInfo={userInfo}
+          filtersEnabled={SegmentFilter.enabled()}
+        />
       </div>
     </header>
   )

diff --git a/public/js/cat_source/es6/components/header/cattol/SubHeaderContainer.js b/public/js/cat_source/es6/components/header/cattol/SubHeaderContainer.js
@@ -115,6 +115,7 @@ class SubHeaderContainer extends React.Component {
           active={this.state.search}
           isReview={config.isReview}
           searchable_statuses={config.searchable_statuses}
+          userInfo={this.props.userInfo}
         />
         {this.props.filtersEnabled ? (
           <SegmentsFilter

diff --git a/public/js/cat_source/es6/components/header/cattol/search/Search.js b/public/js/cat_source/es6/components/header/cattol/search/Search.js
@@ -75,14 +75,17 @@ class Search extends React.Component {
     if (this.state.funcFindButton) {
       SearchUtils.execFind(this.state.search)
     }
+
+    const {guess_tag: guessTag} = this.props.userInfo.metadata
+
     this.setState({
       funcFindButton: false,
-      ...(config.tag_projection_enabled === 1 && {
+      ...(guessTag === 1 && {
         previousIsTagProjectionEnabled: true,
       }),
     })
     // disable tag projection
-    if (config.tag_projection_enabled === 1) {
+    if (guessTag === 1) {
       SegmentActions.changeTagProjectionStatus(false)
     }
   }

diff --git a/public/js/cat_source/es6/components/segments/SegmentsContainer.js b/public/js/cat_source/es6/components/segments/SegmentsContainer.js
@@ -1,6 +1,7 @@
 import React, {
   createRef,
   useCallback,
+  useContext,
   useEffect,
   useLayoutEffect,
   useMemo,
@@ -25,6 +26,7 @@ import {isUndefined} from 'lodash'
 import SegmentUtils from '../../utils/segmentUtils'
 import CommentsStore from '../../stores/CommentsStore'
 import DraftMatecatUtils from './utils/DraftMatecatUtils'
+import {ApplicationWrapperContext} from '../common/ApplicationWrapper'
 
 const ROW_HEIGHT = 90
 const OVERSCAN = 5
@@ -37,14 +39,7 @@ const SEARCH_BAR_OPENED_PADDING_TOP = 80
 
 const listRef = createRef()
 
-function SegmentsContainer({
-  isReview,
-  startSegmentId,
-  firstJobSegment,
-  guessTagActive,
-  speechToTextActive,
-  multiMatchLangs,
-}) {
+function SegmentsContainer({isReview, startSegmentId, firstJobSegment}) {
   useHotkeys(
     Shortcuts.cattol.events.copySource.keystrokes[Shortcuts.shortCutsKeyType],
     (e) => {
@@ -149,6 +144,8 @@ function SegmentsContainer({
     {enableOnContentEditable: true, preventDefault: true},
   )
 
+  const {userInfo} = useContext(ApplicationWrapperContext)
+
   const [segments, setSegments] = useState(Immutable.fromJS([]))
   const [rows, setRows] = useState([])
   const [essentialRows, setEssentialRows] = useState([])
@@ -180,11 +177,19 @@ function SegmentsContainer({
   const cachedRowsHeightMap = useRef(new Map())
   const cachedSegmentsToJS = useRef(new Map())
 
+  const {guess_tags: guessTagActive, dictation: speechToTextActive} =
+    userInfo?.metadata ?? {}
+
   const onChangeRowHeight = useCallback((id, newHeight) => {
     rowsRenderedHeight.current.set(id, newHeight)
     setOnUpdateRow(Symbol())
   }, [])
 
+  const multiMatchLangs = useMemo(
+    () => userInfo?.metadata?.cross_language_matches ?? [],
+    [userInfo?.metadata],
+  )
+
   const scrollToParams = useMemo(() => {
     const position = scrollToSelected ? 'auto' : 'start'
     const ROWS_LENGTH = rows.length

diff --git a/public/js/cat_source/es6/components/settingsPanel/Contents/EditorSettingsTab/GuessTag.js b/public/js/cat_source/es6/components/settingsPanel/Contents/EditorSettingsTab/GuessTag.js
@@ -60,9 +60,9 @@ export const GuessTag = ({sourceLang, targetLangs}) => {
   const onChange = (isActive) => {
     setIsActive(isActive)
 
-    setUserMetadataKey(METADATA_KEY, isActive ? 1 : 0)
-
-    SegmentActions.changeTagProjectionStatus(isActive)
+    setUserMetadataKey(METADATA_KEY, isActive ? 1 : 0).then(() =>
+      SegmentActions.changeTagProjectionStatus(isActive),
+    )
   }
 
   useEffect(() => {

diff --git a/public/js/cat_source/es6/hooks/useAuth.js b/public/js/cat_source/es6/hooks/useAuth.js
@@ -8,6 +8,7 @@ import commonUtils from '../utils/commonUtils'
 import {isEqual} from 'lodash'
 import {logoutUser} from '../api/logoutUser'
 import {updateUserMetadata} from '../api/updateUserMetadata'
+import {flushSync} from 'react-dom'
 
 const USER_INFO_SCHEMA = {
   user: {
@@ -152,10 +153,12 @@ function useAuth() {
       new Promise((resolve, reject) => {
         updateUserMetadata(key, value)
           .then((data) => {
-            setUserInfo((prevState) => ({
-              ...prevState,
-              metadata: {...prevState.metadata, [key]: value},
-            }))
+            flushSync(() =>
+              setUserInfo((prevState) => ({
+                ...prevState,
+                metadata: {...prevState.metadata, [key]: value},
+              })),
+            )
 
             resolve(data)
           })

diff --git a/public/js/cat_source/es6/pages/CatTool.js b/public/js/cat_source/es6/pages/CatTool.js
@@ -13,7 +13,6 @@ import CatToolConstants from '../constants/CatToolConstants'
 import OfflineUtils from '../utils/offlineUtils'
 import SegmentActions from '../actions/SegmentActions'
 import CatToolActions from '../actions/CatToolActions'
-import SegmentFilter from '../components/header/cattol/segment_filter/segment_filter'
 import SegmentStore from '../stores/SegmentStore'
 import SegmentConstants from '../constants/SegmentConstants'
 import useSegmentsLoader from '../hooks/useSegmentsLoader'
@@ -34,7 +33,6 @@ import CommonUtils from '../utils/commonUtils'
 import {CattoolFooter} from '../components/footer/CattoolFooter'
 import {mountPage} from './mountPage'
 import {ApplicationWrapperContext} from '../components/common/ApplicationWrapper'
-import NotificationBox from '../components/notificationsComponent/NotificationBox'
 import SseListener from '../sse/SseListener'
 import Speech2Text from '../utils/speech2text'
 import {initTagSignature} from '../components/segments/utils/DraftMatecatUtils/tagModel'
@@ -274,7 +272,6 @@ function CatTool() {
       )
     CatToolActions.onRender()
     $('html').trigger('start')
-    if (LXQ.enabled()) LXQ.initPopup()
     UI.splittedTranslationPlaceholder = '##$_SPLIT$##'
   }, [])
 
@@ -376,15 +373,10 @@ function CatTool() {
     if (metadata) {
       if (Speech2Text.enabled(metadata)) Speech2Text.init()
       initTagSignature(metadata)
+      if (LXQ.enabled(metadata)) LXQ.init()
     }
   }, [userInfo?.metadata])
 
-  const {
-    guess_tags: guessTagActive,
-    dictation: speechToTextActive,
-    cross_language_matches: multiMatchLangs = [],
-  } = userInfo?.metadata ?? {}
-
   const isFakeCurrentTemplateReady =
     projectTemplates.length &&
     typeof projectTemplates[1] !== 'undefined' &&
@@ -441,9 +433,6 @@ function CatTool() {
                 isReview={config.isReview}
                 startSegmentId={UI.startSegmentId?.toString()}
                 firstJobSegment={config.first_job_segment}
-                guessTagActive={guessTagActive}
-                speechToTextActive={speechToTextActive}
-                multiMatchLangs={multiMatchLangs}
                 languages={supportedLanguages}
               />
             </div>

diff --git a/public/js/cat_source/es6/pages/SignIn.js b/public/js/cat_source/es6/pages/SignIn.js
@@ -1,7 +1,6 @@
 import React, {useContext, useEffect} from 'react'
 import {mountPage} from './mountPage'
 import Header from '../components/header/Header'
-import NotificationBox from '../components/notificationsComponent/NotificationBox'
 import OnBoarding from '../components/onBoarding/OnBoarding'
 import {ApplicationWrapperContext} from '../components/common/ApplicationWrapper'
 

diff --git a/public/js/cat_source/es6/utils/lxq.main.js b/public/js/cat_source/es6/utils/lxq.main.js
@@ -10,34 +10,28 @@ import {lexiqaIgnoreError} from '../api/lexiqaIgnoreError'
 import SegmentStore from '../stores/SegmentStore'
 import {lexiqaTooltipwarnings} from '../api/lexiqaTooltipwarnings'
 import CatToolActions from '../actions/CatToolActions'
-import CommonUtils from './commonUtils'
+import UserStore from '../stores/UserStore'
 
 const LXQ = {
-  enabled: function () {
-    return !!config.lxq_enabled
+  enabled: function ({lexiqa} = {}) {
+    return (lexiqa ? lexiqa : UserStore.getUserMetadata()?.lexiqa) === 1
   },
   enable: function () {
-    if (!config.lxq_enabled) {
-      config.lxq_enabled = 1
-      toggleTagLexica({enabled: true}).then(() => {
-        if (!LXQ.initialized) {
-          LXQ.init()
-        } else {
-          SegmentActions.qaComponentsetLxqIssues(LXQ.lexiqaData.segments)
-        }
-        CatToolActions.onRender()
-        SegmentActions.getSegmentsQa(SegmentStore.getCurrentSegment())
-      })
-    }
+    toggleTagLexica({enabled: true}).then(() => {
+      if (!LXQ.initialized) {
+        LXQ.init()
+      } else {
+        SegmentActions.qaComponentsetLxqIssues(LXQ.lexiqaData.segments)
+      }
+      CatToolActions.onRender()
+      SegmentActions.getSegmentsQa(SegmentStore.getCurrentSegment())
+    })
   },
   disable: function () {
-    if (config.lxq_enabled) {
-      config.lxq_enabled = 0
-      toggleTagLexica({enabled: false}).then(() => {
-        CatToolActions.onRender()
-        SegmentActions.qaComponentsetLxqIssues([])
-      })
-    }
+    toggleTagLexica({enabled: false}).then(() => {
+      CatToolActions.onRender()
+      SegmentActions.qaComponentsetLxqIssues([])
+    })
   },
   checkCanActivate: function () {
     if (isUndefined(this.canActivate)) {
@@ -269,8 +263,6 @@ LXQ.init = function () {
       lxqServer: config.lexiqaServer,
       projectId: config.id_job + '-' + config.password,
     })
-  } else {
-    config.lxq_enabled = false
   }
   /*
    * Add lexiQA event handlers for warnings events
@@ -762,14 +754,13 @@ LXQ.init = function () {
       }
     }
 
-    var initPopup = function () {
-      lexiqaTooltipwarnings().then((data) => {
-        warningMessages = data
-        modulesNoHighlight = Object.entries(data)
-          .filter(([key]) => key[key.length - 1] === 'g')
-          .map(([key]) => key)
-      })
-    }
+    lexiqaTooltipwarnings().then((data) => {
+      warningMessages = data
+      modulesNoHighlight = Object.entries(data)
+        .filter(([key]) => key[key.length - 1] === 'g')
+        .map(([key]) => key)
+    })
+
     // Interfaces
     $.extend(LXQ, {
       getRanges: getRanges,
@@ -779,17 +770,10 @@ LXQ.init = function () {
       ignoreError: ignoreError,
       redoHighlighting: redoHighlighting,
       doQAallSegments: doQAallSegments,
-      initPopup: initPopup,
       partnerid: partnerid,
       projectid: config.id_job + '-' + config.password,
     })
   })(jQuery, config, window, LXQ)
 }
 
-document.addEventListener('DOMContentLoaded', () => {
-  if (LXQ.enabled()) {
-    LXQ.init()
-  }
-})
-
 export default LXQ
diff --git a/public/js/cat_source/es6/utils/segmentUtils.js b/public/js/cat_source/es6/utils/segmentUtils.js
@@ -2,6 +2,7 @@ import CommonUtils from './commonUtils'
 import SegmentStore from '../stores/SegmentStore'
 import DraftMatecatUtils from '../components/segments/utils/DraftMatecatUtils'
 import {SEGMENTS_STATUS} from '../constants/Constants'
+import UserStore from '../stores/UserStore'
 
 const SegmentUtils = {
   /**
@@ -16,7 +17,7 @@ const SegmentUtils = {
    * Tag Projection: check if is enable the Tag Projection
    */
   checkTPEnabled: function () {
-    return !!config.tag_projection_enabled && !!!config.isReview
+    return UserStore.getUserMetadata()?.guess_tags === 1 && !!!config.isReview
   },
   /**
    * Check if the  the Tag Projection in the current segment is enabled and still not tagged