Fix bug for icon changing and undefined kind (#4571)

Author: nturinski

src/FunctionAppResolver.ts

@@ -1,6 +1,7 @@
 import { type ResourceGraphClient } from "@azure/arm-resourcegraph";
 import { createWebSiteClient } from "@microsoft/vscode-azext-azureappservice";
-import { callWithTelemetryAndErrorHandling, nonNullProp, nonNullValueAndProp, type IActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
+import { getResourceGroupFromId } from "@microsoft/vscode-azext-azureutils";
+import { callWithTelemetryAndErrorHandling, nonNullProp, type IActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
 import { type AppResource, type AppResourceResolver } from "@microsoft/vscode-azext-utils/hostapi";
 import { ResolvedFunctionAppResource } from "./tree/ResolvedFunctionAppResource";
 import { ResolvedContainerizedFunctionAppResource } from "./tree/containerizedFunctionApp/ResolvedContainerizedFunctionAppResource";
@@ -91,13 +92,16 @@ export class FunctionAppResolver implements AppResourceResolver {
             }
 
             const siteModel = this.siteCache.get(nonNullProp(resource, 'id').toLowerCase());
-            if (nonNullValueAndProp(siteModel, 'kind') === 'functionapp,linux,container,azurecontainerapps') {
-                // need the full site to resolve containerized function apps
+            if (!siteModel || siteModel.kind === 'functionapp,linux,container,azurecontainerapps') {
+                // if the site model is not found or if it's a containerized function app, we need the full site details
                 const client = await createWebSiteClient({ ...context, ...subContext });
-                const fullSite = await client.webApps.get(nonNullValueAndProp(siteModel, 'resourceGroup'), nonNullValueAndProp(siteModel, 'name'));
-                return ResolvedContainerizedFunctionAppResource.createResolvedFunctionAppResource(context, subContext, fullSite);
-            }
-            if (siteModel) {
+                const fullSite = await client.webApps.get(getResourceGroupFromId(resource.id), resource.name);
+                if (fullSite.kind === 'functionapp,linux,container,azurecontainerapps') {
+                    return ResolvedContainerizedFunctionAppResource.createResolvedFunctionAppResource(context, subContext, fullSite);
+                }
+
+                return new ResolvedFunctionAppResource(subContext, fullSite);
+            } else if (siteModel) {
                 return new ResolvedFunctionAppResource(subContext, undefined, siteModel);
             }
 

src/tree/ResolvedFunctionAppResource.ts

@@ -6,7 +6,7 @@
 import { type Site, type SiteConfig, type SiteSourceControl, type StringDictionary } from "@azure/arm-appservice";
 import { DeleteLastServicePlanStep, DeleteSiteStep, DeploymentTreeItem, DeploymentsTreeItem, LogFilesTreeItem, ParsedSite, SiteFilesTreeItem, createWebSiteClient, getFile, type IDeleteSiteWizardContext } from "@microsoft/vscode-azext-azureappservice";
 import { AppSettingTreeItem, AppSettingsTreeItem } from "@microsoft/vscode-azext-azureappsettings";
-import { AzureWizard, DeleteConfirmationStep, callWithTelemetryAndErrorHandling, nonNullValue, type AzExtTreeItem, type IActionContext, type ISubscriptionContext, type TreeItemIconPath } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, DeleteConfirmationStep, callWithTelemetryAndErrorHandling, type AzExtTreeItem, type IActionContext, type ISubscriptionContext, type TreeItemIconPath } from "@microsoft/vscode-azext-utils";
 import { type ResolvedAppResourceBase } from "@microsoft/vscode-azext-utils/hostapi";
 import { latestGAVersion, tryParseFuncVersion, type FuncVersion } from "../FuncVersion";
 import { type FunctionAppModel } from "../FunctionAppResolver";
@@ -93,7 +93,6 @@ export class ResolvedFunctionAppResource extends ResolvedFunctionAppBase impleme
             const webClient = await createWebSiteClient({ ...context, ...this._subscription });
             const rawSite = await webClient.webApps.get(this.dataModel.resourceGroup, this.dataModel.name);
             this._site = new ParsedSite(rawSite, this._subscription);
-            this.data = rawSite;
             this.addValuesToMask(this._site);
         }
     }
@@ -104,7 +103,6 @@ export class ResolvedFunctionAppResource extends ResolvedFunctionAppBase impleme
                 // try to lazy load the site if it hasn't been initialized yet
                 void this.initSite(context);
             });
-            // If the site is not initialized, we should throw an error
             throw new Error(localize('siteNotSet', 'Site is not initialized. Please try again in a moment.'));
         }
         return this._site;
@@ -176,8 +174,11 @@ export class ResolvedFunctionAppResource extends ResolvedFunctionAppBase impleme
 
         // on refresh, we should reinitialize the site to ensure we have the latest data
         const client = await this.site.createClient(context);
-        this._site = new ParsedSite(nonNullValue(await client.getSite(), 'site'), this._subscription);
-        this.dataModel = this.createDataModelFromSite(this._site.rawSite);
+        const site = await client.getSite();
+        if (site) {
+            this.dataModel = this.createDataModelFromSite(site);
+            this._site = new ParsedSite(site, this._subscription);
+        }
     }
 
     public async getVersion(context: IActionContext): Promise<FuncVersion> {