Merge pull request #30 from itsvick/main

Issue #000 fix: Updated cohort API
tekdi · Nov 22, 2023 · 01fa19f · 01fa19f
2 parents 7ff4b25 + 9f780da
commit 01fa19f
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 25 deletions.
diff --git a/packages/admin/src/pages/CreateCohort.js b/packages/admin/src/pages/CreateCohort.js
@@ -3,34 +3,36 @@ import {
   Layout,
   overrideColorTheme,
   fieldsRegistryService,
+  cohortRegistryService,
 } from "@shiksha/common-lib";
 import React, { useCallback, useEffect, useState } from "react";
 import manifest from "../manifest.json";
 import { useTranslation } from "react-i18next";
 import Form from "@rjsf/core";
 import validator from "@rjsf/validator-ajv8";
-import { Box, Container } from "native-base";
+import { Box, Container, useToast } from "native-base";
+import { useNavigate } from "react-router-dom";
 
 let schema = {
   title: "Add Cohort",
   type: "object",
-  required: ["name", "type", "createdBy", "updatedBy"],
+  required: ["name", "type", "status", "createdBy", "updatedBy"],
   properties: {
     name: { type: "string", title: "Name", default: "" },
     type: { type: "string", title: "Type", default: "" },
-    // status: {
-    //   type: "string",
-    //   anyOf: [
-    //     {
-    //       title: "Active",
-    //       enum: [1],
-    //     },
-    //     {
-    //       title: "Inactive",
-    //       enum: [2],
-    //     },
-    //   ],
-    // },
+    status: {
+      type: "string",
+      anyOf: [
+        {
+          title: "Published",
+          enum: ["published"],
+        },
+        {
+          title: "Draft",
+          enum: ["draft"],
+        },
+      ],
+    },
     // class: {
     //   type: "string",
     //   title: "Class",
@@ -59,14 +61,17 @@ let uiSchema = {
 };
 
 function CreateCohort({ footerLinks, appName }) {
+  const navigate = useNavigate();
   const { t } = useTranslation();
+  const toast = useToast();
   const [formData, setFormData] = useState({ name: "My First Cohort" });
   const [showForm, setShowForm] = useState(false);
   const [formSchema, setFormSchema] = useState({
     schema: schema,
     uiSchema: uiSchema,
   });
   const [fields, setFields] = useState([]);
+  const [fieldResponse, setFieldResponse] = useState({});
   let userIdentifier = localStorage.getItem("id");
 
   useEffect(() => {
@@ -95,12 +100,15 @@ function CreateCohort({ footerLinks, appName }) {
       .then((response) => {
         console.log("response", response);
         let extraFields = [];
+        let fieldRes = {};
         response.forEach((field) => {
           if (field.render) {
             extraFields.push(JSON.parse(field.render));
+            fieldRes[field.name] = field;
           }
         });
         setFields(extraFields);
+        setFieldResponse(fieldRes);
       })
       .catch((error) => {
         console.log(error);
@@ -169,13 +177,37 @@ function CreateCohort({ footerLinks, appName }) {
 
   const handleSubmit = (data) => {
     console.log("data", data);
-    // cohortService
-    //   .createCohort(data, {
-    //     tenantid: process.env.REACT_APP_TENANT_ID,
-    //   })
-    //   .then((response) => {
-    //     console.log("response", response);
-    //   });
+    const fieldKeys = fields.map((obj) => Object.keys(obj)[0]);
+    let corePayload = {};
+    let fieldsPayload = "";
+    const formData = new FormData();
+    for (let key in data) {
+      if (fieldKeys.includes(key)) {
+        if (fieldsPayload === "") {
+          fieldsPayload = `${fieldResponse[key].fieldId}:${data[key]}`;
+        } else {
+          fieldsPayload = `${fieldsPayload}|${fieldResponse[key].fieldId}:${data[key]}`;
+        }
+      } else {
+        corePayload[key] = data[key];
+        formData.append(key, data[key]);
+      }
+    }
+    formData.append("fieldValues", fieldsPayload);
+    cohortRegistryService
+      .create(formData, {
+        tenantid: process.env.REACT_APP_TENANT_ID,
+      })
+      .then((response) => {
+        console.log("response", response);
+        if (!toast.isActive("cohort-created")) {
+          toast.show({
+            id: "cohort-created",
+            title: "Cohort created successfully!",
+          });
+        }
+        navigate("/admin");
+      });
   };
   const colors = overrideColorTheme();
   return (

diff --git a/packages/common-lib/src/services/cohortRegistryService.js b/packages/common-lib/src/services/cohortRegistryService.js
@@ -137,19 +137,19 @@ export const getCohortMembers = async (data = {}, header = {}) => {
 export const create = async (data, header = {}) => {
   let headers = {
     ...header,
+    'Content-Type': 'multipart/form-data',
     Authorization: 'Bearer ' + localStorage.getItem('token')
   }
 
   const result = await post(
     process.env.REACT_APP_API_URL + '/cohort',
     data,
     {
-      headers: headers?.headers ? headers?.headers : {}
+      headers
     }
   )
   if (result.data) {
-    let { cohort } = result.data?.data?.result
-    return cohort
+    return result.data?.data;
   } else {
     return false
   }