From e9f6a163d93bfb320677a0e82234f7a4dfe8a9ef Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Wed, 12 Jul 2023 14:33:57 +0200
Subject: [PATCH] Use new logsviewer

---
 dashboard/src/filemanager.html           | 2 +-
 dashboard/src/js/client.js               | 2 +-
 dashboard/src/views/app.html             | 2 +-
 dashboard/src/views/backups.html         | 6 +++---
 dashboard/src/views/domains.html         | 6 +++---
 dashboard/src/views/emails-eventlog.html | 2 +-
 dashboard/src/views/emails-queue.html    | 2 +-
 dashboard/src/views/emails.html          | 2 +-
 dashboard/src/views/network.html         | 2 +-
 dashboard/src/views/services.html        | 6 +++---
 dashboard/src/views/settings.html        | 2 +-
 dashboard/src/views/system.html          | 2 +-
 dashboard/src/views/users.html           | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dashboard/src/filemanager.html b/dashboard/src/filemanager.html
index 7c2d1d02e..88b46aeef 100644
--- a/dashboard/src/filemanager.html
+++ b/dashboard/src/filemanager.html
@@ -294,7 +294,7 @@
           <div class="btn-group">
             <button type="button" class="btn btn-sm btn-default" ng-show="backendType === 'app'" ng-click="onRestartApp()" uib-tooltip="{{ 'filemanager.toolbar.restartApp' | tr }}" tooltip-placement="bottom" tooltip-append-to-body="true"><i class="fas fa-sync-alt"></i></button>
             <button type="button" class="btn btn-sm btn-default" ng-show="backendType === 'mail'" ng-click="onRestartMail()" uib-tooltip="{{ 'filemanager.toolbar.restartApp' | tr }}" tooltip-placement="bottom" tooltip-append-to-body="true"><i class="fas fa-sync-alt"></i></button>
-            <a type="button" class="btn btn-sm btn-default" ng-show="backendType === 'app'" ng-href="/logs.html?{{ backendType === 'app' ? 'appId=' + backendId : 'id=mail' }}" target="_blank" uib-tooltip="{{ 'filemanager.toolbar.openLogs' | tr }}" tooltip-placement="bottom" tooltip-append-to-body="true"><i class="fas fa-align-left"></i></a>
+            <a type="button" class="btn btn-sm btn-default" ng-show="backendType === 'app'" ng-href="/frontend/logs.html?{{ backendType === 'app' ? 'appId=' + backendId : 'id=mail' }}" target="_blank" uib-tooltip="{{ 'filemanager.toolbar.openLogs' | tr }}" tooltip-placement="bottom" tooltip-append-to-body="true"><i class="fas fa-align-left"></i></a>
             <a type="button" class="btn btn-sm btn-default" ng-show="backendType === 'app'" ng-href="{{ '/terminal.html?id=' + backendId }}" target="_blank" uib-tooltip="{{ 'filemanager.toolbar.openTerminal' | tr }}" tooltip-placement="bottom" tooltip-append-to-body="true"><i class="fa fa-terminal"></i></a>
           </div>
         </div>
diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index e7414704e..21e7c6739 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -599,7 +599,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         // this happens mostly if the box crashes
         if (message === 'Empty message or object') {
             message = 'Got empty response. Click to check the server logs.';
-            action = action || '/logs.html?id=box';
+            action = action || '/frontend/logs.html?id=box';
         }
 
         this.notify('Cloudron Error', message, true, 'error', action);
diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index ff2a8f758..1c5102dae 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -581,7 +581,7 @@
             <i ng-hide="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fas" ng-class="{ 'fa-power-off': !uninstall.startButton, 'fa-play': uninstall.startButton }"></i>
           </button>
           <div class="btn-group btn-group-sm" role="group">
-            <a class="btn btn-sm btn-default" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.logsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-align-left"></i></a>
+            <a class="btn btn-sm btn-default" ng-href="{{ '/frontend/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.logsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-align-left"></i></a>
             <a class="btn btn-sm btn-default" ng-if="app.type !== APP_TYPES.PROXIED" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.terminalActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fa fa-terminal"></i></a>
             <a class="btn btn-sm btn-default" ng-if="app.manifest.addons.localstorage" ng-href="{{ '/frontend/filemanager.html#/home/app/' + app.id }}" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a>
           </div>
diff --git a/dashboard/src/views/backups.html b/dashboard/src/views/backups.html
index baef32064..f91d2a103 100644
--- a/dashboard/src/views/backups.html
+++ b/dashboard/src/views/backups.html
@@ -510,14 +510,14 @@
   <div class="text-left section-header">
     <h3>
       {{ 'backups.schedule.title' | tr }}
-      <!-- <a class="btn btn-sm btn-default pull-right" ng-href="/logs.html?taskId={{cleanupBackups.taskId}}" target="_blank" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}"><i class="fas fa-align-left"></i></a> -->
+      <!-- <a class="btn btn-sm btn-default pull-right" ng-href="/frontend/logs.html?taskId={{cleanupBackups.taskId}}" target="_blank" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}"><i class="fas fa-align-left"></i></a> -->
       <div class="btn-group btn-group-sm pull-right">
         <button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="cleanupTasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'backups.logs.showLogs' | tr }}">
           <i class="fas fa-align-left"></i> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in cleanupTasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
@@ -562,7 +562,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in backupTasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
diff --git a/dashboard/src/views/domains.html b/dashboard/src/views/domains.html
index d5708e9cf..90133a4d2 100644
--- a/dashboard/src/views/domains.html
+++ b/dashboard/src/views/domains.html
@@ -359,7 +359,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in renewCerts.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
@@ -403,7 +403,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in syncDns.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
@@ -447,7 +447,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in changeDashboard.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
diff --git a/dashboard/src/views/emails-eventlog.html b/dashboard/src/views/emails-eventlog.html
index 719900482..539c16fb7 100644
--- a/dashboard/src/views/emails-eventlog.html
+++ b/dashboard/src/views/emails-eventlog.html
@@ -7,7 +7,7 @@
     <h1>
       {{ 'emails.eventlog.title' | tr }}
 
-      <a class="btn btn-default btn-outline pull-right" href="/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
+      <a class="btn btn-default btn-outline pull-right" href="/frontend/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
       <a class="btn btn-default btn-outline pull-right" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
     </h1>
   </div>
diff --git a/dashboard/src/views/emails-queue.html b/dashboard/src/views/emails-queue.html
index 5fcefdf47..130f9acef 100644
--- a/dashboard/src/views/emails-queue.html
+++ b/dashboard/src/views/emails-queue.html
@@ -7,7 +7,7 @@
     <h1>
       {{ 'emails.queue.title' | tr }}
 
-      <a class="btn btn-default btn-outline pull-right" href="/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
+      <a class="btn btn-default btn-outline pull-right" href="/frontend/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
     </h1>
   </div>
 </div>
diff --git a/dashboard/src/views/emails.html b/dashboard/src/views/emails.html
index 1dca3e067..3d3f66045 100644
--- a/dashboard/src/views/emails.html
+++ b/dashboard/src/views/emails.html
@@ -254,7 +254,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in mailLocation.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
diff --git a/dashboard/src/views/network.html b/dashboard/src/views/network.html
index b7212da0a..9ec701119 100644
--- a/dashboard/src/views/network.html
+++ b/dashboard/src/views/network.html
@@ -285,7 +285,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in dyndnsConfigure.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
diff --git a/dashboard/src/views/services.html b/dashboard/src/views/services.html
index 64631f761..01c617cda 100644
--- a/dashboard/src/views/services.html
+++ b/dashboard/src/views/services.html
@@ -81,7 +81,7 @@
                   <td class="elide-table-cell"></td>
                   <td class="elide-table-cell text-center"></td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <a class="btn btn-xs btn-default" href="/logs.html?id=box" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
+                    <a class="btn btn-xs btn-default" href="/frontend/logs.html?id=box" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
                   </td>
                 </tr>
                 <tr ng-repeat="service in services | filter:{ isRedis: false } | orderBy:'name'">
@@ -114,7 +114,7 @@
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-disabled="!service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
                     <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' && !service.config.recoveryMode }"></i></button>
-                    <a class="btn btn-xs btn-default" ng-href="{{ '/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
+                    <a class="btn btn-xs btn-default" ng-href="{{ '/frontend/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
                   </td>
                 </tr>
                 <tr ng-show="hasRedisServices" ng-click="redisServicesExpanded = !redisServicesExpanded" class="hand">
@@ -142,7 +142,7 @@
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
                     <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' && !service.config.recoveryMode }"></i></button>
-                    <a class="btn btn-xs btn-default" ng-href="{{ '/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
+                    <a class="btn btn-xs btn-default" ng-href="{{ '/frontend/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
                   </td>
                 </tr>
               </tbody>
diff --git a/dashboard/src/views/settings.html b/dashboard/src/views/settings.html
index e04d75c31..abe79871a 100644
--- a/dashboard/src/views/settings.html
+++ b/dashboard/src/views/settings.html
@@ -260,7 +260,7 @@
         </button>
         <ul class="dropdown-menu">
           <li ng-repeat="task in update.tasks">
-            <a ng-href="/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
+            <a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
             {{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
             </a>
           </li>
diff --git a/dashboard/src/views/system.html b/dashboard/src/views/system.html
index fe13e2696..ec97a2984 100644
--- a/dashboard/src/views/system.html
+++ b/dashboard/src/views/system.html
@@ -4,7 +4,7 @@
     <div class="col-md-12">
       <h1>
         {{ 'system.title' | tr }}
-        <a class="btn btn-default pull-right" href="/logs.html?id=box" target="_blank">{{ 'main.action.logs' | tr }}</a>
+        <a class="btn btn-default pull-right" href="/frontend/logs.html?id=box" target="_blank">{{ 'main.action.logs' | tr }}</a>
         <button class="btn btn-default pull-right" ng-click="$parent.reboot.show()">{{ 'main.action.reboot' | tr }}</button>
       </h1>
     </div>
diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html
index a3056c55b..7956f80fd 100644
--- a/dashboard/src/views/users.html
+++ b/dashboard/src/views/users.html
@@ -916,7 +916,7 @@
         <div class="col-md-6 text-right">
           <button class="btn btn-primary pull-right" ng-click="externalLdap.show()">{{ 'users.externalLdap.configureAction' | tr }}</button>
           <button class="btn btn-success pull-right" ng-disabled="externalLdap.currentConfig.provider === 'noop'" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> {{ 'users.externalLdap.syncAction' | tr }}</button>
-          <a class="btn btn-primary pull-right" ng-show="externalLdap.taskId" ng-href="/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">{{ 'users.externalLdap.showLogsAction' | tr }}</a>
+          <a class="btn btn-primary pull-right" ng-show="externalLdap.taskId" ng-href="/frontend/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">{{ 'users.externalLdap.showLogsAction' | tr }}</a>
         </div>
       </div>
     </div>