Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: show progress spinner when qna is being created #6723

Merged
benbrown merged 4 commits into from
Apr 7, 2021
Merged

fix: show progress spinner when qna is being created #6723

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b77816
fix #6708: show progress spinner when qna is being created
benbrown Apr 6, 2021
6b128e2
Merge branch 'main' into benbrown/fixqna
benbrown Apr 6, 2021
890279e
Merge branch 'main' into benbrown/fixqna
benbrown Apr 6, 2021
fe0bdfc
Merge branch 'main' into benbrown/fixqna
boydc2014 Apr 7, 2021
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
13 changes: 10 additions & 3 deletions Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
)}
</p>
<Dropdown
disabled={resourceGroups.length === 0}
disabled={resourceGroups.length === 0 || loadingQNA}
label={formatMessage('Resource group:')}
options={
resourceGroups.map((p) => {
Expand All @@ -634,6 +634,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
required
aria-label={formatMessage('Resource group name')}
data-testid={'qnaResourceGroupName'}
disabled={loadingQNA}
id={'qnaResourceGroupName'}
label={formatMessage('Resource group name')}
placeholder={formatMessage('Enter name for new resource group')}
Expand All @@ -648,6 +649,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
required
aria-label={formatMessage('QnA region')}
data-testid={'rootqnaRegion'}
disabled={loadingQNA}
id={'qnaRegion'}
label={formatMessage('QnA region')}
options={QNA_REGIONS}
Expand All @@ -660,6 +662,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
required
aria-label={formatMessage('Resource name')}
data-testid={'qnaResourceName'}
disabled={loadingQNA}
id={'qnaResourceName'}
label={formatMessage('Resource name')}
placeholder={formatMessage('Enter name for new QnA resources')}
Expand All @@ -669,17 +672,21 @@ export const ManageQNA = (props: ManageQNAProps) => {
/>
</div>
<DialogFooter>
<DefaultButton text={formatMessage('Back')} onClick={() => setCurrentPage(1)} />
{loadingQNA && (
<Spinner label="Creating resources..." labelPosition="right" styles={{ root: { float: 'left' } }} />
)}
<DefaultButton disabled={loadingQNA} text={formatMessage('Back')} onClick={() => setCurrentPage(1)} />
<PrimaryButton
disabled={
loadingQNA ||
!qnaResourceName ||
!resourceGroupKey ||
(resourceGroupKey == CREATE_NEW_KEY && !newResourceGroupName)
}
text={formatMessage('Next')}
onClick={createQNA}
/>
<DefaultButton text={formatMessage('Cancel')} onClick={props.onDismiss} />
<DefaultButton disabled={loadingQNA} text={formatMessage('Cancel')} onClick={props.onDismiss} />
</DialogFooter>
</div>
)}
Expand Down