Feature gate job deletions

.env.local

@@ -4,3 +4,4 @@ TEST_DATABASE_URL=postgres://postgres:postgres@localhost:5432/river_test
 OTEL_ENABLED=false
 PORT=8080
 VITE_RIVER_API_BASE_URL=http://localhost:8080/api
+FEATURE_JOB_DELETION_DISABLED=false

handler.go

@@ -97,16 +97,16 @@ func (e *endpoints[TTx]) MountEndpoints(archetype *baseservice.Archetype, logger
 		DB:                       executor,
 		Driver:                   driver,
 		Extensions:               e.Extensions,
+		JobDeletionEnabled:       e.bundleOpts.JobDeletionEnabled,
 		JobListHideArgsByDefault: e.bundleOpts.JobListHideArgsByDefault,
 		Logger:                   logger,
 	}
 
-	return []apiendpoint.EndpointInterface{
+	endpoints := []apiendpoint.EndpointInterface{
 		apiendpoint.Mount(mux, newAutocompleteListEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newFeaturesGetEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newHealthCheckGetEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newJobCancelEndpoint(bundle), mountOpts),
-		apiendpoint.Mount(mux, newJobDeleteEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newJobGetEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newJobListEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newJobRetryEndpoint(bundle), mountOpts),
@@ -117,13 +117,20 @@ func (e *endpoints[TTx]) MountEndpoints(archetype *baseservice.Archetype, logger
 		apiendpoint.Mount(mux, newQueueUpdateEndpoint(bundle), mountOpts),
 		apiendpoint.Mount(mux, newStateAndCountGetEndpoint(bundle), mountOpts),
 	}
+
+	if e.bundleOpts.JobDeletionEnabled {
+		endpoints = append(endpoints, apiendpoint.Mount(mux, newJobDeleteEndpoint(bundle), mountOpts))
+	}
+
+	return endpoints
 }
 
 // HandlerOpts are the options for creating a new Handler.
 type HandlerOpts struct {
 	// DevMode is whether the server is running in development mode.
 	DevMode                  bool
 	Endpoints                uiendpoints.Bundle
+	JobDeletionEnabled       bool
 	JobListHideArgsByDefault bool
 	// LiveFS is whether to use the live filesystem for the frontend.
 	LiveFS bool
@@ -186,6 +193,7 @@ func NewHandler(opts *HandlerOpts) (*Handler, error) {
 	}
 
 	opts.Endpoints.Configure(&uiendpoints.BundleOpts{
+		JobDeletionEnabled:       opts.JobDeletionEnabled,
 		JobListHideArgsByDefault: opts.JobListHideArgsByDefault,
 	})
 

handler_api_endpoint.go

@@ -175,8 +175,9 @@ func (*featuresGetEndpoint[TTx]) Meta() *apiendpoint.EndpointMeta {
 type featuresGetRequest struct{}
 
 type featuresGetResponse struct {
-	Extensions               map[string]bool `json:"extensions"`
-	JobListHideArgsByDefault bool            `json:"job_list_hide_args_by_default"`
+	FeatureJobDeletionEnabled bool            `json:"feature_job_deletion_enabled"`
+	Extensions                map[string]bool `json:"extensions"`
+	JobListHideArgsByDefault  bool            `json:"job_list_hide_args_by_default"`
 }
 
 func (a *featuresGetEndpoint[TTx]) Execute(ctx context.Context, _ *featuresGetRequest) (*featuresGetResponse, error) {
@@ -186,8 +187,9 @@ func (a *featuresGetEndpoint[TTx]) Execute(ctx context.Context, _ *featuresGetRe
 	}
 
 	return &featuresGetResponse{
-		Extensions:               extensions,
-		JobListHideArgsByDefault: a.JobListHideArgsByDefault,
+		FeatureJobDeletionEnabled: a.JobDeletionEnabled,
+		Extensions:                extensions,
+		JobListHideArgsByDefault:  a.JobListHideArgsByDefault,
 	}, nil
 }
 

handler_test.go

@@ -52,11 +52,12 @@ func TestNewHandlerIntegration(t *testing.T) {
 
 		logger := riversharedtest.Logger(t)
 		server, err := NewHandler(&HandlerOpts{
-			DevMode:     true,
-			Endpoints:   bundle,
-			LiveFS:      true,
-			Logger:      logger,
-			projectRoot: "./",
+			DevMode:            true,
+			Endpoints:          bundle,
+			JobDeletionEnabled: true,
+			LiveFS:             true,
+			Logger:             logger,
+			projectRoot:        "./",
 		})
 		require.NoError(t, err)
 		return server

internal/apibundle/api_bundle.go

@@ -16,6 +16,7 @@ type APIBundle[TTx any] struct {
 	DB                       riverdriver.Executor
 	Driver                   riverdriver.Driver[TTx]
 	Extensions               func(ctx context.Context) (map[string]bool, error)
+	JobDeletionEnabled       bool
 	JobListHideArgsByDefault bool
 	Logger                   *slog.Logger
 }

internal/riveruicmd/riveruicmd.go

@@ -163,6 +163,7 @@ func initServer[TClient any](ctx context.Context, opts *initServerOpts, createCl
 		corsOrigins              = strings.Split(os.Getenv("CORS_ORIGINS"), ",")
 		databaseURL              = os.Getenv("DATABASE_URL")
 		devMode                  = envBooleanTrue(os.Getenv("DEV"))
+		jobDeletionEnabled       = !envBooleanTrue(os.Getenv("FEATURE_JOB_DELETION_DISABLED"))
 		jobListHideArgsByDefault = envBooleanTrue(os.Getenv("RIVER_JOB_LIST_HIDE_ARGS_BY_DEFAULT"))
 		host                     = os.Getenv("RIVER_HOST") // may be left empty to bind to all local interfaces
 		liveFS                   = envBooleanTrue(os.Getenv("LIVE_FS"))
@@ -192,6 +193,7 @@ func initServer[TClient any](ctx context.Context, opts *initServerOpts, createCl
 	uiHandler, err := riverui.NewHandler(&riverui.HandlerOpts{
 		DevMode:                  devMode,
 		Endpoints:                createBundle(client),
+		JobDeletionEnabled:       jobDeletionEnabled,
 		JobListHideArgsByDefault: jobListHideArgsByDefault,
 		LiveFS:                   liveFS,
 		Logger:                   opts.logger,

src/App.tsx

@@ -29,6 +29,7 @@ const router = createRouter({
   basepath: getBasePath(),
   context: {
     features: {
+      featureJobDeletionEnabled: true,
       hasClientTable: false,
       hasProducerTable: false,
       producerQueries: false,

src/components/JobDetail.stories.ts

@@ -5,6 +5,12 @@ import { jobFactory } from "@test/factories/job";
 import JobDetail from "./JobDetail";
 
 const meta: Meta<typeof JobDetail> = {
+  args: {
+    cancel: () => {},
+    deleteFn: () => {},
+    jobDeletionEnabled: true,
+    retry: () => {},
+  },
   component: JobDetail,
   title: "Pages/JobDetail",
 };

src/components/JobDetail.test.tsx

@@ -14,6 +14,7 @@ test("requires confirmation before deleting a job", async () => {
     <JobDetail
       cancel={vi.fn()}
       deleteFn={deleteFn}
+      jobDeletionEnabled={true}
       job={job}
       retry={vi.fn()}
     />,
@@ -53,6 +54,7 @@ test("cancels job delete confirmation", async () => {
     <JobDetail
       cancel={vi.fn()}
       deleteFn={deleteFn}
+      jobDeletionEnabled={true}
       job={job}
       retry={vi.fn()}
     />,

src/components/JobDetail.tsx

@@ -21,13 +21,15 @@ import { FormEvent, useState } from "react";
 type JobDetailProps = {
   cancel: () => void;
   deleteFn: () => void;
+  jobDeletionEnabled: boolean;
   job: Job;
   retry: () => void;
 };
 
 export default function JobDetail({
   cancel,
   deleteFn,
+  jobDeletionEnabled,
   job,
   retry,
 }: JobDetailProps) {
@@ -59,6 +61,7 @@ export default function JobDetail({
               <ActionButtons
                 cancel={cancel}
                 deleteFn={deleteFn}
+                jobDeletionEnabled={jobDeletionEnabled}
                 job={job}
                 retry={retry}
               />
@@ -185,7 +188,13 @@ export default function JobDetail({
   );
 }
 
-function ActionButtons({ cancel, deleteFn, job, retry }: JobDetailProps) {
+function ActionButtons({
+  cancel,
+  deleteFn,
+  jobDeletionEnabled,
+  job,
+  retry,
+}: JobDetailProps) {
   const [deleteConfirmationOpen, setDeleteConfirmationOpen] = useState(false);
 
   // Can only delete jobs that aren't running:
@@ -237,27 +246,31 @@ function ActionButtons({ cancel, deleteFn, job, retry }: JobDetailProps) {
           onClick={cancelJob}
           text="Cancel"
         />
-        <ButtonForGroup
-          disabled={deleteDisabled}
-          Icon={TrashIcon}
-          onClick={deleteJob}
-          text="Delete"
-        />
+        {jobDeletionEnabled && (
+          <ButtonForGroup
+            disabled={deleteDisabled}
+            Icon={TrashIcon}
+            onClick={deleteJob}
+            text="Delete"
+          />
+        )}
       </span>
-      <ConfirmationDialog
-        confirmText="Delete job"
-        description={
-          <>
-            This permanently deletes job{" "}
-            <span className="font-mono">{job.id.toString()}</span>. This action
-            cannot be undone.
-          </>
-        }
-        onClose={() => setDeleteConfirmationOpen(false)}
-        onConfirm={confirmDelete}
-        open={deleteConfirmationOpen}
-        title="Delete job?"
-      />
+      {jobDeletionEnabled && (
+        <ConfirmationDialog
+          confirmText="Delete job"
+          description={
+            <>
+              This permanently deletes job{" "}
+              <span className="font-mono">{job.id.toString()}</span>. This
+              action cannot be undone.
+            </>
+          }
+          onClose={() => setDeleteConfirmationOpen(false)}
+          onConfirm={confirmDelete}
+          open={deleteConfirmationOpen}
+          title="Delete job?"
+        />
+      )}
     </>
   );
 }

src/components/JobList.test.tsx

@@ -194,6 +194,7 @@ describe("JobList", () => {
     const deleteJobs = vi.fn();
     const user = userEvent.setup();
     const features = createFeatures({
+      featureJobDeletionEnabled: true,
       jobListHideArgsByDefault: false,
     });
 

src/components/JobList.tsx

@@ -182,6 +182,7 @@ export type JobRowsProps = {
   deleteJobs: (jobIDs: bigint[]) => void;
   hideArgs: boolean;
   initialFilters?: Filter[];
+  jobDeletionEnabled: boolean;
   jobs: JobMinimal[];
   onFiltersChange?: (filters: Filter[]) => void;
   retryJobs: (jobIDs: bigint[]) => void;
@@ -212,13 +213,15 @@ function JobListActionButtons({
   cancel,
   className,
   deleteFn,
+  jobDeletionEnabled,
   jobIDs,
   retry,
   state,
 }: {
   cancel: (jobIDs: bigint[]) => void;
   className?: string;
   deleteFn: (jobIDs: bigint[]) => void;
+  jobDeletionEnabled: boolean;
   jobIDs: bigint[];
   retry: (jobIDs: bigint[]) => void;
   state: JobState;
@@ -279,29 +282,33 @@ function JobListActionButtons({
           onClick={cancelJob}
           text="Cancel"
         />
-        <ButtonForGroup
-          disabled={deleteDisabled}
-          Icon={TrashIcon}
-          onClick={deleteJob}
-          text="Delete"
-        />
+        {jobDeletionEnabled && (
+          <ButtonForGroup
+            disabled={deleteDisabled}
+            Icon={TrashIcon}
+            onClick={deleteJob}
+            text="Delete"
+          />
+        )}
       </span>
-      <ConfirmationDialog
-        confirmText={selectedJobCount === 1 ? "Delete job" : "Delete jobs"}
-        description={
-          selectedJobCount === 1
-            ? "This permanently deletes the selected job. This action cannot be undone."
-            : `This permanently deletes ${selectedJobCount.toString()} selected jobs. This action cannot be undone.`
-        }
-        onClose={() => setDeleteConfirmationOpen(false)}
-        onConfirm={confirmDelete}
-        open={deleteConfirmationOpen}
-        title={
-          selectedJobCount === 1
-            ? "Delete selected job?"
-            : "Delete selected jobs?"
-        }
-      />
+      {jobDeletionEnabled && (
+        <ConfirmationDialog
+          confirmText={selectedJobCount === 1 ? "Delete job" : "Delete jobs"}
+          description={
+            selectedJobCount === 1
+              ? "This permanently deletes the selected job. This action cannot be undone."
+              : `This permanently deletes ${selectedJobCount.toString()} selected jobs. This action cannot be undone.`
+          }
+          onClose={() => setDeleteConfirmationOpen(false)}
+          onConfirm={confirmDelete}
+          open={deleteConfirmationOpen}
+          title={
+            selectedJobCount === 1
+              ? "Delete selected job?"
+              : "Delete selected jobs?"
+          }
+        />
+      )}
     </>
   );
 }
@@ -313,6 +320,7 @@ const JobRows = ({
   deleteJobs,
   hideArgs,
   initialFilters,
+  jobDeletionEnabled,
   jobs,
   onFiltersChange,
   retryJobs,
@@ -382,6 +390,7 @@ const JobRows = ({
             <JobListActionButtons
               cancel={cancelJobs}
               deleteFn={deleteJobs}
+              jobDeletionEnabled={jobDeletionEnabled}
               jobIDs={selectedJobs}
               retry={retryJobs}
               state={state}
@@ -554,6 +563,7 @@ const JobList = (props: JobListProps) => {
           deleteJobs={deleteJobs}
           hideArgs={hideArgs}
           initialFilters={initialFilters}
+          jobDeletionEnabled={features.featureJobDeletionEnabled}
           jobs={jobs}
           onFiltersChange={onFiltersChange}
           retryJobs={retryJobs}

src/components/WorkflowDetail.test.tsx

@@ -42,6 +42,7 @@ vi.mock("@components/workflow-diagram/WorkflowDiagram", () => ({
 
 const features: Features = {
   durablePeriodicJobs: false,
+  featureJobDeletionEnabled: false,
   hasClientTable: false,
   hasProducerTable: true,
   hasSequenceTable: false,

src/routes/jobs/$jobId.tsx

@@ -55,7 +55,7 @@ export const Route = createFileRoute("/jobs/$jobId")({
 function JobComponent() {
   const { jobId } = Route.useParams();
   const navigate = Route.useNavigate();
-  const { queryOptions } = Route.useRouteContext();
+  const { features, queryOptions } = Route.useRouteContext();
   const refreshSettings = useRefreshSetting();
   const queryOptionsWithRefresh = useMemo(
     () => ({ ...queryOptions, refetchInterval: refreshSettings.intervalMs }),
@@ -122,6 +122,7 @@ function JobComponent() {
     <JobDetail
       cancel={cancelMutation.mutate}
       deleteFn={deleteMutation.mutate}
+      jobDeletionEnabled={features.featureJobDeletionEnabled}
       job={job}
       retry={retryMutation.mutate}
     />