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} />
             )}

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 : [];