Resolve conflicts

src/const/ApiConst.js

@@ -119,6 +119,7 @@ export const TOKEN_ADW =
 
 export let BASE_OSPRO = "https://project-api.ospro.id";
 // export let BASE_OSPRO = "http://localhost:8444/adw-backend";
+
 export let BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`;
 export let BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`;
 export let BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`;

src/views/SimproV2/CreatedProyek/DialogGantt.js

@@ -247,6 +247,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
           ) : (
             <div>Gantt Project {proyekName}</div>
           )}
+          <div style={{ display:'flex'}}>
             <Select
               placeholder='Search Gantt Name'
               showSearch
@@ -254,7 +255,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
                 option.children.toLowerCase().includes(inputValue.toLowerCase())
               }
               onChange={(val) => setSearchGantt(val)}
-            style={{ width: 200 }}
+              style={{ width: 200, marginRight:'10px' }}
             >
               {dataGantt.map((res) => (
                 <Option key={res.id} value={res.id}>
@@ -262,13 +263,12 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
                 </Option>
               ))}
             </Select>
-
             {!hierarchyId && (
               <Button onClick={handleOpenDialogForm} size='sm' color="primary">
                 <i className='fa fa-plus'></i>
               </Button>
             )}
-
+          </div>
         </ModalHeader>
         <ModalBody>
           <div style={{ width: '100%', overflow: "auto" }}>

src/views/SimproV2/Gantt/GanttFrame.js

@@ -20,6 +20,7 @@ const GanttFrame = React.memo((props) => {
 
   const { versionGanttId, idProject, ro, timestamp } = props;
   const iframeSrc = `https://project-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}`;
+
   const [batchEntityData, setBatchEntityData] = useState(null);
 
   useEffect(() => {