Update Export file name

aesirxio · Dec 26, 2023 · c229c42 · c229c42
1 parent 941a59c
commit c229c42
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 8 deletions.
diff --git a/packages/aesirx-bi-app/src/components/ExportButton/index.jsx b/packages/aesirx-bi-app/src/components/ExportButton/index.jsx
@@ -3,17 +3,33 @@ import { Col, Dropdown, Form, Row } from 'react-bootstrap';
 import { CSVLink } from 'react-csv';
 import { Translation } from 'react-i18next';
 import ReactToPrint from 'react-to-print';
+import { useBiViewModel } from 'store/BiStore/BiViewModelContextProvider';
 import { downloadExcel } from 'utils';
 
-function ExportButton({ data, tableExport, t, i18n, componentRef, classWrapper = false }) {
+function ExportButton({
+  data,
+  tableExport,
+  t,
+  i18n,
+  componentRef,
+  classWrapper = false,
+  sectionName = '',
+}) {
   const [exportFile, setExportFile] = useState({
     format: 'pdf',
     type: 'page',
   });
+  const biStore = useBiViewModel();
 
   const handleChange = (state) => {
     setExportFile(state);
   };
+  const isSameday =
+    biStore?.biListViewModel?.dateFilter?.date_start ===
+    biStore?.biListViewModel?.dateFilter?.date_end;
+  const nameFile = `${biStore?.biListViewModel?.activeDomain}_${sectionName}_${
+    biStore?.biListViewModel?.dateFilter?.date_start
+  }${!isSameday ? `_${biStore?.biListViewModel?.dateFilter?.date_end}` : ''}`;
   return (
     <div className={`${classWrapper ? '' : 'printButton'} me-2`}>
       <Dropdown align="end">
@@ -135,7 +151,7 @@ function ExportButton({ data, tableExport, t, i18n, componentRef, classWrapper =
                     <CSVLink
                       data={tableExport?.find((o) => o?.name === exportFile?.name)?.data}
                       className="btn btn-light text-nowrap py-13 lh-sm rounded-1"
-                      filename="data.csv"
+                      filename={`${nameFile}.csv`}
                     >
                       Export
                     </CSVLink>
@@ -146,7 +162,7 @@ function ExportButton({ data, tableExport, t, i18n, componentRef, classWrapper =
                   <CSVLink
                     data={data}
                     className="btn btn-light text-nowrap py-13 lh-sm rounded-1"
-                    filename="data.csv"
+                    filename={`${nameFile}.csv`}
                   >
                     Export
                   </CSVLink>
@@ -161,7 +177,10 @@ function ExportButton({ data, tableExport, t, i18n, componentRef, classWrapper =
                     <button
                       className="btn btn-light text-nowrap py-13 lh-sm rounded-1"
                       onClick={() =>
-                        downloadExcel(tableExport?.find((o) => o?.name === exportFile?.name)?.data)
+                        downloadExcel(
+                          tableExport?.find((o) => o?.name === exportFile?.name)?.data,
+                          `${nameFile}`
+                        )
                       }
                     >
                       Export
@@ -172,7 +191,7 @@ function ExportButton({ data, tableExport, t, i18n, componentRef, classWrapper =
                 ) : data?.length ? (
                   <button
                     className="btn btn-light text-nowrap py-13 lh-sm rounded-1"
-                    onClick={() => downloadExcel(data)}
+                    onClick={() => downloadExcel(data, `${nameFile}`)}
                   >
                     Export
                   </button>

diff --git a/packages/aesirx-bi-app/src/containers/ConsentsPage/index.jsx b/packages/aesirx-bi-app/src/containers/ConsentsPage/index.jsx
@@ -45,6 +45,7 @@ const ConsentsPage = observer(
             i18n={this.props.i18n}
             t={this.props.t}
             componentRef={this.componentRef}
+            sectionName={'consent'}
           />
 
           <ComponentToPrint

diff --git a/packages/aesirx-bi-app/src/containers/Dashboard/index.jsx b/packages/aesirx-bi-app/src/containers/Dashboard/index.jsx
@@ -62,6 +62,7 @@ const DashboardContainer = observer(
             i18n={this.props.i18n}
             t={this.props.t}
             componentRef={this.componentRef}
+            sectionName={'dashboard'}
           />
           <ComponentToPrint ref={(el) => (this.componentRef = el)} />
         </DashboardViewModelContextProvider>

diff --git a/packages/aesirx-bi-app/src/containers/EventsPage/index.jsx b/packages/aesirx-bi-app/src/containers/EventsPage/index.jsx
@@ -80,6 +80,7 @@ const EventsPage = observer(
                 t={this.props.t}
                 componentRef={this.componentRef}
                 classWrapper={true}
+                sectionName={'event'}
               />
             </div>
           )}

diff --git a/packages/aesirx-bi-app/src/containers/RegionCountryPage/index.jsx b/packages/aesirx-bi-app/src/containers/RegionCountryPage/index.jsx
@@ -37,6 +37,7 @@ const CountryContainer = observer(
             i18n={this.props.i18n}
             t={this.props.t}
             componentRef={this.componentRef}
+            sectionName={'location'}
           />
           <ComponentToPrint ref={(el) => (this.componentRef = el)} />
         </CountryViewModelContextProvider>

diff --git a/packages/aesirx-bi-app/src/containers/UTMTrackingPage/index.jsx b/packages/aesirx-bi-app/src/containers/UTMTrackingPage/index.jsx
@@ -61,6 +61,7 @@ const UTMTrackingPage = observer(
               i18n={this.props.i18n}
               t={this.props.t}
               componentRef={this.componentRef}
+              sectionName={'utm-tracking'}
             />
           )}
 

diff --git a/packages/aesirx-bi-app/src/containers/VisitorsPage/PagesModel/PageModel.js b/packages/aesirx-bi-app/src/containers/VisitorsPage/PagesModel/PageModel.js
@@ -102,7 +102,7 @@ class PageModel {
   toPagesTableTop = () => {
     const headerTable = [
       'txt_page',
-      'txt_page_views',
+      'txt_visitors',
       'txt_unique_page_views',
       'txt_bounce_rate',
       'txt_page_session',

diff --git a/packages/aesirx-bi-app/src/containers/VisitorsPage/index.jsx b/packages/aesirx-bi-app/src/containers/VisitorsPage/index.jsx
@@ -95,6 +95,9 @@ const VisitorsContainer = observer(
             i18n={this.props.i18n}
             t={this.props.t}
             componentRef={this.componentRef}
+            sectionName={
+              matchVisitor?.isExact || integrationLink === 'visitors' ? 'visitors' : 'behavior'
+            }
           />
 
           <ComponentToPrint

diff --git a/packages/aesirx-bi-app/src/containers/WoocommercePage/index.jsx b/packages/aesirx-bi-app/src/containers/WoocommercePage/index.jsx
@@ -79,6 +79,7 @@ const WoocommercePage = observer(
               i18n={this.props.i18n}
               t={this.props.t}
               componentRef={this.componentRef}
+              sectionName={'woocommerce'}
             />
           )}
 

diff --git a/packages/aesirx-bi-app/src/utils/index.js b/packages/aesirx-bi-app/src/utils/index.js
@@ -1,8 +1,8 @@
 import * as XLSX from 'xlsx';
-const downloadExcel = (data) => {
+const downloadExcel = (data, nameFile) => {
   const worksheet = XLSX.utils.json_to_sheet(data);
   const workbook = XLSX.utils.book_new();
   XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
-  XLSX.writeFile(workbook, 'DataSheet.xlsx');
+  XLSX.writeFile(workbook, `${nameFile}.xlsx`);
 };
 export { downloadExcel };