ui-soxo-bootstrap-core 2.4.25-dev.10 → 2.4.25-dev.11

package/core/models/roles/roles.js

@@ -155,6 +155,15 @@ class RolesAPI extends BaseAPI {
 
   /**
    * Cutsom Api for creating user
+  getRole = () => {
+    return ApiUtils.get({
+      url: `core-roles/get-core-roles?active=Y`,
+    });
+  };
+
+
+  /**
+   * Cutsom Api for updating user
    *
    * @param {*} values
    * @returns

package/core/models/users/components/user-add/user-add.js

@@ -8,7 +8,7 @@ import AsyncSelect from 'react-select/async';
 
 import { Table, Card, Button, JSONInput, GlobalContext } from './../../../../lib/';
 
-import { ModelsAPI, PagesAPI } from '../../..';
+import { ModelsAPI, PagesAPI, RolesAPI } from '../../..';
 
 import { UsersAPI } from '../../..';
 import DoctorAdd from '../../../doctor/components/doctor-add/doctor-add';
@@ -87,6 +87,8 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [departments, setDepartments] = useState([]);
   // doctor list state
   const [doctorList, setDoctorList] = useState([]);
+  // for role list
+  const [roles, setRoles] = useState([]);
 
   const [form] = Form.useForm();
 
@@ -134,6 +136,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
 
   useEffect(() => {
     loadUsers();
+
     setLoading(false);
 
     if (firmDetails) {
@@ -206,6 +209,24 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
       .finally(() => setLoading(false));
   };
 
+  /**
+   * get role lists
+   */
+  function getRoles() {
+    RolesAPI.getRole()
+      .then((res) => {
+        // if API returns { statusCode: 200, result: [...] }
+        if (Array.isArray(res.result)) {
+          setRoles(res.result.filter((r) => r.active === 'Y')); // optional: only active roles
+        } else {
+          setRoles([]);
+        }
+      })
+      .catch((err) => {
+        setRoles([]);
+      });
+  }
+
   /** Get Department List */
   const getDepartments = () => {
     setLoading(true);
@@ -282,6 +303,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
     getBranches();
     getDesignations();
     getDepartments();
+    getRoles();
     getDoctors(); // load doctor list
     getStaff();
   }, []);
@@ -558,6 +580,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                 <Input placeholder="Enter Email Address" />
               </Form.Item>
             </Col>
+
             <Col span={8}>
               {/* Mobile */}
               <Form.Item name="mobile" label="Mobile" rules={[{ required: true, message: 'Please enter your mobile number' }]}>
@@ -686,6 +709,17 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                 <Input placeholder="Enter User Group" />
               </Form.Item>
             </Col>
+            <Col span={8}>
+              <Form.Item name="role_id" label="Role" rules={[{ required: true, message: 'Please Input Role' }]}>
+                <Select placeholder="Select Role" style={{ width: '100%' }}>
+                  {roles.map((role) => (
+                    <Option key={role.id} value={role.id}>
+                      {role.name}
+                    </Option>
+                  ))}
+                </Select>
+              </Form.Item>
+            </Col>
 
             {/* <Form.Item name="mobile" label="Mobile" required={mobileRequired}>
             <Input placeholder="Enter Mobile" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.4.25-dev.10",
+  "version": "2.4.25-dev.11",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"