Skip to content

Commit

Permalink
Merged branch bugfix/work-on-archival-of-big-plan-activitiies into de…
Browse files Browse the repository at this point in the history
…velop
  • Loading branch information
horia141 committed Jun 17, 2024
1 parent 992fb7f commit 6ae3f88
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
31 changes: 16 additions & 15 deletions src/core/jupiter/core/use_cases/time_plans/activity/archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,23 @@ async def _perform_transactional_mutation(
source=InboxTaskSource.BIG_PLAN,
big_plan_ref_id=activity.target_ref_id,
)
inbox_task_activities = await uow.get_for(
TimePlanActivity
).find_all_generic(
parent_ref_id=activity.parent_ref_id,
allow_archived=False,
target=TimePlanActivityTarget.INBOX_TASK,
target_ref_id=[it.ref_id for it in inbox_tasks],
)
for inbox_task_activity in inbox_task_activities:
await generic_archiver(
context.domain_context,
uow,
progress_reporter,
TimePlanActivity,
inbox_task_activity.ref_id,
if len(inbox_tasks) > 0:
inbox_task_activities = await uow.get_for(
TimePlanActivity
).find_all_generic(
parent_ref_id=activity.parent_ref_id,
allow_archived=False,
target=TimePlanActivityTarget.INBOX_TASK,
target_ref_id=[it.ref_id for it in inbox_tasks],
)
for inbox_task_activity in inbox_task_activities:
await generic_archiver(
context.domain_context,
uow,
progress_reporter,
TimePlanActivity,
inbox_task_activity.ref_id,
)

await generic_archiver(
context.domain_context,
Expand Down
2 changes: 1 addition & 1 deletion src/webui/app/routes/workspace/time-plans/$id.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export default function TimePlanView() {
actions={[
NavMultipleCompact(
NavSingle(
"New Inbox Tasks",
"New Inbox Task",
`/workspace/inbox-tasks/new?timePlanReason=for-time-plan&timePlanRefId=${loaderData.timePlan.ref_id}`
),
NavSingle(
Expand Down

0 comments on commit 6ae3f88

Please sign in to comment.