Activities, Admin Api's and Modal Edit

db.js

@@ -6,7 +6,7 @@ let dbConnection
 module.exports = {
     connectToDb : (cb)=>{
         // MongoClient.connect('mongodb://localhost:27017/nisum-scorecard')
-        MongoClient.connect('mongodb+srv://vsingamchetty:user1234@cluster0.ch8kwyt.mongodb.net/nisumscorecard_testing?connectTimeoutMS=30000&socketTimeoutMS=30000')
+        MongoClient.connect('mongodb+srv://vsingamchetty:user1234@cluster0.ch8kwyt.mongodb.net/nisumscorecard?connectTimeoutMS=30000&socketTimeoutMS=30000')
         // mongodb+srv://vsingamchetty:user1234@cluster0.ch8kwyt.mongodb.net/
         .then((client)=>{
             dbConnection=client.db()

server.js

@@ -62,7 +62,6 @@ app.post('/login', async (req, res) => {
   }
 });
 
-
 //to get activities to display
 app.get("/activities", async(req, res) => {
   await db.collection("activities_master")
@@ -133,7 +132,6 @@ app.post("/getreportees",async (req, res) => {
     .catch((error) => res.status(401).send(error));
 });
 
-
 //Example of post Data
 /*
 {
@@ -522,7 +520,7 @@ app.post('/getmaster-data',(req, res) => {
             res.status(201).json(result);
         })
         .catch(error => res.status(500).json({ error: "Could not fetch the Role / Status of Employee" }));
-}); 
+});
 
 // Delete Activity details API endpoint
 // {
@@ -547,7 +545,7 @@ app.put('/deleteActivity', checkEmpIdActivityExists, async (req, res) => {
 
 // Add MasterActivity details API endpoint
 // {
-//   "type": "duties",
+//   "atype": "duties",
 //   "aName": "submission test",
 //   "appreciate": "true",
 //   "depreciate": "false"
@@ -569,8 +567,9 @@ app.post('/addMasterActivity', async (req, res) => {
 //   "ObjectId": "660ba3ab707f841402133801"
 // }
 app.put('/deleteMasterActivity', async (req, res) => {
-  const Id = req.body.ObjectId;
-  await db.collection('activities_master').deleteOne({ _id: new ObjectId(Id) }).then((result) => {
-    res.send(result);}).catch((error) => res.status(401).send(error));;
+  const Id = req.body.aId;
+  await db.collection('activities_master').deleteOne({aId:aId}).then((result) => {
+    res.send(result);}).catch((error) => res.status(401).send(error));
 }); 
 
+

src/components/modal/index.jsx

@@ -20,7 +20,7 @@ export default function MyModal({ visible, onClose, type, handleAddActivity }) {
 
   const getActivitysList = async (type) => {
     const activities = await axios.get(`${base_url}/activities`)
-    const response = await activities.data.filter((item) => item.type == type)
+    const response = await activities.data.filter((item) => item.atype == type)
     setActivitiesList(response)
     setModalLoading(false)
   }