Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/container/Otorisasi/User.js

@@ -493,7 +493,7 @@ export default class UserRole extends Component {
     }, {
       name: "ID",
       options: {
-        filter: false,
+        // filter: false,
         customBodyRender: (val, tableMeta) => {
           return (
             <div style={{ display: 'flex' }}>
@@ -569,7 +569,7 @@ export default class UserRole extends Component {
         </Snackbar>
         {this.state.visibleUser ? <div>
           {this.state.load && (
-            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
+            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -180 }}>
               <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - User</label>
               {/* <div style={{ width: '60%', justifyContent: 'center', display: 'flex', borderWidth: 2, alignItems: 'center' }}>
                 <div style={{ width: '50%', backgroundColor: 'white', padding: 10, borderRadius: 7.5 }}>

src/container/Otorisasi/UserRole.js

@@ -196,7 +196,7 @@ class UserRole extends Component {
     }, {
       name: "ID",
       options: {
-        filter: false,
+        // filter: false,
         customBodyRender: (val, tableMeta) => {
           return (
             <div style={{ display: 'flex' }}>
@@ -251,7 +251,7 @@ class UserRole extends Component {
         <div>
           {this.state.load && (
 
-            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
+            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -180 }}>
               <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Role & Authorization</label>
               {/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />

src/library/CustomTable.js

@@ -55,8 +55,8 @@ exports.customTable = function () {
       MUIDataTableSearch: {
         main: {
           position: 'absolute',
-          top: "5px",
-          right: "5px",
+          top: "2px",
+          right: "2px",
           width: "350px !important",
           backgroundColor: "#f2f6fa",
           zIndex: "10",
@@ -344,206 +344,6 @@ exports.customTable2 = function () {
   }
 }
 
-exports.customTable3 = function () {
-  return {
-    typography: {
-      useNextVariants: true,
-    },
-    overrides: {
-      MUIDataTable: {
-        paper: {
-          position: 'relative',
-          // width: '100% !important',
-          boxShadow: "0 0 0 0 rgba(154,161,171,.15)",
-          border: "1px rgba(0,0,0,0.1) solid",
-          borderRadius: "10px",
-          overflow: "hidden",
-        },
-        // responsiveScroll: {
-        //   position: 'relative',
-        //   width: '100% !important',
-        // }
-        responsiveScrollMaxHeight: {
-          height: 650,
-          maxHeight: 650
-        },
-      },
-      MuiToolbar: {
-        root: {
-          position: 'relative',
-        }
-      },
-      MUIDataTableToolbar: {
-        root: {
-          position: 'relative',
-          padding: "0px 15px",  
-          backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
-        },
-        titleText: {
-          color: "#555"
-        },
-        icon: {
-          color: "#555 !important"
-        },
-        iconActive: {
-          color: "#555 !important"
-        },
-        left: {
-          flex: "0 0 auto !important"
-        },
-        actions: {
-          flex: "1 0 auto !important"
-        }
-      },
-      MUIDataTableSearch: {
-        main: {
-          position: 'absolute',
-          top: "0",
-          right: "-9px",
-          width: "350px !important",
-          backgroundColor: "#f2f6fa",
-          zIndex: "10",
-          textAlign: "right",
-          display: "block",
-        },
-        searchIcon: {
-          width: "50px !important",
-          color: "#555 !important",
-          display: "inline-block",
-          textAlign: "center",
-          verticalAlign: "top",
-        },
-        searchText: {
-          width: "calc(100% - 120px) !important",
-          marginRight: "10px",
-          color: "#555 !important",
-          display: "inline-block",
-          verticalAlign: "top",
-        },
-        clearIcon: {
-          width: "50px !important",
-          color: "#555 !important",
-          display: "inline-block",
-          verticalAlign: "top",
-        },
-      },
-      MuiTableCell: {
-        root: {
-          display: 'table-cell',
-          padding: 7,
-          paddingLeft: 25,
-          fontSize: '0.875rem',
-          textAlign: 'left',
-          fontFamily: "Roboto, Helvetica, Arial, sans-serif",
-          fontWeight: 400,
-          lineHeight: 1.43,
-          borderBottom: '1px solid rgba(224, 224, 224, 1)',
-          letterSpacing: '0.01071em',
-          verticalAlign: 'inherit',
-        }
-      },
-      MUIDataTableHead: {
-        main: {
-          position: 'relative',
-          backgroundColor: mainColor,
-          color: "#555",
-          // display: "flex",
-          // alignItems: "stretch"
-        },
-        fixedHeader: {
-          // position: "relative",
-          borderBottom: "1px rgba(0,0,0,0.1) solid",
-          backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
-          color: "#555",
-          padding: "10px 20px",
-          height: "auto"
-        },
-      },
-      MUIDataTableHeadRow: {
-        root: {
-          position: 'relative',
-          backgroundColor: mainColor,
-        }
-      },
-      MUIDataTableHeadCell: {
-        root: {
-          fontSize: "10pt",
-          fontWeight: "500",
-          color: "#555",
-          backgroundColor: secondColor,
-        },
-        fixedHeader: {
-          // position: "relative",
-          borderBottom: "1px rgba(0,0,0,0.1) solid",
-          backgroundColor: '#f2f6fa', //'rgba(0,76,151,0.05)',
-          color: "#555",
-          padding: "10px 25px",
-          height: "auto"
-        },
-        toolButton: {
-          display: "flex",
-          height: "auto",
-        },
-        data: {
-          display: "inline-block",
-          verticalAlign: "top",
-        },
-        sortActive: {
-          color: "#555"
-        },
-        sortAction: {
-          color: "#555",
-          display: "inline-block",
-          verticalAlign: "top",
-          MuiButtonBase: {
-            color: "#555",
-            root: {
-              color: "#555",
-            }
-          }
-        }
-      },
-      MUIDataTableBodyCell: {
-        root: {
-          position: 'relative',
-          fontSize: "13px",
-        }
-      },
-      MUIDataTableSelectCell: {
-        headerCell: {
-          backgroundColor: secondColor,
-          checkboxRoot: {
-            color: "#555",
-          }
-        },
-        checkboxRoot: {
-          color: "#555"
-        }
-      },
-      MuiInput: {
-        root: {
-          top: "5px",
-          color: "#555 !important",
-        },
-        underline: {
-          borderBottom: "1px #555 solid !important",
-        }
-      },
-      MuiSelect: {
-        root: {
-          top: "0",
-          color: "#555 !important",
-        },
-      }
-      // MuiIconButton: {
-      //   root: {
-      //     color: "#fff !important",
-      //   }
-      // }
-    }
-  }
-}
-
 exports.customOptions = function () {
   return {
     // selectableRows: false,
@@ -584,7 +384,7 @@ exports.customOptionsFixedColumn = function () {
     sort: false,
     responsive: 'scrollMaxHeight',
     viewColumns:false,
-    // overflowX: 'auto',
+    overflowX: 'auto',
     print: false,
     download: false,
     elevation: 5,