revamp whole EA flow. Server created EAs when we do certain jobs (transform, delete_files, restore_files), then instead of faking amendments in the jscript, get job creation to return EA from job ORM, then check is now generic for end of any amendment job, and when it finishes, use that to clear our amendments in document, and redraw through normal UI code. No smarts in client, all driven by state from server, and if we reload a page mid jobs, it has required state, and because an amendment job is still progressing, it runs check code again

job.py

@@ -4,6 +4,7 @@ from flask import request, render_template, redirect, make_response, jsonify, ur
 from settings import Settings
 from main import db, app, ma
 from sqlalchemy import Sequence, func, select
+from sqlalchemy.orm import joinedload
 from sqlalchemy.exc import SQLAlchemyError
 from datetime import datetime, timedelta
 import pytz
@@ -58,10 +59,12 @@ class Job(db.Model):
 
     extra = db.relationship( "JobExtra")
     logs = db.relationship( "Joblog")
+    amendments = db.relationship("EntryAmendment", back_populates="job")
 
     def __repr__(self):
         return "<id: {}, start_time: {}, last_update: {}, name: {}, state: {}, num_files: {}, current_file_num: {}, current_file: {}, pa_job_state: {}, wait_for: {}, extra: {}, logs: {}>".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_files, self.current_file_num, self.current_file, self.pa_job_state, self.wait_for, self.extra, self.logs)
 
+
 ################################################################################
 # Class describing PA_JobManager_Message and in the DB (via sqlalchemy)
 # the job manager can send a message back to the front end (this code) via the 
@@ -83,7 +86,7 @@ class PA_JobManager_Message(PA,db.Model):
 # Used in main html to show a red badge of # jobs to draw attention there are
 # active jobs being processed in the background
 ################################################################################
-def GetNumActiveJobs():
+def getNumActiveJobs():
     ret=Job.query.filter(Job.pa_job_state != 'Completed').with_entities(func.count(Job.id).label('count') ).first()
     return ret[0]
 
@@ -122,16 +125,16 @@ def NewJob(name, num_files="0", wait_for=None, jex=None, desc="No description pr
         if job.name == 'transform_image':
             id=[jex.value for jex in job.extra if jex.name == "id"][0]
             ea=EntryAmendment( eid=id, job_id=job.id, amend_type=at_id )
-            print( f"just added an EA for eid={id}, j={job.id}" )
             db.session.add(ea)
-        elif job.name == 'delete_files':
+            job.amendments.append(ea)
+            # FIXME: add ea to job.amend
+        elif job.name == 'delete_files' or job.name == 'restore_files':
             for j in jex:
                 if 'eid-' in j.name:
-                    ea=EntryAmendment( eid=j.value, amend_type=at_id )
+                    ea=EntryAmendment( eid=j.value, job_id=job.id, amend_type=at_id )
                     db.session.add(ea)
-                    # need to return this to the f/e somehow
-                    # this is for removes, really need to think about this more
-                    #job.amendment=ea
+                    # FIXME: add ea to job.amend
+                    job.amendments.append(ea)
 
     SetFELog( message=f'Created <a class="link-light" href="/job/{job.id}">Job #{job.id}</a> to {desc}', level="success" )
     WakePAJobManager(job.id)
@@ -327,14 +330,22 @@ def joblog_search():
 @app.route("/check_for_jobs", methods=["POST"])
 @login_required
 def check_for_jobs():
-    num=GetNumActiveJobs()
+    from files import job_schemas
+
+    num=getNumActiveJobs()
+    messages = PA_JobManager_Message.query.all()
     sts=[]
-    for msg in PA_JobManager_Message.query.all():
+    for msg in messages:
         u=''
         if 'Job #' not in msg.message and msg.job_id:
             u='<a class="link-light" href="' + url_for('joblog', id=msg.job_id) + '">Job #' + str(msg.job_id) + '</a>: '
         sts.append( { 'id': msg.id, 'message': u+msg.message, 'level': msg.level, 'job_id': msg.job_id, 'persistent': msg.persistent, 'cant_close': msg.cant_close } )
-    return make_response( jsonify( num_active_jobs=num, sts=sts ) )
+
+    # get jobs mentioned in messages as we may need to process the by client for UI
+    job_list=[obj.job_id for obj in messages]
+    stmt = select(Job).options(joinedload(Job.amendments)).where(Job.id.in_(job_list))
+    jobs=db.session.execute(stmt).unique().scalars().all()
+    return make_response( jsonify( num_active_jobs=num, sts=sts, jobs=job_schemas.dump(jobs) ) )
 
 ###############################################################################
 # /clear_msg -> POST -> clears out a F/E message based on passed in <id>