From 0e65efefe4cefaf618bf365622d306995068bb7e Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 27 Jun 2025 17:35:16 +0530
Subject: [PATCH] Integrate Create and Update Components for Services and
 Activity Groups into MasterTable Component

---
 src/components/master/MasterModal.jsx | 16 ++++++++++++++++
 src/pages/master/MasterTable.jsx      |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index b3da6dd9..c65a75c0 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -17,6 +17,10 @@ import CreateCategory from "./CreateContactCategory";
 import CreateContactTag from "./CreateContactTag";
 import EditContactCategory from "./EditContactCategory";
 import EditContactTag from "./EditContactTag";
+import CreateServices from "./CreateServices";
+import EditServices from "./EditServices";
+import CreateActivityGroup from "./CreateActivityGroup";
+import EditActivityGroup from "./EditActivityGroup";
 
 
 const MasterModal = ({ modaldata, closeModal }) => {
@@ -118,6 +122,18 @@ const MasterModal = ({ modaldata, closeModal }) => {
             {modaldata.modalType === "Edit-Job Role" && (
               <EditJobRole data={modaldata.item} onClose={closeModal} />
             )}
+            {modaldata.modalType === "Services" && (
+              <CreateServices onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Services" && (
+              <EditServices data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Activity Group" && (
+              <CreateActivityGroup onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Activity Group" && (
+              <EditActivityGroup data={modaldata.item} onClose={closeModal} />
+            )}
             {modaldata.modalType === "Activity" && (
               <CreateActivity onClose={closeModal} />
             )}
diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx
index 0126b339..f199ea98 100644
--- a/src/pages/master/MasterTable.jsx
+++ b/src/pages/master/MasterTable.jsx
@@ -16,6 +16,11 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
     "tenantId",
     "checkLists",
     "isSystem",
+    "isActive",
+    "serviceId",
+    "servicesName",
+    "actitvityGroupId",
+    "activityGroupName"
   ];
 
   const safeData = Array.isArray(data) ? data : [];