Merge pull request #465 from aesirxio/develop

Add request limit
aesirxio · Jan 6, 2025 · 7c05c54 · 7c05c54
2 parents 2cbcf36 + 7a2aa04
commit 7c05c54
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 31 deletions.
diff --git a/packages/aesirx-bi-app/package.json b/packages/aesirx-bi-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aesirx-bi-app",
-  "version": "2.3.0",
+  "version": "2.1.0",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "main": "dist/index.js",

diff --git a/...ages/aesirx-bi-app/src/containers/Dashboard/DashboardViewModels/DashboardListViewModel.js b/...ages/aesirx-bi-app/src/containers/Dashboard/DashboardViewModels/DashboardListViewModel.js
@@ -48,7 +48,7 @@ class DashboardListViewModel {
     this.globalStoreViewModel = globalStoreViewModel;
   }
 
-  initialize = (dataFilter, dateFilter) => {
+  initialize = async (dataFilter, dateFilter) => {
     if (!dateFilter) {
       const dataFilterObjects = [
         this.dataFilter,
@@ -68,17 +68,31 @@ class DashboardListViewModel {
         }
       });
     }
-    this.getMetrics(dataFilter, dateFilter);
-    this.getVisitors(dataFilter, dateFilter);
-    this.getCountries(dataFilter, dateFilter);
-    this.getBrowsers(dataFilter, dateFilter);
-    this.getDevices(dataFilter, dateFilter);
-    this.getPages(dataFilter, dateFilter);
-    this.getReferer(dataFilter, dateFilter);
-    this.getEventsType(dataFilter, dateFilter);
-    this.getAttribute(dataFilter, dateFilter);
-    this.getLiveVisitorsTotal(dataFilter, false);
-    this.getLiveVisitorsList(dataFilter, false);
+    const limitRequest = process.env.REACT_APP_REQUEST_LIMIT
+      ? parseInt(process.env.REACT_APP_REQUEST_LIMIT)
+      : 8;
+    const functionConfigs = [
+      { func: this.getMetrics, args: [dataFilter, dateFilter] },
+      { func: this.getVisitors, args: [dataFilter, dateFilter] },
+      { func: this.getCountries, args: [dataFilter, dateFilter] },
+      { func: this.getBrowsers, args: [dataFilter, dateFilter] },
+      { func: this.getDevices, args: [dataFilter, dateFilter] },
+      { func: this.getPages, args: [dataFilter, dateFilter] },
+      { func: this.getReferer, args: [dataFilter, dateFilter] },
+      { func: this.getEventsType, args: [dataFilter, dateFilter] },
+      { func: this.getAttribute, args: [dataFilter, dateFilter] },
+      { func: this.getLiveVisitorsTotal, args: [dataFilter, false] },
+      { func: this.getLiveVisitorsList, args: [dataFilter, false] },
+    ];
+
+    for (let i = 0; i < functionConfigs.length; i++) {
+      const { func, args } = functionConfigs[i];
+      if (i >= limitRequest) {
+        await func.apply(this, args);
+      } else {
+        func.apply(this, args);
+      }
+    }
   };
 
   getMetrics = (dataFilter, dateFilter) => {

diff --git a/packages/aesirx-bi-app/src/containers/PageDetail/PageDetailViewModels/PageDetailViewModel.js b/packages/aesirx-bi-app/src/containers/PageDetail/PageDetailViewModels/PageDetailViewModel.js
@@ -35,7 +35,7 @@ class PageDetailListViewModel {
     this.globalStoreViewModel = globalStoreViewModel;
   }
 
-  initialize = (dataFilter, dateFilter) => {
+  initialize = async (dataFilter, dateFilter) => {
     if (!dateFilter) {
       const dataFilterObjects = [
         this.dataFilter,
@@ -52,13 +52,27 @@ class PageDetailListViewModel {
         }
       });
     }
-    this.getMetrics(dataFilter, dateFilter);
-    this.getVisitors(dataFilter, dateFilter);
-    this.getCountries(dataFilter, dateFilter);
-    this.getBrowsers(dataFilter, dateFilter);
-    this.getDevices(dataFilter, dateFilter);
-    this.getPages(dataFilter, dateFilter);
-    this.getReferer(dataFilter, dateFilter);
+    const limitRequest = process.env.REACT_APP_REQUEST_LIMIT
+      ? parseInt(process.env.REACT_APP_REQUEST_LIMIT)
+      : 8;
+    const functionConfigs = [
+      { func: this.getMetrics, args: [dataFilter, dateFilter] },
+      { func: this.getVisitors, args: [dataFilter, dateFilter] },
+      { func: this.getCountries, args: [dataFilter, dateFilter] },
+      { func: this.getBrowsers, args: [dataFilter, dateFilter] },
+      { func: this.getDevices, args: [dataFilter, dateFilter] },
+      { func: this.getPages, args: [dataFilter, dateFilter] },
+      { func: this.getReferer, args: [dataFilter, dateFilter] },
+    ];
+
+    for (let i = 0; i < functionConfigs.length; i++) {
+      const { func, args } = functionConfigs[i];
+      if (i >= limitRequest) {
+        await func.apply(this, args);
+      } else {
+        func.apply(this, args);
+      }
+    }
   };
 
   getMetrics = (dataFilter, dateFilter) => {

diff --git a/...ges/aesirx-bi-app/src/containers/VisitorsPage/VisitorsViewModels/VisitorsListViewModel.js b/...ges/aesirx-bi-app/src/containers/VisitorsPage/VisitorsViewModels/VisitorsListViewModel.js
@@ -51,7 +51,7 @@ class VisitorsListViewModel {
     this.globalStoreViewModel = globalStoreViewModel;
   }
 
-  initialize = (dataFilter, dateFilter) => {
+  initialize = async (dataFilter, dateFilter) => {
     if (!dateFilter) {
       const dataFilterObjects = [
         this.dataFilter,
@@ -69,15 +69,28 @@ class VisitorsListViewModel {
         }
       });
     }
-    this.getMetrics(dataFilter, dateFilter);
-    // this.getVisitors(dataFilter, dateFilter);
-    this.getVisits(dataFilter, dateFilter);
-    this.getCountries(dataFilter, dateFilter);
-    this.getCities(dataFilter, dateFilter);
-    this.getBrowsers(dataFilter, dateFilter);
-    this.getDevices(dataFilter, dateFilter);
-    this.getLanguages(dataFilter, dateFilter);
-    this.getFlowList(dataFilter, dateFilter);
+    const limitRequest = process.env.REACT_APP_REQUEST_LIMIT
+      ? parseInt(process.env.REACT_APP_REQUEST_LIMIT)
+      : 8;
+    const functionConfigs = [
+      { func: this.getMetrics, args: [dataFilter, dateFilter] },
+      { func: this.getVisits, args: [dataFilter, dateFilter] },
+      { func: this.getCountries, args: [dataFilter, dateFilter] },
+      { func: this.getCities, args: [dataFilter, dateFilter] },
+      { func: this.getBrowsers, args: [dataFilter, dateFilter] },
+      { func: this.getDevices, args: [dataFilter, dateFilter] },
+      { func: this.getLanguages, args: [dataFilter, dateFilter] },
+      { func: this.getFlowList, args: [dataFilter, dateFilter] },
+    ];
+
+    for (let i = 0; i < functionConfigs.length; i++) {
+      const { func, args } = functionConfigs[i];
+      if (i >= limitRequest) {
+        await func.apply(this, args);
+      } else {
+        func.apply(this, args);
+      }
+    }
   };
 
   initializeBehavior = async (dataFilter, dateFilter, page) => {