@gitkraken/core-gitlens 0.15.6 → 0.16.0

package/dist/plus/integrations/providers/providersApi.js

@@ -1,3 +1,4 @@
+import { Logger as _logger } from "../../../utils/logger.js";
 import { mapSettledBounded } from "../../../utils/promise.js";
 import { RequestNotFoundError } from "../../../git/errors.js";
 import { base64 } from "../../../utils/base64.js";
@@ -8,13 +9,13 @@ import { isIncompleteCollection, toCollectionScopeFailure, withValidSkippedItems
 import { toTokenWithInfo } from "../authentication/models.js";
 import { collectProviderPagedResult, mergeCollectionMetadata, parsePageCursor, toPageCursor } from "./utils/providerPaging.js";
 import { isRepoIdsInput, providersMetadata } from "./models.js";
-import { azureIssueStateCategory, azureWorkItemEtagFieldNames, encodeAzurePathSegment, fromAzureWorkItemToProviderIssue } from "./azure/models.js";
-import { AzureWorkItemStatesCache, getAzureWorkItemTypeStatesUrl, getAzureWorkItemTypesUrl } from "./azure/workItemStateCategories.js";
+import { azureIssueStateCategory, azureWorkItemEtagFieldNames, encodeAzurePathSegment, fromAzureWorkItemToProviderIssue, toAzureWorkItemDescriptionFields } from "./azure/models.js";
+import { AzureWorkItemStatesCache, getAzureWorkItemFieldsPath, getAzureWorkItemTypeStatesUrl, getAzureWorkItemTypesUrl } from "./azure/workItemStateCategories.js";
 import { requestJiraIssueByKey, requestJiraIssuesEtagFields } from "./jiraIssueByKey.js";
 import { requestLinearIssuesEtagFields } from "./linearIssuesEtag.js";
 import { requestBitbucketServerProjects, requestBitbucketServerRepositories } from "./bitbucket-server/discovery.js";
 import { countBitbucketServerPullRequests, searchBitbucketServerPullRequestsPage } from "./bitbucket-server/pullRequestSearch.js";
-import ProviderApis, { GitIssueState } from "@gitkraken/provider-apis";
+import ProviderApis, { GitIssueState, needsAzureWorkItemHtmlFields } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/providersApi.ts
 const createProviderApis = ProviderApis.default ?? ProviderApis;
 const repoNotFoundMessage = /^Repository .+ not found$/i;
@@ -656,7 +657,8 @@ var ProvidersApi = class {
 		if (issue == null) throw new Error(`Azure DevOps returned no readable work item ${id}`);
 		const project = workItem?.fields?.["System.TeamProject"];
 		if (typeof project === "string" && project.toLowerCase() !== scope.project.toLowerCase()) throw new Error(`Azure DevOps work item ${id} is in project '${project}', not '${scope.project}'`);
-		await this.classifyAzureIssueStates([issue], tokenWithInfo, scope.namespace, scope.project, options);
+		const [htmlFields] = await Promise.all([needsAzureWorkItemHtmlFields(workItem?.fields) ? this.getAzureWorkItemHtmlFields(tokenWithInfo, scope.namespace, options) : void 0, this.classifyAzureIssueStates([issue], tokenWithInfo, scope.namespace, scope.project, options)]);
+		if (htmlFields != null) Object.assign(issue, toAzureWorkItemDescriptionFields(workItem?.fields, htmlFields));
 		return issue;
 	}
 	/**
@@ -1187,6 +1189,20 @@ var ProvidersApi = class {
 			return this.handleProviderError(token, ex);
 		}
 	}
+	/**
+	* The organization's rich text fields a work item's description may come from, as provider-apis reads them for
+	* its list rows. Best-effort: `undefined` on any failure, which leaves the description to the built-in fields
+	* rather than failing the work item. Logged for every failure, a body that isn't a catalog included.
+	*/
+	async getAzureWorkItemHtmlFields(token, namespace, options) {
+		const scope = this.azureStatesScope(token, namespace, "", options);
+		try {
+			return await this.azureWorkItemTypeStates.getHtmlFields(scope, () => this.readAzureStatesMetadata(token, `${scope.baseUrl.replace(/\/$/, "")}/${getAzureWorkItemFieldsPath(namespace)}`, scope.isPAT));
+		} catch (ex) {
+			_logger.warn(`Unable to read the Azure DevOps field catalog of '${namespace}': ${String(ex)}`);
+			return;
+		}
+	}
 	getAzureTypeStates(token, scope, type) {
 		return this.azureWorkItemTypeStates.getStates(scope, type, () => this.readAzureStatesMetadata(token, getAzureWorkItemTypeStatesUrl(scope.baseUrl, scope.namespace, scope.project, type), scope.isPAT));
 	}