Merge pull request #1100 from AI4Bharat/revert-1097-mas-ef

Revert "analytics api integration effciency and download button ui changes"
AI4Bharat · Sep 11, 2024 · 8d901ec · 8d901ec
2 parents b33eb9d + 6cce684
commit 8d901ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/src/ui/pages/component/common/Header.jsx b/src/ui/pages/component/common/Header.jsx
@@ -52,8 +52,6 @@ import CustomizedSnackbars from "../common/Snackbar";
 import userRole from "../../../../utils/UserMappedByRole/Roles";
 import NotificationAPI from "../../../../redux/actions/api/Notification/Notification";
 import UpdateUIPrefsAPI from "../../../../redux/actions/api/UserManagement/UpdateUIPrefs";
-import TaskAnalyticsDataAPI from "../../../../redux/actions/api/Progress/TaskAnalytics";
-import MetaAnalyticsDataAPI from "../../../../redux/actions/api/Progress/MetaAnalytics";
 
 const Header = () => {
   const [anchorElUser, setAnchorElUser] = useState(null);
@@ -171,14 +169,7 @@ const Header = () => {
     getLoggedInUserData();
 
   }, []);
-  useEffect(() => {
-    const userObj = new TaskAnalyticsDataAPI('ContextualTranslationEditing');
-    dispatch(APITransport(userObj));
-    const userObj1 = new MetaAnalyticsDataAPI(1,'ContextualTranslationEditing');
-    dispatch(APITransport(userObj1));
-
 
-  }, []);
 
   /* useEffect(()=>{
     if(loggedInUserData?.prefer_cl_ui !== undefined){

diff --git a/src/ui/pages/container/Progress/MetaAnalytics/MetaAnalytics.jsx b/src/ui/pages/container/Progress/MetaAnalytics/MetaAnalytics.jsx
@@ -104,16 +104,8 @@ export default function MetaAnalytics(props) {
       }, []);
 
       useEffect(() => {
-        const handler = setTimeout(() => {
-          if(!metaAnalyticsData.length){
-            getMetaAnalyticsdata();
-          }
-        }, 500); 
-        return () => {
-            clearTimeout(handler);
-        };
-    }, []);
-
+        getMetaAnalyticsdata();
+      }, []);
       const handleSubmit = async () => {
         getMetaAnalyticsdata();
       }
@@ -239,8 +231,8 @@ export default function MetaAnalytics(props) {
             </Select>
           </FormControl>
 {/* <Grid item xs={12} sm={12} md={12} lg={12} xl={12} container justifyContent="space-between" alignItems="center"> */}
-<CustomButton label="Submit" sx={{ width: { xs: "100px", md: "120px" }, height: "40px" }} onClick={handleSubmit}  />
-          <Box display="flex"   sx={{ width: { xs: "100px", md: "120px" }, height: "40px", marginRight: 1 }}alignItems="center">
+<CustomButton label="Submit" sx={{ width: "120px" }} onClick={handleSubmit} disabled={loading} />
+          <Box display="flex" alignItems="center">
             <CustomButton
               onClick={handleClick}
               disabled={loading}

diff --git a/src/ui/pages/container/Progress/TaskAnalytics/TaskAnalytics.jsx b/src/ui/pages/container/Progress/TaskAnalytics/TaskAnalytics.jsx
@@ -86,17 +86,10 @@ const TaskAnalytics = (props) => {
     setProjectTypes(types);
   }, []);
 
-  useEffect(() => {
-    const handler = setTimeout(() => {
-      if(!taskAnalyticsData.length){
-        getTaskAnalyticsdata();
-      }
-    }, 500); 
-    return () => {
-        clearTimeout(handler);
-    };
-}, []);
 
+  useEffect(() => {
+    getTaskAnalyticsdata();
+  }, []);
 
   useEffect(() => {
     if (taskAnalyticsData.length > 0) {
@@ -210,8 +203,8 @@ const TaskAnalytics = (props) => {
             </Select>
           </FormControl>
           {/* <Grid item xs={12} sm={12} md={12} lg={12} xl={12} container justifyContent="space-between" alignItems="center"> */}
-          <CustomButton label="Submit" sx={{ width: { xs: "100px", md: "120px" }, height: "40px" }} onClick={handleSubmit}  />
-          <Box display="flex"   sx={{ width: { xs: "100px", md: "120px" }, height: "40px", marginRight: 1 }}alignItems="center">
+          <CustomButton label="Submit" sx={{ width: "120px" }} onClick={handleSubmit} disabled={loading} />
+          <Box display="flex" alignItems="center">
             <CustomButton
               onClick={handleClick}
               disabled={loading}