Migrate Status and Event to Universal API #2160

enonic · Nov 15, 2024 · 5d946ad · 5d946ad
1 parent 46097fa
commit 5d946ad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/main/resources/admin/tools/main/main.js b/src/main/resources/admin/tools/main/main.js
@@ -24,7 +24,15 @@ function getConfigAsJson() {
                 application: app.name,
                 api: 'i18n',
             }),
-        }
+        },
+        eventApiUrl: portal.apiUrl({
+            application: 'admin',
+            api: 'event',
+        }),
+        statusApiUrl: portal.apiUrl({
+            application: 'admin',
+            api: 'status',
+        }),
     }, null, 4).replace(/<(\/?script|!--)/gi, "\\u003C$1");
 }
 

diff --git a/src/main/resources/admin/tools/main/main.xml b/src/main/resources/admin/tools/main/main.xml
@@ -13,5 +13,7 @@
     <api>permissionReport</api>
     <api>com.enonic.xp.app.main:launcher</api>
     <api>com.enonic.xp.app.main:i18n</api>
+    <api>admin:status</api>
+    <api>admin:event</api>
   </apis>
 </tool>
diff --git a/src/main/resources/assets/js/app/event/UsersServerEventsListener.ts b/src/main/resources/assets/js/app/event/UsersServerEventsListener.ts
@@ -8,8 +8,8 @@ import {UsersServerEventsTranslator} from './UsersServerEventsTranslator';
 export class UsersServerEventsListener
     extends ServerEventsListener {
 
-    constructor(applications: Application[]) {
-        super(applications);
+    constructor(applications: Application[], eventApiUrl: string) {
+        super(applications, eventApiUrl);
 
         this.setServerEventsTranslator(new UsersServerEventsTranslator());
     }

diff --git a/src/main/resources/assets/js/main.ts b/src/main/resources/assets/js/main.ts
@@ -44,6 +44,7 @@ function getApplication(): Application {
 function startLostConnectionDetector() {
     ConnectionDetector.get()
         .setAuthenticated(true)
+        .setStatusUrl(CONFIG.getString('statusApiUrl'))
         .setSessionExpireRedirectUrl(CONFIG.getString('toolUri'))
         .setNotificationMessage(i18n('notify.connection.loss'))
         .startPolling(true);
@@ -65,7 +66,7 @@ function startApplication() {
     new ChangeUserPasswordDialog();
     application.setLoaded(true);
 
-    const serverEventsListener = new UsersServerEventsListener([application]);
+    const serverEventsListener = new UsersServerEventsListener([application], CONFIG.getString('eventApiUrl'));
     serverEventsListener.start();
 
     startLostConnectionDetector();