Move user menu, create org menu #1992
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { useCallback, useEffect, useRef } from 'react'; | ||
|
|
||
| import { useBillingStore } from 'src/stores/Billing'; | ||
| import { useTenantStore } from 'src/stores/Tenant'; | ||
|
|
||
| export function useTenantChangeReset() { | ||
| const selectedTenant = useTenantStore((state) => state.selectedTenant); | ||
|
|
||
| const resetBillingState = useBillingStore((state) => state.resetState); | ||
|
|
||
| const resetStores = useCallback(() => { | ||
| resetBillingState(); | ||
| }, [resetBillingState]); | ||
|
|
||
| const previousTenant = useRef(selectedTenant); | ||
| useEffect(() => { | ||
| if (previousTenant.current !== selectedTenant) { | ||
| previousTenant.current = selectedTenant; | ||
| resetStores(); | ||
| } | ||
| }, [selectedTenant, resetStores]); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import { | ||
| Dialog, | ||
| DialogContent, | ||
| DialogTitle, | ||
| MenuItem, | ||
| Popover, | ||
| Typography, | ||
| } from '@mui/material'; | ||
|
|
||
| import { Check } from 'iconoir-react'; | ||
| import { FormattedMessage, useIntl } from 'react-intl'; | ||
|
|
||
| import PrefixSelector from 'src/components/inputs/PrefixedName/PrefixSelector'; | ||
| import { | ||
| sideNavMenuAnchorOrigin, | ||
| sideNavMenuTransformOrigin, | ||
| } from 'src/components/menus/shared'; | ||
| import { useUserInfoSummaryStore } from 'src/context/UserInfoSummary/useUserInfoSummaryStore'; | ||
| import { useEntitiesStore_tenantsWithAdmin } from 'src/stores/Entities/hooks'; | ||
| import { useTenantStore } from 'src/stores/Tenant'; | ||
|
|
||
| interface OrgMenuProps { | ||
| anchorEl: HTMLElement | null; | ||
| onClose: () => void; | ||
| } | ||
|
|
||
| export const OrgMenu = ({ anchorEl, onClose }: OrgMenuProps) => { | ||
| const intl = useIntl(); | ||
| const selectedTenant = useTenantStore((state) => state.selectedTenant); | ||
| const setSelectedTenant = useTenantStore( | ||
| (state) => state.setSelectedTenant | ||
| ); | ||
| // Same tenant list the old TenantSelector showed everyone (incl. estuary_support). | ||
| const tenantNames = useEntitiesStore_tenantsWithAdmin(); | ||
| const hasSupportAccess = useUserInfoSummaryStore( | ||
| (state) => state.hasSupportAccess | ||
| ); | ||
|
|
||
| // Support users get the searchable dialog (every prefix); everyone else | ||
| // gets the popover list anchored to the trigger. | ||
| if (hasSupportAccess) { | ||
| return ( | ||
| <Dialog | ||
| open={Boolean(anchorEl)} | ||
| onClose={onClose} | ||
| fullWidth | ||
| maxWidth="xs" | ||
| > | ||
| <DialogTitle> | ||
| <FormattedMessage id="tenant.organization" /> | ||
| </DialogTitle> | ||
| <DialogContent> | ||
| <PrefixSelector | ||
| disabled={false} | ||
| error={false} | ||
| label={intl.formatMessage({ | ||
| id: 'common.tenant', | ||
| })} | ||
| labelId="org-switcher" | ||
| onChange={(newValue) => { | ||
| setSelectedTenant(newValue); | ||
| onClose(); | ||
| }} | ||
| options={tenantNames} | ||
| value={selectedTenant} | ||
| variantString="outlined" | ||
| /> | ||
| </DialogContent> | ||
| </Dialog> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Popover | ||
| open={Boolean(anchorEl)} | ||
| anchorEl={anchorEl} | ||
| onClose={onClose} | ||
| anchorOrigin={sideNavMenuAnchorOrigin} | ||
| transformOrigin={sideNavMenuTransformOrigin} | ||
| slotProps={{ | ||
| paper: { | ||
| sx: { | ||
| width: 240, | ||
| p: 1, | ||
| borderRadius: 2, | ||
| }, | ||
| }, | ||
| }} | ||
| > | ||
| <Typography | ||
| sx={{ | ||
| px: 1, | ||
| pt: 0.5, | ||
| pb: 1, | ||
| fontSize: 11, | ||
| fontWeight: 600, | ||
| textTransform: 'uppercase', | ||
| letterSpacing: 0.5, | ||
| color: 'text.secondary', | ||
| }} | ||
| > | ||
| <FormattedMessage id="tenant.organization" /> | ||
| </Typography> | ||
|
|
||
| {tenantNames.map((tenant) => { | ||
| const label = tenant.replace(/\/$/, ''); | ||
| const isSelected = tenant === selectedTenant; | ||
|
|
||
| return ( | ||
| <MenuItem | ||
| key={tenant} | ||
| selected={isSelected} | ||
| onClick={() => { | ||
| setSelectedTenant(tenant); | ||
| onClose(); | ||
| }} | ||
| sx={{ | ||
| borderRadius: 1, | ||
| fontSize: 13, | ||
| py: 0.75, | ||
| justifyContent: 'space-between', | ||
| }} | ||
| > | ||
| {label} | ||
|
|
||
| {isSelected ? <Check /> : null} | ||
| </MenuItem> | ||
| ); | ||
| })} | ||
| </Popover> | ||
| ); | ||
| }; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
This hook is transitional - it extracts the billing reset logic from the deleted TenantOptions component.
A follow-up PR will key billing data on the selected tenant making this reset unnecessary.