setImageLink(file_url)} style={{cursor: 'pointer'}}>
+ return (
+
setImageLink(file_url)} style={{cursor: 'pointer'}}>
{imageLink &&
-

+

+ }
+
+
+ {imageLink &&
+ <>
+
0 x 0 px
+
size: 0 bytes
+ >
}
diff --git a/src/component/reports/ProductReportTable.jsx b/src/component/reports/ProductReportTable.jsx
index 3d5d8ed..1f6e869 100644
--- a/src/component/reports/ProductReportTable.jsx
+++ b/src/component/reports/ProductReportTable.jsx
@@ -7,7 +7,7 @@ export default function ProductReportTable() {
-
Payments Report
+ Products Report
diff --git a/src/component/reports/Reports.jsx b/src/component/reports/Reports.jsx
index 9f6ece8..75ab88c 100644
--- a/src/component/reports/Reports.jsx
+++ b/src/component/reports/Reports.jsx
@@ -5,12 +5,13 @@ import queryKeys from "../../services/queryKeys";
import {getReportsTopicsList} from "../../services/services";
import PaymentReportTable from "./PaymentReportTable";
import ProductReportTable from "./ProductReportTable";
+import sortArrayByListOrder from "../../helpers/sortArrayByLIstOrder";
export default function Reports() {
const {data, isFetching, isError, error} = useQuery({
- queryKey: queryKeys.my_files,
+ queryKey: queryKeys.topics,
queryFn: () => {
let reqData = {
token: localStorage.getItem('token'), // USER TOKEN
@@ -22,6 +23,13 @@ export default function Reports() {
const reportTopicList = data?.data?.topics?.topics;
+ const renderedTable = {
+ payment:
,
+ product:
+ }
+
+ const sortedReportTopicList= sortArrayByListOrder(reportTopicList ? reportTopicList : []) // SORTED SETTINGSCONFIG
+
return (
<>
@@ -36,28 +44,29 @@ export default function Reports() {
{/*
*/}
-
- {reportTopicList && reportTopicList.map((item, index) => {
- return (
- -
- {item.name}
-
- )
- }
- )
- }
+
+ {/* */}
+
+ {sortedReportTopicList && sortedReportTopicList.map((item, index) => {
+ return (
+ -
+
+ {item?.name}
+
+
+ )
+ })}
+
+ {/* */}
-
-
+ {sortedReportTopicList && sortedReportTopicList.map((item, index) => {
+ return (
+
+ {renderedTable[item?.url]}
+
+ )
+ })}
diff --git a/src/helpers/sortArrayByLIstOrder.js b/src/helpers/sortArrayByLIstOrder.js
new file mode 100644
index 0000000..001ac96
--- /dev/null
+++ b/src/helpers/sortArrayByLIstOrder.js
@@ -0,0 +1,17 @@
+function sortArrayByListOrder(data) {
+ // Convert object to array if needed
+ const array = Array.isArray(data)
+ ? [...data]
+ : Object.values(data);
+
+ // Sort ascending by list_order
+ array.sort((a, b) => {
+ const orderA = a.list_order ?? 0;
+ const orderB = b.list_order ?? 0;
+ return orderA - orderB;
+ });
+
+ return array;
+}
+
+export default sortArrayByListOrder
diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js
index 550a695..bc8e206 100644
--- a/src/services/queryKeys.js
+++ b/src/services/queryKeys.js
@@ -12,6 +12,7 @@ const queryKeys = {
subscriptions: ['subscriptions'],
profile_data: ['profile_data'],
my_files: ['my_files'],
+ topics: ['topics'],
dashboard: ['dashboard'],
topBar: ['top-bar'],