From 024f3962b2becfac079fa7e065cd3fa2781729f9 Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Wed, 21 Apr 2021 10:40:37 -0700
Subject: [PATCH] use getNetboxData utility function in job handling

---
 netbox/project-static/dist/jobs.js     | Bin 150139 -> 150055 bytes
 netbox/project-static/dist/jobs.js.map | Bin 465231 -> 464938 bytes
 netbox/project-static/src/jobs.ts      |  14 +++++---------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/netbox/project-static/dist/jobs.js b/netbox/project-static/dist/jobs.js
index 9d2865210b0f9f698cc2f1e77e0baf907d1489b0..47bcf9c142218d641a36193ea95caeb8da72f028 100644
GIT binary patch
delta 471
zcmaiwJ8K(36ouIfF}A=q?gSBLwFEH(qeU^Q6c!g!^Z+AV2E{H$yEpL|X~xV$aZm&y
zBxQ<#VE#c2=>i6mHdX#hD%EK+wy;}QADnyc>-<}8T`jjhevYnT*nXv$qjRg@&u3i6
zBE#3}lsL*vCej(7I9%l1=4T|QbB)$%8PAj`VjYBqNDC$L&=Nyi$68H=!BnGBlNl1@
zzqf&JDtb59`P~le*B#?bF~JN=BwpHtAzi$2GPgp>*bodm$b-j^I>4T&Th;IFL&g97
z5|#YV4m>?^WIYzM>T{+u(qJ}yi*|^1tS&p;a!QgSpnk5#bx|ag$wy4NnqExMVnY45
zdQ@)8S}l>`xulw9GPUYRy+hsR1_`azNZ8w;Y%YqHX7`;fy!rDID$(}(k9AhLUv(kg
z$-}+t^hlmb&!0h3(nQ{8v)usdZ4W*~&aZk<4k-2EML@R?X@KiPGvG%bK5dxL$CN)9
Qz$i#x2ccs8?*aV!4@TIUF#rGn

delta 484
zcmaKoF-rq66vycs#ER8Lp{Om_LyiPuso<hV5ZY?nrRXA}IMll+CubsQQY^I~qPt)r
zle41;qWBT~5`F=3adk1ZMK`Da<Dd6_|Mzm&OMdl|=a-2`sF!9m5xApdyVGh&C!%au
z?;(LnKqGUVfw`1KP27$0q2O#)nU@S?&3y^BM>YPL5N5Ir*#$uwM3aaF#O3T%xrE{F
zf#!jV1a|_&a7Uuw9<x&ha^q*lO*#wH=KU%$W**8gTNG#jWt8hUCW_`3iKL+j^fBWq
zf5_BY%=%@qT?>(WB=&2ei~W9cj#BA)@@C_8D%EPlnz`8X5TifN=Fq`@|49BXu_TU9
zVy5i8FPYMkJ3~D8JhyIt!L?DmpX2=H*i8$VbfR#Dkzfc|QO{}(<`SvF`2$wdTsz=Q
zH0_}SI%-mG8uQ?qk99~Ugh>?u8>a$iw!W=E+R9S}d@G+7$Xm%(Vadu?6)r{s#4*w4
RtqMEVTCUlb!0;Npd;_&Tos|Fp

diff --git a/netbox/project-static/dist/jobs.js.map b/netbox/project-static/dist/jobs.js.map
index 1c58823d11d912f72304231961f83531dcdbd603..075a1ed3153bbcdc42f377c3b9547810b43eed22 100644
GIT binary patch
delta 438
zcmX@VNoLgsnT8g|ElewG*bSZhbP^r&rf;ZWQfAI}ciuiBoT-zMF=Ki{9aBQGyQ5>c
zj;o_<hz^kD4P-ecg9t~RR0!dm=LC`g3nI%DIyw3qJL&j3dgMFlWI8!IW`NZhxab5s
zI$An`%!t%UcXD*ja@n3(&&0^cTI!sl<3IgjDwFW^4+%`tjAh%WH8ANj36?rL1C0UN
z=nW#m9h0VCYhtosbZzHvW&&bnAZ7t#*6sYwY!5p5brjN5OZ-wxlJYBD5=#=dzvp4s
zWt#55&n}*noS#=*qL7)QV2i3oLp=qkQa39<NjEb^UDG-yPeB2q7AWMLpIeZVT9S%K
zQ!-SEy5{r%es+oJ{sQcM4w-2R8YPtlsrhLND5lujDySEi6lLb6t1GCfA<OBN<oo28
erxrOU7N=@xPG?-jB(l9-kbM^0c6kYQ14aN>!-_Bf

delta 617
zcmZ8bO-ma=7-lCXd$Be}5vhSrRg8hr97HI7!8?<f#?W|3AtD}<m}$CUvzzX2f~9E_
zLZRf=+xQ2hw5K4#Ui%M<|DZke;;Fs&(AmwZ!NdD7Jo9{g8^(TI#Cji<OZ2s)Iy6tp
z&=$iES`674=6)`sfub};=>sZt(*P|>a=_Y@WB`gJ4Vjk`fRh41f$-6bol<fDQ1?Y|
zsV6AQR0%Z-%u0DgZj9xSTc;!o03P{<j)if^ZZH}4+?0_E0Hb1U&y(nWP=nq@*VFD|
z7b!~EW>s<^esMG{{*=(X;<$%Blthng#>fk=C+9&Cj>K6XJyY1Ht3Hw!k~bkQ>|XUF
zKL_sjNp%&)wCX0#w{*Q+(fPLRSejAW#XH!L)Ry=?r9RnACUJ^8+-hhB$Ifex_st5<
zrU=$v;ikoHZa8bl2F53*VLP~PR<hN!&Kr^zbJvkr(r4m{El(pYE8`0MbZ69smzM*p
z7+T@S^X;<U;_*ZRzw>O;Se2tjPG9gK5csL@MeU(_9=#pF%tlk^j`$l=XT;KVBnr|Q
kkTP_9$qgGUzQ5=8+b^98N_|y4?-ru!mx%jsR$Wv60}Wfm>i_@%

diff --git a/netbox/project-static/src/jobs.ts b/netbox/project-static/src/jobs.ts
index cc3fb8494..319910a1e 100644
--- a/netbox/project-static/src/jobs.ts
+++ b/netbox/project-static/src/jobs.ts
@@ -1,5 +1,5 @@
 import { createToast } from './bs';
-import { apiGetBase, hasError } from './util';
+import { apiGetBase, hasError, getNetboxData } from './util';
 
 let timeout: number = 1000;
 
@@ -21,19 +21,14 @@ function asyncTimeout(ms: number) {
  * JavaScript.
  */
 function getJobInfo(): JobInfo {
-  let id: Nullable<string> = null;
   let complete = false;
 
-  // Determine the Job ID, if present.
-  const jobIdElement = document.getElementById('jobId');
-  if (jobIdElement !== null && jobIdElement.getAttribute('data-value')) {
-    id = jobIdElement.getAttribute('data-value');
-  }
+  const id = getNetboxData('data-job-id');
+  const jobComplete = getNetboxData('data-job-complete');
 
   // Determine the job completion status, if present. If the job is not complete, the value will be
   // "None". Otherwise, it will be a stringified date.
-  const jobCompleteElement = document.getElementById('jobComplete');
-  if (jobCompleteElement !== null && jobCompleteElement.getAttribute('data-value') !== 'None') {
+  if (typeof jobComplete === 'string' && jobComplete.toLowerCase() !== 'none') {
     complete = true;
   }
   return { id, complete };
@@ -91,6 +86,7 @@ async function checkJobStatus(id: string) {
 
 function initJobs() {
   const { id, complete } = getJobInfo();
+
   if (id !== null && !complete) {
     // If there is a job ID and it is not completed, check for the job's status.
     Promise.resolve(checkJobStatus(id));