Skip to content

Commit 35fda61

Browse files
committed
Updated abortedToken logic
1 parent 5790f63 commit 35fda61

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

app/lib/task/backend.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,19 @@ class TaskBackend {
455455
return false;
456456
}
457457

458+
state.abortedTokens = [
459+
...state.versions!.entries
460+
.where((e) => deselectedVersions.contains(e.key))
461+
.map((e) => e.value)
462+
.map(
463+
(vs) => AbortedTokenInfo(
464+
token: vs.secretToken!,
465+
expires: vs.scheduled.add(maxTaskExecutionTime),
466+
),
467+
),
468+
...?state.abortedTokens,
469+
].where((t) => t.isNotExpired).take(50).toList();
470+
458471
// Make changes!
459472
state.versions!
460473
// Remove versions that have been deselected

app/lib/task/models.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ class AbortedTokenInfo {
431431
factory AbortedTokenInfo.fromJson(Map<String, dynamic> m) =>
432432
_$AbortedTokenInfoFromJson(m);
433433
Map<String, dynamic> toJson() => _$AbortedTokenInfoToJson(this);
434+
435+
bool get isNotExpired => clock.now().isBefore(expires);
434436
}
435437

436438
/// A [db.Property] encoding a List os [AbortedTokenInfo] as JSON.

0 commit comments

Comments
 (0)