Merge pull request #15911 from deepan10/azure-sites

Fixed : AzureSites plugin UI load and action issue

.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

plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts

@@ -35,7 +35,7 @@ export class AzureSitesApiBackendClient implements AzureSitesApi {
   }
 
   async stop(request: AzureSiteStartStopRequest): Promise<void> {
-    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<void> {
-    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();

plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx

@@ -73,9 +73,11 @@ const Kind = ({ value }: { value: Kinds }) => {
     app: <PublicIcon />,
     functionapp: <FlashOnIcon />,
   };
+  const kindArray = value.split(',');
+  const iconValue: Kinds = kindArray.includes('app') ? 'app' : 'functionapp';
   return (
     <Box display="flex" alignItems="center">
-      <Tooltip title={value}>{iconMap[value]}</Tooltip>
+      <Tooltip title={iconValue}>{iconMap[iconValue]}</Tooltip>
     </Box>
   );
 };