opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: CB-727 CB-881 authentication progress indication

Browse Source
This commit is contained in:
Wroud
2021-03-31 14:12:34 +03:00
parent 10bcb422ea
commit 18b295cb40
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-blocks/src/Button.tsx
+2 -1
View File
@@ -102,6 +102,7 @@ export const Button: React.FC<ButtonProps> = function Button({
tag = 'button',
disabled = false,
loading,
className,
...rest
}) {
if (loading) {
@@ -110,7 +111,7 @@ export const Button: React.FC<ButtonProps> = function Button({
const Button = tag;
return styled(useStyles(buttonStyles, ...(mod || []).map(mod => buttonMod[mod])))(
<Button {...rest} disabled={disabled} {...use({ loading })}>
<Button {...rest} disabled={disabled} {...use({ loading })} className={className}>
<ripple as="div" />
<button-label as='div'>{children}</button-label>
<Loader small />
webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
+4 -1
View File
@@ -100,6 +100,8 @@ export const AuthDialog: DialogComponent<string | null, null> = observer(functio
const showTabs = !payload && controller.providers.length > 1;
const additional = userInfo.data !== null && controller.provider?.id && !userInfo.hasToken(controller.provider?.id);
return styled(useStyles(styles))(
<TabsState currentTabId={controller.provider?.id}>
<CommonDialogWrapper
@@ -107,13 +109,14 @@ export const AuthDialog: DialogComponent<string | null, null> = observer(functio
icon={controller.provider?.icon}
header={(
<>
{userInfo.data !== null && <auth-token-info-message as='div'>{translate('authentication_request_token')}</auth-token-info-message>}
{additional && <auth-token-info-message as='div'>{translate('authentication_request_token')}</auth-token-info-message>}
{showTabs && (
<TabList aria-label='Auth providers'>
{controller.providers.map(provider => (
<Tab
key={provider.id}
tabId={provider.id}
disabled={controller.isAuthenticating}
onOpen={() => controller.selectProvider(provider.id)}
>
<TabTitle>{provider.label}</TabTitle>