add setJobsView and setJobsListView methods

jupyter-server · Oct 7, 2022 · 31d091a · 31d091a
1 parent 1fbb973
commit 31d091a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 18 deletions.
diff --git a/src/mainviews/detail-view/detail-view.tsx b/src/mainviews/detail-view/detail-view.tsx
@@ -8,7 +8,8 @@ import {
   IDetailViewModel,
   IJobDefinitionModel,
   IJobDetailModel,
-  JobsView
+  JobsView,
+  ListJobsView
 } from '../../model';
 import { useTranslator } from '../../hooks';
 import { SchedulerService } from '../../handler';
@@ -30,7 +31,8 @@ export interface IDetailViewProps {
   app: JupyterFrontEnd;
   model: IDetailViewModel;
   setCreateJobModel: (createModel: ICreateJobModel) => void;
-  setView: (view: JobsView) => void;
+  setJobsView: (view: JobsView) => void;
+  setListJobsView: (view: ListJobsView) => void;
   // Extension point: optional additional component
   advancedOptions: React.FunctionComponent<Scheduler.IAdvancedOptionsProps>;
 }
@@ -97,7 +99,12 @@ export function DetailView(props: IDetailViewProps): JSX.Element {
             _:
               | React.MouseEvent<HTMLAnchorElement, MouseEvent>
               | React.MouseEvent<HTMLSpanElement, MouseEvent>
-          ): void => props.setView('ListJobs')}
+          ): void => {
+            props.setJobsView('ListJobs');
+            props.setListJobsView(
+              props.model.detailType === 'Job' ? 'Job' : 'JobDefinition'
+            );
+          }}
         >
           {props.model.detailType === 'Job'
             ? trans.__('Notebook Jobs')
@@ -128,7 +135,8 @@ export function DetailView(props: IDetailViewProps): JSX.Element {
               model={jobModel}
               handleModelChange={() => fetchJobDetailModel()}
               setCreateJobModel={props.setCreateJobModel}
-              setView={props.setView}
+              setJobsView={props.setJobsView}
+              setListJobsView={props.setListJobsView}
               // Extension point: optional additional component
               advancedOptions={props.advancedOptions}
               outputFormatsStrings={outputFormatStrings ?? []}
@@ -137,7 +145,8 @@ export function DetailView(props: IDetailViewProps): JSX.Element {
           {props.model.detailType === 'JobDefinition' && jobDefinitionModel && (
             <JobDefinition
               model={jobDefinitionModel}
-              setView={props.setView}
+              setJobsView={props.setJobsView}
+              setListJobsView={props.setListJobsView}
               refresh={fetchJobDefinitionModel}
             />
           )}

diff --git a/src/mainviews/detail-view/job-definition.tsx b/src/mainviews/detail-view/job-definition.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { IJobDefinitionModel, JobsView } from '../../model';
+import { IJobDefinitionModel, JobsView, ListJobsView } from '../../model';
 import { useTranslator } from '../../hooks';
 import { TextFieldStyled, timestampLocalize } from './job-detail';
 import { SchedulerService } from '../../handler';
@@ -16,7 +16,8 @@ import {
 export interface IJobDefinitionProps {
   model: IJobDefinitionModel;
   refresh: () => void;
-  setView: (view: JobsView) => void;
+  setJobsView: (view: JobsView) => void;
+  setListJobsView: (view: ListJobsView) => void;
 }
 
 export function JobDefinition(props: IJobDefinitionProps): JSX.Element {
@@ -26,7 +27,8 @@ export function JobDefinition(props: IJobDefinitionProps): JSX.Element {
 
   const handleDeleteJobDefinition = async () => {
     await ss.deleteJob(props.model.definitionId ?? '');
-    props.setView('ListJobs');
+    props.setJobsView('ListJobs');
+    props.setListJobsView('JobDefinition');
   };
 
   const pauseJobDefinition = async () => {

diff --git a/src/mainviews/detail-view/job-detail.tsx b/src/mainviews/detail-view/job-detail.tsx
@@ -1,7 +1,12 @@
 import React from 'react';
 
 import { JupyterFrontEnd } from '@jupyterlab/application';
-import { ICreateJobModel, IJobDetailModel, JobsView } from '../../model';
+import {
+  ICreateJobModel,
+  IJobDetailModel,
+  JobsView,
+  ListJobsView
+} from '../../model';
 import { useTranslator } from '../../hooks';
 import { SchedulerService } from '../../handler';
 import { Scheduler as SchedulerTokens } from '../../tokens';
@@ -25,7 +30,8 @@ export interface IJobDetailProps {
   model: IJobDetailModel;
   handleModelChange: () => void;
   setCreateJobModel: (createModel: ICreateJobModel) => void;
-  setView: (view: JobsView) => void;
+  setJobsView: (view: JobsView) => void;
+  setListJobsView: (view: ListJobsView) => void;
   // Extension point: optional additional component
   advancedOptions: React.FunctionComponent<SchedulerTokens.IAdvancedOptionsProps>;
   outputFormatsStrings?: string[];
@@ -59,12 +65,13 @@ export function JobDetail(props: IJobDetailProps): JSX.Element {
     };
 
     props.setCreateJobModel(initialState);
-    props.setView('CreateJob');
+    props.setJobsView('CreateJob');
   };
 
   const handleDeleteJob = async () => {
     await ss.deleteJob(props.model.jobId ?? '');
-    props.setView('ListJobs');
+    props.setJobsView('ListJobs');
+    props.setListJobsView('Job');
   };
 
   const handleStopJob = async () => {

diff --git a/src/model.ts b/src/model.ts
@@ -64,11 +64,7 @@ export interface INotebookJobsListingModel {
 // Revised models
 
 // TODO: make these values enums
-export type JobsView =
-  | 'CreateJob'
-  | 'ListJobs'
-  | 'JobDetail'
-  | 'JobDefinitionDetail';
+export type JobsView = 'CreateJob' | 'ListJobs' | 'JobDetail';
 export type ListJobsView = 'Job' | 'JobDefinition';
 
 export type IJobParameter = {

diff --git a/src/notebook-jobs-panel.tsx b/src/notebook-jobs-panel.tsx
@@ -110,7 +110,10 @@ export class NotebookJobsPanel extends VDomRenderer<JobsModel> {
               setCreateJobModel={newModel =>
                 (this.model.createJobModel = newModel)
               }
-              setView={view => (this.model.jobsView = view)}
+              setJobsView={view => (this.model.jobsView = view)}
+              setListJobsView={view => {
+                this.model.listJobsModel.listJobsView = view;
+              }}
               advancedOptions={this._advancedOptions}
             />
           )}