Skip to content

Commit 5c6bf80

Browse files
committed
* #RI-5793 - [Regression] Create database popup for authorized account doesn't close after creating db
* #RI-5794 - [Regression] There is no spinner for info dialogs during sso login
1 parent 9e5baca commit 5c6bf80

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
EuiTitle
1111
} from '@elastic/eui'
1212
import { find } from 'lodash'
13+
import cx from 'classnames'
1314
import { CloudJobStep } from 'uiSrc/electron/constants'
1415
import ExternalLink from 'uiSrc/components/base/external-link'
1516
import ChampagneIcon from 'uiSrc/assets/img/icons/champagne.svg'
@@ -42,7 +43,7 @@ export const INFINITE_MESSAGES = {
4243
>
4344
<EuiFlexGroup justifyContent="flexEnd" direction="row" gutterSize="none">
4445
<EuiFlexItem grow={false}>
45-
<EuiLoadingSpinner className="infiniteMessage__icon" />
46+
<EuiLoadingSpinner className={cx('infiniteMessage__icon', styles.loading)} />
4647
</EuiFlexItem>
4748
<EuiFlexItem grow>
4849
<EuiTitle className="infiniteMessage__title">
@@ -67,7 +68,7 @@ export const INFINITE_MESSAGES = {
6768
>
6869
<EuiFlexGroup justifyContent="flexEnd" direction="row" gutterSize="none">
6970
<EuiFlexItem grow={false}>
70-
<EuiLoadingSpinner className="infiniteMessage__icon" />
71+
<EuiLoadingSpinner className={cx('infiniteMessage__icon', styles.loading)} />
7172
</EuiFlexItem>
7273
<EuiFlexItem grow>
7374
<EuiTitle className="infiniteMessage__title">
@@ -259,7 +260,7 @@ export const INFINITE_MESSAGES = {
259260
>
260261
<EuiFlexGroup justifyContent="flexEnd" direction="row" gutterSize="none">
261262
<EuiFlexItem grow={false}>
262-
<EuiLoadingSpinner className="infiniteMessage__icon" />
263+
<EuiLoadingSpinner className={cx('infiniteMessage__icon', styles.loading)} />
263264
</EuiFlexItem>
264265
<EuiFlexItem grow>
265266
<EuiTitle className="infiniteMessage__title">

redisinsight/ui/src/components/notifications/components/infinite-messages/styles.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@
99
margin-right: 4px;
1010
}
1111
}
12+
13+
.loading {
14+
border-top-color: var(--euiColorGhost) !important;
15+
}

redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.spec.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ describe('OAuthCreateDb', () => {
109109
setSSOFlow(OAuthSocialAction.Create),
110110
showOAuthProgress(true),
111111
addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)),
112+
setSocialDialogState(null),
112113
addFreeDb()
113114
]
114115
expect(store.getActions()).toEqual(expectedActions)

redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
createFreeDbJob,
66
fetchPlans,
77
oauthCloudUserSelector,
8+
setSocialDialogState,
89
showOAuthProgress
910
} from 'uiSrc/slices/oauth/cloud'
1011

@@ -62,6 +63,7 @@ const OAuthCreateDb = (props: Props) => {
6263
dispatch(addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)))
6364

6465
if (isRecommended) {
66+
dispatch(setSocialDialogState(null))
6567
dispatch(createFreeDbJob({
6668
name: CloudJobName.CreateFreeSubscriptionAndDatabase,
6769
resources: {

0 commit comments

Comments
 (0)