Shoonya v2.3 Patch

src/config/apiendpoint.js

@@ -1,5 +1,5 @@
 const apiendpoint =  {
-  login: "/users/auth/jwt/create",
+  login:"/users/auth/jwt/create",
   getProjects:"/projects/",
   getWorkspaces:"/workspaces/",
   fetch:"/users/account/",

src/redux/actions/api/Dataset/aiModel.js

@@ -0,0 +1,53 @@
+/**
+ * Automate Datasets API
+ */
+ import API from "../../../api";
+ import ENDPOINTS from "../../../../config/apiendpoint";
+ import constants from '../../../constants';
+
+ export default class aiModel extends API {
+   constructor(srcInstanceId,translationmodel,org_id,checked, timeout = 2000) {
+     super("POST", timeout, false);
+    //  this.type = constants.AUTOMATE_DATASETS;
+     this.input_dataset_instance_id = srcInstanceId;
+     this.api_type = translationmodel;
+     this.org = org_id;
+     this.automate_missing_data_items= checked;
+     this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.functions}schedule_ocr_prediction_json_population`;
+   }
+
+   processResponse(res) {
+     super.processResponse(res);
+     if (res) {
+       this.res = res;
+     }
+   }
+
+   apiEndPoint() {
+     return this.endpoint;
+   }
+
+   getBody() {
+     return {
+        dataset_instance_id: this.input_dataset_instance_id,
+        api_type: this.api_type,
+        organization_id: this.org,
+        automate_missing_data_items:this.automate_missing_data_items
+     }
+   }
+
+   getHeaders() {
+     this.headers = {
+       headers: {
+         "Content-Type": "application/json",
+         "Authorization":`JWT ${localStorage.getItem('shoonya_access_token')}`
+       },
+     };
+     return this.headers;
+   }
+
+   getPayload() {
+     return this.res;
+   }
+ }
+

src/redux/actions/api/Organization/SendOrganizationUserReports.js

@@ -0,0 +1,50 @@
+/**
+ * Send Organization User Reports API
+ */
+import API from "../../../api";
+import ENDPOINTS from "../../../../config/apiendpoint";
+import constants from "../../../constants";
+
+export default class SendOrganizationUserReportsAPI extends API {
+  constructor(orgId, userId, projectType, participationTypes, timeout = 2000) {
+    super("POST", timeout, false);
+    this.projectType = projectType;
+    this.participationTypes = participationTypes;
+    this.userId = userId;
+    this.type = constants.SEND_ORGANIZATION_USER_REPORTS;
+    this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getOrganizations}${orgId}/send_user_analytics/`;
+  }
+
+  processResponse(res) {
+    super.processResponse(res);
+    if (res) {
+        this.orgUserReport = res;
+    }
+  }
+
+  apiEndPoint() {
+    return this.endpoint;
+  }
+
+  getBody() {
+    return {
+      project_type: this.projectType,
+      participation_types: this.participationTypes,
+      user_id: this.userId
+    };
+  }
+
+  getHeaders() {
+    this.headers = {
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization":`JWT ${localStorage.getItem('shoonya_access_token')}`
+      },
+    };
+    return this.headers;
+  }
+
+  getPayload() {
+    return this.orgUserReport;
+  }
+}

src/redux/actions/api/WorkspaceDetails/CreateWorkspace.js

@@ -6,12 +6,13 @@ import ENDPOINTS from "../../../../config/apiendpoint";
 import constants from "../../../constants";
 
 export default class CreateWorkspaceAPI extends API {
-    constructor(orgId, workspaceName, timeout = 2000) {
+    constructor(orgId, workspaceName,publicanalytics, timeout = 2000) {
         super("POST", timeout, false);
         this.type = constants.ADD_MEMBERS_TO_PROJECT;
         this.organization = orgId;
         this.workspace_name = workspaceName;
         this.is_archived = false;
+        this.public_analytics = publicanalytics;
         this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getWorkspaces
             }`;
     }
@@ -32,6 +33,7 @@ export default class CreateWorkspaceAPI extends API {
             organization: this.organization,
             workspace_name: this.workspace_name,
             is_archived: this.is_archived,
+            public_analytics: this.public_analytics
         };
     }
 

src/redux/actions/api/WorkspaceDetails/GetWorkspaceUserReports.js

@@ -6,14 +6,15 @@
 import constants from "../../../constants";
 
  export default class GetWorkspaceUserReportsAPI extends API {
-   constructor(workspaceId, projectType, fromDate, toDate, language,reportsType, timeout = 2000) {
+   constructor(workspaceId, projectType, fromDate, toDate, language,reportsType,reportfilter, timeout = 2000) {
      super("POST", timeout, false);
      this.type = constants.GET_WORKSPACE_USER_REPORTS;
      this.projectType = projectType;
      this.fromDate = fromDate;
      this.toDate = toDate;
       this.language = language;
       this.reportsType = reportsType ;
+      this.reportfilter = reportfilter;
      this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getWorkspaces}${workspaceId}/user_analytics/`;
    }
 
@@ -34,12 +35,15 @@ import constants from "../../../constants";
       from_date: this.fromDate,
       to_date: this.toDate,
       reports_type: this.reportsType,
+      ...(this.reportfilter !== "AllStage" && {project_progress_stage: this.reportfilter}),
     } : {
         project_type: this.projectType,
         from_date: this.fromDate,
         to_date: this.toDate,
         tgt_language: this.language,
         reports_type: this.reportsType,
+        ...(this.reportfilter !== "AllStage" && {project_progress_stage: this.reportfilter}),
+
     }
    }
 

src/redux/actions/api/WorkspaceDetails/SendWorkspaceUserReports.js

@@ -0,0 +1,50 @@
+/**
+ * Send Workspace User Reports API
+ */
+import API from "../../../api";
+import ENDPOINTS from "../../../../config/apiendpoint";
+import constants from "../../../constants";
+
+export default class SendWorkspaceUserReportsAPI extends API {
+  constructor(wsId, userId, projectType, participationTypes, timeout = 2000) {
+    super("POST", timeout, false);
+    this.projectType = projectType;
+    this.participationTypes = participationTypes;
+    this.userId = userId;
+    this.type = constants.SEND_WORKSPACE_USER_REPORTS;
+    this.endpoint = `${super.apiEndPointAuto()}${ENDPOINTS.getWorkspaces}${wsId}/send_user_analytics/`;
+  }
+
+  processResponse(res) {
+    super.processResponse(res);
+    if (res) {
+        this.wsUserReport = res;
+    }
+  }
+
+  apiEndPoint() {
+    return this.endpoint;
+  }
+
+  getBody() {
+    return {
+      project_type: this.projectType,
+      participation_types: this.participationTypes,
+      user_id: this.userId
+    };
+  }
+
+  getHeaders() {
+    this.headers = {
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization":`JWT ${localStorage.getItem('shoonya_access_token')}`
+      },
+    };
+    return this.headers;
+  }
+
+  getPayload() {
+    return this.wsUserReport;
+  }
+}

src/redux/constants.js

@@ -98,6 +98,8 @@ const constants = {
   WS_META_ANALYTICS: "WS_META_ANALYTICS",
   WS_PERODICAL_TASK: "WS_PERODICAL_TASK",
   WS_TASK_ANALYTICS: "WS_TASK_ANALYTICS",
+  SEND_ORGANIZATION_USER_REPORTS: "SEND_ORGANIZATION_USER_REPORTS",
+  SEND_WORKSPACE_USER_REPORTS: "SEND_WORKSPACE_USER_REPORTS",
 
 };
 

src/redux/reducers/Organization/SendOrganizationUserReports.js

@@ -0,0 +1,21 @@
+import constants from "../../constants";
+
+let initialState = {
+    data: []
+}
+const reducer = (state = initialState, action) => {
+    switch (action.type) {
+        case constants.SEND_ORGANIZATION_USER_REPORTS:
+            return {
+                ...state,
+                data: action.payload
+            } 
+
+        default:
+            return {
+                ...state
+            }
+    }
+};
+
+export default reducer;

src/redux/reducers/WorkspaceDetails/SendWorkspaceUserReports.js

@@ -0,0 +1,21 @@
+import constants from "../../constants";
+
+let initialState = {
+    data: []
+}
+const reducer = (state = initialState, action) => {
+    switch (action.type) {
+        case constants.SEND_WORKSPACE_USER_REPORTS:
+            return {
+                ...state,
+                data: action.payload
+            } 
+
+        default:
+            return {
+                ...state
+            }
+    }
+};
+
+export default reducer;

src/redux/reducers/index.js

@@ -86,6 +86,8 @@ import wsCumulativeTasks from "./WorkspaceDetails/GetCumulativeTasks";
 import wsMetaAnalytics from "./WorkspaceDetails/GetMetaAnalytics";
 import wsPeriodicalTasks from "./WorkspaceDetails/GetPeriodicalTasks";
 import wsTaskAnalytics from "./WorkspaceDetails/GetTaskAnalytics";
+import sendOrganizationUserReports from "./Organization/SendOrganizationUserReports";
+import sendWorkspaceUserReports from './WorkspaceDetails/SendWorkspaceUserReports';
 
 const index = {
     apiStatus,
@@ -179,7 +181,8 @@ const index = {
     wsMetaAnalytics,
     wsPeriodicalTasks,
     wsTaskAnalytics,
-
+    sendOrganizationUserReports,
+    sendWorkspaceUserReports,
 
 };