Merge pull request 'staging upload 23-04-04' (#7) from staging into master

Reviewed-on: ordo/adw-frontend#7

src/containers/DefaultLayout/DefaultLayout.js

@@ -250,11 +250,9 @@ class DefaultLayout extends Component {
 								<i className="nav-icon fa fa-user-circle"></i>  {localStorage.getItem('user_name')}
 							</DropdownToggle>
 							<DropdownMenu right>
-								<DropdownItem>
+								<DropdownItem color="primary" size="sm" onClick={() => handleChangeLng("id")}>ID</DropdownItem>
-									<Button color="primary" outline size="sm" onClick={() => handleChangeLng("id")}>ID</Button>
+                <DropdownItem color="success" size="sm" onClick={() => handleChangeLng("en")}>EN</DropdownItem>
-									<Button color="success" outline size="sm" onClick={() => handleChangeLng("en")}>EN</Button>
+								<DropdownItem href="#/settings"><i className="fa fa-user"></i>Profile</DropdownItem>
-								</DropdownItem>
-								<DropdownItem href="#/settings"><i class="fa fa-user"></i>Profile</DropdownItem>
 								<DropdownItem onClick={e => this.signOut(e)}><i className="fa fa-sign-out"></i> Logout</DropdownItem>
 							</DropdownMenu>
 						</UncontrolledDropdown>

src/views/SimproV2/CreatedProyek/DIalogHierarchy.js

@@ -8,7 +8,6 @@ import SweetAlert from 'react-bootstrap-sweetalert';
 import { HIERARCHY_FTTH_DELETE, HIERARCHY_FTTH_SEARCH, USER_LIST } from '../../../const/ApiConst';
 import axios from "../../../const/interceptorApi"
 import { NotificationContainer, NotificationManager } from 'react-notifications';
-import DialogForm from './DialogFormHierarchy';
 import DialogUserGantt from './DialogUserGantt';
 
 const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName }) => {
@@ -224,12 +223,6 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek
       >
         Delete this data
       </SweetAlert>
-      <DialogForm
-        idTask={idTask}
-        openDialog={openDialogForm}
-        toggleDialog={toggleDialogForm}
-        closeDialog={closeDialogForm}
-      />
 
       <DialogUserGantt
         idGantt={idGantt}

src/views/SimproV2/ResourceWorker/index.js

@@ -429,7 +429,7 @@ const ResourceWorker = ({ params }) => {
       getDataUser();
       NotificationManager.success(`Data resource berhasil diedit`, 'Success!!');
     } else {
-      NotificationManager.error(`Data resource gagal di edit`, `Failed!!`);
+      NotificationManager.error(`${result.data.message}`, `Failed!!`);
     }
   }