Merge branch 'general' of https://git.oslog.id/ordo/adw-frontend

src/views/Dashboard/DashboardProject.js

@@ -126,8 +126,6 @@ const DashboardProject = () => {
   const [calculationStatus, setCalculationStatus] = useState(false);
   const [isHierarchy, setIsHierarchy] = useState(false);
   let history = useHistory();
-  let location = useLocation();
-  const isDashboardProject = location.pathname.includes('dashboard-project');
 
   useEffect(() => {
     getProjectDetail();
@@ -358,7 +356,7 @@ const DashboardProject = () => {
   const getSCurve = async () => {
     setIsReadySCurve(false);
     let URL = `${BASE_OSPRO}/api/project/get-s-curve`;
-    if (SCURVE && SCURVE == "1" && isHierarchy) {
+    if (SCURVE && SCURVE == "1") {
       URL = `${BASE_OSPRO}/api/project/calculate-s-curve`;
     }
 
@@ -1019,7 +1017,7 @@ const DashboardProject = () => {
             </Col>
           </Row>
           <Row>
-            <Col span={isDashboardProject ? 8 : 10}>
+            <Col span={SCURVE ? 8 : 10}>
               <div
                 style={{
                   border: "solid",
@@ -1144,7 +1142,7 @@ const DashboardProject = () => {
                 </div>
               </div>
             </Col>
-            {isDashboardProject ? (
+            {SCURVE ? (
               <Col span={16}>
                 <div
                   style={{
@@ -1557,7 +1555,7 @@ const DashboardProject = () => {
               </Col>
             </Row>
             <Row>
-              {isDashboardProject ? (
+              {SCURVE ? (
                 <Col span={24}>
                   <div
                     style={{