feat(TM details): Add editor url to TM results (#1301)

https://zanata.atlassian.net/browse/ZNTA-448
zanata · Sep 30, 2016 · 9f030e5 · 9f030e5
1 parent e1951ce
commit 9f030e5
Show file tree

Hide file tree

Showing 31 changed files with 87 additions and 991 deletions.
diff --git a/zanata-war/eclipse/launch/webtrans-dummy.launch b/zanata-war/eclipse/launch/webtrans-dummy.launch
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
@@ -68,6 +68,7 @@
 import org.zanata.search.LevenshteinUtil;
 import org.zanata.service.TranslationMemoryService;
 import org.zanata.util.SysProperties;
+import org.zanata.util.UrlUtil;
 import org.zanata.webtrans.shared.model.TransMemoryDetails;
 import org.zanata.webtrans.shared.model.TransMemoryQuery;
 import org.zanata.webtrans.shared.model.TransMemoryResultItem;
@@ -131,6 +132,9 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService {
     @Inject @FullText
     private FullTextEntityManager entityManager;
 
+    @Inject
+    private UrlUtil urlUtil;
+
     // sort desc by lastChanged of HTextFlowTarget
     private final Sort lastChangedSort = new Sort(
             SortField.FIELD_SCORE,
@@ -153,9 +157,10 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService {
             getTransMemoryDetail(HLocale hLocale, HTextFlow tf) {
         HTextFlowTarget tft = tf.getTargets().get(hLocale.getId());
 
-        String iterationName = tf.getDocument().getProjectIteration().getSlug();
-        String projectName =
-                tf.getDocument().getProjectIteration().getProject().getName();
+        HDocument document = tf.getDocument();
+        HProjectIteration version = document.getProjectIteration();
+        HProject project = version.getProject();
+
         String msgContext =
                 (tf.getPotEntryData() == null) ? null : tf.getPotEntryData()
                         .getContext();
@@ -164,10 +169,14 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService {
                 && tft.getLastModifiedBy().hasAccount()) {
             username = tft.getLastModifiedBy().getAccount().getUsername();
         }
+        String url = urlUtil.editorTransUnitUrl(project.getSlug(),
+                version.getSlug(), hLocale.getLocaleId(),
+                document.getSourceLocaleId(), document.getDocId(), tf.getId());
+
         return new TransMemoryDetails(HSimpleComment.toString(tf.getComment()),
-                HSimpleComment.toString(tft.getComment()), projectName,
-                iterationName, tf.getDocument().getDocId(), tf.getResId(),
-                msgContext, tft.getState(), username, tft.getLastChanged());
+                HSimpleComment.toString(tft.getComment()), project.getName(),
+            version.getSlug(), tf.getDocument().getDocId(), tf.getResId(),
+                msgContext, tft.getState(), username, tft.getLastChanged(), url);
     }
 
     /**

diff --git a/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java b/...a-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
@@ -87,6 +87,7 @@ protected void selectDoc(int selected) {
         String iteration = "";
         String doc = "";
         String lastModifiedBy = "";
+        String url = "";
         Date lastModifiedDate = null;
 
         if (selected >= 0) {
@@ -98,6 +99,7 @@ protected void selectDoc(int selected) {
             doc = item.getDocId();
             lastModifiedBy = item.getLastModifiedBy();
             lastModifiedDate = item.getLastModifiedDate();
+            url = item.getUrl();
             display.setState(item.getState());
         }
 
@@ -106,7 +108,7 @@ protected void selectDoc(int selected) {
         display.setProjectName(project);
         display.setVersionName(iteration);
         display.setDocumentName(doc);
-
+        display.setUrl(url);
         display.setLastModified(lastModifiedBy, lastModifiedDate);
     }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java
@@ -34,6 +34,8 @@ public interface TransMemoryDetailsDisplay extends WidgetDisplay {
 
     void setLastModified(String lastModifiedBy, Date lastModifiedDate);
 
+    void setUrl(String url);
+
     void clearSourceAndTarget();
 
     void setSource(List<String> sourceContents);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
@@ -18,6 +18,7 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.InlineHTML;
@@ -48,6 +49,9 @@ interface TMIUiBinder extends UiBinder<HTMLPanel, TransMemoryDetailsView> {
     @UiField(provided = true)
     DialogBoxCloseButton closeButton;
 
+    @UiField
+    Anchor urlLink;
+
     @UiField
     ListBox documentListBox;
     @UiField
@@ -117,6 +121,16 @@ public void setLastModified(String lastModifiedBy, Date lastModifiedDate) {
         }
     }
 
+    @Override
+    public void setUrl(String url) {
+        urlLink.setHref(url);
+        if (Strings.isNullOrEmpty(url)) {
+            urlLink.addStyleName("is-hidden");
+        } else {
+            urlLink.removeStyleName("is-hidden");
+        }
+    }
+
     @Override
     public void clearSourceAndTarget() {
         sourceTextContainer.clear();

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
@@ -47,7 +47,12 @@
         </div>
       </div>
 
-      <g:InlineLabel ui:field='lastModified' styleName="txt--understated" />
+      <g:Anchor ui:field='urlLink' target="_blank" styleName="l--push-all-quarter">
+        Link to translation
+      </g:Anchor>
+
+      <g:InlineLabel ui:field='lastModified'
+        styleName="l--float-right  txt--understated" />
     </div>
   </g:HTMLPanel>
 </ui:UiBinder>
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
@@ -19,6 +19,7 @@ public class TransMemoryDetails implements IsSerializable {
     private ContentState state;
     private String lastModifiedBy;
     private Date lastModifiedDate;
+    private String url;
 
     @SuppressWarnings("unused")
     private TransMemoryDetails() {
@@ -27,7 +28,7 @@ private TransMemoryDetails() {
     public TransMemoryDetails(String sourceComment, String targetComment,
             String projectName, String iterationName, String docId,
             String resId, String msgContext, ContentState state,
-            String lastModifiedBy, Date lastModifiedDate) {
+            String lastModifiedBy, Date lastModifiedDate, String url) {
         this.sourceComment = sourceComment;
         this.targetComment = targetComment;
         this.projectName = projectName;
@@ -38,6 +39,7 @@ public TransMemoryDetails(String sourceComment, String targetComment,
         this.state = state;
         this.lastModifiedBy = lastModifiedBy;
         this.lastModifiedDate = lastModifiedDate;
+        this.url = url;
     }
 
     public String getSourceComment() {
@@ -80,6 +82,10 @@ public Date getLastModifiedDate() {
         return lastModifiedDate;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
     @Override
     public String toString() {
         // @formatter:off
@@ -94,6 +100,7 @@ public String toString() {
             add("state", state).
             add("lastModifiedBy", lastModifiedBy).
             add("lastModifiedDate", lastModifiedDate).
+            add("url", url).
             toString();
       // @formatter:on
     }

diff --git a/zanata-war/src/main/webapp/WEB-INF/web.xml b/zanata-war/src/main/webapp/WEB-INF/web.xml
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
@@ -71,6 +71,7 @@
 import org.zanata.transaction.TransactionUtil;
 import org.zanata.ui.model.statistic.WordStatistic;
 import org.zanata.util.IServiceLocator;
+import org.zanata.util.UrlUtil;
 import org.zanata.util.Zanata;
 import org.zanata.webtrans.shared.model.DocumentStatus;
 import org.zanata.webtrans.shared.model.ValidationId;
@@ -112,7 +113,8 @@
         VersionStateCacheImpl.class,
         TranslationStateCacheImpl.class,
         ValidationServiceImpl.class,
-        TransactionUtil.class
+        TransactionUtil.class,
+        UrlUtil.class
 })
 public class CopyTransServiceImplParameterizedTest {
 
@@ -136,6 +138,9 @@ public class CopyTransServiceImplParameterizedTest {
     @Produces @Mock @FullText
     FullTextEntityManager fullTextEntityManager;
 
+    @Produces @Mock
+    private UrlUtil urlUtil;
+
     @Produces @Mock
     private CacheLoader<DocumentLocaleKey, WordStatistic> documentStatisticLoader;
 

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
@@ -54,6 +54,7 @@
 import org.zanata.test.CdiUnitRunner;
 import org.zanata.ui.model.statistic.WordStatistic;
 import org.zanata.util.IServiceLocator;
+import org.zanata.util.UrlUtil;
 import org.zanata.util.Zanata;
 import org.zanata.webtrans.shared.model.DocumentStatus;
 import org.zanata.webtrans.shared.model.ValidationId;
@@ -92,6 +93,9 @@ public class CopyTransServiceImplTest extends ZanataDbunitJpaTest {
     @Inject DocumentDAO documentDAO;
     @Inject CopyTransServiceImpl copyTransService;
 
+    @Produces @Mock
+    private UrlUtil urlUtil;
+
     @Produces @Mock IServiceLocator serviceLocator;
     @Produces @Mock @FullText FullTextEntityManager fullTextEntityManager;
 

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
@@ -169,7 +169,7 @@ private static TransMemoryResultItem importedTmResult(Long sourceId,
 
     private static TransMemoryDetails tmDetail() {
         return new TransMemoryDetails("", "", "project a", "master",
-                "pot/msg.pot", "resId", null, null, null, null);
+                "pot/msg.pot", "resId", null, null, null, null, null);
     }
 
     private TransMemoryQuery

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
@@ -16,6 +16,7 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.mockito.Mock;
 import org.zanata.common.ContentType;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.LocaleDAO;
@@ -35,6 +36,7 @@
 import org.zanata.test.ParamTestCdiExtension;
 import org.zanata.test.rule.DataSetOperation;
 import org.zanata.test.rule.JpaRule;
+import org.zanata.util.UrlUtil;
 import org.zanata.util.Zanata;
 
 import javax.enterprise.inject.Produces;
@@ -104,6 +106,9 @@ public static class TranslationFinderParameterizedTest {
         @Inject
         TranslationMemoryServiceImpl translationMemoryService;
 
+        @Produces @Mock
+        private UrlUtil urlUtil;
+
         @Parameterized.Parameter(0)
         Execution execution;
 
@@ -308,6 +313,9 @@ FullTextEntityManager getFullTextEntityManager() {
             return Search.getFullTextEntityManager(jpaRule.getEntityManager());
         }
 
+        @Produces @Mock
+        private UrlUtil urlUtil;
+
         @Produces @Zanata
         EntityManagerFactory getEntityManagerFactory() {
             return jpaRule.getEntityManagerFactory();

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
@@ -19,6 +19,7 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.mockito.Mock;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.LocaleDAO;
 import org.zanata.dao.TextFlowDAO;
@@ -38,6 +39,7 @@
 import org.zanata.test.ParamTestCdiExtension;
 import org.zanata.test.rule.DataSetOperation;
 import org.zanata.test.rule.JpaRule;
+import org.zanata.util.UrlUtil;
 import org.zanata.util.Zanata;
 import org.zanata.webtrans.shared.model.TransMemoryDetails;
 import org.zanata.webtrans.shared.model.TransMemoryQuery;
@@ -84,6 +86,9 @@ public static class TranslationMemoryServiceNonParameterizedTest {
         @Inject
         LocaleDAO localeDAO;
 
+        @Produces @Mock
+        private UrlUtil urlUtil;
+
         @Produces @Zanata
         EntityManagerFactory getEntityManagerFactory() {
             return jpaRule.getEntityManagerFactory();
@@ -266,6 +271,9 @@ public static class TranslationMemoryServiceImplParameterizedTest {
         @Inject
         LocaleDAO localeDAO;
 
+        @Produces @Mock
+        private UrlUtil urlUtil;
+
         @Produces @Zanata
         EntityManagerFactory getEntityManagerFactory() {
             return jpaRule.getEntityManagerFactory();