Merge pull request #3831 from OneCommunityGlobal/sundar/fix-save-summary

Sundar/fix save summary

Author: one-community

src/components/WeeklySummary/WeeklySummary.jsx

@@ -1,4 +1,3 @@
-/* eslint-disable prettier/prettier */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import {
@@ -623,10 +622,14 @@ export class WeeklySummary extends Component {
 
   // Updates user profile and weekly summaries
   updateUserData = async userId => {
-    // eslint-disable-next-line no-shadow
     const { getUserProfile, getWeeklySummaries } = this.props;
-    await getUserProfile(userId);
-    await getWeeklySummaries(userId);
+    if (typeof getUserProfile === 'function') {
+      await getUserProfile(userId);
+    }
+    // always refresh summaries if that exists
+    if (typeof getWeeklySummaries === 'function') {
+      await getWeeklySummaries(userId);
+    }
   };
 
   // Handler for success scenario after save
@@ -654,15 +657,15 @@ export class WeeklySummary extends Component {
     const toastIdOnSave = 'toast-on-save';
     const errors = this.validate();
 
-    this.setState({ errors: errors || {} });
+    this.setState({ errors: errors });
     if (Object.keys(errors).length > 0) {
       this.setState({ moveConfirm: false });
       return;
     }
 
     const result = await this.handleChangeInSummary();
 
-    if (result === 200) {
+    if (result === 200 || result?.status === 200) {
       await this.handleSaveSuccess(toastIdOnSave);
       if (closeAfterSave) {
         this.handleClose();
@@ -712,10 +715,10 @@ export class WeeklySummary extends Component {
     }
     this.mainSaveHandler(true);
   };
-
   handleClose = () => {
-    // eslint-disable-next-line react/destructuring-assignment
-    this.props.setPopup(false);
+    if (typeof this.props.setPopup === 'function') {
+      this.props.setPopup(false);
+    }
   };
 
   render() {

src/components/WeeklySummary/__tests__/WeeklySummary.test.jsx

@@ -1,5 +1,4 @@
 /* eslint-disable testing-library/no-render-in-lifecycle */
-// eslint-disable-next-line no-unused-vars
 import React from 'react';
 import moment from 'moment';
 import { render, screen, waitFor, fireEvent } from '@testing-library/react';
@@ -19,13 +18,21 @@ vi.mock('../CurrentPromptModal', () => ({
   default: () => <div data-testid="current-prompt-modal">Mocked Prompt Modal</div>,
 }));
 const wrapper = props => render(<CurrentPromptModal {...props} />);
-vi.mock('react-toastify', () => ({
-  toast: vi.fn(),
-  ToastContainer: () => <div data-testid="toast-container" />,
-}));
+
+vi.mock('react-toastify', () => {
+  const toast = vi.fn();
+  toast.success = vi.fn();
+  toast.error = vi.fn();
+
+  return {
+    toast,
+    ToastContainer: () => <div data-testid="toast-container" />,
+  };
+});
+
 const mockStore = configureStore([]);
 
-describe.skip('WeeklySummary page', () => {
+describe('WeeklySummary page', () => {
   describe('On page load', () => {
     it('displays loading indicator', () => {
       const props = {