ignore _aitranslate_bak in recursive translation

ist-dresden · Nov 13, 2024 · 114e3a0 · 114e3a0
1 parent 68bd8d0
commit 114e3a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/...ore/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java b/...ore/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java
@@ -130,7 +130,8 @@ protected void copyOriginalPage(SlingHttpServletRequest request, String path) th
             }
             Page copy = pageManager.copy(originalPage, newPath, null, true, true, false);
             if (copy != null) {
-                liveRelationshipManager.endRelationship(copy.getContentResource(), false);
+                liveRelationshipManager.endRelationship(copy.getContentResource(), true);
+                liveRelationshipManager.detach(copy.getContentResource(), true); // end doesn't seem to work
                 LOG.info("Created copy of {} at {}", originalPage.getPath(), newPath);
                 resolver.commit();
             } else {

diff --git a/...e/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java b/...e/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java
@@ -150,7 +150,7 @@ public TranslationRun startTranslation(
     }
 
     protected List<Resource> collectPages(Resource root, int maxDepth) {
-        if (maxDepth < 0) {
+        if (maxDepth < 0 || root.getName().endsWith(AutoTranslateListModel.SUFFIX_TRANSLATECOPY)) {
             return Collections.emptyList();
         }
         if (root.getPath().contains("/jcr:content")) {

diff --git a/...va/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java b/...va/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java
@@ -23,6 +23,7 @@
 import com.adobe.granite.workflow.metadata.MetaDataMap;
 import com.composum.ai.aem.core.impl.autotranslate.AutoPageTranslateService;
 import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateConfigService;
+import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateListModel;
 import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateService.TranslationParameters;
 import com.day.cq.wcm.api.WCMException;
 import com.google.gson.Gson;
@@ -146,7 +147,8 @@ protected void translate(@Nonnull Resource resource, TranslationParameters parms
             while (childIterator.hasNext()) {
                 Resource child = childIterator.next();
                 // skip jcr:content node since that has been translated already
-                if (!child.getPath().contains("/jcr:content")) {
+                if (!child.getPath().contains("/jcr:content") &&
+                        !child.getName().endsWith(AutoTranslateListModel.SUFFIX_TRANSLATECOPY)) {
                     translate(child, parms, depth + 1);
                 }
             }

diff --git a/...i.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html b/...i.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html
@@ -113,7 +113,7 @@
                                 </section>
                                 <hr>
                                 <section>
-                                    Drag this bookmarklet to your bookmark bar to easily open this UI from any page:
+                                    Drag this bookmarklet to your bookmark bar to easily open this UI with the path from any page or editor:
                                     <a id="bookmarklet">Translation Tester</a>
                                 </section>
                             </div>

diff --git a/...s/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.html b/...s/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.html
@@ -77,8 +77,14 @@
     // Load the initial URLs if available in the parameters
     const initialUrl1 = getParameterByName('url1');
     const initialUrl2 = getParameterByName('url2');
-    if (initialUrl1) leftIframe.src = initialUrl1;
-    if (initialUrl2) rightIframe.src = initialUrl2;
+    if (initialUrl1) {
+        leftIframe.src = initialUrl1;
+        leftField.value = initialUrl1;
+    }
+    if (initialUrl2) {
+        rightIframe.src = initialUrl2;
+        rightField.value = initialUrl2;
+    }
 
     // Load event listeners for iframes
     leftIframe.addEventListener('load', function () {