-
Notifications
You must be signed in to change notification settings - Fork 557
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.
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
fix interactive TUI #5681
fix interactive TUI #5681
Conversation
9461d9c
to
f982ca0
Compare
Name: "Duration", | ||
Value: time.Since(before).Truncate(time.Millisecond).String(), | ||
Order: 3, | ||
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -219,259 +218,3 @@ func (i *Item) tasksView() string { | |||
|
|||
return strings.Join(tasks, "\n") | |||
} | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the noise, I don't think anything actually changed here, just wanted to split it out.
@@ -347,16 +350,41 @@ func (m Model) processUpdate(msg *progrock.StatusUpdate) (tea.Model, tea.Cmd) { | |||
return m, tea.Batch(cmds...) | |||
} | |||
|
|||
func (m Model) addToFirstGroup(id string) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A side fix; I recently changed it to include duplicates vertices, but I think it was ultimately just confusing DX, so now it just picks the first pipeline path that the vertex is seen in, the same way the Cloud telemetry flow works.
@@ -45,12 +45,12 @@ type PipelinedVertex struct { | |||
Pipelines []pipeline.Path | |||
} | |||
|
|||
func (t *Pipeliner) WriteStatus(ev *progrock.StatusUpdate) error { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another side fix; there was no need for this type to be a progrock.Writer
, and removing the error
return value makes the caller's lives easier.
674d582
to
f84e9b4
Compare
Growing scope a bit to bump to Progrock v0.10 which cleans up the clumsy "multiple root groups" situation by forcing every root group to have the same ID. |
it wasn't able to cope with the new 'init' vertex that we create while initializing along the way, also remove the redundant 'Duration' status info now that Progrock displays timing info natively in its UI Signed-off-by: Alex Suraci <alex@dagger.io>
Signed-off-by: Alex Suraci <alex@dagger.io>
f84e9b4
to
49481c8
Compare
Manually verified root group labels are making their way to Cloud even with the additional 'root group' for client initializing. cc @marcosnils - tl;dr Progrock now enforces that all "root groups" (i.e. the outermost group for every Recorder) have the exact same ID. Nothing should break but let me know if you see anything strange! I temporarily updated the
I think the proper behavior here is probably to just roll up all the labels ever seen for the root group, which might already be what Cloud does. As a knock-on effect this might mean users now see the initializing/connecting group + vertex in the Cloud UI. Not sure if that's already happening, but it's definitely happening with this change (example). It matches the TUI so this isn't necessarily a bad thing. We could mark it "internal" if we don't want it shown in either, but that's tricky because we at least want to show it in the TUI while the initialization is happening in case it's taking a long time. |
It wasn't able to cope with the new 'init' vertex that we create while initializing, and it wasn't transitioning to
COMPLETED
anymore.Along the way, also remove the redundant 'Duration' status info now that Progrock displays timing info natively in its UI. Also use Pipeliner to dedupe vertices since that was pretty confusing before.
fixes #5662