enonic · ashklianko · Jan 5, 2024 · Jan 12, 2024 · Jan 18, 2024 · Jan 25, 2024
diff --git a/modules/app/build.gradle b/modules/app/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     include "com.enonic.xp:lib-schema:${xpVersion}"
     include "com.enonic.lib:lib-admin-ui:${libAdminUiVersion}"
     include "com.enonic.lib:lib-mustache:2.1.1"
+    include "com.enonic.lib:lib-http-client:3.2.2"
     include "com.enonic.xp:lib-io:${xpVersion}"
     include "com.enonic.lib:lib-license:3.1.0"
     include "com.enonic.xp:lib-auth:${xpVersion}"

diff --git a/modules/app/src/main/resources/admin/tools/main/main.html b/modules/app/src/main/resources/admin/tools/main/main.html
@@ -33,6 +33,18 @@
     <link rel="stylesheet" type="text/css" href="{{assetsUri}}/admin/common/styles/lib.css">
     <link rel="stylesheet" type="text/css" href="{{assetsUri}}/styles/contentlib.css">
     <script type="text/javascript" src="{{assetsUri}}/admin/common/js/lib.js"></script>
+
+    {{#aiContentOperatorAssetsUrl}}
+    <!-- Append AI Content Operator -->
+    <link rel="stylesheet" type="text/css" href="{{aiContentOperatorAssetsUrl}}/style.css">
+    <script type="text/javascript" src="{{aiContentOperatorAssetsUrl}}/index.js" data-locales="{{aiLocales}}"
+            data-asset-url="{{aiContentOperatorAssetsUrl}}" async></script>
+    {{/aiContentOperatorAssetsUrl}}
+
+    {{#aiTranslatorAssetsUrl}}
+    <!-- Append AI Translator -->
+    <script type="text/javascript" src="{{aiTranslatorAssetsUrl}}/index.js" data-asset-url="{{aiTranslatorAssetsUrl}}" async></script>
+    {{/aiTranslatorAssetsUrl}}
 </head>
 <body>
 

diff --git a/modules/app/src/main/resources/admin/tools/main/main.js b/modules/app/src/main/resources/admin/tools/main/main.js
@@ -1,17 +1,18 @@
 /*global app, resolve*/
 
 const admin = require('/lib/xp/admin');
+const appLib = require('/lib/xp/app');
 const mustache = require('/lib/mustache');
 const portal = require('/lib/xp/portal');
 const i18n = require('/lib/xp/i18n');
 
-exports.renderTemplate = function (path, params) {
+const AI_TRANSLATOR_APP_KEY = 'com.enonic.app.ai.translator';
+const AI_CONTENT_OPERATOR_APP_KEY = 'com.enonic.app.ai.contentoperator';
+
+exports.renderTemplate = function (params) {
     const view = resolve('./main.html');
-    const toolUri = admin.getToolUrl(app.name, 'main');
-    const isBrowseMode = path === toolUri;
-    const enableSecurityPolicy = app.config['contentSecurityPolicy.enabled'] !== 'false';
 
-    params.isBrowseMode = isBrowseMode;
+    const enableSecurityPolicy = app.config['contentSecurityPolicy.enabled'] !== 'false';
 
     const response = {
         contentType: 'text/html',
@@ -32,30 +33,45 @@ exports.renderTemplate = function (path, params) {
     return response;
 }
 
-exports.getParams = function () {
+exports.getParams = function (path) {
     const toolUrlBase = admin.getToolUrl(
         app.name,
         'main'
     );
+    const isBrowseMode = path === admin.getToolUrl(app.name, 'main');
+
+    const aiContentOperatorApp = appLib.get({key: AI_CONTENT_OPERATOR_APP_KEY});
+    const aiTranslatorApp = appLib.get({key: AI_TRANSLATOR_APP_KEY});
+
+    const isAiContentOperatorEnabled = aiContentOperatorApp != null && aiContentOperatorApp.started && !isBrowseMode;
+    const isAiTranslatorEnabled = aiTranslatorApp != null && aiTranslatorApp.started && !isBrowseMode;
+
+    const locales = admin.getLocales();
+
     return {
         assetsUri: portal.assetUrl({path: ''}),
         appName: i18n.localize({
             key: 'admin.tool.displayName',
             bundles: ['i18n/phrases'],
-            locale: admin.getLocales()
+            locale: locales
         }),
+        aiContentOperatorAssetsUrl: isAiContentOperatorEnabled ? portal.assetUrl({application: AI_CONTENT_OPERATOR_APP_KEY}) : undefined,
+        aiTranslatorAssetsUrl: isAiTranslatorEnabled ? portal.assetUrl({application: AI_TRANSLATOR_APP_KEY}) : undefined,
         launcherPath: admin.getLauncherPath(),
         configServiceUrl: portal.apiUrl({
             application: app.name,
             api: 'config',
         }),
         toolBaseUrl: toolUrlBase,
         toolAppName: app.name,
+        isBrowseMode: isBrowseMode,
+        aiLocales: locales ? locales.join(',') : '',
     }
 }
 
 function handleGet(req) {
-    return exports.renderTemplate(req.path, exports.getParams());
+    const params = exports.getParams(req.path);
+    return exports.renderTemplate(params);
 }
 
 exports.get = handleGet;
diff --git a/modules/app/src/main/resources/admin/tools/main/main.xml b/modules/app/src/main/resources/admin/tools/main/main.xml
@@ -18,5 +18,7 @@
     <api>com.enonic.xp.app.main:i18n</api>
     <api>admin:widget</api>
     <api>com.enonic.app.contentstudio.plus:i18n</api>
+    <api>com.enonic.app.ai.contentoperator:rest</api>
+    <api>com.enonic.app.ai.translator:rest</api>
   </apis>
 </tool>
diff --git a/modules/app/src/main/resources/apis/config/config.js b/modules/app/src/main/resources/apis/config/config.js
@@ -16,6 +16,9 @@ function handleGet() {
         app.name,
         'main'
     );
+    const sagaPollDelay = Number(app.config['openai.poll.delay']) || 0;
+    const sagaPollLimit = Number(app.config['openai.poll.limit']) || 0;
+
     return {
         status: 200,
         contentType: 'application/json',
@@ -59,6 +62,18 @@ function handleGet() {
                     application: app.name,
                     api: 'export',
                 }),
+                aiContentOperatorServiceUrl: portal.apiUrl({
+                    application: 'com.enonic.app.ai.contentoperator',
+                    api: 'rest',
+                }),
+                aiTranslatorServiceUrl: portal.apiUrl({
+                    application: 'com.enonic.app.ai.translator',
+                    api: 'rest',
+                }),
+                appServiceUrl: portal.apiUrl({
+                    application: app.name,
+                    api: 'applications',
+                }),
             },
             theme: 'light',
             /* Remove in CS/lib-admin-ui 5.0 */

diff --git a/modules/app/src/main/resources/lib/requests.js b/modules/app/src/main/resources/lib/requests.js
@@ -0,0 +1,56 @@
+const utils = require('/lib/utils');
+const libHttpClient = require('/lib/http-client');
+
+function respondJson(status, body) {
+    return {
+        status: status,
+        contentType: 'application/json',
+        body: body,
+    };
+}
+
+exports.respondJson = respondJson;
+
+function respondMessage(status, message) {
+    return respondJson(status, {
+        message: message,
+    });
+}
+
+exports.respondMessage = respondMessage;
+
+function request(params) {
+    const path = params.path;
+    const method = params.method || 'GET';
+    const headers = utils.copy({
+        accept: 'application/json',
+    }, params.headers || {});
+    const body = params.body;
+
+    return libHttpClient.request({
+        url: path,
+        method: method,
+        headers: headers,
+        connectionTimeout: 15000,
+        readTimeout: 10000,
+        body: body ? JSON.stringify(body) : undefined,
+    });
+}
+
+exports.request = request;
+
+function getRequest(path, headers) {
+    try {
+        return libHttpClient.request({
+            url: path,
+            method: 'GET',
+            headers: headers || {},
+        });
+    } catch (e) {
+        log.error('Problems with executing GET: ' + path);
+        log.error(e.stack);
+        throw e;
+    }
+}
+
+exports.getRequest = getRequest;
diff --git a/modules/app/src/main/resources/lib/utils.js b/modules/app/src/main/resources/lib/utils.js
@@ -0,0 +1,15 @@
+function copy(objA, objB) {
+    const newObject = {};
+    for (let i = 0; i < arguments.length; i++) {
+        let obj = arguments[i] || {};
+        for (const key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                newObject[key] = obj[key];
+            }
+        }
+    }
+
+    return newObject;
+}
+
+exports.copy = copy;
diff --git a/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.svg b/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.svg
diff --git a/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.woff b/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.woff
diff --git a/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.woff2 b/modules/lib/src/main/resources/assets/icons/fonts/icomoon-studio-lib.woff2
diff --git a/modules/lib/src/main/resources/assets/icons/icons.less b/modules/lib/src/main/resources/assets/icons/icons.less
@@ -247,6 +247,14 @@
   }
 }
 
+.icon-copy {
+  .icon-studio-lib();
+
+  &::before {
+    content: "\e92c";
+  }
+}
+
 .icon-inherited(@size: 18px, @width: @size+2, @height: @size+2, @line-height: @size+4) {
   .icon-down-arrow();
 

diff --git a/modules/lib/src/main/resources/assets/js/app/ContentFormContext.ts b/modules/lib/src/main/resources/assets/js/app/ContentFormContext.ts
@@ -1,15 +1,15 @@
-import {Input} from '@enonic/lib-admin-ui/form/Input';
+import {Application} from '@enonic/lib-admin-ui/application/Application';
+import {ApplicationKey} from '@enonic/lib-admin-ui/application/ApplicationKey';
 import {PropertyPath} from '@enonic/lib-admin-ui/data/PropertyPath';
-import {ContentInputTypeViewContext} from './inputtype/ContentInputTypeViewContext';
-import {Content} from './content/Content';
-import {Site} from './content/Site';
 import {FormContext, FormContextBuilder} from '@enonic/lib-admin-ui/form/FormContext';
+import {Input} from '@enonic/lib-admin-ui/form/Input';
 import {ContentTypeName} from '@enonic/lib-admin-ui/schema/content/ContentTypeName';
+import {Content} from './content/Content';
 import {ContentId} from './content/ContentId';
 import {ContentPath} from './content/ContentPath';
+import {Site} from './content/Site';
+import {ContentInputTypeViewContext} from './inputtype/ContentInputTypeViewContext';
 import {Project} from './settings/data/project/Project';
-import {ApplicationKey} from '@enonic/lib-admin-ui/application/ApplicationKey';
-import {Application} from '@enonic/lib-admin-ui/application/Application';
 
 export class ContentFormContext
     extends FormContext {
@@ -86,7 +86,8 @@ export class ContentFormContext
         return this.stoppedApplications?.find(app => app.getApplicationKey().equals(appKey));
     }
 
-    createInputTypeViewContext(inputTypeConfig: object, parentPropertyPath: PropertyPath, input: Input): ContentInputTypeViewContext {
+    createInputTypeViewContext(inputTypeConfig: ContentInputTypeViewContext['inputConfig'], parentPropertyPath: PropertyPath,
+                               input: Input): ContentInputTypeViewContext {
         const viewContext = {
             formContext: this,
             input: input,
@@ -96,7 +97,7 @@ export class ContentFormContext
             content: this.getPersistedContent(),
             project: this.getProject(),
             applicationKey: this.applicationKey
-        } as ContentInputTypeViewContext;
+        } satisfies ContentInputTypeViewContext;
 
         this.contentUpdatedListeners.push(content => {
             viewContext.content = content;
@@ -114,7 +115,7 @@ export class ContentFormContext
             .setApplicationKey(this.applicationKey)
             .setFormState(this.getFormState())
             .setShowEmptyFormItemSetOccurrences(this.getShowEmptyFormItemSetOccurrences())
-            .setValidationErrors(this.getValidationErrors()) as ContentFormContextBuilder;
+            .setValidationErrors(this.getValidationErrors());
     }
 
     static create(): ContentFormContextBuilder {

diff --git a/modules/lib/src/main/resources/assets/js/app/TooltipHelper.ts b/modules/lib/src/main/resources/assets/js/app/TooltipHelper.ts
@@ -1,7 +1,7 @@
-import {StyleHelper} from '@enonic/lib-admin-ui/StyleHelper';
-import {ElementRemovedEvent} from '@enonic/lib-admin-ui/dom/ElementRemovedEvent';
-import {ElementRegistry} from '@enonic/lib-admin-ui/dom/ElementRegistry';
 import {Element} from '@enonic/lib-admin-ui/dom/Element';
+import {ElementRegistry} from '@enonic/lib-admin-ui/dom/ElementRegistry';
+import {ElementRemovedEvent} from '@enonic/lib-admin-ui/dom/ElementRemovedEvent';
+import {StyleHelper} from '@enonic/lib-admin-ui/StyleHelper';
 
 export class TooltipHelper {
 
@@ -76,8 +76,10 @@ export class TooltipHelper {
 
         function removeTooltipOnClick(e: JQuery.MouseEventBase): void {
             setTimeout(() => {
-                const target = e.target || e.currentTarget;
-                const canRemove = !lastTarget || lastTarget.isEqualNode(target) || lastTarget.contains(target);
+                const canRemove = !lastTarget ||
+                                  lastTarget.isEqualNode(e.target) ||
+                                  lastTarget.isEqualNode(e.currentTarget) ||
+                                  lastTarget.contains(e.target);
                 if (canRemove) {
                     removeTooltip(e);
                 }