WIP: hook selectedDocId and selectedLocaleId into MTMerge container

zanata · Sep 3, 2018 · d8dc427 · d8dc427
1 parent 900ec0f
commit d8dc427
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 8 deletions.
diff --git a/server/zanata-frontend/src/app/actions/version-actions.js b/server/zanata-frontend/src/app/actions/version-actions.js
@@ -60,7 +60,7 @@ import {
  */
 
 export const toggleMTMergeModal =
-  createAction(TOGGLE_MT_MERGE_MODAL)
+  createAction(TOGGLE_MT_MERGE_MODAL, toggle => toggle, (args) => ({args}))
 /** Open or close the TM Merge modal  */
 export const toggleTMMergeModal =
     createAction(TOGGLE_TM_MERGE_MODAL)

diff --git a/server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx b/server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
@@ -25,6 +25,8 @@ export type MTMergeModalStateProps = Readonly<{
   showMTMerge: boolean
   availableLocales: Locale[]
   processStatus?: ProcessStatus
+  selectedDocId?: string
+  selectedLocaleId?: string
 }>
 
 // Redux dispatch, ie connect's TDispatchProps
@@ -84,7 +86,9 @@ export class MTMergeModal extends Component<Props, MTMergeUIState> {
       availableLocales,
       processStatus,
       onCancelMTMerge,
-      queryMTMergeProgress,
+      queryMTMergeProgress
+      // selectedDocId,
+      // selectedLocaleId
     } = this.props
     const enableSubmit = this.state.checkedLocales.length > 0 && !processStatus
     const queryProgress = () => {

diff --git a/server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts b/server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
@@ -21,6 +21,8 @@ const mapReduxStateToProps = (state: RootState): MTMergeModalStateProps => {
       MTMerge: {
         showMTMerge,
         processStatus,
+        selectedDocId,
+        selectedLocaleId
         // queryStatus
       }
     }
@@ -29,6 +31,8 @@ const mapReduxStateToProps = (state: RootState): MTMergeModalStateProps => {
     showMTMerge,
     availableLocales: locales as Locale[],
     processStatus,
+    selectedDocId,
+    selectedLocaleId
     // queryStatus
   }
 }
@@ -45,7 +49,7 @@ const mapDispatchToProps = (dispatch: any): MTMergeModalDispatchProps => {
       dispatch(currentMTMergeProcessFinished())
     },
     onCancel: () => {
-      dispatch(toggleMTMergeModal())
+      dispatch(toggleMTMergeModal({show: false}))
     },
     onSubmit: (projectSlug, versionSlug, mtMergeOptions) => {
       dispatch(mergeVersionFromMT(projectSlug, versionSlug, mtMergeOptions))

diff --git a/server/zanata-frontend/src/app/jsf/index.js b/server/zanata-frontend/src/app/jsf/index.js
@@ -56,7 +56,8 @@ const enhancedHistory = syncHistoryWithStore(history, store)
 
 export default function mountReactToJsf () {
   // Attaching to window object so modals can be triggered from the JSF page
-  window.toggleMTMergeModal = () => store.dispatch(toggleMTMergeModal())
+  window.toggleMTMergeModal = (show, docId, localeId) =>
+    store.dispatch(toggleMTMergeModal({show, docId, localeId}))
   window.toggleTMMergeModal = () => store.dispatch(toggleTMMergeModal())
   window.toggleTMXExportModal = (show) =>
     store.dispatch(showExportTMXModal(show))

diff --git a/server/zanata-frontend/src/app/reducers/state.ts b/server/zanata-frontend/src/app/reducers/state.ts
@@ -27,6 +27,8 @@ export type ProjectVersionState = {
     triggered: boolean
     processStatus?: ProcessStatus
     queryStatus?: string
+    selectedLocaleId?: string
+    selectedDocId?: string
   }
   TMMerge: {
     show: boolean

diff --git a/server/zanata-frontend/src/app/reducers/version-reducer.js b/server/zanata-frontend/src/app/reducers/version-reducer.js
@@ -36,6 +36,8 @@ export const defaultState = {
     triggered: false,
     processStatus: undefined,
     queryStatus: undefined,
+    selectedLocaleId: undefined,
+    selectedDocId: undefined
   },
   TMMerge: {
     show: false,
@@ -56,9 +58,13 @@ export const defaultState = {
 // Should be fixed by Redux 4: https://github.com/reactjs/redux/pull/2773
 /** @type {import('redux').Reducer<ProjectVersionState>} */
 const version = handleActions({
-  [TOGGLE_MT_MERGE_MODAL]: (state, _action) => {
+  [TOGGLE_MT_MERGE_MODAL]: (state, action) => {
     return update(state, {
-      MTMerge: { showMTMerge: { $set: !state.MTMerge.showMTMerge } }
+      MTMerge: {
+        showMTMerge: { $set: action.payload.show },
+        selectedDocId: { $set: action.payload.docId },
+        selectedLocaleId: { $set: action.payload.localeId }
+      }
     })
   },
   [TOGGLE_TM_MERGE_MODAL]: (state, _action) => {

diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
@@ -418,7 +418,7 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{versionHomeAction.canMTDocument(document.docId)}">
                           <li>
-                            <a href="#" class="i__item--right" onclick="toggleMTMergeModal(); return false">
+                            <a href="#" class="i__item--right" onclick="toggleMTMergeModal(true, '#{document.docId}', '#{versionHomeAction.selectedLocale.localeId}'); return false">
                               #{msgs['jsf.iteration.MTMerge']}
                               <i class="i i--translate i__item__icon"></i>
                             </a>

diff --git a/server/zanata-war/src/main/webapp/iteration/view.xhtml b/server/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -425,7 +425,7 @@
                       </li>
                       <ui:fragment rendered="#{versionHomeAction.isMTEnabled()}">
                         <li>
-                          <a href="#" class="i__item--right" onclick="toggleMTMergeModal(); return false">
+                          <a href="#" class="i__item--right" onclick="toggleMTMergeModal(true); return false">
                             #{msgs['jsf.iteration.MTMerge']}
                             <i class="i i--translate i__item__icon"></i>
                           </a>