fix: bind Tomorrow conflict recovery to operator account

frontend/tomorrow-plan.js

@@ -63,14 +63,15 @@ function createTomorrowPlan({fetchJson,localDate,timeZone,storage,getLogin}={})
     }).catch(async error=>{
       if(error?.status===409) {
         const remote=await fetchJson('api/v1/tomorrow');
-        lastConflict={local:pending(),remote:{...remote,ids:[...remote.ids],estimates:{...(remote.estimates||{})}}};
+        lastConflict={key,local:pending(),remote:{...remote,ids:[...remote.ids],estimates:{...(remote.estimates||{})}}};
       }
       throw error;
     }).finally(()=>{flushing=null;});
     return flushing;
   }
   async function keepLocal() {
-    if(!lastConflict) return false;
+    if(!lastConflict||lastConflict.key!==storageKey()) return false;
+    const conflictKey=lastConflict.key;
     const local={...lastConflict.local,ids:[...lastConflict.local.ids],estimates:{...lastConflict.local.estimates}};
     const body=deliveryBody({...local,base_revision:lastConflict.remote.revision});
     try {
@@ -84,13 +85,13 @@ function createTomorrowPlan({fetchJson,localDate,timeZone,storage,getLogin}={})
     } catch(error) {
       if(error?.status===409) {
         const remote=await fetchJson('api/v1/tomorrow');
-        lastConflict={local,remote:{...remote,ids:[...remote.ids],estimates:{...(remote.estimates||{})}}};
+        lastConflict={key:conflictKey,local,remote:{...remote,ids:[...remote.ids],estimates:{...(remote.estimates||{})}}};
       }
       throw error;
     }
   }
   function useRemote() {
-    if(!lastConflict) return false;
+    if(!lastConflict||lastConflict.key!==storageKey()) return false;
     const remote=lastConflict.remote;
     const key=storageKey();
     if(key&&storage) storage.removeItem(key);
@@ -162,8 +163,8 @@ function createTomorrowPlan({fetchJson,localDate,timeZone,storage,getLogin}={})
     return {run,stop(){if(timer!==null)clearTimer(timer);timer=null;}};
   }
   function conflict() {
-    return lastConflict&&{local:{...lastConflict.local,ids:[...lastConflict.local.ids],estimates:{...lastConflict.local.estimates}},
-      remote:{...lastConflict.remote,ids:[...lastConflict.remote.ids],estimates:{...lastConflict.remote.estimates}}};
+    return lastConflict?.key===storageKey()?{local:{...lastConflict.local,ids:[...lastConflict.local.ids],estimates:{...lastConflict.local.estimates}},
+      remote:{...lastConflict.remote,ids:[...lastConflict.remote.ids],estimates:{...lastConflict.remote.estimates}}}:null;
   }
   return {adopt,load,save,stage,pending,flush,conflict,keepLocal,useRemote,promote,state,summary,nextLocalDate,startLifecycle};
 }