Create a new generateDefaultWorkspaceName#85789
Conversation
melvin-bot
bot
requested review from
parasharrajat and
trjExpensify
and removed request for
a team and
trjExpensify
|
@parasharrajat Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 3f5ac7daf1
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
src/libs/actions/App.ts
Outdated
| type?: PolicyType; | ||
| // TODO: Remove optional (?) once allBetas Onyx.connect is removed (https://github.com/Expensify/App/issues/66417) | ||
| betas?: OnyxEntry<OnyxTypes.Beta[]>; | ||
| lastWorkspaceNumber: number | undefined; |
There was a problem hiding this comment.
lastWorkspaceNumber to the name generator
This new parameter never gets consumed inside createWorkspaceWithPolicyDraftAndNavigateToIt(): the function still calls createDraftInitialWorkspace()/createWorkspace() without it, and those paths still fall back to generateDefaultWorkspaceName(). In the /transition?...exitTo=workspace/new flow this change is targeting, the new selector/hook becomes a no-op, so users who already have "… Workspace" workspaces still get another base name instead of the expected incremented suffix.
Useful? React with 👍 / 👎.
| } | ||
|
|
||
| App.setUpPoliciesAndNavigate(session, introSelected, activePolicyID, isSelfTourViewed); | ||
| App.setUpPoliciesAndNavigate(session, introSelected, activePolicyID, isSelfTourViewed, lastWorkspaceNumber); |
There was a problem hiding this comment.
lastWorkspaceNumber is read inside a mount-only effect, so setUpPoliciesAndNavigate() only ever sees the first render’s value. On fresh logins or cleared caches, useLastWorkspaceNumber() will still be undefined when this effect runs, and the workspace is auto-created before openApp()/reconnectApp() finish hydrating the policy collection. Because the effect never reruns when the selector updates, the duplicate-name case still reproduces in that environment.
Useful? React with 👍 / 👎.
src/hooks/useLastWorkspaceNumber.ts
Outdated
| @@ -0,0 +1,15 @@ | |||
| import type {OnyxCollection} from 'react-native-onyx'; | |||
| import useOnyx from '@hooks/useOnyx'; | |||
src/libs/actions/Policy/Policy.ts
Outdated
| * @param [email] the email to base the workspace name on. If not passed, will use the logged-in user's email instead | ||
| * @param [lastWorkspaceNumber] the last workspace number | ||
| */ | ||
| function newGenerateDefaultWorkspaceName(email = '', lastWorkspaceNumber: number | undefined): string { |
|
Hmm, somehow some of my changes are not commited 🤦 |
|
@parasharrajat fixed the CI |
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
src/libs/actions/Policy/Policy.ts
Outdated
|
|
||
| if (isSMSDomain) { | ||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| return translateLocal('workspace.new.myGroupWorkspace', {workspaceNumber: lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined}); |
There was a problem hiding this comment.
use translate from component.
There was a problem hiding this comment.
I just copied this from the old generateDefaultWorkspaceName. I think we should handle this in the translate refactor project instead, so we can keep the scope small here.
There was a problem hiding this comment.
But as part of migration, we should refactor for all new functions.
src/libs/actions/Policy/Policy.ts
Outdated
| const displayNameForWorkspace = getDisplayNameForWorkspace(email || deprecatedSessionEmail); | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-deprecated | ||
| return translateLocal('workspace.new.workspaceName', displayNameForWorkspace, lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined); |
| const username = emailParts.at(0) ?? ''; | ||
| return Str.UCFirst(username); |
There was a problem hiding this comment.
Where do we manage this part from old function?
} else if (PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) {
displayNameForWorkspace = Str.UCFirst(username);
} else {
displayNameForWorkspace = userDetails?.phoneNumber ?? '';
}
There was a problem hiding this comment.
In line 2147-2149, we already return early if PUBLIC_DOMAINS_SET.has(domain.toLowerCase()) is false,
So } else if (PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) { will always be true
|
@parasharrajat just merged main main |
|
Check errors @bernhardoj |
| * @param [email] the email to base the workspace name on. If not passed, will use the logged-in user's email instead | ||
| * @param [lastWorkspaceNumber] the last workspace number | ||
| */ | ||
| function newGenerateDefaultWorkspaceName(email: string, lastWorkspaceNumber: number | undefined, localeTranslate: LocalizedTranslate): string { |
There was a problem hiding this comment.
I'll rename localeTranslate back to translate after we completely remove generateDefaultWorkspaceName
|
@parasharrajat fixed |
|
Unrelated failing test |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issuessection above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
- I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReportand notonIconClick). - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar, I verified the components usingAvatarhave been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */ - The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
- If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avataris modified, I verified thatAvataris working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
- If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
- If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
01.04.2026_20.02.10_REC.mp4
🎀 👀 🎀 C+ reviewed
|
@cristipaval looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
test 6 is unrelated |
|
🚧 @cristipaval has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.52-0 🚀
Bundle Size Analysis (Sentry): |
|
No help site changes are required. This PR is a purely internal refactor — it extracts workspace name generation into I reviewed all articles under |
5 participants
Explanation of Change
Fixed Issues
$ #66574
PROPOSAL:
Tests
Same as QA Steps
Offline tests
Same as QA Steps
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mp4