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

@@ -239,7 +239,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
     <>
       <Modal size="xl" isOpen={openDialog} toggle={toggleDialog}>
         <ModalHeader className="capitalize withBtn" toggle={closeDialog} style={{ width: "100%" }}>
-          {hierarchyName ? (
+	 {hierarchyName ? (
             <Breadcrumb>
               <BreadcrumbItem><a href="/projects">Project</a></BreadcrumbItem>
               <BreadcrumbItem active>{hierarchyName}</BreadcrumbItem>
@@ -247,28 +247,28 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
           ) : (
             <div>Gantt Project {proyekName}</div>
           )}
-          <Select
+          <div style={{ display:'flex'}}>
-            placeholder='Search Gantt Name'
+            <Select
-            showSearch
+              placeholder='Search Gantt Name'
-            filterOption={(inputValue, option) =>
+              showSearch
-              option.children.toLowerCase().includes(inputValue.toLowerCase())
+              filterOption={(inputValue, option) =>
-            }
+                option.children.toLowerCase().includes(inputValue.toLowerCase())
-            onChange={(val) => setSearchGantt(val)}
+              }
-            style={{ width: 200 }}
+              onChange={(val) => setSearchGantt(val)}
-          >
+              style={{ width: 200, marginRight:'10px' }}
-            {dataGantt.map((res) => (
+            >
-              <Option key={res.id} value={res.id}>
+              {dataGantt.map((res) => (
-                {res.name_version}
+                <Option key={res.id} value={res.id}>
-              </Option>
+                  {res.name_version}
-            ))}
+                </Option>
-          </Select>
+              ))}
-
+            </Select>
-          {!hierarchyId && (
+            {!hierarchyId && (
-            <Button onClick={handleOpenDialogForm} size='sm' color="primary">
+              <Button onClick={handleOpenDialogForm} size='sm' color="primary">
-              <i className='fa fa-plus'></i>
+                <i className='fa fa-plus'></i>
-            </Button>
+              </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(() => {