Merge branch 'riri' into 'master'

permission role & user role

See merge request !201

src/container/Login.js

@@ -112,7 +112,7 @@ class Login extends Component {
                 }
                 this.props.history.push('/home/beranda')
               } else {
-                if (response.data.message == 'Incorrect password.') {
+                if (response.data.message == 'Password is Not Correct') {
                   this.setState({ errorPassword: true, msgPassword: response.data.message })
                 } else {
                   this.setState({ errorEmail: true, msgEmail: response.data.message })

src/container/MasterData/ReportItems.js

@@ -838,7 +838,7 @@ export default class ReportItems extends Component {
                                             <img src={Images.download} />
                                         </button>
                                     </a>
-                                    <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
+                                    <ReactTooltip border={true} id="visualisasi" place="bottom" type="light" effect="solid" />
                                     <a data-tip={'Visualization'} data-for="visualisasi">
                                         <button
                                             style={{
@@ -852,7 +852,7 @@ export default class ReportItems extends Component {
                                             <img src={Images.visualisasi} />
                                         </button>
                                     </a>
-                                    <ReactTooltip border={true} id="visualisasi" place="bottom" type="light" effect="solid" />
+                                    <ReactTooltip border={true} id="tambah" place="bottom" type="light" effect="solid" />
                                     {this.state.buttonCreate && (
                                         <a data-tip={'Add New'} data-for="tambah">
                                             <button

src/container/Otorisasi/UserRole.js

@@ -32,12 +32,16 @@ class UserRole extends Component {
       search: '',
       alert: false,
       tipeAlert: '',
-      messageAlert: ''
+      messageAlert: '',
+      buttonCreate: false,
+      buttonEdit: false,
+      load: false
     }
   }
 
   componentDidMount() {
     this.getRole()
+    this.getPermission()
   }
 
   closeEdit() {
@@ -75,6 +79,26 @@ class UserRole extends Component {
     })
   }
 
+  getPermission() {
+    let payload = {
+        menu: "user role"
+    }
+    api.create().getPermission(payload).then(response => {
+        console.log(response)
+        if (response.data) {
+            if (response.data.status === "success") {
+                this.setState({
+                    buttonCreate: response.data.data.create,
+                    buttonEdit: response.data.data.edit,
+                    load: true
+                })
+            } else {
+                this.setState({ load: true })
+            }
+        }
+    })
+}
+
   searchRole() {
     let payload = {
       "keyword": this.state.search
@@ -130,23 +154,25 @@ class UserRole extends Component {
           console.log(tableMeta);
           return (
             <div style={{ display: 'flex' }}>
-              <button
-                style={{
-                  backgroundColor: 'transparent',
-                  cursor: 'pointer',
-                  borderColor: 'transparent',
-                }}
-                // onClick={() => console.log(tableMeta.rowData[1])}
-                onClick={() => this.setState({ edit: true, indexData: tableMeta.rowData[1] })}
-              >
-                <div style={{ display: 'flex' }}>
-                  {tableMeta.rowData[2] !== "superadmin" ?
-                    <img src={Images.editCopy} /> :
-                    null
-                  }
-                </div >
+              {this.state.buttonEdit && (
+                <button
+                  style={{
+                    backgroundColor: 'transparent',
+                    cursor: 'pointer',
+                    borderColor: 'transparent',
+                  }}
+                  // onClick={() => console.log(tableMeta.rowData[1])}
+                  onClick={() => this.setState({ edit: true, indexData: tableMeta.rowData[1] })}
+                >
+                  <div style={{ display: 'flex' }}>
+                    {tableMeta.rowData[2] !== "superadmin" ?
+                      <img src={Images.editCopy} /> :
+                      null
+                    }
+                  </div >
 
-              </button>
+                </button>
+              )}
             </div >
           );
         }
@@ -206,44 +232,49 @@ class UserRole extends Component {
             </Alert>
         </Snackbar>
         <div>
-          <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
-            <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 }} />
-              <InputBase
-                style={{ width: '100%' }}
-                placeholder="Search"
-                value={this.state.search}
-                onChange={(e) => {
-                  this.setState({ search: e.target.value }, () => {
-                    if (this.state.search.length > 0) {
-                      this.searchRole()
-                    } else {
-                      this.getRole()
-                    }
-                  });
-                }}
-                inputProps={{ 'aria-label': 'naked' }}
-              />
-            </div>
-            {/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */}
-            <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
-              <a data-tip={'Create'} data-for="create">
-                <button
-                  style={{
-                    backgroundColor: 'transparent',
-                    cursor: 'pointer',
-                    borderColor: 'transparent',
-                    margin: 5
+          {this.state.load && (
+
+            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
+              <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 }} />
+                <InputBase
+                  style={{ width: '100%' }}
+                  placeholder="Search"
+                  value={this.state.search}
+                  onChange={(e) => {
+                    this.setState({ search: e.target.value }, () => {
+                      if (this.state.search.length > 0) {
+                        this.searchRole()
+                      } else {
+                        this.getRole()
+                      }
+                    });
                   }}
-                  onClick={() => this.setState({ add: true })}
-                >
-                  <img src={Images.add} />
-                </button>
-              </a>
-              <ReactTooltip border={true} id="create" place="bottom" type="light" effect="solid" />
+                  inputProps={{ 'aria-label': 'naked' }}
+                />
+              </div>
+              {/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */}
+              <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
+                {this.state.buttonCreate && (
+                  <a data-tip={'Create'} data-for="create">
+                    <button
+                      style={{
+                        backgroundColor: 'transparent',
+                        cursor: 'pointer',
+                        borderColor: 'transparent',
+                        margin: 5
+                      }}
+                      onClick={() => this.setState({ add: true })}
+                    >
+                      <img src={Images.add} />
+                    </button>
+                  </a>
+                )}
+                <ReactTooltip border={true} id="create" place="bottom" type="light" effect="solid" />
+              </div>
             </div>
-          </div>
+          )}
           <div style={{ padding: 25 }}>
             <MuiThemeProvider theme={getMuiTheme()}>
               <MUIDataTable