From 55e0a21f798fbf56679aed4ce267d6efb8241dfa Mon Sep 17 00:00:00 2001 From: Dunemask Date: Tue, 9 Aug 2022 15:19:09 +0000 Subject: [PATCH] Fixed nav bug --- src/views/jobs/Jobs.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/jobs/Jobs.jsx b/src/views/jobs/Jobs.jsx index 4e260c9..62eb282 100644 --- a/src/views/jobs/Jobs.jsx +++ b/src/views/jobs/Jobs.jsx @@ -18,11 +18,11 @@ export default function Jobs() { useEffect(() => { const jobName = location.hash.slice(1); const pipelineId = jobName.slice(1); - const noPipeline = !jobName || jobState.pipelines.find((p)=>p.id ===pipelineId); - - const noJob = !jobName || jobState.jobs.find((job) => job.name === jobName) - if(!noPipeline || !noJob) return; - navigate("/qualiteer/jobs"); + if(!jobName || !pipelineId) return; + const hasJob = jobState.pipelines.find((p)=>p.id ===pipelineId); + const hasPipeline = jobState.jobs.find((job) => job.name === jobName); + if(hasPipeline || hasJob) return; + if(jobName || pipelineId) navigate("/qualiteer/jobs"); }); return ( @@ -69,7 +69,7 @@ export default function Jobs() { ) } - { location.hash[1] === "p"? p.id===location.hash.slice(2))}/> : + { location.hash[1] === "p"? jobState.pipelines.find((p)=>p.id===location.hash.slice(2)) && (p.id===location.hash.slice(2))}/>) : jobState.jobs.find((job) => job.name === location.hash.slice(1)) && ( job.name === location.hash.slice(1))} />