Merge branch 'PalisadoesFoundation:develop' into SecuredRouteForUser-…

…Test
PalisadoesFoundation · Nov 11, 2023 · 5bba391 · 5bba391
2 parents c46c375 + 57baf75
commit 5bba391
Show file tree

Hide file tree

Showing 17 changed files with 564 additions and 357 deletions.
diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -567,6 +567,7 @@ export const ORGANIZATION_POST_LIST = gql`
         lastName
         email
       }
+      createdAt
     }
   }
 `;
@@ -594,7 +595,7 @@ export const ORGANIZATION_POST_CONNECTION_LIST = gql`
           lastName
           email
         }
-        pinned
+        createdAt
         likeCount
         commentCount
         comments {
@@ -611,7 +612,6 @@ export const ORGANIZATION_POST_CONNECTION_LIST = gql`
           }
           text
         }
-        createdAt
         likedBy {
           _id
           firstName

diff --git a/src/assets/css/app.css b/src/assets/css/app.css
@@ -5560,7 +5560,7 @@ fieldset:disabled .btn {
   box-shadow: var(--bs-toast-box-shadow);
   border-radius: var(--bs-toast-border-radius);
 }
-.toast.showing {
+.showing {
   opacity: 0;
 }
 .toast:not(.show) {

diff --git a/src/assets/svgs/date.svg b/src/assets/svgs/date.svg
diff --git a/src/assets/svgs/location.svg b/src/assets/svgs/location.svg
diff --git a/src/assets/svgs/user.svg b/src/assets/svgs/user.svg
diff --git a/src/components/EventListCard/EventListCard.module.css b/src/components/EventListCard/EventListCard.module.css
@@ -26,9 +26,7 @@
   justify-content: flex-end;
 }
 .icon {
-  transform: scale(1);
-  cursor: pointer;
-  color: #31bb6b;
+  margin: 1px;
 }
 
 .cards {
@@ -86,6 +84,8 @@
 }
 .dispflex {
   display: flex;
+  margin-bottom: 5px;
+  margin-right: 5px;
 }
 .dispflex > input {
   width: 20%;

diff --git a/src/components/EventListCard/EventListCard.test.tsx b/src/components/EventListCard/EventListCard.test.tsx
@@ -149,6 +149,30 @@ describe('Testing Event List Card', () => {
     expect(screen.queryByText(props.eventName)).not.toBeInTheDocument();
   });
 
+  test('Testing for update modal', async () => {
+    render(
+      <MockedProvider addTypename={false} link={link}>
+        <BrowserRouter>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <EventListCard {...props} />
+            </I18nextProvider>
+          </Provider>
+        </BrowserRouter>
+      </MockedProvider>
+    );
+
+    await wait();
+
+    userEvent.click(screen.getByTestId('card'));
+    userEvent.click(screen.getByTestId('editEventModalBtn'));
+
+    userEvent.click(screen.getByTestId('EventUpdateModalCloseBtn'));
+    userEvent.click(screen.getByTestId('createEventModalCloseBtn'));
+
+    await wait();
+  });
+
   test('Testing event update functionality', async () => {
     render(
       <MockedProvider addTypename={false} link={link}>
@@ -159,7 +183,8 @@ describe('Testing Event List Card', () => {
     );
 
     await wait();
-
+    userEvent.click(screen.getByTestId('card'));
+    userEvent.click(screen.getByTestId('editEventModalBtn'));
     userEvent.type(screen.getByTestId('updateTitle'), props.eventName);
     userEvent.type(
       screen.getByTestId('updateDescription'),
@@ -199,7 +224,8 @@ describe('Testing Event List Card', () => {
     );
 
     await wait();
-
+    userEvent.click(screen.getByTestId('card'));
+    userEvent.click(screen.getByTestId('editEventModalBtn'));
     userEvent.type(screen.getByTestId('updateTitle'), props.eventName);
     userEvent.type(
       screen.getByTestId('updateDescription'),
@@ -232,6 +258,11 @@ describe('Testing Event List Card', () => {
           <EventListCard {...props} />
         </MockedProvider>
       );
+      userEvent.click(screen.getByTestId('card'));
+      userEvent.click(screen.getByTestId('deleteEventModalBtn'));
+
+      userEvent.click(screen.getByTestId('EventDeleteModalCloseBtn'));
+      userEvent.click(screen.getByTestId('createEventModalCloseBtn'));
     });
 
     it('should call the delete event mutation when the "Yes" button is clicked', async () => {
@@ -240,7 +271,8 @@ describe('Testing Event List Card', () => {
           <EventListCard {...props} />
         </MockedProvider>
       );
-
+      userEvent.click(screen.getByTestId('card'));
+      userEvent.click(screen.getByTestId('deleteEventModalBtn'));
       const deleteBtn = screen.getByTestId('deleteEventBtn');
       fireEvent.click(deleteBtn);
     });
@@ -263,7 +295,8 @@ describe('Testing Event List Card', () => {
           <EventListCard {...props} />
         </MockedProvider>
       );
-
+      userEvent.click(screen.getByTestId('card'));
+      userEvent.click(screen.getByTestId('deleteEventModalBtn'));
       const deleteBtn = screen.getByTestId('deleteEventBtn');
       fireEvent.click(deleteBtn);
     });