Update PanelContainerComponent.tsx

package.json

@@ -167,7 +167,7 @@
     "less-vars-loader": "1.1.0",
     "mini-css-extract-plugin": "2.1.0",
     "monaco-editor-webpack-plugin": "1.7.0",
-    "node-fetch": "3.3.2",
+    "node-fetch": "2.6.1",
     "playwright": "1.13.0",
     "prettier": "2.2.1",
     "process": "0.11.10",

src/Explorer/Panes/PanelContainerComponent.tsx

@@ -1,4 +1,5 @@
 import { IPanelProps, IRenderFunction, Panel, PanelType } from "@fluentui/react";
+import { useSelectedNode } from "Explorer/useSelectedNode";
 import * as React from "react";
 import { useNotificationConsole } from "../../hooks/useNotificationConsole";
 import { useSidePanel } from "../../hooks/useSidePanel";
@@ -77,6 +78,20 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
   }
 
   private onDissmiss = (ev?: KeyboardEvent | React.SyntheticEvent<HTMLElement>): void => {
+    const collection = useSelectedNode.getState().findSelectedCollection();
+    if (collection) {
+      const targetElementDataTest: string | undefined = collection.id();
+      const targetElement: HTMLElement | null = document.querySelector(`[data-test="${targetElementDataTest}"]`);
+      if (targetElement) {
+        setTimeout(() => {
+          const moreButton: HTMLElement | null = targetElement.querySelector('[name="More"]');
+          if (moreButton) {
+            moreButton.focus();
+          }
+        }, 100);
+        clearTimeout;
+      }
+    }
     if (ev && (ev.target as HTMLElement).id === "notificationConsoleHeader") {
       ev.preventDefault();
     } else {

src/Explorer/QueryCopilot/QueryCopilotUtilities.test.tsx

@@ -1,220 +0,0 @@
-import { FeedOptions } from "@azure/cosmos";
-import { QueryCopilotSampleContainerSchema } from "Common/Constants";
-import { handleError } from "Common/ErrorHandlingUtils";
-import { sampleDataClient } from "Common/SampleDataClient";
-import * as commonUtils from "Common/dataAccess/queryDocuments";
-import DocumentId from "Explorer/Tree/DocumentId";
-import { querySampleDocuments, readSampleDocument, submitFeedback } from "./QueryCopilotUtilities";
-jest.mock("Explorer/Tree/DocumentId", () => {
-  return jest.fn().mockImplementation(() => {
-    return {
-      id: jest.fn(),
-      loadDocument: jest.fn(),
-    };
-  });
-});
-
-jest.mock("Utils/NotificationConsoleUtils", () => ({
-  logConsoleProgress: jest.fn(),
-  logConsoleError: jest.fn(),
-}));
-
-jest.mock("@azure/cosmos", () => ({
-  FeedOptions: jest.fn(),
-  QueryIterator: jest.fn(),
-}));
-
-jest.mock("Common/ErrorHandlingUtils", () => ({
-  handleError: jest.fn(),
-}));
-
-jest.mock("Utils/NotificationConsoleUtils", () => ({
-  logConsoleProgress: jest.fn().mockReturnValue((): void => undefined),
-}));
-
-jest.mock("Common/dataAccess/queryDocuments", () => ({
-  getCommonQueryOptions: jest.fn((options) => options),
-}));
-
-jest.mock("Common/SampleDataClient");
-
-jest.mock("node-fetch");
-
-describe("QueryCopilotUtilities", () => {
-  beforeEach(() => jest.clearAllMocks());
-  describe("submitFeedback", () => {
-    const payload = {
-      like: "like",
-      generatedSql: "GeneratedQuery",
-      userPrompt: "UserPrompt",
-      description: "Description",
-      contact: "Contact",
-      containerSchema: QueryCopilotSampleContainerSchema,
-    };
-
-    it("should call fetch with the payload with like", async () => {
-      const mockFetch = jest.fn().mockResolvedValueOnce({});
-
-      globalThis.fetch = mockFetch;
-
-      await submitFeedback({
-        likeQuery: true,
-        generatedQuery: "GeneratedQuery",
-        userPrompt: "UserPrompt",
-        description: "Description",
-        contact: "Contact",
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        "https://copilotorchestrater.azurewebsites.net/feedback",
-        expect.objectContaining({
-          method: "POST",
-          headers: {
-            "content-type": "application/json",
-          },
-        })
-      );
-
-      const actualBody = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(actualBody).toEqual(payload);
-    });
-
-    it("should call fetch with the payload with unlike and empty parameters", async () => {
-      payload.like = "dislike";
-      payload.description = "";
-      payload.contact = "";
-      const mockFetch = jest.fn().mockResolvedValueOnce({});
-
-      globalThis.fetch = mockFetch;
-
-      await submitFeedback({
-        likeQuery: false,
-        generatedQuery: "GeneratedQuery",
-        userPrompt: "UserPrompt",
-        description: undefined,
-        contact: undefined,
-      });
-
-      expect(mockFetch).toHaveBeenCalledWith(
-        "https://copilotorchestrater.azurewebsites.net/feedback",
-        expect.objectContaining({
-          method: "POST",
-          headers: {
-            "content-type": "application/json",
-          },
-        })
-      );
-
-      const actualBody = JSON.parse(mockFetch.mock.calls[0][1].body);
-      expect(actualBody).toEqual(payload);
-    });
-
-    it("should handle errors and call handleError", async () => {
-      globalThis.fetch = jest.fn().mockRejectedValueOnce(new Error("Mock error"));
-
-      await submitFeedback({
-        likeQuery: true,
-        generatedQuery: "GeneratedQuery",
-        userPrompt: "UserPrompt",
-        description: "Description",
-        contact: "Contact",
-      }).catch((error) => {
-        expect(error.message).toEqual("Mock error");
-      });
-
-      expect(handleError).toHaveBeenCalledWith(new Error("Mock error"), expect.any(String));
-    });
-  });
-
-  describe("querySampleDocuments", () => {
-    (sampleDataClient as jest.Mock).mockReturnValue({
-      database: jest.fn().mockReturnValue({
-        container: jest.fn().mockReturnValue({
-          items: {
-            query: jest.fn().mockReturnValue([]),
-          },
-        }),
-      }),
-    });
-
-    it("calls getCommonQueryOptions with the provided options", () => {
-      const query = "sample query";
-      const options: FeedOptions = { maxItemCount: 10 };
-
-      querySampleDocuments(query, options);
-
-      expect(commonUtils.getCommonQueryOptions).toHaveBeenCalledWith(options);
-    });
-
-    it("returns the result of items.query method", () => {
-      const query = "sample query";
-      const options: FeedOptions = { maxItemCount: 10 };
-      const mockResult = [
-        { id: 1, name: "Document 1" },
-        { id: 2, name: "Document 2" },
-      ];
-
-      // Mock the items.query method to return the mockResult
-      (sampleDataClient().database("CopilotSampleDb").container("SampleContainer").items
-        .query as jest.Mock).mockReturnValue(mockResult);
-
-      const result = querySampleDocuments(query, options);
-
-      expect(result).toEqual(mockResult);
-    });
-  });
-
-  describe("readSampleDocument", () => {
-    it("should call the read method with the correct parameters", async () => {
-      (sampleDataClient as jest.Mock).mockReturnValue({
-        database: jest.fn().mockReturnValue({
-          container: jest.fn().mockReturnValue({
-            item: jest.fn().mockReturnValue({
-              read: jest.fn().mockResolvedValue({
-                resource: {},
-              }),
-            }),
-          }),
-        }),
-      });
-
-      const documentId = new DocumentId(null, "DocumentId", []);
-      const expectedResponse = {};
-
-      const result = await readSampleDocument(documentId);
-
-      expect(sampleDataClient).toHaveBeenCalled();
-      expect(sampleDataClient().database).toHaveBeenCalledWith("CopilotSampleDb");
-      expect(sampleDataClient().database("CopilotSampleDb").container).toHaveBeenCalledWith("SampleContainer");
-      expect(
-        sampleDataClient().database("CopilotSampleDb").container("SampleContainer").item("DocumentId", undefined).read
-      ).toHaveBeenCalled();
-      expect(result).toEqual(expectedResponse);
-    });
-
-    it("should handle an error and re-throw it", async () => {
-      (sampleDataClient as jest.Mock).mockReturnValue({
-        database: jest.fn().mockReturnValue({
-          container: jest.fn().mockReturnValue({
-            item: jest.fn().mockReturnValue({
-              read: jest.fn().mockRejectedValue(new Error("Mock error")),
-            }),
-          }),
-        }),
-      });
-
-      const errorMock = new Error("Mock error");
-      const documentId = new DocumentId(null, "DocumentId", []);
-
-      await expect(readSampleDocument(documentId)).rejects.toStrictEqual(errorMock);
-
-      expect(sampleDataClient).toHaveBeenCalled();
-      expect(sampleDataClient().database).toHaveBeenCalledWith("CopilotSampleDb");
-      expect(sampleDataClient().database("CopilotSampleDb").container).toHaveBeenCalledWith("SampleContainer");
-      expect(
-        sampleDataClient().database("CopilotSampleDb").container("SampleContainer").item("DocumentId", undefined).read
-      ).toHaveBeenCalled();
-      expect(handleError).toHaveBeenCalledWith(errorMock, "ReadDocument", expect.any(String));
-    });
-  });
-});

tsconfig.strict.json

@@ -163,4 +163,4 @@
     "src/Terminal/**/*",
     "src/Utils/arm/**/*"
   ]
-}
+}