remove duplicate lines of code

fixed BUG-143, disable next/prev as first thing we do when going next/prev Page
fix BUG-125: right-click changes highlight if its not in the highlight set
2025-11-18 21:13:02 +11:00 · 2025-10-28 23:04:33 +11:00 · 2025-10-28 22:31:15 +11:00 · 2025-10-28 22:16:26 +11:00 · 2025-10-28 22:04:47 +11:00 · 2025-10-27 22:06:54 +11:00
15 changed files with 563 additions and 332 deletions
--- a/42
+++ b/42
@@ -1,41 +1,9 @@
-### Next: 141
+### Next: 146
 BUG-140: When db is restarted underneath PA, it crashes job mgr... It should just accept timeouts, and keep trying to reconnect every 2? mins
-BUG-139: using any large entry list and going next a few times, ends say 4 pages of 50 into 4000 matches (entries from DB < 50)... 
-    - confirmed this is when person has 2 or more refimgs:
-      - on page "2", we get 49 pulled back in the ORM instead of the 50 expected -- b/c I use that to indicate we must be at the end of the list if not 50 found
-    -- really, need to fix once and for all the eids / re-running query.
-        do GetEntries as we do now, once done however, get all entry ids.  Stick those into the DB with a unique query-id and datestamp
-        new func to get all details needed for entries in an eid list (of 1-page) - show this page of entries
-        use current, full eidlist and to work our start/end of list (next/prev), disabling.
-        then client can keep current page of data, if you hit next/prev, use DB unique query id / full list and page of eids, and give full data for new page of entries
-      Implications though, are if a search is invalidated (maybe delete / move a photo), need to remove them from the list on the DB too OR let user know/decide to fix/wait.
-
-
-BUG-100: I managed to get 2 photos matching mich in the NOT_WORKING photo (probably dif refimgs but same p.tag?)
-    = /photos/2012/20120414-damien/IMG_8467.JPG
+BUG-118: can move files from Bin path, but it leaves the del_file entry for it - need to remove it
+BUG-117: when search returns files that can be deleted and/or restored, the icon stays as delete and tries to delete!
 BUG-106: cant add trudy /pat? as refimgs via FaceDBox
    - seems the cropped trudy face is not sufficient to find a face, how odd...
      (it came from a face bbox, BUT, I have grown the face seln by 10%?)
-BUG-117: when search returns files that can be deleted and/or restored, the icon stays as delete and tries to delete!
-BUG-118: can move files from Bin path, but it leaves the del_file entry for it - need to remove it
-BUG-119: "Uncaught (in promise) Error: A listener indicated an asynchronous
-            response by returning true, but the message channel closed before a response
-            was received"
-            investigate this (possible I'm calling check_for_jobs and maybe not doing the async right?)
-
-BUG-123: pa_job_manager crashed with timeout on connection (probably when I turned off traefik for a bit?).  Regardless, should be more fault tolerant --> maybe offer to restart pa_job_manager IF its crashed?
-        this definitely happened also, when I shutdown the DB back-end mid job, and it was able to be restarted, so could get f/e to at least suggest a restart of the contianer, or auto-restart job_mgr?
-
-BUG-125: when an image is highlighted, then post the contextmenu on a different image - the highlight does not move to the new image
-         and the selected menu function processes the original or the new depending on the way the code works.
-         There is a chance we need to change the document on click to a mouse down (or whatever the context menu 
-         uses for default), rather than just fix the highlight
-
-BUG-130: moving files and then trying to go next page and it got confused...
-BUG-132: right arrow to go to next photo in viewer ALSO scrolls to the right, needs a return somewhere in the jscript
-BUG-133: when rebuilding pa[dev], the first run fails to have symlinks to the right paths for Import/Storage, etc.  a simple restart fixes - so potentially the intial copy or some other race condition?
-BUG-134: when moving set of photos on page, then move another set of photos on page, the first set reappears. Could really delete them from the dom?
-BUG-135: failed to rotate: 2006/20061215-ITS-xmas-KP/DSC00582.JPG - not sure why && not repeatable, so its not the image, timing/race condition maybe?
-BUG-137: after moving/refiling photos, the next shift-click is out of order (reload fixes it)
-BUG-138: Placeholder for all the ways we can get the front-end confused:
-        ---> JUST fix all these BUGs (relating to confused/lost state) by revisiting the overally complex way I remember state and my position in a list (probably FAR easier, to make an initial sql just save all eids, and then not try to recreate that list ever again and not care how I got into the list).  Can attach a "running server-side sequence number", and if old sequence, and the original eid list results in a failure, then just pop up that the saved list is no longer valid, and ask user to re-do their search/list..."
+BUG-100: I managed to get 2 photos matching mich in the NOT_WORKING photo (probably dif refimgs but same p.tag?)
+    = /photos/2012/20120414-damien/IMG_8467.JPG
--- a/12
+++ b/12
@@ -1,15 +1,3 @@
-### major fix - go to everywhere I call GetEntries(), and redo the logic totally...
-    * client side: 
-        * instead of removing deleted images from DOM, we should gray them out and put a big Del (red circle with line?) though it as overlay.
-        [DONE] * Create another table of entry_ammendments - note the deletions, rotations, flips of specific eids - then reproduce that on the client side visually as needed
-        [DONE]  - at least grayed-out, to indicate a pending action is not complete.
-          - When job that flips, rotates, deletes completes then create an entry_amendment in the DB.  
-              - Also hand fudge the jscript amendments for each job / next get_entry_by_id (if needed will also set amendments as needed)
-              - When job finishes, remove amendment from DB
-              - when job finishes, remove amendment from document.amendments
-        need to rework all the throbber stuff, I think it is probably better not to have a div I never use with the throbber in it, just add when I need it...
-            like in code for amendments.  Also get rid of style and just use class 
-
 ### GENERAL
 * jobs for AI should show path name
 * rm dups job should show progress bar
--- a/amend.py
+++ b/amend.py
@@ -0,0 +1,65 @@
+from sqlalchemy import select
+from flask import request, jsonify
+from flask_login import login_required
+
+from shared import PA
+from main import db, app
+
+################################################################################
+# Amendments are used to define types of changes being made to an entry (e.g.
+# rotate, flip) should contain relatively transient content (e.g. we might be
+# processing a long-running job now, and then add a rotate, the rotate wont
+# finish for minutes, so these classes allow the UI to handle that gracefully
+################################################################################
+
+################################################################################
+# Class describing AmendmentType in the DB (via sqlalchemy)
+################################################################################
+class AmendmentType(PA,db.Model):
+    __tablename__ = "amendment_type"
+    id = db.Column(db.Integer, db.Sequence('file_type_id_seq'), primary_key=True )
+    job_name = db.Column(db.String, nullable=False )
+    which = db.Column(db.String, nullable=False )
+    what = db.Column(db.String, nullable=False )
+    colour = db.Column(db.String, nullable=False )
+
+################################################################################
+# Class describing which Entry has a pending Amendment in the DB (via sqlalchemy)
+################################################################################
+class EntryAmendment(PA,db.Model):
+    __tablename__ = "entry_amendment"
+    eid = db.Column(db.Integer, db.ForeignKey("entry.id"), primary_key=True )
+    job_id = db.Column(db.Integer, db.ForeignKey("job.id"), primary_key=True )
+    amend_type = db.Column(db.Integer, db.ForeignKey("amendment_type.id"))
+    type = db.relationship("AmendmentType", backref="entry_amendment")
+    job = db.relationship("Job", back_populates="amendments")
+
+
+################################################################################
+# check if this job is something we need to log an EntryAmendment for, based on
+# job name and potentially amt in extras, to find the type of amendment
+################################################################################
+def inAmendmentTypes(job):
+    if not hasattr(job, 'extra' ) or not job.extra:
+        return None
+    amt=None
+    for jex in job.extra:
+        if jex.name == "amt":
+            amt=jex.value
+
+    # FIXME: should just cache this once per build, only would change with code updates
+    for at in getAmendments():
+        # for transform_image, amt=flip*, 90/180/270 - so amt will be set, use it, otherwise just use job.name
+        if (amt and f"{job.name}:{amt}" == at.job_name) or (at.job_name == job.name):
+            return at.id
+    return None
+
+
+################################################################################
+# Class describing which Entry has a pending Amendment in the DB (via sqlalchemy)
+################################################################################
+def getAmendments():
+    # get Amend types (get EAT data once - used in inAmendmentTypes()
+    stmt=select(AmendmentType)
+    eat=db.session.execute(stmt).scalars().all()
+    return eat
--- a/files.py
+++ b/files.py
@@ -1,10 +1,11 @@
 from flask_wtf import FlaskForm
-from flask import request, render_template, redirect, send_from_directory, url_for, jsonify, make_response
+from flask import request, render_template, redirect, send_from_directory, url_for, jsonify
 from marshmallow import Schema, fields
 from main import db, app, ma 
 from sqlalchemy import Sequence, text, select, union, or_
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import joinedload
+import numbers
 import os
 import glob
 import json
@@ -22,6 +23,7 @@ import pytz
 import html
 from flask_login import login_required, current_user
 from types import SimpleNamespace
+from amend import EntryAmendment, AmendmentType

 # Local Class imports
 ################################################################################
@@ -33,6 +35,7 @@ from person import Refimg, Person, PersonRefimgLink
 from settings import Settings, SettingsIPath, SettingsSPath, SettingsRBPath
 from shared import SymlinkName, ICON, PA
 from dups import Duplicates
+from amend import getAmendments
 from face import Face, FaceFileLink, FaceRefimgLink, FaceOverrideType, FaceNoMatchOverride, FaceForceMatchOverride

 # pylint: disable=no-member
@@ -126,20 +129,6 @@ class FileType(PA,db.Model):
    id = db.Column(db.Integer, db.Sequence('file_type_id_seq'), primary_key=True )
    name = db.Column(db.String, unique=True, nullable=False )

-class AmendmentType(PA,db.Model):
-    __tablename__ = "amendment_type"
-    id = db.Column(db.Integer, db.Sequence('file_type_id_seq'), primary_key=True )
-    which = db.Column(db.String, nullable=False )
-    what = db.Column(db.String, nullable=False )
-    colour = db.Column(db.String, nullable=False )
-
-class EntryAmendment(PA,db.Model):
-    __tablename__ = "entry_amendment"
-    eid = db.Column(db.Integer, db.ForeignKey("entry.id"), primary_key=True )
-    amend_type = db.Column(db.Integer, db.ForeignKey("amendment_type.id"))
-    type = db.relationship("AmendmentType", backref="entry_amendment")
-
-
 ################################################################################
 # this is how we order all queries based on value of 'noo' - used with
 # access *order_map.get(OPT.noo)
@@ -254,6 +243,7 @@ class EntryAmendmentSchema(ma.SQLAlchemyAutoSchema):
        model = EntryAmendment
        load_instance = True
    eid = ma.auto_field()
+    job_id = ma.auto_field()
    type = ma.Nested(AmendmentTypeSchema)

 ################################################################################
@@ -277,11 +267,31 @@ class EntrySchema(ma.SQLAlchemyAutoSchema):
    def get_full_path(self, obj):
        return obj.FullPathOnFS()

+class JobExtraSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model = JobExtra
+        load_instance = True
+    name = ma.auto_field()
+    value = ma.auto_field()
+
+class JobSchema(ma.SQLAlchemyAutoSchema):
+    class Meta:
+        model = Job
+        load_instance = True
+    id = ma.auto_field()
+    name = ma.auto_field()
+    extra = ma.Nested(JobExtraSchema, many=True)
+    amendments = ma.Nested(EntryAmendmentSchema, many=True)
+
 # global - this will be use more than once below, so do it once for efficiency
 entries_schema = EntrySchema(many=True)
 FOT_Schema = FaceOverrideTypeSchema(many=True)
 path_Schema = PathSchema(many=True)
 person_Schema = PersonSchema(many=True)
+et_schema = AmendmentTypeSchema(many=True)
+ea_schema = EntryAmendmentSchema(many=True)
+job_schema = JobSchema(many=False)
+job_schemas = JobSchema(many=True)

 ################################################################################
 # /get_entries_by_ids -> route where we supply list of entry ids (for next/prev
@@ -319,11 +329,9 @@ def process_ids():
    # get any pending entry amendments
    stmt = select(EntryAmendment).join(AmendmentType)
    ea = db.session.execute(stmt).unique().scalars().all()
-    ea_schema = EntryAmendmentSchema(many=True)
    ea_data=ea_schema.dump(ea)
-    print( ea_data )

-    return jsonify(entries=entries_schema.dump(sorted_data), amend=ea_data)
+    return jsonify(entries=entries_schema.dump(sorted_data), amendments=ea_data)


 ################################################################################
@@ -379,17 +387,21 @@ def getPeople():
    people=db.session.execute(stmt).scalars().all()
    return person_Schema.dump(people)

-
-################################################################################
-# Get all relevant Entry.ids based on search_term passed in and OPT visuals
-################################################################################
-def GetSearchQueryData(OPT):
+def initQueryData():
    query_data={}
    query_data['entry_list']=None 
    query_data['root_eid']=0
    query_data['NMO'] = getFOT()
    query_data['move_paths'] = getMoveDetails()
    query_data['people'] = getPeople()
+    query_data['amendTypes'] = et_schema.dump( getAmendments() )
+    return query_data
+
+################################################################################
+# Get all relevant Entry.ids based on search_term passed in and OPT visuals
+################################################################################
+def GetSearchQueryData(OPT):
+    query_data=initQueryData()

    search_term = OPT.search_term
    # turn * wildcard into sql wildcard of %
@@ -426,11 +438,7 @@ def GetSearchQueryData(OPT):
 # Get all relevant Entry.ids based on files_ip/files_sp/files_rbp and OPT visuals
 #################################################################################
 def GetQueryData( OPT ):
-    query_data={}
-    query_data['entry_list']=None 
-    query_data['NMO'] = getFOT()
-    query_data['move_paths'] = getMoveDetails()
-    query_data['people'] = getPeople()
+    query_data=initQueryData()

    # always get the top of the (OPT.prefix) Path's eid and keep it for OPT.folders toggling/use
    dir_stmt=( 
@@ -481,7 +489,7 @@ def change_file_opts():
        query_data = GetSearchQueryData( OPT )
    else:
        query_data = GetQueryData( OPT )
-    return make_response( jsonify( query_data=query_data ) )
+    return jsonify( query_data=query_data )
    

 ################################################################################
@@ -640,7 +648,7 @@ def restore_files():
        jex.append( JobExtra( name=f"{el}", value=str(request.form[el]) ) )

    job=NewJob( name="restore_files", num_files=0, wait_for=None, jex=jex, desc="to restore selected file(s)" )
-    return redirect("/jobs")
+    return jsonify( job=job_schema.dump(job) )

 ################################################################################
 # /delete_files -> create a job to delete files for the b/e to process
@@ -653,7 +661,7 @@ def delete_files():
        jex.append( JobExtra( name=f"{el}", value=str(request.form[el]) ) )

    job=NewJob( name="delete_files", num_files=0, wait_for=None, jex=jex, desc="to delete selected file(s)" )
-    return redirect("/jobs")
+    return jsonify( job=job_schema.dump(job) )

 ################################################################################
 # /move_files -> create a job to move files for the b/e to process
@@ -666,8 +674,7 @@ def move_files():
    for el in request.form:
        jex.append( JobExtra( name=f"{el}", value=str(request.form[el]) ) )
    job=NewJob( name="move_files", num_files=0, wait_for=None, jex=jex, desc="to move selected file(s)" )
-    # data is not used, but send response to trigger CheckForJobs()
-    return make_response( jsonify( job_id=job.id ) )
+    return jsonify( job=job_schema.dump(job) )

@login_required
@app.route("/view/", methods=["POST"])
@@ -696,7 +703,7 @@ def view():

 # route called from front/end - if multiple images are being transformed, each transorm == a separate call
 # to this route (and therefore a separate transorm job.  Each reponse allows the f/e to check the
-# specific transorm job is finished (/check_transform_job)  which will be called (say) every 1 sec. from f/e
+# specific transorm job is finished (/check_amend_job_status)  which will be called (say) every 1 sec. from f/e
 # with a spinning wheel, then when pa_job_mgr has finished it will return the transformed thumb
@app.route("/transform", methods=["POST"])
@login_required
@@ -709,25 +716,29 @@ def transform():
        jex.append( JobExtra( name=f"{el}", value=str(request.form[el]) ) )

    job=NewJob( name="transform_image", num_files=0, wait_for=None, jex=jex, desc="to transform selected file(s)" )
-    return make_response( jsonify( job_id=job.id ) )
+    return jsonify( job=job_schema.dump(job) )

 ################################################################################
-# /check_transform_job -> URL that is called repeatedly by front-end waiting for the
-#                    b/e to finish the transform job.  Once done, the new / now
-#                    transformed image's thumbnail is returned so the f/e can
-#                    update with it
+# /check_amend_job_status -> URL that is called repeatedly by front-end waiting
+#   for the b/e to finish the amendment job (delete/restore/move file).
+#   Once done, return "ok"
 ################################################################################
-@app.route("/check_transform_job", methods=["POST"])
+@app.route("/check_amend_job_status", methods=["POST"])
@login_required
-def check_transform_job():
+def check_amend_job_status():
    job_id = request.form['job_id']
-    job = Job.query.get(job_id)
-    j=jsonify( finished=False )
-    if job.pa_job_state == 'Completed':
-        id=[jex.value for jex in job.extra if jex.name == "id"][0]
-        e=Entry.query.join(File).filter(Entry.id==id).first()
-        j=jsonify( finished=True, thumbnail=e.file_details.thumbnail )
-    return make_response( j )
+    stmt = select(Job).options(joinedload(Job.amendments)).where(Job.id == job_id)
+    job=db.session.execute(stmt).unique().scalars().first()
+    # FIXME: should validate job_id is real from UI
+    if job.name == 'transform_image':
+        eid=[jex.value for jex in job.extra if jex.name == "id"][0]
+        stmt=select(Entry).where(Entry.id==eid)
+        ent=db.session.execute(stmt).scalars().all()
+        ent_data=entries_schema.dump(ent)
+        j=jsonify(finished=(job.pa_job_state == 'Completed'), job=job_schema.dump(job), entry=ent_data[0] )
+    else:
+        j=jsonify(finished=(job.pa_job_state == 'Completed'), job=job_schema.dump(job))
+    return j

 ################################################################################
 # /include -> return contents on /include and does not need a login, so we
@@ -773,7 +784,7 @@ def get_existing_paths(dt):
        except:
            # this is not a date, so we cant work out possible dirs, just
            # return an empty set
-            return make_response( '[]' )
+            return jsonify( '[]' )
        new_dt=new_dtime.strftime('%Y%m%d')
        # find dirs named with this date
        dirs_arr+=Dir.query.filter(Dir.rel_path.ilike('%'+new_dt+'%')).all();
@@ -787,8 +798,8 @@ def get_existing_paths(dt):
    ret='[ '
    first_dir=1
    for dir in dirs:
-        # this can occur if there is a file with this date name in the top-levle of the path, its legit, but only really happens in DEV
-        # regardless, it cant be used for a existpath button in the F/E, ignore it
+        # this can occur if there is a file with this date name in the top-level of the path, its legit, but only really happens in DEV
+        # regardless, it cant be used for a existing path button in the F/E, ignore it
        if dir.rel_path == '':
            continue
        if not first_dir:
@@ -806,7 +817,7 @@ def get_existing_paths(dt):
        ret+= ' } '
        first_dir=0
    ret+= ' ]'
-    return make_response( ret )
+    return jsonify ( ret )

 # quick helper func to return timestamps of jscript files
 # we use this as a quick/hacky way of versioning them
--- a/internal/js/files_support.js
+++ b/internal/js/files_support.js
@@ -87,21 +87,9 @@ function GetExistingDirsAsDiv( dt, divname, ptype )
    } )
 }

-// wrapper to do some clean up before POST to /move_files or /delete_files
-// used to remove the highlighted item(s) && reset the numbering so highlighting continues to work
-function MoveOrDelCleanUpUI()
-{
-    // remove the images being moved (so UI immediately 'sees' the move)
-    $("[name^=eid-]").each( function() { $('#'+$(this).attr('value')).remove() } )
-    // reorder the images via ecnt again, so future highlighting can work
-    document.mf_id=0; $('.figure').each( function() { $(this).attr('ecnt', document.mf_id ); document.mf_id++ } )
-    $('#dbox').modal('hide')
-}
-
-
 // show the DBox for a move file, includes all thumbnails of selected files to move
 // and a pre-populated folder to move them into, with text field to add a suffix
-function MoveDBox(path_details)
+function MoveDBox()
 {
    $('#dbox-title').html('Move Selected File(s) to new directory in Storage Path')  
    div =`
@@ -111,21 +99,21 @@ function MoveDBox(path_details)
        <form id="mv_fm" class="form form-control-inline col-12">
        <input id="move_path_type" name="move_path_type" type="hidden"
        `
-    div += ' value="' + path_details[0].type.name + '"></input>'
+    div += ' value="' + move_paths[0].type.name + '"></input>'
    div+=GetSelnAsDiv()
    yr=$('.highlight').first().attr('yr')
    dt=$('.highlight').first().attr('date')
    div+='<div class="row">Use Existing Directory (in the chosen path):</div><div id="existing"></div>'
-    GetExistingDirsAsDiv( dt, "existing", path_details[0].type.name )
+    GetExistingDirsAsDiv( dt, "existing", 'Storage' )
    div+=`
        <div class="input-group my-3">
        <alert class="alert alert-primary my-auto py-1">
        `
    // NB: alert-primary here is a hack to get the bg the same color as the alert primary by
-    div+= '<svg id="move_path_icon" width="20" height="20" fill="currentColor"><use xlink:href="' + path_details[0].icon_url + '"></svg>'
+    div+= '<svg id="move_path_icon" width="20" height="20" fill="currentColor"><use xlink:href="' + move_paths[0].icon_url + '"></svg>'
    div+= '<select id="rp_sel" name="rel_path" class="text-primary alert-primary py-1 border border-primary rounded" onChange="change_rp_sel()">'
-    for(p of path_details) {
-        div+= '<option path_type="'+p.type.name+'" icon_url="'+p.icon_url+'">'+p.root_dir+'</option>'
+    for(p of move_paths) {
+        div+= `<option path_type="${p.type.name}" icon_url="${p.icon_url}">${p.root_dir}</option>`
    }
    div+= '</select>'
    div+=`
@@ -139,11 +127,26 @@ function MoveDBox(path_details)
        </div>
        <div class="form-row col-12 mt-2">
            <button onClick="$('#dbox').modal('hide'); return false;" class="btn btn-outline-secondary offset-1 col-2">Cancel</button>
-            <button id="move_submit" onClick="MoveOrDelCleanUpUI(); $.ajax({ type: 'POST', data: $('#mv_fm').serialize(), url: '/move_files', success: function(data) { 
-                if( $(location).attr('pathname').match('search') !== null ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-primary col-2">Ok</button>
+            <button onClick="
+                $.ajax({ type: 'POST', data: $('#mv_fm').serialize(), url: '/move_files',
+                        success: function(data) {
+                            processAmendments( data.job.amendments )
+                            checkForAmendmentJobToComplete(data.job.id)
+                        }
+                });
+                $('#dbox').modal('hide')
+                return false"
+                class="btn btn-outline-secondary col-2">Ok</button>
        </div>
        </form>
    `
+    // force to Storage always - if in Import, liekly storing, if in Storage, likely moving, user can always override
+    div+=`
+        <script>
+            storage_rp = move_paths.find(item => item.type.name === "Storage")?.root_dir;
+            $('#rp_sel').val(storage_rp);change_rp_sel()
+        </script>
+        `

    $('#dbox-content').html(div)
    $('#dbox').modal('show')
@@ -151,36 +154,71 @@ function MoveDBox(path_details)
    $("#suffix").keypress(function (e) { if (e.which == 13) { $("#move_submit").click(); return false; } } )
 }

+// This function is called anytime we have a job that returns amendments
+// (visually we want to show this entry is being amended by a job)
+// as we check for a job to end every second, we can call this multiple times
+// during the runtime of a job, so only redraw/react to a new amendment
+// NOTE: we update all views, as we might go into one via jscript before the job ends
+function processAmendments( ams )
+{
+    for (const am of ams)
+    {
+        // if we return anything here, we already have this amendment, so continue to next
+        if( document.amendments.filter(obj => obj.eid === am.eid).length > 0 )
+            continue
+
+        document.amendments.push(am)
+
+        if( document.viewing && document.viewing.id == am.eid )
+        {
+            im.src=im.src + '?t=' + new Date().getTime();
+            DrawImg()
+        }
+
+        // find where in the page this image is being viewed
+        idx = pageList.indexOf(am.eid)
+        // createFigureHtml uses matching document.amendments to show thobber, etc
+        html = createFigureHtml( document.entries[idx] )
+        $('#'+am.eid).replaceWith( html )
+    }
+}
+
+// function to add data for document.amendment based on id and amt
+// used when we transform several images in files_*, or single image in viewer
 // show the DBox for a delete/restore file, includes all thumbnails of selected files 
-// with appropriate coloured button to Delete or Restore files`
+// with appropriate coloured button to Delete or Restore files
 function DelDBox(del_or_undel)
 {
    to_del = GetSelnAsData()
    $('#dbox-title').html(del_or_undel+' Selected File(s)')
    div ='<div class="row col-12"><p class="col">' + del_or_undel + ' the following files?</p></div>'
    div+=GetSelnAsDiv()
+    if( del_or_undel == "Delete" )
+    {
+        which="delete"
+        col="danger"
+    }
+    else
+    {
+        which="restore"
+        col="success"
+    }
+
+    document.ents_to_del=[]
+    $('.highlight').each(function( cnt ) { document.ents_to_del[cnt]=parseInt($(this).attr('id')) } )
    div+=`<div class="row col-12 mt-3">
            <button onClick="$('#dbox').modal('hide')" class="btn btn-outline-secondary col-2">Cancel</button>
-    `
-    div+=`
-    <button onClick="MoveOrDelCleanUpUI(); $.ajax({ type: 'POST', data: to_del, url:
-    `
-    if( del_or_undel == "Delete" )
-        div+=`
-        '/delete_files',
+            <button onClick="
+                $.ajax({ type: 'POST', data: to_del, url: '/${which}_files',
                        success: function(data) {
-            if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-danger col-2">Ok</button>
-        </div>
-        `
-    else
-        // just force page reload to / for now if restoring files from a search path -- a search (by name) 
-        // would match the deleted/restored file, so it would be complex to clean up the UI (and can't reload, as DB won't be changed yet)
-        div+=`
-        '/restore_files',
-        success: function(data){ 
-            if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-success col-2">Ok</button>
-        </div>
-        `
+                            processAmendments( data.job.amendments )
+                            checkForAmendmentJobToComplete(data.job.id)
+                        }
+                });
+                $('#dbox').modal('hide')
+                return false"
+                class="btn btn-outline-${col} col-2">Ok</button>
+        </div>`
    $('#dbox-content').html(div)
    $('#dbox').modal('show')
 }
@@ -354,34 +392,27 @@ function NoSel() {
        return true
 }

+// quick wrapper to add a single <figure> to the #figures div
+function addFigure( obj )
+{
+    html=createFigureHtml( obj )
+    $('#figures').append( html )
+}
+
 /**
 * Renders a group header or entry based on the object and options.
 * obj - The object containing file/directory details.
- * last - Tracks the last printed group (e.g., { printed: null }).
- * ecnt - Entry counter (e.g., { val: 0 }).
 * returns {string} - Generated HTML string.
 */
-function addFigure( obj, last, ecnt ) 
+function createFigureHtml( obj )
 {
-    let html = "";
+    // if am is null, no amendment for this obj, otherwise we have one
+    var am=null
+    for (const tmp of document.amendments)
+        if( tmp.eid == obj.id )
+            am=tmp

-    // Grouping logic
-    if (OPT.grouping === "Day") {
-        if (last.printed !== obj.file_details.day) {
-            html += `<div class="row ps-3"><h6>Day: ${obj.file_details.day} of ${obj.file_details.month}/${obj.file_details.year}</h6></div>`;
-            last.printed = obj.file_details.day;
-        }
-    } else if (OPT.grouping === "Week") {
-        if (last.printed !== obj.file_details.woy) {
-            html += `<div class="row ps-3"><h6>Week #: ${obj.file_details.woy} of ${obj.file_details.year}</h6></div>`;
-            last.printed = obj.file_details.woy;
-        }
-    } else if (OPT.grouping === "Month") {
-        if (last.printed !== obj.file_details.month) {
-            html += `<div class="row ps-3"><h6>Month: ${obj.file_details.month} of ${obj.file_details.year}</h6></div>`;
-            last.printed = obj.file_details.month;
-        }
-    }
+    let html = "";

    // Image/Video/Unknown entry
    if (obj.type.name === "Image" || obj.type.name === "Video" || obj.type.name === "Unknown") {
@@ -395,13 +426,27 @@ function addFigure( obj, last, ecnt )
        const prettyDate = `${obj.file_details.day}/${obj.file_details.month}/${obj.file_details.year}`;
        const type = obj.type.name;

+        // if amendment for this obj, do not add entry class - prevents highlighting
+        if( am ) {
+            ent=""
+            gs="style='filter: grayscale(100%);'"
+            am_html ='<img class="position-absolute top-50 start-50 translate-middle" height="60" src="/internal/white-circle.png">'
+            am_html+='<img class="position-absolute top-50 start-50 translate-middle" height="64" src="/internal/throbber.gif">'
+            if( am.type.which == 'icon' )
+                am_html+=`<svg class="position-absolute top-50 start-50 translate-middle" height="32" style="color:${am.type.colour}" fill="${am.type.colour}"><use xlink:href="/internal/icons.svg#${am.type.what}"></use></svg>`
+            else
+                am_html+=`<img class="position-absolute top-50 start-50 translate-middle" src="/internal/${am.type.what}?v={{js_vers['r270']}}" height="32">`
+        } else {
+            ent="entry"
+            gs=""
+            am_html=""
+        }
        html += `
-                <figure id="${obj.id}" ecnt="${ecnt}" class="col col-auto g-0 figure entry m-1"
+            <figure id="${obj.id}" class="col col-auto g-0 figure ${ent} m-1"
                path_type="${pathType}" size="${size}" hash="${hash}" in_dir="${inDir}"
                fname="${fname}" yr="${yr}" date="${date}" pretty_date="${prettyDate}" type="${type}">
-                    ${renderMedia(obj)}
-                </figure>
-            `;
+                ${renderMedia(obj,gs,am_html)}
+            `
    }
    // Directory entry
    else if (obj.type.name === "Directory" && OPT.folders) {
@@ -410,68 +455,45 @@ function addFigure( obj, last, ecnt )
          : obj.dir_details.in_path.path_prefix;

        html += `
-            <figure class="col col-auto g-0 dir entry m-1" id="${obj.id}" ecnt="${ecnt}" dir="${dirname}" type="Directory">
+            <figure class="col col-auto g-0 dir entry m-1" id="${obj.id}" dir="${dirname}" type="Directory">
            <svg class="svg" width="${OPT.size - 22}" height="${OPT.size - 22}" fill="currentColor">
            <use xlink:href="/internal/icons.svg#Directory"></use>
            </svg>
            <figcaption class="svg_cap figure-caption text-center text-wrap text-break">${obj.name}</figcaption>
-            </figure>
        `;
        html += `<script>f=$('#${obj.id}'); w=f.find('svg').width(); f.find('figcaption').width(w);</script>`;
    }
-
-    $('#figures').append( html )
-
-    // check if there is a pending amendment for this entry, if so mark it up
-    // (e.g. its being deleted, rotated, etc) - details in the am obj
-    for (const am of document.amendments)
-    {
-        if( am.eid == obj.id )
-        {
-            $('#'+obj.id).find('img.thumb').attr('style', 'filter: grayscale(100%);' )
-            $('#'+obj.id).removeClass('entry')
-            html='<img class="position-absolute top-50 start-50 translate-middle" height="60" src="/internal/white-circle.png">'
-            html+='<img class="position-absolute top-50 start-50 translate-middle" height="64" src="/internal/throbber.gif">'
-            if( am.type.which == 'icon' )
-                html+=`<svg class="position-absolute top-50 start-50 translate-middle" height="32" style="color:${am.type.colour}" fill="${am.type.colour}"><use xlink:href="/internal/icons.svg#${am.type.what}"></use></svg>`
-            else
-                html+=`<img class="position-absolute top-50 start-50 translate-middle" src="/internal/${am.type.what}?v={{js_vers['r270']}}" height="32">`
-            $('#'+obj.id).find('a').append(html)
+    // moved the bindings to here as we need to reset them if we recreate this Figure (after a transform job)
+    html += `<script>
+        if( "${obj.type.name}" === "Directory" ) {
+            $("#${obj.id}").click( function(e) { document.back_id=this.id; getDirEntries(this.id,false) } )
+        } else {
+            $('#${obj.id}').click( function(e) { DoSel(e, this ); SetButtonState(); return false; });
+            $('#${obj.id}').dblclick( function(e) { startViewing( $(this).attr('id') ) } )
        }
-    }
-    return
+    </script>
+    </figure>`
+    return html
 }

 // Helper function to render media (image/video/unknown)
-function renderMedia(obj) {
+function renderMedia(obj,gs,am_html) {
  const isImageOrUnknown = obj.type.name === "Image" || obj.type.name === "Unknown";
  const isVideo = obj.type.name === "Video";
  const path = `${obj.in_dir.in_path.path_prefix}/${obj.in_dir.rel_path}/${obj.name}`;
  const thumb = obj.file_details.thumbnail
-    ? `<a href="${path}"><img alt="${obj.name}" class="thumb" height="${OPT.size}" src="data:image/jpeg;base64,${obj.file_details.thumbnail}"></a>`
+    ? `<a href="${path}"><img alt="${obj.name}" ${gs} class="thumb" height="${OPT.size}" src="data:image/jpeg;base64,${obj.file_details.thumbnail}"></a>`
    : `<a href="${path}"><svg width="${OPT.size}" height="${OPT.size}" fill="white"><use xlink:href="/internal/icons.svg#unknown_ftype"/></svg></a>`;

-  let mediaHtml = `<div style="position:relative; width:100%">${thumb}`;
+  let mediaHtml = `<div style="position:relative; width:100%">${thumb}${am_html}`;

-  if (isImageOrUnknown) {
-    if (OPT.search_term) {
-      mediaHtml += `
-        <div style="position:absolute; bottom: 0px; left: 2px;">
-          <svg width="16" height="16" fill="white"><use xlink:href="/internal/icons.svg#${getLocationIcon(obj)}"/></svg>
-        </div>
-      `;
-    }
-    mediaHtml += `
-      <div id="s${obj.id}" style="display:none; position:absolute; top: 50%; left:50%; transform:translate(-50%, -50%);">
-        <img height="64px" src="/internal/throbber.gif">
-      </div>
-    `;
-  } else if (isVideo) {
+  if (isVideo) {
    mediaHtml += `
      <div style="position:absolute; top: 0px; left: 2px;">
        <svg width="16" height="16" fill="white"><use xlink:href="/internal/icons.svg#film"/></svg>
      </div>
    `;
+  }
  if (OPT.search_term) {
      mediaHtml += `
        <div style="position:absolute; bottom: 0px; left: 2px;">
@@ -479,7 +501,6 @@ function renderMedia(obj) {
        </div>
      `;
  }
-  }

  mediaHtml += `</div>`;
  return mediaHtml;
@@ -527,7 +548,6 @@ function drawPageOfFigures()
 {
    $('#figures').empty()
    var last = { printed: null }
-    var ecnt=0

    // something is up, let the user know
    if( document.alert )
@@ -557,30 +577,41 @@ function drawPageOfFigures()
        // with clas "back" this gets a different click handler which flags server to return data by 'going back/up' in dir tree
        // we give the server the id of the first item on the page so it can work out how to go back
        html=`<div class="col col-auto g-0 m-1">
-                <figure id="${back_id}" ecnt="0" class="${cl} entry m-1" type="Directory">
+                <figure id="${back_id}" class="${cl} entry m-1" type="Directory">
                    <svg class="svg" width="${OPT.size-22}" height="${OPT.size-22}">
                        <use xlink:href="internal/icons.svg#folder_back${gray}"/>
                    </svg>
                    <figcaption class="figure-caption text-center">${back}</figcaption>
                </figure>
             </div>`
-        ecnt++
        $('#figures').append(html)
    }
    for (const obj of document.entries) {
-        addFigure( obj, last, ecnt )
-        ecnt++
+        // Grouping logic
+        if (OPT.grouping === "Day") {
+            if (last.printed !== obj.file_details.day) {
+                $('#figures').append(`<div class="row ps-3"><h6>Day: ${obj.file_details.day} of ${obj.file_details.month}/${obj.file_details.year}</h6></div>` );
+                last.printed = obj.file_details.day;
            }
+        } else if (OPT.grouping === "Week") {
+            if (last.printed !== obj.file_details.woy) {
+                $('#figures').append(`<div class="row ps-3"><h6>Week #: ${obj.file_details.woy} of ${obj.file_details.year}</h6></div>` );
+                last.printed = obj.file_details.woy;
+            }
+        } else if (OPT.grouping === "Month") {
+            if (last.printed !== obj.file_details.month) {
+                $('#figures').append(`<div class="row ps-3"><h6>Month: ${obj.file_details.month} of ${obj.file_details.year}</h6></div>` );
+                last.printed = obj.file_details.month;
+            }
+        }
+        addFigure( obj )
+    }
+    $(".back").click( function(e) { getDirEntries(this.id,true) } )
    if( document.entries.length == 0 )
        if( OPT.search_term )
            $('#figures').append( `<span class="alert alert-danger p-2 col-auto"> No matches for: '${OPT.search_term}'</span>` )
        else if( OPT.root_eid == 0 )
            $('#figures').append( `<span class="alert alert-danger p-2 col-auto d-flex align-items-center">No files in Path!</span>` )
-    $('.figure').click( function(e) { DoSel(e, this ); SetButtonState(); return false; });
-    $('.figure').dblclick( function(e) { startViewing( $(this).attr('id') ) } )
-    // for dir, getDirEntries 2nd param is back (or "up" a dir)
-    $(".dir").click( function(e) { document.back_id=this.id; getDirEntries(this.id,false) } )
-    $(".back").click( function(e) { getDirEntries(this.id,true) } )
 }

 // emtpy out file_list_div, and repopulate it with new page of content
@@ -628,6 +659,7 @@ function getEntriesByIdSuccessHandler(res,pageNumber,successCallback,viewingIdx)
    document.entries=res;
    // cache this
    document.page[pageNumber]=res
+    // FIXME: I want to remove successCallback, instead: if viewing, or files_*, or file_list, then call relevant draw routine
    successCallback(res,viewingIdx)
    resetNextPrevButtons()
    // if search, disable folders
@@ -669,7 +701,14 @@ function getPage(pageNumber, successCallback, viewingIdx=0)
        type: 'POST', url: '/get_entries_by_ids',
        data: JSON.stringify(data), contentType: 'application/json',
        dataType: 'json',
-        success: function(res) { document.amendments=res.amend; getEntriesByIdSuccessHandler( res.entries, pageNumber, successCallback, viewingIdx ) },
+        success: function(res) {
+            document.amendments=res.amendments;
+            // only called when an amendment is pending & we are viewing a page in files/list view
+            // so check for amendment job(s) ending...
+            for (const tmp of document.amendments)
+                checkForAmendmentJobToComplete(tmp.job_id)
+            getEntriesByIdSuccessHandler( res.entries, pageNumber, successCallback, viewingIdx ) 
+        },
        error: function(xhr, status, error) { console.error("Error:", error); } });
    return
 }
@@ -720,6 +759,10 @@ function resetNextPrevButtons()
 // get list of eids for the next page, also make sure next/prev buttons make sense for page we are on
 function nextPage(successCallback)
 {
+     // start with disabling more next presses until we are ready to process them
+     $('.prev').prop('disabled', true).addClass('disabled');
+     $('.next').prop('disabled', true).addClass('disabled');
+
    // pageList[0] is the first entry on this page
    const currentPage=getPageNumberForId( pageList[0] )
    // should never happen / just return pageList unchanged
@@ -735,6 +778,10 @@ function nextPage(successCallback)
 // get list of eids for the prev page, also make sure next/prev buttons make sense for page we are on
 function prevPage(successCallback)
 {
+    // start with disabling more prev presses until we are ready to process them
+    $('.prev').prop('disabled', true).addClass('disabled');
+    $('.next').prop('disabled', true).addClass('disabled');
+
    // pageList[0] is the first entry on this page
    const currentPage=getPageNumberForId( pageList[0] )
    // should never happen / just return pageList unchanged
@@ -811,11 +858,78 @@ function changeSize()
    $('.svg_cap').width(sz);
 }

+// when a delete or restore files job has completed successfullly, then get ids
+// find the page we are on, remove amendments & ids from entryList and re-get page
+// which will reset pageList and the UI of images for that page
+function handleMoveOrDeleteOrRestoreFileJobCompleted(job)
+{
+    // this grabs the values from the object attributes of eid-0, eid-1, etc.
+    const ids = job.extra.filter(item => item.name.startsWith("eid-")).map(item => item.value);
+    
+    // find page number of first element to delete (this is the page we will return too)
+    pnum=getPageNumberForId( parseInt(ids[0]) )
+
+    // remove amendment data
+    for (const ent of ids)
+    {
+        id=parseInt(ent)
+        removeAmendment( id )
+        // remove the item in the entryList
+        index=entryList.indexOf(id);
+        if( index != -1 )
+            entryList.splice(index, 1); // Remove the element
+        else
+        {
+            return; // have to get out of here, or calling getPage() below will loop forever
+        }
+    }
+
+    // re-create pageList by reloading the page
+    getPage(pnum,getPageFigures)
+}
+
+// POST to a check URL, that will tell us if the amendment job has completed,
+// it also calls CheckForJobs() which will fix up the Active Jobs badge,
+function checkForAmendmentJobToComplete(job_id)
+{
+    CheckForJobs()
+    $.ajax( { type: 'POST', data: '&job_id='+job_id, url: '/check_amend_job_status',
+        success: function(res) { handleCheckAmendmentJobStatus(res); } } )
+}
+
+// the status of a Amendment Job has been returned, finished is True/False
+// if not finished try again in 1 second... If finished then invalidate page
+// cache and based on job type call code correct func to update the UI appropriately
+function handleCheckAmendmentJobStatus(data)
+{
+    if( data.finished )
+    {
+        // invalidate the cache
+        document.page.length=0
+
+        // transforms contain the single transformed entry data for convenience
+        if( data.job.name == 'transform_image' )
+            handleTransformImageJobCompleted(data.job, data.entry)
+        else if ( data.job.name == 'delete_files' || data.job.name == 'restore_files' || data.job.name == 'move_files' )
+            handleMoveOrDeleteOrRestoreFileJobCompleted(data.job)
+            // if we are viewing this file, then just go up / back,b/c this file is "gone" from this view
+            if( document.viewing )
+                goOutOfViewer()
+    }
+    else { setTimeout( function() { checkForAmendmentJobToComplete(data.job.id) }, 1000 ); }
+}
+
 // different context menu on files
 $.contextMenu({
    selector: '.entry',
    itemClickEvent: "click",
    build: function($triggerElement, e) {
+        // if we are not in the highlight set, then move the highlight to this element
+        if( ! $(e.currentTarget).is('.highlight') )
+        {
+            $('.highlight').removeClass('highlight');
+            $(e.currentTarget).addClass('highlight')
+        }
        // when right-clicking & no selection add one OR deal with ctrl/shift right-lick as it always changes seln
        if( NoSel() || e.ctrlKey || e.shiftKey )
        {
@@ -877,7 +991,7 @@ $.contextMenu({
            callback: function( key, options) {
                if( key == "details" ) { DetailsDBox() }
                if( key == "view" ) { startViewing( $(this).attr('id') ) }
-                if( key == "move" ) { MoveDBox(move_paths) }
+                if( key == "move" ) { MoveDBox() }
                if( key == "del"  ) { DelDBox('Delete') }
                if( key == "undel") { DelDBox('Restore') }
                if( key == "r90"  ) { Transform(90) }
--- a/internal/js/files_transform.js
+++ b/internal/js/files_transform.js
@@ -1,47 +1,31 @@
-function handleTransformFiles(data,id,job_id)
+// This function will remove the matching amendment for this entry (id)
+// can only have 1 ammendment per image, its grayed out for other changes
+function removeAmendment( id )
 {
-    if( data.finished )
-    {
-        $('#s'+id).hide()
-        $('#'+id).find('img.thumb').attr('style', 'filter: color(100%);' );
-        $('#'+id).addClass('entry')
-        $('#'+id).find('.thumb').attr('src', 'data:image/jpeg;base64,'+data.thumbnail)
-        return false;
-    }
-    else
-    {
-        setTimeout( function() { CheckTransformJob(id,job_id,handleTransformFiles) }, 1000,id, job_id );
-    }
+    document.amendments=document.amendments.filter(obj => obj.eid !== id)
 }

-// POST to a check URL, that will tell us if the transformation has completed,
-// if not, try again in 1 second... If it has finished then reset the thumbnail
-// to full colour, put it back to being an entry and reset the thumbnail to the
-// newly created one that was sent back in the response to the POST
-function handleTransformViewing(data,id,job_id)
+// If Transform job has finished then reset relevant document.entries
+// with updated from DB, remove the amendment and redraw image
+function handleTransformImageJobCompleted(job, entry)
 {
-    if( data.finished )
+    removeAmendment( entry.id )
+    // update viewer  if we are viewing an image
+    if( document.viewing )
    {
-        // stop throbber, remove grayscale & then force reload with timestamped version of im.src
-        grayscale=0
-        throbber=0
+        // force reload with timestamped version of im.src
        im.src=im.src + '?t=' + new Date().getTime();
-        return false;
-    }
-    else
-    {
-        setTimeout( function() { CheckTransformJob(id,job_id,handleTransformViewing) }, 1000,id, job_id );
-    }
+        DrawImg()
    }

-// POST to a check URL, that will tell us if the transformation has completed,
-// if not, try again in 1 second... If it has finished then reset the thumbnail
-// to full colour, put it back to being an entry and reset the thumbnail to the
-// newly created one that was sent back in the response to the POST
-function CheckTransformJob(id,job_id,successCallback)
-{
-    CheckForJobs()
-    $.ajax( { type: 'POST', data: '&job_id='+job_id, url: '/check_transform_job', success: function(res) { successCallback(res,id,job_id); } } )
+    // ALWAYS update files* div as we could go back to this from a viewer, and
+    // the thumbnail needs the updated data
+    idx = entryList.indexOf(entry.id)
+    // replace data for this entry now its been transformed
+    document.entries[idx]=entry
+    // redraw into figure html in dom
+    html = createFigureHtml( entry )
+    $('#'+entry.id).replaceWith( html )
 }

 // for each highlighted image, POST the transform with amt (90, 180, 270,
@@ -52,19 +36,24 @@ function CheckTransformJob(id,job_id,successCallback)
 function Transform(amt)
 {
    // we are in the viewer with 1 image only...
-    if( document.viewing )
+    if( $('#viewer_div').length && ! $('#viewer_div').hasClass('d-none') )
    {
        post_data = '&amt='+amt+'&id='+document.viewing.id
-        // send /transform for this image, grayscale the thumbmail, add color spinning wheel overlay, and start checking for job end
-        $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data) { grayscale=1; throbber=1; DrawImg(); CheckTransformJob(document.viewing.id,data.job_id,handleTransformViewing); return false; } })
+        // POST /transform for image, grayscale the image, add throbber, & start checking for end of job
+        $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data) { 
+            processAmendments(data.job.amendments)
+            checkForAmendmentJobToComplete(data.job.id)
+        } })
    }
    else
    {
-        $('.highlight').each(function( id, e ) {
+        $('.highlight').each(function( cnt, e ) {
            post_data = '&amt='+amt+'&id='+e.id
-            // send /transform for this image, grayscale the thumbmail, add color spinning wheel overlay, and start checking for job end
-            $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data){ $('#'+e.id).find('img.thumb').attr('style', 'filter: grayscale(100%);' ); $('#'+e.id).removeClass('entry'); $('#s'+e.id).show(); CheckTransformJob(e.id,data.job_id,handleTransformFiles); return false; } })
+            // POST /transform for image, grayscale the thumbnail, add throbber, & start checking for end of job
+            $.ajax({ type: 'POST', data: post_data, url: '/transform', success: function(data){ 
+                processAmendments(data.job.amendments)
+                checkForAmendmentJobToComplete(data.job.id)
+            } })
        } )
    }
 }
-
--- a/internal/js/jobs.js
+++ b/internal/js/jobs.js
@@ -71,21 +71,14 @@ function SetActiveJobsBadge(num_jobs)
 // after a 1 second timeout
 function CheckForJobs()
 {
-    $.ajax(
-        {
+    $.ajax( {
        type: 'POST', url: '/check_for_jobs',
        success: function(data) {
-                data.sts.forEach( 
-                    function(el)
-                    {
-                        StatusMsg(el)
-                    }
-                )
+            // for each status, handle it/make toast in UI
+            data.sts.forEach( function(el) { StatusMsg(el) } )
            SetActiveJobsBadge(data.num_active_jobs)
-                if( data.num_active_jobs > 0 )
-                {
-                    setTimeout( function() { CheckForJobs() }, 1000 );
-                }
+            // still active job(s), keep checking for them to end
+            if( data.num_active_jobs > 0 ) { setTimeout( function() { CheckForJobs() }, 1000 ); }
        },
    } )
    return false;
--- a/internal/js/view_support.js
+++ b/internal/js/view_support.js
@@ -62,6 +62,11 @@ function DrawImg()
    if( im.width == 0 )
        return

+    // find any matching ammendment
+    am=document.amendments.filter(obj => obj.eid === document.viewing.id)
+    if( am.length )
+        am=am[0]
+
    canvas.width=NewWidth(im)
    canvas.height=NewHeight(im)

@@ -69,14 +74,32 @@ function DrawImg()
 	$('#img-cap').width(canvas.width)

    // actually draw the pixel images to the canvas at the right size
-    if( grayscale )
+    if (!Array.isArray(am))
        context.filter='grayscale(1)'
    context.drawImage(im, 0, 0, canvas.width, canvas.height )
    // -50 is a straight up hack, no idea why this works, but its good enough for me
-    if( throbber )
-        $('#throbber').attr('style', 'display:show; position:absolute; left:'+canvas.width/2+'px; top:'+(canvas.height/2-50)+'px' )
+    if (!Array.isArray(am))
+    {
+        $('#throbber').show()
+        $('#white-circle').show()
+        if(am.type.which == 'img' )
+        {
+            $('#inside-img').attr('src', '/internal/'+am.type.what );
+            $('#inside-img').show()
+        }
        else
-        $('#throbber').hide();
+        {
+            $('#inside-icon').attr('style', `color:${am.type.colour};height:64px` )
+            $('#inside-icon').attr('fill', am.type.colour )
+            $('#inside-icon use').attr('xlink:href', `/internal/icons.svg#${am.type.what}`);
+            $('#inside-icon').show()
+        }
+    } else {
+        $('#throbber').hide()
+        $('#white-circle').hide()
+        $('#inside-img').hide()
+        $('#inside-icon').hide()
+    }

    // show (or not) the whole figcaption with fname in it - based on state of fname_toggle
    if( $('#fname_toggle').prop('checked' ) )
@@ -166,7 +189,7 @@ function ViewImageOrVideo()
    if( ! document.viewing ) return
    if( document.viewing.type.name == 'Image' )
    {
-        im.src='../' + document.viewing.FullPathOnFS
+        im.src='../' + document.viewing.FullPathOnFS + '?t=' + new Date().getTime();
        $('#video_div').hide()
        if( $('#fname_toggle').prop('checked' ) )
            $('#img-cap').show()
@@ -603,6 +626,8 @@ function goOutOfViewer()
    // hide viewer div, then show files_div
    $('#viewer_div').addClass('d-none')
    $('#files_div').removeClass('d-none')
+    // no longer viewing an image too
+    document.viewing=null
 }

 // change the viewer to the previous entry (handle page change too)
@@ -678,12 +703,10 @@ function addViewerKeyHandler() {
        {
            case "Left": // IE/Edge specific value
            case "ArrowLeft":
-                if( $('#la').prop('disabled') == false )
                $('#la').click()
                break;
            case "Right": // IE/Edge specific value
            case "ArrowRight":
-                if( $('#ra').prop('disabled') == false )
                $('#ra').click()
                break;
            case "d":
@@ -724,7 +747,6 @@ function nextImageInViewer()
    getNextEntry()
    setDisabledForViewingNextPrevBttons()
    ViewImageOrVideo()
-
 }

 // wrapper func to start the viewer - needed as we have a dbl-click & View file
--- a/internal/white-circle.png
+++ b/internal/white-circle.png
--- a/job.py
+++ b/job.py
@@ -4,11 +4,13 @@ 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
 import socket
 from shared import PA, PA_JOB_MANAGER_HOST, PA_JOB_MANAGER_PORT, NEWEST_LOG_LIMIT, OLDEST_LOG_LIMIT
+from amend import EntryAmendment, inAmendmentTypes
 from flask_login import login_required, current_user
 from sqlalchemy.dialects.postgresql import INTERVAL
 from sqlalchemy.sql.functions import concat
@@ -57,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 
@@ -82,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]

@@ -114,8 +118,23 @@ def NewJob(name, num_files="0", wait_for=None, jex=None, desc="No description pr

    db.session.add(job)
    db.session.commit()
-    SetFELog( message=f'Created <a class="link-light" href="/job/{job.id}">Job #{job.id}</a> to {desc}', level="success" )

+    # if this job changes an eid we store that in DB and client shows until it finishes the job
+    at_id = inAmendmentTypes(job)
+    if at_id:
+        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 )
+            db.session.add(ea)
+            job.amendments.append(ea)
+        elif job.name == 'delete_files' or job.name == 'restore_files' or job.name == 'move_files':
+            for j in jex:
+                if 'eid-' in j.name:
+                    ea=EntryAmendment( eid=j.value, job_id=job.id, amend_type=at_id )
+                    db.session.add(ea)
+                    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)
    return job

@@ -309,14 +328,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>
--- a/main.py
+++ b/main.py
@@ -66,8 +66,6 @@ app.config['LDAP_USER_DN'] = 'ou=users'
 app.config['LDAP_GROUP_DN'] = 'ou=groups'
 app.config['LDAP_USER_RDN_ATTR'] = 'uid'
 app.config['LDAP_USER_LOGIN_ATTR'] = 'uid'
-app.config['LDAP_BIND_USER_DN'] = None
-app.config['LDAP_BIND_USER_PASSWORD'] = None
 app.config['LDAP_GROUP_OBJECT_FILTER'] = '(objectclass=posixGroup)'
 app.config['LDAP_BIND_USER_DN'] = None
 app.config['LDAP_BIND_USER_PASSWORD'] = None
--- a/pa_job_manager.py
+++ b/pa_job_manager.py
@@ -1,4 +1,3 @@
-
 #
 # This file controls the 'external' job control manager, that (periodically #
 # looks / somehow is pushed an event?) picks up new jobs, and processes them.
@@ -15,7 +14,7 @@

 ### SQLALCHEMY IMPORTS ###
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import Column, Integer, String, Sequence, Float, ForeignKey, DateTime, LargeBinary, Boolean, func, text
+from sqlalchemy import Column, Integer, String, Sequence, Float, ForeignKey, DateTime, LargeBinary, Boolean, func, text, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import relationship
 from sqlalchemy import create_engine
@@ -23,7 +22,7 @@ from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import scoped_session

 ### LOCAL FILE IMPORTS ###
-from shared import DB_URL, PA_JOB_MANAGER_HOST, PA_JOB_MANAGER_PORT, THUMBSIZE, SymlinkName, GenThumb, SECS_IN_A_DAY, PA_EXIF_ROTATER
+from shared import DB_URL, PA_JOB_MANAGER_HOST, PA_JOB_MANAGER_PORT, THUMBSIZE, SymlinkName, GenThumb, SECS_IN_A_DAY, PA_EXIF_ROTATER, PA
 from datetime import datetime, timedelta, date

 ### PYTHON LIB IMPORTS ###
@@ -46,6 +45,8 @@ import re
 import sys
 import ffmpeg
 import subprocess
+# FIXME: remove this
+import time


 # global debug setting
@@ -512,6 +513,15 @@ class PA_JobManager_FE_Message(Base):
    def __repr__(self):
        return "<id: {}, job_id: {}, level: {}, message: {}".format(self.id, self.job_id, self.level, self.message)

+################################################################################
+# Class describing which Entry has a pending Amendment in the DB (via sqlalchemy)
+################################################################################
+class EntryAmendment(PA,Base):
+    __tablename__ = "entry_amendment"
+    eid = Column(Integer, ForeignKey("entry.id"), primary_key=True )
+    job_id = Column(Integer, ForeignKey("job.id"), primary_key=True )
+    # don't over think this, we just use eid to delete this entry anyway
+    amend_type = Column(Integer)

 ##############################################################################
 # PAprint(): convenience function to prepend a timestamp to a printed string
@@ -1863,9 +1873,22 @@ def JobRunAIOn(job):
    FinishJob(job, "Finished Processesing AI")
    return

+################################################################################
+# removeEntryAmendment(): helper routine to remove an Etnry Amendment for a
+# given job and eid (called after Transform or Delete/Restore/Move files
+################################################################################
+def removeEntryAmendment( job, eid ):
+    # now remove the matching amendment for the transform job
+    stmt=select(EntryAmendment).where(EntryAmendment.eid==eid)
+    ea=session.execute(stmt).scalars().one_or_none()
+    if ea:
+        session.delete(ea)
+    else:
+        AddLogForJob( job, f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id})" )
+        PAprint( f"ERROR: failed to remove entry amendment in DB for this transformation? (eid={id}, job={job} )" )
+
 ####################################################################################################################################
 # JobTransformImage(): transform an image by the amount requested (can also flip horizontal or vertical)
-# TODO: should be JobTransformImage() ;)
 ####################################################################################################################################
 def JobTransformImage(job):
    JobProgressState( job, "In Progress" )
@@ -1874,6 +1897,11 @@ def JobTransformImage(job):
    amt=[jex.value for jex in job.extra if jex.name == "amt"][0]
    e=session.query(Entry).join(File).filter(Entry.id==id).first()
    PAprint( f"JobTransformImage: job={job.id}, id={id}, amt={amt}" )
+    # cant transfer non-image, but may get here if multi-select includes non-Image
+    if e.type.name != 'Image':
+        removeEntryAmendment( job, id )
+        FinishJob(job, "Cannot rotate file as it is not an Image","Failed")
+        return

    if amt == "fliph":
        AddLogForJob(job, f"INFO: Flipping {e.FullPathOnFS()} horizontally" )
@@ -1897,6 +1925,10 @@ def JobTransformImage(job):
    e.file_details.hash = md5( job, e )
    PAprint( f"JobTransformImage DONE thumb: job={job.id}, id={id}, amt={amt}" )
    session.add(e)
+    # any faces in this file are no longer valid, remove them
+    session.query(FaceFileLink).filter(FaceFileLink.file_eid==e.id).delete()
+    removeEntryAmendment( job, id )
+
    FinishJob(job, "Finished Processesing image rotation/flip")
    return
    
@@ -2174,6 +2206,7 @@ def JobMoveFiles(job):
        if 'eid-' in jex.name:
            move_me=session.query(Entry).get(jex.value)
            MoveEntriesToOtherFolder( job, move_me, dst_storage_path, f"{prefix}{suffix}" )
+            removeEntryAmendment( job, move_me.id )
    NewJob( name="check_dups", num_files=0, wait_for=None, jex=None, parent_job=None, desc="check for duplicate files" )
    FinishJob(job, f"Finished move selected file(s)")
    return
@@ -2188,6 +2221,7 @@ def JobDeleteFiles(job):
        if 'eid-' in jex.name:
            del_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first()
            MoveFileToRecycleBin(job,del_me)
+            removeEntryAmendment(job,del_me.id)
    NewJob( name="check_dups", num_files=0, wait_for=None, jex=None, parent_job=None, desc="check for duplicate files" )
    FinishJob(job, f"Finished deleting selected file(s)")
    return
@@ -2202,6 +2236,7 @@ def JobRestoreFiles(job):
        if 'eid-' in jex.name:
            restore_me=session.query(Entry).join(File).filter(Entry.id==jex.value).first()
            RestoreFile(job,restore_me)
+            removeEntryAmendment(job,restore_me.id)
    NewJob( name="check_dups", num_files=0, wait_for=None, jex=None, parent_job=None, desc="check for duplicate files" )
    FinishJob(job, f"Finished restoring selected file(s)")
    return
@@ -2707,7 +2742,6 @@ def ScheduledJobs():
        created_jobs=True
    return created_jobs

-
 ####################################################################################################################################
 # MAIN - start with validation, then grab any jobs in the DB to process, then
 # go into waiting on a socket to be woken up (and then if woken, back into HandleJobs()
--- a/tables.sql
+++ b/tables.sql
@@ -168,18 +168,21 @@ CREATE TABLE pa_job_manager_fe_message ( id INTEGER, job_id INTEGER, level VARCH
    CONSTRAINT pk_pa_job_manager_fe_acks_id PRIMARY KEY(id),
    CONSTRAINT fk_pa_job_manager_fe_message_job_id FOREIGN KEY(job_id) REFERENCES job(id) );

-CREATE TABLE amendment_type ( id INTEGER, which VARCHAR(8), what VARCHAR(32), colour VARCHAR(32),
+CREATE TABLE amendment_type ( id INTEGER, job_name VARCHAR(64), which VARCHAR(8), what VARCHAR(32), colour VARCHAR(32),
    CONSTRAINT pk_amendment_type_id PRIMARY KEY(id) );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 1, 'icon', 'trash', 'red' );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 2, 'img', 'rot90.png', '#009EFF' );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 3, 'img', 'rot180.png', '#009EFF' );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 4, 'img', 'rot270.png', '#009EFF' );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 5, 'icon', 'flip_h', '#009EFF' );
-INSERT INTO amendment_type ( id, which, what, colour ) VALUES ( 6, 'icon', 'flip_v', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 1, 'delete_files', 'icon', 'trash', 'var(--bs-danger)' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 2, 'restore_files', 'icon', 'trash', 'var(--bs-success)' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 3, 'transform_image:90', 'img', 'rot90.png', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 4, 'transform_image:180', 'img', 'rot180.png', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 5, 'transform_image:270', 'img', 'rot270.png', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 6, 'transform_image:fliph', 'icon', 'flip_h', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 7, 'transform_image:flipv', 'icon', 'flip_v', '#009EFF' );
+INSERT INTO amendment_type ( id, job_name, which, what, colour ) VALUES ( 8, 'move_files', 'icon', 'folder_plus', 'var(--bs-primary)' );

-CREATE TABLE entry_amendment ( eid INTEGER, amend_type INTEGER,
-    CONSTRAINT pk_entry_amendment_eid_name PRIMARY KEY(eid,amend_type),
-    CONSTRAINT fk_entry_amendment_amendment_type FOREIGN KEY(amend_type) REFERENCES amendment_type(id) );
+CREATE TABLE entry_amendment ( amend_type INTEGER, eid INTEGER, job_id INTEGER,
+    CONSTRAINT pk_entry_amendment_eid_job_id PRIMARY KEY(eid,job_id),
+    CONSTRAINT fk_entry_amendment_amendment_type FOREIGN KEY(amend_type) REFERENCES amendment_type(id),
+    CONSTRAINT fk_entry_amendment_job_id FOREIGN KEY(job_id) REFERENCES job(id) );

 -- default data for types of paths
 INSERT INTO path_type VALUES ( (SELECT NEXTVAL('path_type_id_seq')), 'Import' );
--- a/templates/files.html
+++ b/templates/files.html
@@ -137,9 +137,17 @@
                            <use xlink:href="{{url_for('internal', filename='icons.svg')}}?v={{js_vers['ic']}}#prev"/></svg>
                    </button>
                </div>
-                <figure class="col col-auto border border-info rounded m-0 p-1" id="figure">
+                <figure style="position: relative;" class="col col-auto border border-info rounded m-0 p-1" id="figure">
                    <canvas id="canvas"></canvas>
-                    <img id="throbber" src="{{url_for('internal', filename='throbber.gif')}}?v={{js_vers[th]}}" style="display:none;">
+                    <!-- next 4 are placeholders and called on during amendments only in viewer code -->
+                    <img id="throbber" src="{{url_for('internal', filename='throbber.gif')}}?v={{js_vers[th]}}" style="display:none;height:96px"
+                        class="position-absolute top-50 start-50 translate-middle">
+                    <img id="white-circle" src="{{url_for('internal', filename='white-circle.png')}}?v={{js_vers[th]}}" style="display:none;height:72px"
+                        class="position-absolute top-50 start-50 translate-middle">
+                    <img id="inside-img" style="display:none;height:64px" class="position-absolute top-50 start-50 translate-middle">
+                    <svg id="inside-icon" style="display:none;height:64px" class="position-absolute top-50 start-50 translate-middle">
+                        <use xlink:href="{{url_for('internal', filename='icons.svg')}}?v={{js_vers['ic']}}#flip_v">
+                        </use></svg>
                    <script>
                        var im=new Image();
                        im.onload=DrawImg
@@ -251,6 +259,10 @@
    // this implies no content in the Path at all
    OPT.root_eid = {{ query_data.root_eid }};

+    // amendment types are stable per code release, store them once and use as
+    // needed when we amend entrys in Transforms, removes, etc.
+    document.amendTypes = {{ query_data.amendTypes|tojson }};
+
    // get items out of query_data into convenience javascript vars...
    var move_paths = {{ query_data.move_paths|tojson }};
    var NMO={{query_data.NMO|tojson}}
@@ -264,10 +276,8 @@
    // force pageList to set pageList for & render the first page
    getPage(1,getPageFigures)

-    // FIXME: doco, but also gather all globals together, many make them all document. to be obviously global (and add fullscreen)
+    // gap is used to keep some space around video in viewer - tbh, not sure why anymore
    var gap=0.8
-    var grayscale=0
-    var throbber=0

    function PrettyFname(fname)
    {
@@ -317,5 +327,11 @@
        $('#viewer_del').on('click', function() { DelDBox('Restore') } )
    }

+    if( isMobile() )
+    {
+        $('#shift-key').css('visibility', 'visible');
+        $('#ctrl-key').css('visibility', 'visible');
+    }
+
 </script>
 {% endblock script_content %}
--- a/wrapper.sh
+++ b/wrapper.sh
@@ -13,6 +13,9 @@ else
    sudo -u pauser gunicorn --bind=0.0.0.0:80 --workers=1 --threads=1 main:app --env ENV="development" --error-logfile gunicorn.error.log --access-logfile gunicorn.log --capture-output --enable-stdio-inheritance --reload
 fi

+# warm the cache to see if this helps with odd restart 404s
+curl -sf http://localhost/health
+
 # this should never be invoked unless gunicorn fails -- in that case, at least
 # we will keep the container can login by hand and check the issue/error
 sleep 99999
Author	SHA1	Message	Date
Damien De Paoli	74647bcdfb	remove duplicate lines of code	2025-11-18 21:13:02 +11:00
Damien De Paoli	0ee55ee73d	fixed BUG-143, disable next/prev as first thing we do when going next/prev Page	2025-10-28 23:04:33 +11:00
Damien De Paoli	89e8c5d9f7	fix BUG-125: right-click changes highlight if its not in the highlight set	2025-10-28 22:31:15 +11:00
Damien De Paoli	76b0745cc3	remove face data after transform (BUG-142), also only reset viewing image if we are viewing, and remove debugs	2025-10-28 22:16:26 +11:00
Damien De Paoli	bc2d4384c9	fix BUG-141, crashing pa_job_manager when transforming a non-Image	2025-10-28 22:04:47 +11:00
Damien De Paoli	d247ecec54	fix up bug where sucess used instead of success, also if we delete/restore/move a file from inside the viewer, then adjust the files* divs, and go out of the viewer (back/up) and show updated files div	2025-10-27 22:06:54 +11:00
Damien De Paoli	bb43cc5623	new TODOs	2025-10-27 22:04:31 +11:00
Damien De Paoli	a6edbd184b	fixed mistaken removal of shift/ctrl buttons on mobiles for file* views	2025-10-26 20:30:44 +11:00
Damien De Paoli	09e7b8eea7	one more old BUG gone, reordered file	2025-10-26 20:30:22 +11:00
Damien De Paoli	f2ef55a58a	cleaned up old bugs that are fixed by new entry_amendments logic	2025-10-26 15:55:13 +11:00
Damien De Paoli	4d7f3dfed9	Fixing BUGs 144/145, (needed a parseInt), and force MovedBox path selection to Storage always - if moving from Import path, likely storing, if in Storage path, likely moving inside the Storage area, user can always override	2025-10-26 15:44:13 +11:00
Damien De Paoli	4421da0d1d	make move_files have EntryAmendments, do not remove from the UI instantly, and handle just like delete_files, remove restriction on forcing the page to go back to / on search, with new logic its not an issue, also force MoveDBox to start with Storage path rather than another, MOST moves should be to Storage, but should tweak this to be the opposite of current path type	2025-10-26 13:32:31 +11:00
Damien De Paoli	6eba21e028	added BUG-143 around fast page changes	2025-10-25 20:26:32 +11:00
Damien De Paoli	9bdd9d5b78	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	2025-10-25 18:21:28 +11:00
Damien De Paoli	d3ae9b788f	make sure loading viewer for the first time add query param to get latest version of img, and when we leave viewer reset document.viewing	2025-10-25 18:18:58 +11:00
Damien De Paoli	1396cbab78	added removeEntryAmendment() and call that when transform/delete_files/restore_files	2025-10-25 18:13:19 +11:00
Damien De Paoli	b7500e5170	use throbber gray, rather than white	2025-10-25 18:12:32 +11:00
Damien De Paoli	392708bad9	reformat	2025-10-25 18:12:15 +11:00
Damien De Paoli	90b3fe4c2f	try to warm the cache to help with restart / traefik not noticing	2025-10-25 18:06:38 +11:00
Damien De Paoli	bd6c9c1fbd	code formatting	2025-10-25 10:52:30 +11:00
Damien De Paoli	56771308a6	updated BUGs in general to remove older / fixed BUGs relating to the confusion of current/eids, etc. update amendments in tables.sql to include job_id in entry_ammendment added amend.py to move amendment-related code into its own file when we create a job (NewJob) and that job matches an amendmentType (via job_name or job_name:amt <- where amt relates to how we do a transform_image), then we enter a new EntryAmendment pa_job_mgr knows when a Transform job ends, and removes relevant EntryAmendment files*.js use EntryAmendment data to render thumbnails with relevant AmendmentType if a normal page load (like /files_ip), and there is an EntryAmendment, mark up the thumb, run the check jobs to look for completion of the job, removeal of the EntryAmendment and update the entry based on 'transformed' image OVERALL: this is a functioning version that uses EntryAmendments and can handle loading a new page with outstanding amendments and 'deals' with it. This is a good base, but does not cater for remove_files or move_files	2025-10-20 19:31:57 +11:00
Damien De Paoli	905910ecf0	updated BUGs in general to remove older / fixed BUGs relating to the confusion of current/eids, etc. update amendments in tables.sql to include job_id in entry_ammendment added amend.py to move amendment-related code into its own file when we create a job (NewJob) and that job matches an amendmentType (via job_name or job_name:amt <- where amt relates to how we do a transform_image), then we enter a new EntryAmendment pa_job_mgr knows when a Transform job ends, and removes relevant EntryAmendment files*.js use EntryAmendment data to render thumbnails with relevant AmendmentType and if a normal page load (like /files_ip), and there is an EntryAmendment, mark up the thumb, run the check jobs to look for completion of the job, removeal of the EntryAmendment and update the entry based on 'transformed' image OVERALL: this is a functioning version that uses EntryAmendments and can handle loading a new page with outstanding amendments and 'deals' with it. This is a good base, but does not cater for remove_files or move_files	2025-10-20 19:23:52 +11:00
Damien De Paoli	a38c54812c	use amendments to render throbber/grayscale	2025-10-20 19:23:12 +11:00
Damien De Paoli	dc6b831481	remove overkill use of make_response	2025-10-20 19:16:25 +11:00
Damien De Paoli	8969cd452e	for now, store away amendment types into dom for client-side additions - still working on right place for the additions	2025-10-19 11:29:52 +11:00
Damien De Paoli	d65f3b32d3	pass amendmentTypes to client in query_data, make query_data single func to remove duplicate code, reference new amend.py for class defintions	2025-10-19 11:29:10 +11:00
Damien De Paoli	0b0035d1d2	adding job_name into amendment type, and updating inserts to match	2025-10-19 11:24:54 +11:00