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

feat: Expose Deploy* and Retrieve* Commands for Scratch Orgs #4809

Merged
merged 14 commits into from
May 3, 2023

Conversation

klewis-sfdc
Copy link
Contributor

@klewis-sfdc klewis-sfdc commented Apr 18, 2023

What does this PR do?

  • Exposes the SFDX: Deploy* and SFDX: Retrieve* commands when connected to a scratch org.

What issues does this PR fix or reference?

@W-11309172@

Functionality Before

  • The SFDX: Deploy* and SFDX: Retrieve* commands were unavailable when connected to a scratch org.

Functionality After

  • The SFDX: Deploy* and SFDX: Retrieve* commands are available when connected to a scratch org.
  • The commands handle source tracking correctly and fix it up appropriately after deploy/retrieve operations

@klewis-sfdc klewis-sfdc requested a review from a team as a code owner April 18, 2023 04:08
@klewis-sfdc klewis-sfdc marked this pull request as draft April 18, 2023 04:08
@klewis-sfdc klewis-sfdc changed the base branch from ken/deploy-for-source-tracked-orgs to ken/W-12989124--fix-deploy-for-src-trk-sandboxes April 25, 2023 22:13
@salesforce-cla
Copy link

Thanks for the contribution! Unfortunately we can't verify the commit author(s): Kenneth Lewis <k***@k***.i***.s***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, sign the Salesforce Inc. Contributor License Agreement and this Pull Request will be revalidated.

@klewis-sfdc klewis-sfdc force-pushed the ken/W-11309172--deploy-retrieve-scratch-orgs branch from 3e75bbf to 198e6d1 Compare April 25, 2023 23:05
@klewis-sfdc klewis-sfdc force-pushed the ken/W-11309172--deploy-retrieve-scratch-orgs branch from 198e6d1 to 83ed0fe Compare April 25, 2023 23:32
@klewis-sfdc klewis-sfdc force-pushed the ken/W-11309172--deploy-retrieve-scratch-orgs branch from 83ed0fe to d74b429 Compare April 25, 2023 23:33
Base automatically changed from ken/W-12989124--fix-deploy-for-src-trk-sandboxes to develop April 27, 2023 18:16
@klewis-sfdc klewis-sfdc marked this pull request as ready for review May 2, 2023 06:01
Copy link
Contributor

@randi274 randi274 left a comment

Choose a reason for hiding this comment

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

QA:
All the "new" deploy/retrieve commands appear and work in their given context

  • ✅ Individual files
  • ✅ Multi-selected files
  • ✅ Entire directories
  • ✅ Entire Project - Starting with Deploy was weird to fix up source tracking... Better to start w/ a scratch org using the Push command, and then using deploy iteratively.
  • ✅ Command Palette
  • ✅ Right-click menu in file
  • ✅ Manifest file - as long as the version is correct :)

Source tracking is fixed up

  • ✅ Local/remote changes for deploy -> view changes shows changes/doesn't show changes

Save on push/deploy
-❓ uses push by default. Do we want that? -> ✅ yes; will be fixed up by custom setting later!

Push/Pull

  • ✅ Still available, still work!

Conflicts view

  • ✅ Looks good

@klewis-sfdc klewis-sfdc merged commit 48007b7 into develop May 3, 2023
16 checks passed
@klewis-sfdc klewis-sfdc deleted the ken/W-11309172--deploy-retrieve-scratch-orgs branch May 3, 2023 22:44
treywashington pushed a commit to treywashington/salesforcedx-vscode that referenced this pull request May 8, 2023
…tcom#4809)

* feat: fixup source-tracking in deploy flow

* chore: pkg lock

* feat: squash merge of depl retr for scratch orgs branch

* feat: now that stl ignores conflicts, no suppress

* test: update tests to reflect last change

* chore: fixup pkg json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants