Merge remote-tracking branch 'upstream/develop-postgres' into issue-2936

Author: Aad1tya27

src/components/AddOn/core/AddOnEntry/AddOnEntry.module.css

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import styles from './AddOnEntry.module.css';
+import styles from './../../../../style/app.module.css';
 import { Button, Card, Spinner } from 'react-bootstrap';
 import { UPDATE_INSTALL_STATUS_PLUGIN_MUTATION } from 'GraphQl/Mutations/mutations';
 import { useMutation } from '@apollo/client';

src/components/AddOn/core/AddOnEntry/AddOnEntry.test.tsx

@@ -1,5 +1,4 @@
 import React, { act } from 'react';
-import 'jest-location-mock';
 import { fireEvent, render, screen } from '@testing-library/react';
 import {
   ApolloClient,
@@ -20,17 +19,18 @@ import { ORGANIZATIONS_LIST, PLUGIN_GET } from 'GraphQl/Queries/Queries';
 import userEvent from '@testing-library/user-event';
 import useLocalStorage from 'utils/useLocalstorage';
 import { MockedProvider } from '@apollo/react-testing';
+import { vi, describe, test, expect } from 'vitest';
 
 const { getItem } = useLocalStorage();
 interface InterfacePlugin {
   enabled: boolean;
   pluginName: string;
   component: string;
 }
-jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
+vi.mock('components/AddOn/support/services/Plugin.helper', () => ({
   __esModule: true,
-  default: jest.fn().mockImplementation(() => ({
-    fetchStore: jest.fn().mockResolvedValue([
+  default: vi.fn().mockImplementation(() => ({
+    fetchStore: vi.fn().mockResolvedValue([
       {
         _id: '1',
         pluginName: 'Plugin 1',
@@ -47,7 +47,7 @@ jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
       },
       // Add more mock data as needed
     ]),
-    fetchInstalled: jest.fn().mockResolvedValue([
+    fetchInstalled: vi.fn().mockResolvedValue([
       {
         _id: '1',
         pluginName: 'Installed Plugin 1',
@@ -64,18 +64,16 @@ jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
       },
       // Add more mock data as needed
     ]),
-    generateLinks: jest
-      .fn()
-      .mockImplementation((plugins: InterfacePlugin[]) => {
-        return plugins
-          .filter((plugin) => plugin.enabled)
-          .map((installedPlugin) => {
-            return {
-              name: installedPlugin.pluginName,
-              url: `/plugin/${installedPlugin.component.toLowerCase()}`,
-            };
-          });
-      }),
+    generateLinks: vi.fn().mockImplementation((plugins: InterfacePlugin[]) => {
+      return plugins
+        .filter((plugin) => plugin.enabled)
+        .map((installedPlugin) => {
+          return {
+            name: installedPlugin.pluginName,
+            url: `/plugin/${installedPlugin.component.toLowerCase()}`,
+          };
+        });
+    }),
   })),
 }));
 
@@ -99,11 +97,11 @@ const client: ApolloClient<NormalizedCacheObject> = new ApolloClient({
   link: ApolloLink.from([httpLink]),
 });
 
-jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
+vi.mock('components/AddOn/support/services/Plugin.helper', () => ({
   __esModule: true,
-  default: jest.fn().mockImplementation(() => ({
-    fetchInstalled: jest.fn().mockResolvedValue([]),
-    fetchStore: jest.fn().mockResolvedValue([]),
+  default: vi.fn().mockImplementation(() => ({
+    fetchInstalled: vi.fn().mockResolvedValue([]),
+    fetchStore: vi.fn().mockResolvedValue([]),
   })),
 }));
 
@@ -168,10 +166,15 @@ const PLUGIN_LOADING_MOCK = {
     loading: true,
   },
 };
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useParams: () => ({ orgId: 'undefined' }),
-}));
+
+vi.mock('react-router-dom', async () => {
+  const actualModule = await vi.importActual('react-router-dom');
+  return {
+    ...actualModule,
+    useParams: () => ({ orgId: 'undefined' }),
+  };
+});
+
 const ORGANIZATIONS_LIST_MOCK = {
   request: {
     query: ORGANIZATIONS_LIST,