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: added notification when scratch org is about to expire #4304

Merged
merged 14 commits into from
Jul 26, 2022

Conversation

jeffb-sfdc
Copy link
Contributor

What does this PR do?

This PR adds a new feature which notifies the user if their scratch org expires in a few days

What issues does this PR fix or reference?

@W-11463274@

Functionality Before

Upon startup and activation, the Salesforce extension for VS Code would active.

Functionality After

The Salesforce extension for VS Code actives, and it now also checks the user's org list for active orgs about to expire.

@jeffb-sfdc jeffb-sfdc requested a review from a team as a code owner July 20, 2022 23:23
@jeffb-sfdc jeffb-sfdc requested a review from RitamAgrawal July 20, 2022 23:23
@jeffb-sfdc jeffb-sfdc changed the title feat: added notifuication when scratch org is about to expire feat: added notification when scratch org is about to expire [Draft-needs localization and unit tests] Jul 20, 2022
@jeffb-sfdc jeffb-sfdc changed the title feat: added notification when scratch org is about to expire [Draft-needs localization and unit tests] feat: added notification when scratch org is about to expire [Draft-needs unit tests] Jul 20, 2022
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.

Awesome stuff! Looking forward to seeing this feature in action 😎

if (isDemoMode()) {
decorators.showDemoMode();
}
await processPostProjectOpened(extensionContext);
Copy link
Contributor

Choose a reason for hiding this comment

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

I love moving all of this into a new function 🎉 I'm not sure about the method name here though, it took me a second to get what it was doing. Maybe something like initializeProject?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, there wasn't really an "obvious" name for this. I like renaming it to initializeProject(). I'll go make this change.

check once a day, uncomment the following code.

// And run again once every 24 hours.
setInterval(async () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This would be good, especially for users that keep their projects open.

Copy link
Contributor Author

@jeffb-sfdc jeffb-sfdc Jul 21, 2022

Choose a reason for hiding this comment

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

^THIS! - I 100% agree, but Ananya doesn't. An argument she brought up was that users complain that our extension is too noisy (too many notifications). The plan is to release w/only displaying on activation, and then see what users think.


export async function checkForExpiredOrgs() {
try {
const daysBeforeExpire = 5;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this something we could put behind a custom setting, and maybe allow for no reminder? I usually made my scratch orgs last 7 days (some folks I know make theirs only for 1-2), so it would be a bit more frequent/intrusive. Also cool if that's a better fit for a subsequent item 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it would be good for a followup item. Let's see how the users like this feature, and how they use it. If we add the "also check daily" feature in, it would be good then to revisit this and maybe add a custom setting. I think for right now, I'd like to not make all the options user configurable (too many options = too many choices for the user)

packages/salesforcedx-vscode-core/src/util/orgUtil.ts Outdated Show resolved Hide resolved
decorators.showOrg();
decorators.monitorOrgConfigChanges();

await setUpOrgExpirationWatcher();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@randi274 Also, I initially had the impl for setUpOrgExpirationWatcher() in index.ts, but it wasn't testable (there are no unit tests for the code in this index.ts... it's all tested implicitly by the integration tests) so I moved setUpOrgExpirationWatcher() into its own file (packages/salesforcedx-vscode-core/src/util/orgUtil.ts) and created unit tests.

@@ -643,5 +643,11 @@ export const messages = {
'Unable to rename the component. Try renaming the component manually and then redeploying your changes.',
error_function_type: 'Unable to determine type of executing function.',
error_unable_to_get_started_function:
'Unable to access the function in "{0}".'
'Unable to access the function in "{0}".',
Copy link
Contributor Author

@jeffb-sfdc jeffb-sfdc Jul 21, 2022

Choose a reason for hiding this comment

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

This text was provided by @sbudhirajadoc

@jeffb-sfdc jeffb-sfdc requested a review from klewis-sfdc July 21, 2022 20:09
if (isDemoMode()) {
decorators.showDemoMode();
}
await initializeProject(extensionContext);
Copy link
Contributor

Choose a reason for hiding this comment

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

👍🏽

@jeffb-sfdc jeffb-sfdc changed the title feat: added notification when scratch org is about to expire [Draft-needs unit tests] feat: added notification when scratch org is about to expire Jul 21, 2022
daysUntilExpiration.setDate(daysUntilExpiration.getDate() + daysBeforeExpire);

const orgList = new OrgList();
const authInfoObjects = await orgList.getAuthInfoObjects();
Copy link
Contributor

Choose a reason for hiding this comment

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

In the draft PR that updates orgList to not read from the .sfdx directory, the return type of this method changes to return the OrgAuthorization type from core.

FileInfo is a type that is created after reading the files in the ~/.sfdx directory.

That change would require some reworking of this methods internals, to work with OrgAuthorization type and the AuthFields type for auth fields that are stored there in core v3, like expiration date: https://github.com/forcedotcom/salesforcedx-vscode/pull/4297/files#diff-2b72c15ab3c2e3d66f269772e80aed9902d2d85d9acb2a462116d03541484d4fR97

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this file could import and use AuthInfo.listAllAuthorizations()

Copy link
Contributor

Choose a reason for hiding this comment

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

Good find @klewis-sfdc! Looks like this one will be behind the core v3 change in the queue. @jeffb-sfdc did you want to merge that work in now, or wait til we finish sorting out all of the larger issues?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've spoke with Ken about this, and the plan is to merge in now and not be held up, then pull develop into his branch and then address this issue.

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.

I'm good on this pending any QA findings 👍

@randi274
Copy link
Contributor

Tested on Mac:

  • ✔️ Can create scratch org w/in the 5 day window and not receive error instantly
  • ✔️ When I open VS Code w/ only expired orgs, I see no warning
  • ✔️ When I open VS Code w/ 1 soon expiring org, I see the warning for 1 org
  • ✔️ When I open VS Code w/ 2 soon expiring orgs, I see the warning for 2 orgs
  • ✔️ When I remove both orgs, I see no warnings
  • ✔️ If I have no scratch orgs, I see no warnings
  • ✔️ If I have no orgs at all, I see no warnings or errors
  • ❌ - Seeing a duplicate button for the org picker

Attempted testing on Windows, but building there is still pretty difficult, so limited to Mac.

Once the duplicate button is resolved, this is good to 🚢

@randi274
Copy link
Contributor

Confirmed that duplicate button is now gone! ⚓ away!

@jeffb-sfdc jeffb-sfdc merged commit 95ffe16 into develop Jul 26, 2022
@jeffb-sfdc jeffb-sfdc deleted the jb/scratch-org-expiration-notification branch July 26, 2022 18:38
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.

3 participants