Reverted to prior commit and re-incorporated new logic

Author: Whitney Shake

src/dotnet/APIView/ClientSPA/src/app/_components/code-panel/code-panel.component.html

@@ -25,7 +25,7 @@
     <ng-container *ngIf="item.type === CodePanelRowDatatype.CommentThread">
       <app-comment-thread
         [codePanelRowData]="item"
-        [associatedCodeLine]="codePanelData!.nodeMetaData[item.nodeIdHashed]!.codeLines[item.associatedRowPositionInGroup]!"
+        [associatedCodeLine]="getAssociatedCodeLine(item)"
         (cancelCommentActionEmitter)="handleCancelCommentActionEmitter($event)"
         (saveCommentActionEmitter)="handleSaveCommentActionEmitter($event)"
         (deleteCommentActionEmitter)="handleDeleteCommentActionEmitter($event)"

src/dotnet/APIView/ClientSPA/src/app/_components/code-panel/code-panel.component.ts

@@ -136,6 +136,13 @@ export class CodePanelComponent implements OnChanges{
     return "";
   }
 
+  getAssociatedCodeLine(item: CodePanelRowData): CodePanelRowData | undefined {
+    if (this.codePanelData?.nodeMetaData && this.codePanelData.nodeMetaData[item.nodeIdHashed]) {
+      return this.codePanelData.nodeMetaData[item.nodeIdHashed].codeLines[item.associatedRowPositionInGroup] || undefined;
+    }
+    return undefined;
+  }
+
   toggleNodeComments(target: Element) {
     const nodeIdHashed = target.closest('.code-line')!.getAttribute('data-node-id');
     const rowPositionInGroup = parseInt(target.closest('.code-line')!.getAttribute('data-row-position-in-group')!, 10);

src/dotnet/APIView/ClientSPA/src/app/_components/shared/comment-thread/comment-thread.component.ts

@@ -105,6 +105,8 @@ export class CommentThreadComponent {
     if (changes['codePanelRowData']) {
       this.setCommentResolutionState();
     }
+    if (changes['associatedCodeLine']) {
+    }
   }
 
   setCommentResolutionState() {
@@ -170,20 +172,23 @@ export class CommentThreadComponent {
     const target = (event.originalEvent?.target as Element).closest("a") as Element;
     const commentId = target.getAttribute("data-item-id");
     const commentData = this.codePanelRowData?.comments?.find(comment => comment.id === commentId)?.commentText.replace(/<[^>]*>/g, '').trim();
-  
+
     const codeLineContent = this.associatedCodeLine 
-    ? this.associatedCodeLine.rowOfTokens
-        .filter(token => token.kind !== 'nonBreakingSpace')
-        .map(token => token.value)
-        .join('')
-    : '';
-  
-    const apiViewUrl = `${window.location.href.split("#")[0]}%23${encodeURIComponent(encodeURIComponent(event.item?.title!))}`;
-    const issueBody = encodeURIComponent(`\`\`\`${event.item?.title}\n${codeLineContent}\n\`\`\`\n#\n${commentData}\n#\n[Created from ApiView comment]\n(${apiViewUrl})`);
-  
+        ? this.associatedCodeLine.rowOfTokens
+            .filter(token => token.kind !== 'nonBreakingSpace')
+            .map(token => token.value)
+            .join(' ')
+            .replace(/\s+/g, ' ')
+            .trim()
+        : '';
+
+    const nodeId: string = this.codePanelRowData?.nodeId ?? 'defaultNodeId';
+    const apiViewUrl = `${window.location.href.split("#")[0]}&nId=${encodeURIComponent(nodeId)}`;
+    const issueBody = encodeURIComponent(`\`\`\`${event.item?.title}\n${codeLineContent}\n\`\`\`\n#\n${commentData}\n#\n[Created from ApiView comment](${apiViewUrl})`);
+
     window.open(`https://github.com/Azure/${repo}/issues/new?body=${issueBody}`, '_blank');
   }
-  
+
   showReplyEditor(event: Event) {
     this.codePanelRowData!.showReplyTextBox = true;
   }

tools/js-sdk-release-tools/src/test/apiVersion/apiVersionExtractor.test.ts

@@ -0,0 +1,40 @@
+import { expect, test } from "vitest";
+import { findApiVersionInRestClient, getApiVersionType } from "../../mlc/apiVersion/apiVersionTypeExtractor";
+import { join } from "path";
+import { ApiVersionType } from "../../common/types";
+
+test("MLC api-version Extractor: new createClient function", async () => {
+    const clientPath = join(__dirname, 'testCases/new/src/rest/newClient.ts');
+    const version = findApiVersionInRestClient(clientPath);
+    expect(version).toBe('2024-03-01-preview');
+});
+
+test("MLC api-version Extractor: get api version type from new createClient function", async () => {
+    const root = join(__dirname, 'testCases/new/');
+    const version = getApiVersionType(root);
+    expect(version).toBe(ApiVersionType.Preview);
+});
+
+test("MLC api-version Extractor: old createClient function 1", async () => {
+    const clientPath = join(__dirname, 'testCases/old1/src/rest/oldClient.ts');
+    const version = findApiVersionInRestClient(clientPath);
+    expect(version).toBe('v1.1-preview.1');
+});
+
+test("MLC api-version Extractor: get api version type from old createClient function 1", async () => {
+    const root = join(__dirname, 'testCases/old1/');
+    const version = getApiVersionType(root);
+    expect(version).toBe(ApiVersionType.Preview);
+});
+
+test("MLC api-version Extractor: old createClient function 2", async () => {
+    const clientPath = join(__dirname, 'testCases/old2/src/rest/oldClient.ts');
+    const version = findApiVersionInRestClient(clientPath);
+    expect(version).toBe('2024-03-01');
+});
+
+test("MLC api-version Extractor: get api version type from old createClient function 2", async () => {
+    const root = join(__dirname, 'testCases/old2/');
+    const version = getApiVersionType(root);
+    expect(version).toBe(ApiVersionType.Stable);
+});

tools/js-sdk-release-tools/src/test/apiVersion/testCases/new/src/rest/newClient.ts

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { getClient, ClientOptions } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+import { TokenCredential } from "@azure/core-auth";
+import { DocumentDBContext } from "./clientDefinitions.js";
+
+/** The optional parameters for the client */
+export interface DocumentDBContextOptions extends ClientOptions {
+  /** The api version option of the client */
+  apiVersion?: string;
+}
+
+/**
+ * Initialize a new instance of `DocumentDBContext`
+ * @param credentials - uniquely identify client credential
+ * @param options - the parameter for all optional parameters
+ */
+export default function createClient(
+  credentials: TokenCredential,
+  {
+    apiVersion = "2024-03-01-preview",
+    ...options
+  }: DocumentDBContextOptions = {},
+): DocumentDBContext {
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `https://management.azure.com`;
+  const userAgentInfo = `azsdk-js-arm-mongocluster/1.0.0-beta.1`;
+  const userAgentPrefix =
+    options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+      ? `${options.userAgentOptions.userAgentPrefix} ${userAgentInfo}`
+      : `${userAgentInfo}`;
+  options = {
+    ...options,
+    userAgentOptions: {
+      userAgentPrefix,
+    },
+    loggingOptions: {
+      logger: options.loggingOptions?.logger ?? logger.info,
+    },
+    credentials: {
+      scopes: options.credentials?.scopes ?? [`${endpointUrl}/.default`],
+    },
+  };
+  const client = getClient(
+    endpointUrl,
+    credentials,
+    options,
+  ) as DocumentDBContext;
+
+  client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+  client.pipeline.addPolicy({
+    name: "ClientApiVersionPolicy",
+    sendRequest: (req, next) => {
+      // Use the apiVersion defined in request url directly
+      // Append one if there is no apiVersion and we have one at client options
+      const url = new URL(req.url);
+      if (!url.searchParams.get("api-version") && apiVersion) {
+        req.url = `${req.url}${Array.from(url.searchParams.keys()).length > 0 ? "&" : "?"
+          }api-version=${apiVersion}`;
+      }
+
+      return next(req);
+    },
+  });
+  return client;
+}

tools/js-sdk-release-tools/src/test/apiVersion/testCases/old1/src/rest/oldClient.ts

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { getClient, ClientOptions } from "@azure-rest/core-client";
+import { logger } from "./logger.js";
+import { TokenCredential, KeyCredential } from "@azure/core-auth";
+import { FaceClient } from "./clientDefinitions.js";
+import { Versions } from "./models.js";
+
+export interface FaceClientOptions extends ClientOptions {
+  apiVersion?: Versions;
+}
+
+/**
+ * Initialize a new instance of `FaceClient`
+ * @param endpointParam - Supported Cognitive Services endpoints (protocol and hostname, for example:
+ * https://{resource-name}.cognitiveservices.azure.com).
+ * @param credentials - uniquely identify client credential
+ * @param options - the parameter for all optional parameters
+ */
+export default function createClient(
+  endpointParam: string,
+  credentials: TokenCredential | KeyCredential,
+  options: FaceClientOptions = {},
+): FaceClient {
+  const apiVersion = options.apiVersion ?? "v1.1-preview.1";
+  const endpointUrl = options.endpoint ?? options.baseUrl ?? `${endpointParam}/face/${apiVersion}`;
+
+  const userAgentInfo = `azsdk-js-ai-vision-face-rest/1.0.0-beta.1`;
+  const userAgentPrefix =
+    options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+      ? `${options.userAgentOptions.userAgentPrefix} ${userAgentInfo}`
+      : `${userAgentInfo}`;
+  options = {
+    ...options,
+    userAgentOptions: {
+      userAgentPrefix,
+    },
+    loggingOptions: {
+      logger: options.loggingOptions?.logger ?? logger.info,
+    },
+    credentials: {
+      scopes: options.credentials?.scopes ?? ["https://cognitiveservices.azure.com/.default"],
+      apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "Ocp-Apim-Subscription-Key",
+    },
+  };
+
+  const client = getClient(endpointUrl, credentials, options) as FaceClient;
+
+  client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
+
+  client.pipeline.addPolicy({
+    name: "VerifyImageFilenamePolicy",
+    sendRequest: (request, next) => {
+      for (const part of request.multipartBody?.parts ?? []) {
+        const contentDisposition = part.headers.get("content-disposition");
+        if (
+          contentDisposition &&
+          contentDisposition.includes(`name="VerifyImage"`) &&
+          !contentDisposition.includes("filename=")
+        ) {
+          part.headers.set("content-disposition", `form-data; name="VerifyImage"; filename="blob"`);
+        }
+      }
+      return next(request);
+    },
+  });
+
+  return client;
+}

tools/js-sdk-release-tools/src/test/apiVersion/testCases/old2/src/rest/oldClient.ts

@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { getClient, ClientOptions } from "@azure-rest/core-client";
+import { logger } from "../logger.js";
+import { TokenCredential, KeyCredential } from "@azure/core-auth";
+import { OpenAIContext } from "./clientDefinitions.js";
+
+/**
+ * Initialize a new instance of `OpenAIContext`
+ * @param endpoint - Supported Cognitive Services endpoints (protocol and hostname, for example:
+ * https://westus.api.cognitive.microsoft.com).
+ * @param credentials - uniquely identify client credential
+ * @param options - the parameter for all optional parameters
+ */
+export default function createClient(
+  endpoint: string,
+  credentials: TokenCredential | KeyCredential,
+  options: ClientOptions = {},
+): OpenAIContext {
+  const baseUrl = options.baseUrl ?? `${endpoint}/openai`;
+  options.apiVersion = options.apiVersion ?? "2024-03-01";
+  const userAgentInfo = `azsdk-js-openai-rest/1.0.0-beta.12`;
+  const userAgentPrefix =
+    options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+      ? `${options.userAgentOptions.userAgentPrefix} ${userAgentInfo}`
+      : `${userAgentInfo}`;
+  options = {
+    ...options,
+    userAgentOptions: {
+      userAgentPrefix,
+    },
+    loggingOptions: {
+      logger: options.loggingOptions?.logger ?? logger.info,
+    },
+    credentials: {
+      scopes: options.credentials?.scopes ?? ["https://cognitiveservices.azure.com/.default"],
+      apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "api-key",
+    },
+  };
+
+  const client = getClient(baseUrl, credentials, options) as OpenAIContext;
+
+  return client;
+}