Skip to content

Show reload organizations only when it can succeed #446

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.

Sign up for GitHub

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

Open
celdrake wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show reload organizations only when it can succeed #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/i18n/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
"Unable to log in to the application": "Unable to log in to the application",
"You do not have access to any organizations.": "You do not have access to any organizations.",
"Please contact your administrator to be granted access to an organization.": "Please contact your administrator to be granted access to an organization.",
"You will need to log out and log in again to access the application.": "You will need to log out and log in again to access the application.",
"We cannot log you in as we could not determine what organizations you have access to.": "We cannot log you in as we could not determine what organizations you have access to.",
"Please try refreshing the page. If the problem persists, contact your administrator.": "Please try refreshing the page. If the problem persists, contact your administrator.",
"Error details": "Error details",
Expand Down
21 changes: 12 additions & 9 deletions libs/ui-components/src/components/common/OrganizationSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ const OrganizationSelector = ({ onClose, isFirstLogin = true }: OrganizationSele
<>
<Text>{t('You do not have access to any organizations.')}</Text>
<Text>{t('Please contact your administrator to be granted access to an organization.')}</Text>
<Text>{t('You will need to log out and log in again to access the application.')}</Text>
</>
) : (
<>
Expand All @@ -212,15 +213,17 @@ const OrganizationSelector = ({ onClose, isFirstLogin = true }: OrganizationSele
</>
)}
</TextContent>
<ActionList className="pf-v5-u-mt-md">
<ActionListGroup>
<ActionListItem>
<Button variant="primary" onClick={handleRefetch} isDisabled={isReloading}>
{t('Reload organizations')}
</Button>
</ActionListItem>
</ActionListGroup>
</ActionList>
{!isEmptyOrganizations && (
<ActionList className="pf-v5-u-mt-md">
<ActionListGroup>
<ActionListItem>
<Button variant="primary" onClick={handleRefetch} isDisabled={isReloading}>
{t('Reload organizations')}
</Button>
</ActionListItem>
</ActionListGroup>
</ActionList>
)}
</Alert>
</Bullseye>
</PageSection>
Expand Down