Enhance website data retrieval with fallback support and new Git ALM format (#1295)

Enhance website data retrieval by adding fallback for website name and supporting new Git ALM format in website ID extraction

Co-authored-by: Amit Joshi <amitjoshi@microsoft.com>

Author: amitjoshi438

src/client/power-pages/actions-hub/ActionsHubCommandHandlers.ts

@@ -596,7 +596,7 @@ export function findOtherSites(knownSiteIds: Set<string>, fsModule = fs, yamlMod
                         const websiteData = yamlModule.parse(yamlContent) as WebsiteYaml;
 
                         otherSites.push({
-                            name: websiteData?.adx_name || path.basename(dir), // Use folder name as fallback
+                            name: websiteData?.adx_name || websiteData?.name || path.basename(dir), // Use folder name as fallback
                             websiteId: websiteId,
                             folderPath: dir,
                             isCodeSite: powerPagesSiteFolderExists

src/common/services/Interfaces.ts

@@ -69,4 +69,5 @@ export interface WebsiteYaml {
     adx_statuscode?: number;
     adx_website_language?: number | string;
     adx_websiteid?: string;
+    name?: string
 }

src/common/utilities/WorkspaceInfoFinderUtil.ts

@@ -59,8 +59,13 @@ export function getWebsiteRecordId(param: { uri: string }[] | string): string {
         if (fs.existsSync(websiteYmlPath)) {
             const fileContent = fs.readFileSync(websiteYmlPath, 'utf8');
             const parsedYaml = parse(fileContent);
-            if (parsedYaml && parsedYaml.adx_websiteid) {
-                return parsedYaml.adx_websiteid;
+            if (parsedYaml) {
+                // Check for adx_websiteid first, then fallback to id (to support new Git ALM format)
+                if (parsedYaml.adx_websiteid) {
+                    return parsedYaml.adx_websiteid;
+                } else if (parsedYaml.id) {
+                    return parsedYaml.id;
+                }
             }
         }
     } catch (exception) {