Skip to content

Commit 8eb5a13

Browse files
author
Andrea Ceriani
committed
Merge branch '492-console-wide-account' of github.com:eth-cscs/firecrest-ui into 492-console-wide-account
2 parents b39a211 + 4f9b737 commit 8eb5a13

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

app/modules/compute/components/lists/JobList.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ const UnavailableSystemAlert: React.FC<any> = ({ unavailableSystems, className =
5858
interface JobTableRowProps {
5959
job: Job
6060
system: string
61+
account: string
6162
}
6263

6364
enum DisplayField {
@@ -76,13 +77,13 @@ const mustHideField = (field: DisplayField, hideFields: [DisplayField] | []) =>
7677
return true
7778
}
7879

79-
const JobTableRow: React.FC<JobTableRowProps> = ({system, job }: JobTableRowProps) => {
80+
const JobTableRow: React.FC<JobTableRowProps> = ({system, job, account }: JobTableRowProps) => {
8081
const navigate = useNavigate()
8182
const [detailsDialogOpen, setDetailsDialogOpen] = useState(false)
8283
const [cancelDialogOpen, setCancelDialogOpen] = useState(false)
8384

8485
const goToDetails = (jobId: number) => {
85-
navigate(`/compute/systems/${system}/jobs/${jobId}`)
86+
navigate(`/compute/systems/${system}/accounts/${account}/jobs/${jobId}`)
8687
}
8788

8889
return (
@@ -192,8 +193,6 @@ const JobTableRow: React.FC<JobTableRowProps> = ({system, job }: JobTableRowProp
192193

193194
const JobsTable: React.FC<any> = ({jobs }: any) => {
194195

195-
const allUsers = true
196-
197196
const onChangeHandler = (event: any) => {
198197
window.location.href = `/compute/systems/${jobs.system}/accounts/${jobs.account}?allUsers=${event.currentTarget.checked}`
199198
}
@@ -239,6 +238,7 @@ const JobsTable: React.FC<any> = ({jobs }: any) => {
239238
system={jobs.system}
240239
key={`${job.jobId}`}
241240
job={job}
241+
account={jobs.account}
242242
/>
243243
))}
244244
</tbody>
@@ -247,7 +247,7 @@ const JobsTable: React.FC<any> = ({jobs }: any) => {
247247
)
248248
}
249249

250-
const SystemJobList: React.FC<any> = ({ system, jobs, account }) => {
250+
const SystemJobList: React.FC<any> = ({ jobs }) => {
251251

252252
jobs.jobs = jobs.jobs.sort((a: any, b: any) => b.time.start - a.time.start)
253253
return (

0 commit comments

Comments
 (0)