From 853edde2d422cb818cc0b0c214ce992e927057a2 Mon Sep 17 00:00:00 2001
From: wahyun <wahyumind01@gmail.com>
Date: Fri, 17 May 2024 15:58:47 +0700
Subject: [PATCH] fix: company_id is null & default value in default page

---
 src/views/Master/MasterRoles/DialogForm.js | 5 +++++
 src/views/Master/MasterRoles/index.js      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/views/Master/MasterRoles/DialogForm.js b/src/views/Master/MasterRoles/DialogForm.js
index 32ce293..caad24e 100644
--- a/src/views/Master/MasterRoles/DialogForm.js
+++ b/src/views/Master/MasterRoles/DialogForm.js
@@ -112,6 +112,10 @@ class DialogForm extends Component {
       alert("Description cannot be empty!");
       return true;
     }
+    if (!this.state.selectedMenu || this.state.selectedMenu === "") {
+      alert("Default page cannot be empty!");
+      return true;
+    }
   }
 
   handleSave = () => {
@@ -216,6 +220,7 @@ class DialogForm extends Component {
                 onChange={(e) => {
                   this.setState({ selectedMenu: e.target.value });
                 }}>
+                <option value="" selected disabled>Select default page</option>
                 {this.state.menu.map((item) => (
                   <option key={item.id} value={item.id}>
                     {item.name}
diff --git a/src/views/Master/MasterRoles/index.js b/src/views/Master/MasterRoles/index.js
index 2578efe..123d531 100644
--- a/src/views/Master/MasterRoles/index.js
+++ b/src/views/Master/MasterRoles/index.js
@@ -51,6 +51,7 @@ class index extends Component {
 			all_project: props.all_project || null,
 			hierarchy: props.hierarchy || [],
 			user_name: props.user_name || '',
+      company_id: props.company_id || 0,
 			config: {
 				headers: {
 					Authorization: `Bearer ${props.token || ''}`,