Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions extensions/azurePublish/src/components/azureProvisionDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -451,17 +451,19 @@ export const AzureProvisionDialog: React.FC = () => {

const getResources = async () => {
try {
if (isMounted.current) {
const resources = await getResourceList(currentProjectId(), publishType);
setExtensionResourceOptions(resources);
}
const resources = await getResourceList(currentProjectId(), publishType);
setExtensionResourceOptions(resources);
} catch (err) {
// todo: how do we handle API errors in this component
// eslint-disable-next-line no-console
console.log('ERROR', err);
}
};

useEffect(() => {
getResources();
}, [publishType]);

useEffect(() => {
if (token) {
setSubscriptionsErrorMessage(undefined);
Expand All @@ -483,8 +485,6 @@ export const AzureProvisionDialog: React.FC = () => {
setSubscriptionsErrorMessage(err.message);
}
});

getResources();
}
}, [token]);

Expand Down Expand Up @@ -683,7 +683,7 @@ export const AzureProvisionDialog: React.FC = () => {
style={{ height: 'calc(100vh - 64px)' }}
>
<ChooseProvisionAction
choice="create"
choice={formData.creationType}
onChoiceChanged={(choice) => {
updateFormData('creationType', choice);
}}
Expand Down Expand Up @@ -882,8 +882,10 @@ export const AzureProvisionDialog: React.FC = () => {
case 'import':
setPageAndTitle(PageTypes.EditJson);
break;
case 'create':
case 'generate':
onNext(formData.hostname);
break;
case 'create':
default:
setPageAndTitle(PageTypes.ConfigProvision);
break;
Expand Down Expand Up @@ -969,7 +971,11 @@ export const AzureProvisionDialog: React.FC = () => {
style={{ margin: '0 4px' }}
text={formatMessage('Back')}
onClick={() => {
setPageAndTitle(PageTypes.ConfigProvision);
if (formData.creationType === 'generate') {
setPageAndTitle(PageTypes.ChooseAction);
} else {
setPageAndTitle(PageTypes.ConfigProvision);
}
}}
/>
<PrimaryButton
Expand Down