Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Use alert for remote runner message

Chocobozzz027bfba8da77
diff --git a/client/src/app/+admin/admin-settings.component.ts b/client/src/app/+admin/admin-settings.component.ts
index 67b4787da1..9d16796f0c 100644
--- a/client/src/app/+admin/admin-settings.component.ts
+++ b/client/src/app/+admin/admin-settings.component.ts
@@ -103,7 +103,7 @@ export class AdminSettingsComponent implements OnInit {
}
private buildRunnerItems () {
- if (!this.isRemoteRunnersEnabled() || !this.hasRight(UserRight.MANAGE_RUNNERS)) return
+ if (!this.server.isRemoteRunnersEnabled() || !this.hasRight(UserRight.MANAGE_RUNNERS)) return
this.menuEntries.push({
label: $localize`Runners`,
@@ -165,14 +165,4 @@ export class AdminSettingsComponent implements OnInit {
private hasRight (right: UserRightType) {
return this.auth.getUser().hasRight(right)
}
-
- private isRemoteRunnersEnabled () {
- const config = this.server.getHTMLConfig()
-
- return config.transcoding.remoteRunners.enabled ||
- config.live.transcoding.remoteRunners.enabled ||
- config.videoStudio.remoteRunners.enabled ||
- config.videoTranscription.remoteRunners.enabled ||
- config.storyboards.remoteRunners.enabled
- }
}
diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html
index 3fbf2b9087..6bdcc427e7 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -1,4 +1,6 @@
-<div class="muted" i18n>Some jobs are also processed by <a routerLink="/admin/settings/system/runners/jobs-list">remote runners</a>.</div>
+@if (isRunnerEnabled()) {
+ <div class="alert alert-info" i18n>Some jobs are also processed by <a routerLink="/admin/settings/system/runners/jobs-list">remote runners</a>.</div>
+}
<my-table
#table
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index 7ee8b46abb..1da15d2e59 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'
import { Component, inject, viewChild } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { RouterLink } from '@angular/router'
-import { RestPagination } from '@app/core'
+import { RestPagination, ServerService } from '@app/core'
import { AdvancedFilterDef } from '@app/shared/shared-forms/advanced-input-filter.component'
import { PeerTubeBadgeService } from '@app/shared/shared-main/common/peertube-badge.service'
import { Job, JobState, JobType } from '@peertube/peertube-models'
@@ -27,6 +27,7 @@ type DataLoaderParameter = Parameters<JobsComponent['_dataLoader']>[0]
]
})
export class JobsComponent {
+ private server = inject(ServerService)
private jobsService = inject(JobService)
private peertubeBadgeService = inject(PeerTubeBadgeService)
@@ -160,6 +161,10 @@ export class JobsComponent {
return $localize`Filter by type: ${type.toLocaleUpperCase()}`
}
+ isRunnerEnabled () {
+ return this.server.isRemoteRunnersEnabled()
+ }
+
private _dataLoader (options: {
pagination: RestPagination
sort: SortMeta
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 86ed80d38b..0556ba2e96 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -102,6 +102,18 @@ export class ServerService {
return this.htmlConfig
}
+ isRemoteRunnersEnabled () {
+ const config = this.getHTMLConfig()
+
+ return config.transcoding.remoteRunners.enabled ||
+ config.live.transcoding.remoteRunners.enabled ||
+ config.videoStudio.remoteRunners.enabled ||
+ config.videoTranscription.remoteRunners.enabled ||
+ config.storyboards.remoteRunners.enabled
+ }
+
+ // ---------------------------------------------------------------------------
+
getCommentPolicies () {
return of([
{