Merge branch 'deni-dev(pc)' into 'master'

Deni dev(pc)

See merge request !234

src/container/MasterData/Parameter/Parameter.js

@@ -646,6 +646,7 @@ export default class Parameter extends Component {
             name: "Action",
             options: {
                 sort: false,
+                filter: false,
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
@@ -796,9 +797,9 @@ export default class Parameter extends Component {
                 {this.state.visibleParameter === true ?
                     <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%', }}>Parameter</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' }}>
+                                {/* <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 }} />
                                     <InputBase
                                         style={{ width: '100%' }}
@@ -807,7 +808,7 @@ export default class Parameter extends Component {
                                         onChange={(e) => this.handleInputChange(e.target.value)}
                                         inputProps={{ 'aria-label': 'naked' }}
                                     />
-                                </div>
+                                </div> */}
                                 <div style={{ width: '30%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                     <a data-tip={'Download Template'} data-for="template">
                                         <button

src/container/MasterData/UnitBisnis.js

@@ -436,6 +436,7 @@ export default class UnitBisnis extends Component {
         const columns = [{
             name: "Action",
             options: {
+                filter: false,
                 sort: false,
                 customBodyRender: (val, tableMeta) => {
                     return (
@@ -510,9 +511,9 @@ export default class UnitBisnis extends Component {
                 {this.state.visibleUnitBisnis === true ?
                     this.state.load && (
                         <div>
-                            <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 - Business Unit</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' }}>
+                                {/* <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 }} />
                                     <InputBase
                                         style={{ width: '100%' }}
@@ -521,7 +522,7 @@ export default class UnitBisnis extends Component {
                                         onChange={(e) => this.handleInputChange(e.target.value)}
                                         inputProps={{ 'aria-label': 'naked' }}
                                     />
-                                </div>
+                                </div> */}
                                 <div style={{ width: '30%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                     <a data-tip={'Download Template'} data-for="template">
                                         <button
@@ -610,7 +611,7 @@ export default class UnitBisnis extends Component {
                                         theme={getMuiTheme()}
                                         data={this.state.rows}
                                         columns={this.state.cols}
-                                        options={options2}
+                                        options={options}
                                     />
                                 </MuiThemeProvider>
                             )}

src/library/CustomTable.js

@@ -99,6 +99,19 @@ exports.customTable = function () {
           verticalAlign: 'inherit',
         }
       },
+      MuiPopover: {
+        paper: {
+          outline: 0,
+          position: 'absolute',
+          maxWidth: 'calc(100% -32px)',
+          minWidth: 199,
+          maxHeight: 'calc(100% -32px)',
+          minHeight: 16,
+          overflowX: 'hidden',
+          overflowY: 'auto',
+          width: 400
+        }
+      },
       MUIDataTableFilterList: {
         root: {
           backgroundColor: "#f2f6fa",