Skip to content
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

Remove checkoutLocation from StartWorkspaceReq #9007

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Remove checkoutLocation from StartWorkspaceReq #9007

merged 2 commits into from
Apr 7, 2022

Conversation

csweichel
Copy link
Contributor

Description

This PR removes the redundant checkoutLocation field from the StartWorkspace request. Checkout location is a concept that exists on the content initializer, not on the workspace itself.

Related Issue(s)

Fixes #7370
Related #8888

How to test

  • Create new workspace
  • Modify or create a new file
  • Stop the workspace
  • Navigate to dashboard -> changes are displayed for the workspace
  • Start the workspace again
  • Stop the workspace
  • Navigate to dashboard -> changes should still be displayed for the workspace

Release Notes

Ensure uncommitted changes are displayed in dashboard when workspace was restored from backup

@Furisto
Copy link
Member

Furisto commented Mar 31, 2022

@csweichel I have fixed the outstanding issues.

@Furisto Furisto marked this pull request as ready for review April 4, 2022 09:27
@Furisto Furisto requested a review from a team April 4, 2022 09:27
@Furisto Furisto requested review from aledbf and sagor999 as code owners April 4, 2022 09:27
@Furisto Furisto requested a review from a team April 4, 2022 09:27
@Furisto Furisto requested a review from geropl as a code owner April 4, 2022 09:27
@github-actions github-actions bot added team: webapp Issue belongs to the WebApp team team: workspace Issue belongs to the Workspace team labels Apr 4, 2022
aledbf
aledbf previously approved these changes Apr 5, 2022
Copy link
Member

@aledbf aledbf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

sagor999
sagor999 previously approved these changes Apr 5, 2022
easyCZ
easyCZ previously approved these changes Apr 5, 2022
Copy link
Member

@easyCZ easyCZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good example where the change could be across multiple PRs.

  1. Just proto changes and generated code
  2. The updated logic

Change works according to tests specified.

result.setBackup(new FromBackupInitializer());
const backup = new FromBackupInitializer();
if (CommitContext.is(context)) {
backup.setCheckoutLocation(context.checkoutLocation || "");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we default to "."? : 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Being picky here bc we had an incident after the last change in the multirepo PR

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we default to "."?

Also in all cases, even if not a CommitContext?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@csweichel Could you double-check here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AlexTugarev This could be the problematic lines, actually. ☝️

@csweichel
Copy link
Contributor Author

had to rebase. @easyCZ @sagor999 @aledbf could you re-approve please?

@aledbf aledbf self-requested a review April 7, 2022 16:31
@roboquat roboquat merged commit 3bf6664 into main Apr 7, 2022
@roboquat roboquat deleted the cw/coloc branch April 7, 2022 18:59
@roboquat roboquat added the deployed: workspace Workspace team change is running in production label Apr 8, 2022
@AlexTugarev
Copy link
Member

Hi! Was this change tested with a restart of a workspace?

@geropl geropl restored the cw/coloc branch April 12, 2022 07:09
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Apr 12, 2022
@geropl geropl deleted the cw/coloc branch April 14, 2022 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: webapp Meta team change is running in production deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note size/XXL team: webapp Issue belongs to the WebApp team team: workspace Issue belongs to the Workspace team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Source changes not reflected in dashboard overview
8 participants