Skip to content

add scheduling goal invocation ID to the allowed columns on Activity Directives table #1895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dandelany wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

add scheduling goal invocation ID to the allowed columns on Activity Directives table #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf2153
add scheduling goal invocation ID to the allowed columns on Activity …
dandelany Mar 11, 2026
c8af288
fix tests, format
dandelany Mar 11, 2026
f37bcff
update ag grid header tooltip style to use --ag-background-color var
dandelany Mar 13, 2026
c510473
Merge branch 'develop' into fix/add-source-scheduling-invocation-column
dandelany Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/components/activity/ActivityAnchorForm.svelte.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe('Activity Anchor Form component', () => {
name: 'parent 1',
plan_id: 12,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '00:00:00.00',
start_time_ms: 1715731443696,
tags: [],
Expand All @@ -38,6 +39,7 @@ describe('Activity Anchor Form component', () => {
name: 'child 1',
plan_id: 12,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '00:10:00.00',
start_time_ms: 1715731443696,
tags: [],
Expand All @@ -57,6 +59,7 @@ describe('Activity Anchor Form component', () => {
name: 'child 2',
plan_id: 12,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '11:00:00.00',
start_time_ms: 1715731443696,
tags: [],
Expand All @@ -76,6 +79,7 @@ describe('Activity Anchor Form component', () => {
name: 'child 3',
plan_id: 12,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '09:00:00.00',
start_time_ms: 1715731443696,
tags: [],
Expand Down
62 changes: 44 additions & 18 deletions src/components/activity/ActivityDirectiveForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,24 +620,6 @@
on:updateStartOffset={updateStartOffset}
/>

<Highlight highlight={highlightKeysMap.source_scheduling_goal_id}>
<Input layout="inline">
<label
use:tooltip={{ content: 'Source Scheduling Goal ID', placement: 'top' }}
for="sourceSchedulingGoalId"
>
Source Scheduling Goal ID
</label>
<input
class="st-input w-full"
disabled
name="sourceSchedulingGoalId"
id="sourceSchedulingGoalId"
value={activityDirective.source_scheduling_goal_id ?? 'None'}
/>
</Input>
</Highlight>

<Highlight highlight={highlightKeysMap.tags}>
<Input layout="inline">
<label use:tooltip={{ content: 'Tags', placement: 'top' }} for="activityDirectiveTags"> Tags </label>
Expand Down Expand Up @@ -727,6 +709,50 @@
/>
</Input>
</Highlight>

<Highlight highlight={highlightKeysMap.source_scheduling_goal_id}>
<Input layout="inline">
<label
use:tooltip={{
content:
'Source Scheduling Goal ID - The ID of the scheduling goal that created this activity directive',
placement: 'top',
}}
for="sourceSchedulingGoalId"
>
Source Scheduling Goal ID
</label>
<input
class="st-input w-full"
disabled
name="sourceSchedulingGoalId"
id="sourceSchedulingGoalId"
value={activityDirective.source_scheduling_goal_id ?? 'None'}
/>
</Input>
</Highlight>

<Highlight highlight={highlightKeysMap.source_scheduling_goal_invocation_id}>
<Input layout="inline">
<label
use:tooltip={{
content:
'Source Scheduling Goal Invocation ID - The ID of the scheduling goal invocation (run) that created this activity directive',
placement: 'top',
}}
for="sourceSchedulingGoalInvocationId"
>
Source Scheduling Goal Invocation ID
</label>
<input
class="st-input w-full"
disabled
name="sourceSchedulingGoalInvocationId"
id="sourceSchedulingGoalInvocationId"
value={activityDirective.source_scheduling_goal_invocation_id ?? 'None'}
/>
</Input>
</Highlight>
</Collapse>
</fieldset>

Expand Down
16 changes: 15 additions & 1 deletion src/components/activity/ActivityDirectivesTablePanel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
field: 'anchor_name',
filter: 'text',
headerName: 'Anchor Name',
headerTooltip: 'Name of the activity that this activity is anchored to, if any.',
hide: true,
resizable: true,
sortable: true,
Expand All @@ -81,8 +82,10 @@
field: 'anchored_to_start',
filter: 'text',
headerName: 'Anchored to Start',
headerTooltip:
'True if the activity is anchored to the start of the plan or the start of another activity, false if anchored to the end.',
hide: true,
resizable: false,
resizable: true,
sortable: true,
},
applied_preset: {
Expand Down Expand Up @@ -183,6 +186,17 @@
field: 'source_scheduling_goal_id',
filter: 'number',
headerName: 'Scheduling Goal ID',
headerTooltip: 'The ID of the scheduling goal that created this activity directive',
hide: true,
resizable: true,
sortable: true,
tooltipInteraction: true,
},
source_scheduling_goal_invocation_id: {
field: 'source_scheduling_goal_invocation_id',
filter: 'number',
headerName: 'Scheduling Goal Invocation ID',
headerTooltip: 'The ID of the scheduling goal invocation (run) that created this activity directive',
hide: true,
resizable: true,
sortable: true,
Expand Down
8 changes: 8 additions & 0 deletions src/components/plan/PlanMergeReview.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ describe('PlanMergeReview component', () => {
plan_id: 1,
snapshot_id: 1,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '23:06:17.622',
tags: [],
type: 'A_Activity',
Expand All @@ -209,6 +210,7 @@ describe('PlanMergeReview component', () => {
plan_id: 1,
snapshot_id: 1,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '36:25:10.489',
tags: [],
type: 'A_Activity',
Expand Down Expand Up @@ -249,6 +251,7 @@ describe('PlanMergeReview component', () => {
plan_id: 1,
snapshot_id: 1,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '23:06:17.622',
tags: [],
type: 'A_Activity',
Expand All @@ -268,6 +271,7 @@ describe('PlanMergeReview component', () => {
name: 'A_Activity',
snapshot_id: 2,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '36:25:10.489',
tags: [],
type: 'A_Activity',
Expand Down Expand Up @@ -309,6 +313,7 @@ describe('PlanMergeReview component', () => {
name: 'B_Activity',
snapshot_id: 6,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '46:33:39.909',
tags: [],
type: 'B_Activity',
Expand Down Expand Up @@ -337,6 +342,7 @@ describe('PlanMergeReview component', () => {
plan_id: 1,
snapshot_id: 6,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '53:35:33.936',
tags: [],
type: 'C_Activity',
Expand All @@ -360,6 +366,7 @@ describe('PlanMergeReview component', () => {
name: 'A_Activity',
snapshot_id: 6,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '23:22:32.036',
tags: [],
type: 'A_Activity',
Expand All @@ -380,6 +387,7 @@ describe('PlanMergeReview component', () => {
plan_id: 1,
snapshot_id: 6,
source_scheduling_goal_id: -1,
source_scheduling_goal_invocation_id: -1,
start_offset: '23:22:32.036',
tags: [],
type: 'A_Activity',
Expand Down
4 changes: 4 additions & 0 deletions src/css/ag-grid-stellar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,3 +607,7 @@
.ag-theme-stellar .ag-tertiary-highlight {
background-color: var(--ag-selected-row-background-color);
}

.ag-theme-stellar .ag-tooltip {
background-color: var(--ag-background-color);
}
1 change: 1 addition & 0 deletions src/types/activity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export type ActivityDirectiveDB = {
name: string;
plan_id: number;
source_scheduling_goal_id: number | null;
source_scheduling_goal_invocation_id: number | null;
start_offset: string;
tags: { tag: Tag }[];
type: string;
Expand Down
7 changes: 7 additions & 0 deletions src/utilities/activities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ describe('sortActivityDirectivesOrSpans', () => {
name: 'foo 1',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '10:00:00',
start_time_ms: 1715731443696,
tags: [],
Expand All @@ -159,6 +160,7 @@ describe('sortActivityDirectivesOrSpans', () => {
name: 'foo 2',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '09:00:00',
start_time_ms: 1715731443696,
tags: [],
Expand All @@ -179,6 +181,7 @@ describe('sortActivityDirectivesOrSpans', () => {
name: 'foo 3',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '08:00:00',
start_time_ms: 1715731443696,
tags: [],
Expand Down Expand Up @@ -365,6 +368,7 @@ function getTestActivityDirectivesDB(): ActivityDirectiveDB[] {
name: 'Activity 1',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '10:00:00',
tags: [],
type: 'foo',
Expand All @@ -384,6 +388,7 @@ function getTestActivityDirectivesDB(): ActivityDirectiveDB[] {
name: 'Activity 2',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '09:00:00',
tags: [],
type: 'foo',
Expand All @@ -403,6 +408,7 @@ function getTestActivityDirectivesDB(): ActivityDirectiveDB[] {
name: 'Activity 3',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '08:00:00',
tags: [],
type: 'foo',
Expand All @@ -426,6 +432,7 @@ describe('addAbsoluteTimeToRevision', () => {
name: 'foo 1',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '05:00:00',
tags: [],
type: 'foo',
Expand Down
4 changes: 4 additions & 0 deletions src/utilities/gql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ const gql = {
name
plan_id
source_scheduling_goal_id
source_scheduling_goal_invocation_id
start_offset
tags {
tag {
Expand Down Expand Up @@ -1656,6 +1657,7 @@ const gql = {
metadata
name
source_scheduling_goal_id
source_scheduling_goal_invocation_id
start_offset
tags {
tag {
Expand Down Expand Up @@ -2156,6 +2158,7 @@ const gql = {
name
plan_id
source_scheduling_goal_id
source_scheduling_goal_invocation_id
start_offset
tags {
tag {
Expand Down Expand Up @@ -3678,6 +3681,7 @@ const gql = {
name
plan_id
source_scheduling_goal_id
source_scheduling_goal_invocation_id
start_offset
tags {
tag {
Expand Down
3 changes: 3 additions & 0 deletions src/utilities/plan.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ describe('Plan utility', () => {
name: 'Test Activity',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '0:00:00',
start_time_ms: 0,
tags: [
Expand Down Expand Up @@ -190,6 +191,7 @@ describe('Plan utility', () => {
name: 'Test Activity',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '0:00:00',
start_time_ms: 0,
tags: [
Expand Down Expand Up @@ -409,6 +411,7 @@ describe('Plan utility', () => {
name: 'Test Activity',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '0:00:00',
start_time_ms: 0,
tags: [
Expand Down
3 changes: 3 additions & 0 deletions src/utilities/time.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ test('getActivityDirectiveStartTimeMs', () => {
name: 'foo 1',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '10:00:00',
tags: [],
type: 'foo',
Expand All @@ -125,6 +126,7 @@ test('getActivityDirectiveStartTimeMs', () => {
name: 'foo 1',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '00:02:00',
tags: [],
type: 'foo',
Expand Down Expand Up @@ -241,6 +243,7 @@ test('getActivityDirectiveStartTimeMs - no cycles, anchor chain', () => {
name: 'root',
plan_id: 1,
source_scheduling_goal_id: null,
source_scheduling_goal_invocation_id: null,
start_offset: '01:00:00',
tags: [],
type: 'bar',
Expand Down
Loading
Loading