Merge pull request #3841 from OneCommunityGlobal/anjali-email-fix-separate

Meenashi Takeover Anjali Phase 3 - Optimize Follow-Up Email Templates and Feedback Form

Author: one-community

package-lock.json

@@ -74,7 +74,6 @@
     "rc-slider": "^11.1.8",
     "react": "^18.3.1",
     "react-autosuggest": "^10.1.0",
-    "react-beautiful-dnd": "^13.1.1",
     "react-bootstrap": "^1.0.1",
     "react-chartjs-2": "^5.3.0",
     "react-circular-progressbar": "^2.1.0",

package.json

@@ -0,0 +1,30 @@
+import axios from 'axios';
+import { ENDPOINTS } from '../../utils/URL';
+import {toast} from 'react-toastify';
+import { ADD_EVENT_FEEDBACK } from "../../constants/communityPortal/eventFeedbackConstant";
+
+export const addEventFeedback = (eventFeedback) => {
+  return async dispatch => {
+    try {
+      const res = await axios
+      .post(ENDPOINTS.CP_ADD_EVENT_FEEDBACK, eventFeedback);
+       if (res.status === 201) 
+        toast.success('Event Feedback submitted successfully!');
+        dispatch ({
+    type:ADD_EVENT_FEEDBACK,
+    payload:eventFeedback
+  });
+      }
+      catch(error) {
+        if (error.response.status === 500)
+          toast.error('Error submitting Event Feedback. Please try again.');
+        else if (error.response.status === 404 ||error.response.status === 403 || error.response.status === 400)
+        toast.error('Permission or Validation Error. Please check your input or access rights');
+        else {
+        toast.error('Error submitting Event Feedback. Please try again.');
+        }
+      };
+
+    }
+  
+}

src/actions/communityPortal/eventFeedback.js

@@ -20,20 +20,17 @@ function UtilizationChart() {
 
   const fetchChartData = async () => {
     try {
-      const response = await axios.get(
-        `${process.env.REACT_APP_APIENDPOINT}/tools/utilization`,
-        {
-          params: {
-            startDate,
-            endDate,
-            tool: toolFilter,
-            project: projectFilter,
-          },
-          headers: {
-            Authorization: localStorage.getItem('token'),
-          },
-        }
-      );
+      const response = await axios.get(`${process.env.REACT_APP_APIENDPOINT}/tools/utilization`, {
+        params: {
+          startDate,
+          endDate,
+          tool: toolFilter,
+          project: projectFilter,
+        },
+        headers: {
+          Authorization: localStorage.getItem('token'),
+        },
+      });
       setToolsData(response.data);
     } catch (err) {
       setError('Failed to load utilization data.');
@@ -143,10 +140,7 @@ function UtilizationChart() {
               className={styles.datepickerWrapper}
             />
 
-            <button
-              onClick={handleApplyClick}
-              className={styles.button}
-            >
+            <button onClick={handleApplyClick} className={styles.button}>
               Apply
             </button>
           </div>

src/components/BMDashboard/UtilizationChart/UtilizationChart.jsx

@@ -1,11 +1,9 @@
 import { useEffect, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import hasPermission from '~/utils/permissions';
 import './Collaboration.css';
 import { toast } from 'react-toastify';
 import { ApiEndpoint } from '~/utils/URL';
+import { useSelector } from 'react-redux';
 import OneCommunityImage from '../../assets/images/logo2.png';
-import JobReorderModal from './JobReorderModal';
 
 function Collaboration() {
   const [query, setQuery] = useState('');
@@ -20,12 +18,8 @@ function Collaboration() {
   const [showSearchResults, setShowSearchResults] = useState(false);
   const [showTooltip, setShowTooltip] = useState(false);
   const [tooltipPosition, setTooltipPosition] = useState(null);
-  const [isReorderModalOpen, setIsReorderModalOpen] = useState(false);
 
   const darkMode = useSelector(state => state.theme.darkMode);
-  const dispatch = useDispatch();
-  const userHasPermission = permission => dispatch(hasPermission(permission));
-  const canReorderJobs = userHasPermission('reorderJobs');
 
   useEffect(() => {
     const tooltipDismissed = localStorage.getItem('tooltipDismissed');
@@ -51,18 +45,7 @@ function Collaboration() {
       }
 
       const data = await response.json();
-
-      const sortedJobs = data.jobs.sort((a, b) => {
-        if (a.displayOrder !== b.displayOrder) {
-          return a.displayOrder - b.displayOrder;
-        }
-        if (a.featured !== b.featured) {
-          return b.featured - a.featured; // Featured jobs first
-        }
-        return new Date(b.datePosted) - new Date(a.datePosted);
-      });
-
-      setJobAds(sortedJobs);
+      setJobAds(data.jobs);
       setTotalPages(data.pagination.totalPages);
     } catch (error) {
       toast.error('Error fetching jobs');
@@ -152,15 +135,6 @@ function Collaboration() {
     setTooltipPosition('category');
   };
 
-  const toggleReorderModal = () => {
-    setIsReorderModalOpen(prevState => !prevState);
-  };
-
-  const handleJobsReordered = () => {
-    // Refresh job listings after reordering
-    fetchJobAds(query, category);
-  };
-
   useEffect(() => {
     fetchJobAds(query, category);
     fetchCategories();
@@ -191,17 +165,6 @@ function Collaboration() {
                 <button className="btn btn-secondary" type="submit" onClick={handleSubmit}>
                   Go
                 </button>
-
-                {/* Only show reorder button for users with permission */}
-                {canReorderJobs && (
-                  <button
-                    className="btn btn-secondary reorder-button"
-                    type="button"
-                    onClick={toggleReorderModal}
-                  >
-                    Edit to Reorder
-                  </button>
-                )}
               </form>
               {showTooltip && tooltipPosition === 'search' && (
                 <div className="job-tooltip">
@@ -314,14 +277,6 @@ function Collaboration() {
             )}
           </div>
         </div>
-
-        {/* Reorder Modal */}
-        <JobReorderModal
-          isOpen={isReorderModalOpen}
-          toggle={toggleReorderModal}
-          onJobsReordered={handleJobsReordered}
-          darkMode={darkMode}
-        />
       </div>
     );
   }
@@ -350,17 +305,6 @@ function Collaboration() {
               <button className="btn btn-secondary" type="submit" onClick={handleSubmit}>
                 Go
               </button>
-
-              {/* Only show reorder button for users with permission */}
-              {canReorderJobs && (
-                <button
-                  className="btn btn-secondary reorder-button"
-                  type="button"
-                  onClick={toggleReorderModal}
-                >
-                  Edit to Reorder
-                </button>
-              )}
             </form>
             {showTooltip && tooltipPosition === 'search' && (
               <div className="job-tooltip">
@@ -518,14 +462,6 @@ function Collaboration() {
           </div>
         )}
       </div>
-
-      {/* Reorder Modal */}
-      <JobReorderModal
-        isOpen={isReorderModalOpen}
-        toggle={toggleReorderModal}
-        onJobsReordered={handleJobsReordered}
-        darkMode={darkMode}
-      />
     </div>
   );
 }