Merge branch 'develop-postgres' of https://github.com/hustlernik/tala…

…wa-admin into refactor-issue#2895

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

@@ -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/Venues/VenueModal.test.tsx → src/components/Venues/VenueModal.spec.tsx

@@ -4,7 +4,6 @@ import type { RenderResult } from '@testing-library/react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
-import 'jest-location-mock';
 import { I18nextProvider } from 'react-i18next';
 
 import type { InterfaceVenueModalProps } from './VenueModal';
@@ -19,6 +18,8 @@ import {
   UPDATE_VENUE_MUTATION,
 } from 'GraphQl/Mutations/mutations';
 import type { ApolloLink } from '@apollo/client';
+import { vi } from 'vitest';
+import type * as RouterTypes from 'react-router-dom';
 
 const MOCKS = [
   {
@@ -65,10 +66,16 @@ const MOCKS = [
 const link = new StaticMockLink(MOCKS, true);
 
 const mockId = 'orgId';
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useParams: () => ({ orgId: mockId }),
-}));
+
+vi.mock('react-router-dom', async () => {
+  const actual = (await vi.importActual(
+    'react-router-dom',
+  )) as typeof RouterTypes;
+  return {
+    ...actual,
+    useParams: () => ({ orgId: mockId }),
+  };
+});
 
 async function wait(ms = 100): Promise<void> {
   await act(() => {
@@ -78,26 +85,26 @@ async function wait(ms = 100): Promise<void> {
   });
 }
 
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    warning: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    warning: vi.fn(),
+    error: vi.fn(),
   },
 }));
 
 const props: InterfaceVenueModalProps[] = [
   {
     show: true,
-    onHide: jest.fn(),
+    onHide: vi.fn(),
     edit: false,
     venueData: null,
-    refetchVenues: jest.fn(),
+    refetchVenues: vi.fn(),
     orgId: 'orgId',
   },
   {
     show: true,
-    onHide: jest.fn(),
+    onHide: vi.fn(),
     edit: true,
     venueData: {
       _id: 'venue1',
@@ -106,7 +113,7 @@ const props: InterfaceVenueModalProps[] = [
       image: 'image1',
       capacity: '100',
     },
-    refetchVenues: jest.fn(),
+    refetchVenues: vi.fn(),
     orgId: 'orgId',
   },
 ];
@@ -129,7 +136,7 @@ const renderVenueModal = (
 };
 
 describe('VenueModal', () => {
-  global.alert = jest.fn();
+  global.alert = vi.fn();
 
   test('renders correctly when show is true', async () => {
     renderVenueModal(props[0], link);

src/style/app.module.css

@@ -2303,6 +2303,33 @@ button[data-testid='createPostBtn'] {
   }
 }
 
+/* AddOnEntry.tsx */
+
+.entrytoggle {
+  margin: 24px 24px 0 auto;
+  width: fit-content;
+}
+
+.entryaction {
+  margin-left: auto;
+  display: flex !important;
+  align-items: center;
+  background-color: transparent;
+  color: #31bb6b;
+}
+.cardAddOnEntry {
+  border: 4px solid green;
+}
+.entryaction i {
+  margin-right: 8px;
+}
+
+.entryaction .spinner-grow {
+  height: 1rem;
+  width: 1rem;
+  margin-right: 8px;
+}
+
 /* PostCard.tsx */
 
 .cardStyles {