diff --git a/.changeset/thin-scissors-press.md b/.changeset/thin-scissors-press.md new file mode 100644 index 0000000000..2891d4ca66 --- /dev/null +++ b/.changeset/thin-scissors-press.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-azure-sites': patch +--- + +Fixed `AzureSites` plugin start and stop issue #15904 +Fixed `AzureSites` UI load issue #15907 diff --git a/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts b/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts index fc622e786b..b66a3cbb3f 100644 --- a/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts +++ b/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts @@ -35,7 +35,7 @@ export class AzureSitesApiBackendClient implements AzureSitesApi { } async stop(request: AzureSiteStartStopRequest): Promise { - const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ + const url = `${await this.discoveryApi.getBaseUrl('azure-sites')}/${ request.subscription }/${request.resourceGroup}/${request.name}/stop`; const { token: accessToken } = await this.identityApi.getCredentials(); @@ -48,7 +48,7 @@ export class AzureSitesApiBackendClient implements AzureSitesApi { }); } async start(request: AzureSiteStartStopRequest): Promise { - const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ + const url = `${await this.discoveryApi.getBaseUrl('azure-sites')}/${ request.subscription }/${request.resourceGroup}/${request.name}/start`; const { token: accessToken } = await this.identityApi.getCredentials(); diff --git a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx index a25d186a48..dc059b2f15 100644 --- a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx +++ b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx @@ -73,9 +73,11 @@ const Kind = ({ value }: { value: Kinds }) => { app: , functionapp: , }; + const kindArray = value.split(','); + const iconValue: Kinds = kindArray.includes('app') ? 'app' : 'functionapp'; return ( - {iconMap[value]} + {iconMap[iconValue]} ); };