5.0.5γ

Author: jarena3

src/classes/components/cloud/CloudController.ts

@@ -201,8 +201,8 @@ class CloudController {
     if (!this._metadata?.Updated) return false
     if (!this._lastUploadedItemModified) return false
     if (this.Parent.SaveController?.IsDeleted && !this._metadata.Deleted) return false
-    const localModified =
-      this.Parent.SaveController.LastModified || this.Parent.SaveController.Created
+    const sc = this.Parent.SaveController
+    const localModified = sc?.LastModified || sc?.Created || 0
     return (
       this._lastUploadedItemModified >= this._metadata.ItemModified &&
       this._lastUploadedItemModified >= localModified
@@ -400,22 +400,44 @@ class CloudController {
         continue
       }
 
+      if (toRaw(item).SaveController?.IsDeleted && !item.CloudController._metadata?.Deleted) {
+        const sc = toRaw(item).SaveController
+        const deletedMeta: dbItemMeta = {
+          ...item.CloudController.Metadata.Serialize(),
+          item_modified: sc.LastModified,
+          deleted: sc.DeleteTime,
+        }
+        try {
+          const res = await updateItem(deletedMeta, 'item')
+          if (res.data) {
+            item.CloudController.Metadata = { ...deletedMeta, ...res.data }
+          }
+          item.CloudController._lastUploadedItemModified = sc.LastModified
+          toRaw(item).SaveController.saveSilent()
+        } catch (e) {
+          failures.push({ item, error: e })
+        }
+        continue
+      }
+
       if (!item.CloudController._lastFieldHashes) {
         const hasPriorSync = Object.keys(item.CloudController._fieldTs).length > 0
         const hasServerRecord = !!item.CloudController._metadata?.Updated
         if (hasPriorSync || hasServerRecord) {
-          try {
-            await item.CloudController.syncFromCloud()
-          } catch (syncErr) {
-            failures.push({ item, error: syncErr })
+          if (!toRaw(item).SaveController?.IsDeleted) {
+            try {
+              await item.CloudController.syncFromCloud()
+            } catch (syncErr) {
+              failures.push({ item, error: syncErr })
+            }
           }
           continue
         }
       }
 
       const prepared = CloudController.prepareUpload(item)
       if (!prepared) {
-        if (item.CloudController.serverVersionChanged) {
+        if (item.CloudController.serverVersionChanged && !toRaw(item).SaveController?.IsDeleted) {
           try {
             await item.CloudController.syncFromCloud()
           } catch (syncErr) {
@@ -510,7 +532,7 @@ class CloudController {
               logger.error(`BatchUpdateCloud upload failed: ${task.item.Name}`, r.reason)
               failures.push({ item: task.item, error: r.reason })
               compensations.push(
-                updateItem(task.previousMeta).catch(err =>
+                updateItem(toRaw(task.item).SaveController?.IsDeleted ? task.meta : task.previousMeta).catch(err =>
                   logger.warn(
                     `BatchUpdateCloud: DynamoDB compensation failed for ${task.item.Name}`,
                     err

src/user/store/RemoteItemStore.ts

@@ -6,6 +6,7 @@ import {
   NotFoundError,
 } from '@/io/apis/account'
 import { CloudController } from '@/classes/components/cloud/CloudController'
+import { AuthStore } from './AuthStore'
 import { UserMetadataStore } from './UserMetadataStore'
 import { CloudDataStore } from './CloudDataStore'
 import { NotificationStore } from './NotificationStore'
@@ -139,8 +140,8 @@ export const RemoteItemStore = defineStore('remoteItems', {
         if (item.deleted) continue
         const localItem = cloudDataStore.getLocalItem(item.sortkey)
         if (localItem) {
-          const isOwnCloudItem = cloudDataStore.CloudItems.some(ci => ci.sortkey === item.sortkey)
-          if (!isOwnCloudItem) {
+          const isOwned = item.user_id === AuthStore().Cognito?.userId
+          if (!isOwned) {
             toRaw(localItem).CloudController.Metadata = item
           }
         } else {
@@ -166,7 +167,7 @@ export const RemoteItemStore = defineStore('remoteItems', {
 
       const codeToExpectedId = new Map<string, string>()
       for (const item of data) {
-        codeToExpectedId.set(item.code, item.sortkey.split('_')[2])
+        codeToExpectedId.set(item.code, item.sortkey.split('_').slice(2).join('_'))
       }
 
       const { SyncStore } = await import('./SyncStore')

src/user/store/SyncStore.ts

@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia'
-import { toRaw } from 'vue'
 import { CloudController, DbItemMetadata } from '@/classes/components/cloud/CloudController'
 import type { ICloudSyncable } from '@/classes/components/cloud/ICloudSyncable'
 import { normalizeItemType } from '@/classes/components/cloud/ItemTypeMap'
@@ -48,15 +47,15 @@ export const SyncStore = defineStore('sync', {
       const localIds = new Set(this.AllLocalItems.map(y => y.ID))
       const raw = cdStore.CloudItems.filter(x => {
         if (x.deleted) return false
-        const itemId = x.sortkey.split('_')[2]
+        const itemId = x.sortkey.split('_').slice(2).join('_')
         return !localIds.has(itemId)
       })
 
       return raw.map(x => ({
         raw: x,
         IsCloudOnly: true,
         Name: x.name,
-        ID: x.sortkey.split('_')[2],
+        ID: x.sortkey.split('_').slice(2).join('_'),
         ItemType: x.sortkey.split('_')[1],
         CloudController: {
           Metadata: new DbItemMetadata(x),
@@ -86,7 +85,7 @@ export const SyncStore = defineStore('sync', {
         const t = normalizeItemType(x.ItemType)
         if (t === 'encounterarchive') return false
         if (t === 'pilotsheet' && (x as any).Archived) {
-          return cdStore.CloudItems.some(ci => ci.sortkey === x.CloudController.Metadata.SortKey)
+          return !!x.CloudController.Metadata?.Updated
         }
         return cdStore.SyncItemTypes.includes(t)
       }).filter(x => !x.CloudController.isSynced)
@@ -285,7 +284,11 @@ export const SyncStore = defineStore('sync', {
       for (const [type, reg] of allRegistrations()) {
         if (type === 'campaign' || type === 'pilotgroup') continue
         for (const item of reg.getAll() as any[]) {
-          if (item.SaveController?.IsDeleted && item.SaveController.DeleteTime < threshold) {
+          if (
+            item.SaveController?.IsDeleted &&
+            item.SaveController.DeleteTime < threshold &&
+            !!item.CloudController?.Metadata?.Deleted
+          ) {
             promises.push(
               reg.deleteLocal(item).then(() => {
                 deleted.push(`Permanently Deleted ${type}: ${item.Name ?? item.Title ?? item.ID}`)