diff --git a/cypress/pages/workerView.ts b/cypress/pages/workerView.ts
index 12b57cc27c..e14bfd36a2 100644
--- a/cypress/pages/workerView.ts
+++ b/cypress/pages/workerView.ts
@@ -1,14 +1,14 @@
import { BasePage } from './base';
export class WorkerViewPage extends BasePage {
- url = '/workers';
+ url = '/settings/workers';
getters = {
workerCards: () => cy.getByTestId('worker-card'),
workerCard: (workerId: string) => this.getters.workerCards().contains(workerId),
workerViewLicensed: () => cy.getByTestId('worker-view-licensed'),
workerViewUnlicensed: () => cy.getByTestId('worker-view-unlicensed'),
menuItems: () => cy.get('.el-menu-item'),
- menuItem: () => this.getters.menuItems().get('#workersview'),
+ menuItem: () => this.getters.menuItems().get('#settings-workersview'),
};
actions = {};
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index a0df126025..3a0062c44f 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -261,15 +261,6 @@ export default defineComponent({
position: 'top',
activateOnRouteNames: [VIEWS.EXECUTIONS],
},
- {
- id: 'workersview',
- icon: 'truck-monster',
- label: this.$locale.baseText('mainSidebar.workersView'),
- position: 'top',
- available:
- this.settingsStore.isQueueModeEnabled && this.settingsStore.isWorkerViewAvailable,
- activateOnRouteNames: [VIEWS.WORKER_VIEW],
- },
{
id: 'cloud-admin',
type: 'link',
@@ -448,12 +439,6 @@ export default defineComponent({
}
break;
}
- case 'workersview': {
- if (this.$router.currentRoute.name !== VIEWS.WORKER_VIEW) {
- this.goToRoute({ name: VIEWS.WORKER_VIEW });
- }
- break;
- }
case 'settings': {
const defaultRoute = this.findFirstAccessibleSettingsRoute();
if (defaultRoute) {
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index 5f7383d849..bdcbf15ef4 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/editor-ui/src/components/SettingsSidebar.vue
@@ -117,6 +117,15 @@ export default defineComponent({
available: this.canAccessLdapSettings(),
activateOnRouteNames: [VIEWS.LDAP_SETTINGS],
},
+ {
+ id: 'settings-workersview',
+ icon: 'truck-monster',
+ label: this.$locale.baseText('mainSidebar.workersView'),
+ position: 'top',
+ available:
+ this.settingsStore.isQueueModeEnabled && this.settingsStore.isWorkerViewAvailable,
+ activateOnRouteNames: [VIEWS.WORKER_VIEW],
+ },
];
for (const item of this.settingsFakeDoorFeatures) {
@@ -241,6 +250,10 @@ export default defineComponent({
void this.$router.push({ name: VIEWS.AUDIT_LOGS });
}
break;
+ case 'settings-workersview': {
+ await this.navigateTo(VIEWS.WORKER_VIEW);
+ break;
+ }
default:
break;
}
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
index 5bea9073a9..b930e6e012 100644
--- a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
@@ -7,8 +7,8 @@
:class="stale ? [$style.cardHeading, $style.stale] : [$style.cardHeading]"
data-test-id="worker-card-name"
>
- {{ worker.workerId }} ({{ worker.hostname }}) | Average Load:
- {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free Memory:
+ Name: {{ worker.workerId }} ({{ worker.hostname }})
+ Average Load: {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free Memory:
{{ memAsGb(worker.freeMem).toFixed(2) }}GB / {{ memAsGb(worker.totalMem).toFixed(2) }}GB
{{ stale ? ' (stale)' : '' }}
@@ -17,8 +17,8 @@
{{ $locale.baseText('workerList.item.lastUpdated') }} {{ secondsSinceLastUpdateString }}s
- ago | Architecture: {{ worker.arch }} | Platform: {{ worker.platform }} | n8n-Version:
- {{ worker.version }} | Uptime: {{ upTime(worker.uptime) }}
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index fee730ac7e..e394d60b09 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -217,21 +217,6 @@ export const routes = [
},
},
},
- {
- path: '/workers',
- name: VIEWS.WORKER_VIEW,
- components: {
- default: WorkerView,
- sidebar: MainSidebar,
- },
- meta: {
- permissions: {
- allow: {
- loginStatus: [LOGIN_STATUS.LoggedIn],
- },
- },
- },
- },
{
path: '/workflows',
name: VIEWS.WORKFLOWS,
@@ -736,6 +721,20 @@ export const routes = [
},
},
},
+ {
+ path: 'workers',
+ name: VIEWS.WORKER_VIEW,
+ components: {
+ settingsView: WorkerView,
+ },
+ meta: {
+ permissions: {
+ allow: {
+ loginStatus: [LOGIN_STATUS.LoggedIn],
+ },
+ },
+ },
+ },
{
path: 'community-nodes',
name: VIEWS.COMMUNITY_NODES,
diff --git a/packages/editor-ui/src/views/WorkerView.vue b/packages/editor-ui/src/views/WorkerView.vue
index 067be72cb4..b12de68954 100644
--- a/packages/editor-ui/src/views/WorkerView.vue
+++ b/packages/editor-ui/src/views/WorkerView.vue
@@ -1,30 +1,26 @@
-
+
+
+
+ {{ $locale.baseText('workerList.actionBox.title') }}
+
+
+ {{ $locale.baseText('workerList.actionBox.description') }}
+
+ {{ $locale.baseText('workerList.actionBox.description.link') }}
+
+
+