lee/wanderer
1
0
Fork 0
mirror of https://github.com/wanderer-industries/wanderer synced 2025-12-12 02:35:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: pending deletion working again (#185)
Some checks are pending
Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run
Details
Build / Manual Approval (push) Blocked by required conditions
Details
Build / 🛠 Build (1.17, 18.x, 27) (push) Blocked by required conditions
Details
Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions
Details
Build / 🛠 Build Docker Images (linux/arm64) (push) Blocked by required conditions
Details
Build / merge (push) Blocked by required conditions
Details
Build / 🏷 Create Release (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
guarzo
2025-02-18 17:24:15 -05:00
committed by GitHub
parent f965461820
commit 3d54783a3e
6 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/contentHelpers.ts
View File

@@ -55,6 +55,22 @@ export function schedulePendingAdditionForSig(
);
}
export function mergeLocalPendingAdditions(
serverSigs: ExtendedSystemSignature[],
localSigs: ExtendedSystemSignature[],
): ExtendedSystemSignature[] {
const now = Date.now();
const pendingAdditions = localSigs.filter(sig => sig.pendingAddition && sig.pendingUntil && sig.pendingUntil > now);
const mergedMap = new Map<string, ExtendedSystemSignature>();
serverSigs.forEach(sig => mergedMap.set(sig.eve_id, sig));
pendingAdditions.forEach(sig => {
if (!mergedMap.has(sig.eve_id)) {
mergedMap.set(sig.eve_id, sig);
}
});
return Array.from(mergedMap.values());
}
export function scheduleLazyDeletionTimers(
toRemove: ExtendedSystemSignature[],
setPendingMap: React.Dispatch<React.SetStateAction<Record<string, { finalUntil: number; finalTimeoutId: number }>>>,