update menu company page

src/views/Master/MasterCompany/DialogForm.js

@@ -11,6 +11,7 @@ import DialogFormMenu from './FormMenu';
 import 'antd/dist/antd.css';
 import { useTranslation } from 'react-i18next';
 import axios from "../../../const/interceptorApi"
+import moment from 'moment';
 import {
   USER_SEARCH, MENU_COMPANY_DELETE, USER_DELETE, ROLE_SEARCH, COMPANY_MANAGEMENT_GET_ID, MENU_COMPANY_SEARCH, BASE_SIMPRO_LUMEN_IMAGE
 } from '../../../const/ApiConst';
@@ -39,6 +40,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
   const [about, setAbout] = useState('')
   const [htmlTitle, setHtmlTitle] = useState('')
   const [appName, setAppName] = useState('')
+  const [typeAccount, setTypeAccount] = useState('')
   const [baseUrl, setBaseUrl] = useState([])
   const [statusCompany, setStatusCompany] = useState(true)
   const [template, setTemplate] = useState('')
@@ -95,8 +97,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
       setStatusCompany(dataEditCompany.is_active)
       setTemplate(dataEditCompany.template_id)
       setBaseUrl(dataEditCompany.base_url ? dataEditCompany.base_url : [])
-        if(dataEditCompany.base_url)
+      if (dataEditCompany.base_url) {
-        {
         setAvailableBaseUrl(true)
       } else {
         setAvailableBaseUrl(false)
@@ -391,7 +392,9 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
         app_name: appName,
         base_url: baseUrl.length == 0 ? null : baseUrl,
         is_active: statusCompany,
-                template_id: parseInt(template)
+        template_id: parseInt(template),
+        type_account: typeAccount,
+        date_register: moment()
       }
       data.imageLogin = logoLogin ? logoLogin : null;
       data.imageHeader = logoHeader ? logoHeader : null;
@@ -415,6 +418,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
         base_url: baseUrl.length == 0 ? null : baseUrl,
         is_active: statusCompany,
         template_id: parseInt(template),
+        type_account: typeAccount,
       }
       data.imageLogin = logoLogin ? logoLogin : null;
       data.imageHeader = logoHeader ? logoHeader : null;
@@ -576,13 +580,9 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
     }
   };
 
-    const truncateText = (text, maxLength) => {
+  const onChangeType = (val) => {
-      if (text.length > maxLength) {
+    setTypeAccount(val)
-        return text.substring(0, maxLength) + '...';
   }
-      return text;
-    };
-
   const toggleModal = () => {
     setModalOpen(!modalOpen);
   };
@@ -684,6 +684,28 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company
               </FormGroup>
             </Col>
           </Row>
+          <Row>
+            <Col md={6}>
+              <FormGroup>
+                <Label className="capitalize">
+                  {t('status')}<span style={{ color: "red" }}>*</span>
+                </Label>
+                <Select
+                  showSearch
+                  filterOption={(inputValue, option) =>
+                    option.children.toLowerCase().includes(inputValue.toLowerCase())
+                  }
+                  value={typeAccount}
+                  defaultValue={typeAccount}
+                  onChange={onChangeType}
+                  style={{ width: "100%" }}
+                >
+                  <Option value="Company">Company</Option>
+                  <Option value="Personal">Personal</Option>
+                </Select>
+              </FormGroup>
+            </Col>
+          </Row>
           <Row>
             <Col md={6}>
               <Col md={12}>

src/views/Master/MenuCompany/DialogMasterMenu.js

@@ -36,7 +36,8 @@ const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
     const [tooltipTambah, setTooltipTambah] = useState(false)
     const [totalPage, setTotalPage] = useState(0)
     const [typeDialog, setTypeDialog] = useState('Save')
-    const [loading, SetLoading] = useState(false)
+    const [loading, setLoading] = useState(false)
+    const [openDialogMasterMenu, setOpenDialogFormMenu] = useState(false)
     const { t } = useTranslation()
     // const pageName = params.name;
 
@@ -84,7 +85,7 @@ const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
     }
 
     const getDataMenu = async () => {
-        SetLoading(true)
+        setLoading(true)
         let start = 0;
 
         if (currentPage !== 1 && currentPage > 1) {
@@ -114,17 +115,17 @@ const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
         if (result && result.data && result.data.code == 200) {
             setDatatable(result.data.data);
             setTotalPage(result.data.totalRecord);
-            SetLoading(false)
+            setLoading(false)
         } else {
             NotificationManager.error('Gagal Mengambil Data!!', 'Failed');
-            SetLoading(false)
+            setLoading(false)
         }
     }
 
     const handleOpenDialog = async (type) => {
         await setTypeDialog(type)
         getDataAllMenu();
-        // setOpenDialog(true)
+        setOpenDialogFormMenu(true)
     }
 
     const handleCloseDialog = (type, data) => {
@@ -134,19 +135,16 @@ const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
             editMenu(data);
         }
         setDataEdit([])
-        // setOpenDialog(false)
+        setOpenDialogFormMenu(false)
     }
 
     const toggleAddDialog = () => {
-        // setOpenDialog(!openDialog)
+        setOpenDialogFormMenu(!openDialog)
     }
 
     const handleCancel = () => {
         closeDialog('cancel', 'none')
-        // setDatatable([]);
+        setLoading(false);
-        // setBaseUrl([]);
-        // setAvailableBaseUrl(false);
-        // setLoading(false);
     }
 
 
@@ -334,15 +332,15 @@ const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
             >
                 {t('deleteMsg')}
             </SweetAlert>
-            {/* <DialogForm
+            <DialogForm
-                openDialog={openDialog}
+                openDialog={openDialogMasterMenu}
                 closeDialog={handleCloseDialog}
                 toggleDialog={() => toggleAddDialog}
                 typeDialog={typeDialog}
                 dataEdit={dataEdit}
                 clickOpenModal={clickOpenModal}
                 dataMenu={allDataMenu}
-            /> */}
+            />
             <Modal size="xl" fullscreen="xl" scrollable={true} isOpen={openDialog} toggle={toggleDialog}>
                 <ModalHeader className="capitalize withBtn" toggle={closeDialog} style={{ width: "100%" }}>
                     MASTER MENU

src/views/Master/MenuCompany/index.js

@@ -414,9 +414,6 @@ const Index = ({ params, ...props }) => {
                   <Button id="TooltipMasterMenu" color="warning" onClick={() => handleOpenDialogMasterMenu()}><i className="fa fa-table"></i></Button>
                 </Tooltip>
               }
-              <Tooltip title={t('menuAdd')}>
-                <Button style={{ marginLeft: "5px" }} id="TooltipTambah" color="success" onClick={() => handleOpenDialog('Save')}><i className="fa fa-plus"></i></Button>
-              </Tooltip>
               <Tooltip title={t('exportExcel')}>
                 <Button style={{ marginLeft: "5px" }} id="TooltipExport" color="primary" onClick={() => handleExportExcel()}><i className="fa fa-print"></i></Button>
               </Tooltip>