Merge pull request #8 from chaitanyakole/test_branch

Changed column name create role to Enable role and other text changes
tekdi · Dec 5, 2024 · a033680 · a033680
2 parents 33957fd + 6dc0b87
commit a033680
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -139,7 +139,8 @@
     "ADD_NEW_TENANT": "Add New Tenant",
     "CREATE_ROLE": "Create Role",
     "USER_DELETE_FAILED": "User deletion failed",
-    "ASSIGN_ROLE": "Assign Role"
+    "ASSIGN_ROLE": "Assign Role",
+    "ENABLE_ROLE": "Enable Role"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -32,7 +32,7 @@ interface DynamicFormProps {
   onChange: (event: IChangeEvent<any>) => void;
   onError: (errors: any) => void;
   showErrorList: boolean;
-  id?: string; // Optional id prop
+  id?: string;
 
   widgets?: {
     [key: string]: React.FC<WidgetProps<any, RJSFSchema, any>>;
@@ -127,9 +127,10 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
 
   const transformErrors = (errors: any) => {
     const currentYearPattern = new RegExp(getCurrentYearPattern());
+
     errors.length === 0 ? setNoError(true) : setNoError(false);
 
-    let updatedUiSchema: UiSchema = { ...uiSchema }; // Ensure the type is UiSchema
+    let updatedUiSchema: UiSchema = { ...uiSchema };
 
     return errors?.map((error: any) => {
       const property = error.property ? error.property.substring(1) : ""; // Check if error.property exists
@@ -266,7 +267,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   };
 
   useEffect(() => {
-    // setSubmittedButtonStatus(false);
+    setSubmittedButtonStatus(false);
   }, []);
   return (
     <div className="shreyas shinde">

diff --git a/src/components/HeaderComponent.tsx b/src/components/HeaderComponent.tsx
@@ -14,7 +14,6 @@ import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
 import { QueryKeys, Role, Status } from "@/utils/app.constant";
-import FiberManualRecordIcon from "@mui/icons-material/FiberManualRecord";
 import {
   getCenterList,
   getStateBlockDistrictList,

diff --git a/src/components/KaTableComponent.tsx b/src/components/KaTableComponent.tsx
@@ -180,7 +180,7 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
                         }}
                       >
                         <Typography variant="body2" fontFamily={"Poppins"}>
-                          {t("COMMON.CREATE_ROLE")}
+                          {t("COMMON.ENABLE_ROLE")}
                         </Typography>
                       </Button>
                     </Tooltip>

diff --git a/src/components/TenantSchema.json b/src/components/TenantSchema.json
@@ -5,12 +5,11 @@
   "required": ["name", "domain"],
   "properties": {
     "name": {
-      "title": "Full Name",
+      "title": "Tenant Name",
       "type": "string",
-      "pattern": "^[a-zA-Z][a-zA-Z ]*[a-zA-Z]$",
       "fieldId": null,
       "validation": [],
-      "description": "Enter your full name; only letters and spaces are allowed."
+      "description": "Enter tenant name."
     },
     "domain": {
       "title": "Domain",

diff --git a/src/data/tableColumns.ts b/src/data/tableColumns.ts
@@ -89,7 +89,7 @@ export const getTenantTableData = (t: any, isMobile: boolean) => {
     //   titleKey: "TABLE_TITLE.ARCHIVED_LEARNERS",
     //   width: 130,
     // },
-    { key: "roleDefine", titleKey: "COMMON.CREATE_ROLE", width: 130 },
+    { key: "roleDefine", titleKey: "COMMON.ENABLE_ROLE", width: 130 },
     { key: "actions", titleKey: "TABLE_TITLE.ACTIONS", width: 125 },
   ];
 

diff --git a/src/pages/cohortSchema.json b/src/pages/cohortSchema.json
@@ -3,12 +3,11 @@
   "required": ["name", "status", "type"],
   "properties": {
     "name": {
-      "title": "Full Name",
+      "title": "Cohort Name",
       "type": "string",
-      "pattern": "^[a-zA-Z][a-zA-Z ]*[a-zA-Z]$",
       "fieldId": null,
       "validation": [],
-      "description": "Enter the full name, using only letters and spaces."
+      "description": "Enter the cohort name."
     },
     "type": {
       "title": "Type",

diff --git a/src/pages/cohorts.tsx b/src/pages/cohorts.tsx
@@ -201,7 +201,7 @@ const Center: React.FC = () => {
     name: {
       "ui:widget": "text",
       "ui:placeholder": "Enter your full name",
-      "ui:help": "Full name, only letters and spaces are allowed.",
+      "ui:help": "Full name, numbers, letters and spaces are allowed.",
     },
     username: {
       "ui:widget": "text",

diff --git a/src/pages/tenant.tsx b/src/pages/tenant.tsx
@@ -165,7 +165,7 @@ const Tenant: React.FC = () => {
   const [selectedRowData, setSelectedRowData] = useState<any>("");
   const [roles, setRoles] = useState([]);
   const [updateBtnDisabled, setUpdateBtnDisabled] = React.useState(true);
-  const [addBtnDisabled, setAddBtnDisabled] = React.useState(true);
+  const [addBtnDisabled, setAddBtnDisabled] = React.useState(false);
   const [addFormData, setAddFormData] = useState({});
 
   const uiSchema = {
@@ -188,7 +188,7 @@ const Tenant: React.FC = () => {
   const cohortUiSchema = {
     name: {
       "ui:widget": "text",
-      "ui:placeholder": "Enter full name",
+      "ui:placeholder": "Enter Cohort Name",
       "ui:options": {},
     },
     type: {
@@ -197,7 +197,7 @@ const Tenant: React.FC = () => {
       // "ui:options": {
       //   defaultValue: "cohort",
       // },
-      "ui:disabled": true, // This will make the field readonly
+      "ui:disabled": true,
     },
     district: {
       "ui:widget": "text",
@@ -1216,8 +1216,8 @@ const Tenant: React.FC = () => {
             <Box
               style={{
                 display: "flex",
-                justifyContent: "right", // Centers the button horizontally
-                marginTop: "20px", // Adjust margin as needed
+                justifyContent: "right",
+                marginTop: "20px",
               }}
               gap={2}
             >
@@ -1236,18 +1236,19 @@ const Tenant: React.FC = () => {
               >
                 {t("COMMON.CANCEL")}
               </Button>
+
               <Button
                 variant="contained"
                 type="submit"
-                form="update-center-form" // Add this line
+                form="update-center-form"
+                disabled={addBtnDisabled}
                 sx={{
                   fontSize: "14px",
                   fontWeight: "500",
                   width: "auto",
                   height: "40px",
                   marginLeft: "10px",
                 }}
-                disabled={addBtnDisabled}
                 onClick={() => {
                   setSubmittedButtonStatus(true);
                 }}

diff --git a/src/pages/userSchema.json b/src/pages/userSchema.json
@@ -8,7 +8,6 @@
       "title": "Full Name",
       "fieldId": null,
       "type": "string",
-      "pattern": "^[a-zA-Z][a-zA-Z ]*[a-zA-Z]$",
       "validation": []
     },
     "mobileNo": {