@agilo/medusa-analytics-plugin 1.2.0 → 1.2.1

package/.medusa/server/src/admin/index.js

@@ -9,9 +9,11 @@ const dateFns = require("date-fns");
 const reactAriaComponents = require("react-aria-components");
 const reactRouterDom = require("react-router-dom");
 const recharts = require("recharts");
+const Medusa = require("@medusajs/js-sdk");
 const clsx = require("clsx");
 const tailwindMerge = require("tailwind-merge");
 const reactQuery = require("@tanstack/react-query");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -30,6 +32,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 const React__namespace = /* @__PURE__ */ _interopNamespace(React);
+const Medusa__default = /* @__PURE__ */ _interopDefault(Medusa);
 function $2b4dce13dd5a17fa$export$842a2cf37af977e1(amount, numerator) {
   return amount - numerator * Math.floor(amount / numerator);
 }
@@ -827,6 +830,12 @@ function generateColorsForData(data, keyField, saturation = 70, lightness = 50)
     (item) => generateStableColor(String(item[keyField]), saturation, lightness)
   );
 }
+const sdk = new Medusa__default.default({
+  baseUrl: __BACKEND_URL__ || "/",
+  auth: {
+    type: "session"
+  }
+});
 const BarChart = ({
   data,
   xAxisDataKey,
@@ -1072,17 +1081,15 @@ const ProductsTable = ({ products }) => {
     products.length > PAGE_SIZE$1 && /* @__PURE__ */ jsxRuntime.jsx(ui.DataTable.Pagination, {})
   ] });
 };
-const BACKEND_URL$2 = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveProductAnalytics(date) {
   if (!date || !date.from || !(date == null ? void 0 : date.to)) {
     return void 0;
   }
   const dateFrom = dateFns.format(date.from, "yyyy-MM-dd");
   const dateTo = dateFns.format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL$2}/admin/agilo-analytics/products?date_from=${dateFrom}&date_to=${dateTo}`
+  const productAnalytics = await sdk.client.fetch(
+    `/admin/agilo-analytics/products?date_from=${dateFrom}&date_to=${dateTo}`
   );
-  const productAnalytics = await data.json();
   return productAnalytics;
 }
 const useProductAnalytics = (query, options) => {
@@ -1095,21 +1102,14 @@ const useProductAnalytics = (query, options) => {
     ...options
   });
 };
-const BACKEND_URL$1 = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveOrderAnalytics(preset, date) {
-  if (!date || !date.from || !(date == null ? void 0 : date.to)) {
-    const data2 = await fetch(
-      `${BACKEND_URL$1}/admin/agilo-analytics/orders?preset=${preset}`
-    );
-    const orderAnalytics2 = await data2.json();
-    return orderAnalytics2;
+  let url = `/admin/agilo-analytics/orders?preset=${preset}`;
+  if (date && date.from && date.to) {
+    const dateFrom = dateFns.format(date.from, "yyyy-MM-dd");
+    const dateTo = dateFns.format(date.to, "yyyy-MM-dd");
+    url = `/admin/agilo-analytics/orders?preset=custom&date_from=${dateFrom}&date_to=${dateTo}`;
   }
-  const dateFrom = dateFns.format(date.from, "yyyy-MM-dd");
-  const dateTo = dateFns.format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL$1}/admin/agilo-analytics/orders?date_from=${dateFrom}&date_to=${dateTo}&preset=${preset}`
-  );
-  const orderAnalytics = await data.json();
+  const orderAnalytics = await sdk.client.fetch(url);
   return orderAnalytics;
 }
 const useOrderAnalytics = (preset, query, options) => {
@@ -1212,17 +1212,15 @@ const ProductsTableSkeleton = () => {
     /* @__PURE__ */ jsxRuntime.jsx(ui.DataTable.Table, {})
   ] });
 };
-const BACKEND_URL = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveCustomersAnalytics(date) {
   if (!date || !date.from || !(date == null ? void 0 : date.to)) {
     return void 0;
   }
   const dateFrom = dateFns.format(date.from, "yyyy-MM-dd");
   const dateTo = dateFns.format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL}/admin/agilo-analytics/customers?date_from=${dateFrom}&date_to=${dateTo}`
+  const customersAnalytics = await sdk.client.fetch(
+    `/admin/agilo-analytics/customers?date_from=${dateFrom}&date_to=${dateTo}`
   );
-  const customersAnalytics = await data.json();
   return customersAnalytics;
 }
 const useCustomerAnalytics = (query, options) => {
@@ -1312,42 +1310,42 @@ const StackedBarChart = ({
 };
 const dummyData = [
   {
-    a: "a",
+    a: "a1",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a2",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a3",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a4",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a5",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a6",
     b: "b",
     c: 0,
     d: 0,

package/.medusa/server/src/admin/index.mjs

@@ -9,6 +9,7 @@ import { format, parse, startOfMonth, endOfMonth, subMonths } from "date-fns";
 import { DateRangePicker, Group, DateInput, DateSegment, Button, Popover, Dialog, RangeCalendar, Heading as Heading$1, CalendarGrid, CalendarCell } from "react-aria-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import { ResponsiveContainer, BarChart as BarChart$1, CartesianGrid, XAxis, YAxis, Tooltip, Bar, LineChart as LineChart$1, Line, Cell, PieChart as PieChart$1, Pie } from "recharts";
+import Medusa from "@medusajs/js-sdk";
 import { clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 import { useQuery } from "@tanstack/react-query";
@@ -809,6 +810,12 @@ function generateColorsForData(data, keyField, saturation = 70, lightness = 50)
     (item) => generateStableColor(String(item[keyField]), saturation, lightness)
   );
 }
+const sdk = new Medusa({
+  baseUrl: __BACKEND_URL__ || "/",
+  auth: {
+    type: "session"
+  }
+});
 const BarChart = ({
   data,
   xAxisDataKey,
@@ -1054,17 +1061,15 @@ const ProductsTable = ({ products }) => {
     products.length > PAGE_SIZE$1 && /* @__PURE__ */ jsx(DataTable.Pagination, {})
   ] });
 };
-const BACKEND_URL$2 = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveProductAnalytics(date) {
   if (!date || !date.from || !(date == null ? void 0 : date.to)) {
     return void 0;
   }
   const dateFrom = format(date.from, "yyyy-MM-dd");
   const dateTo = format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL$2}/admin/agilo-analytics/products?date_from=${dateFrom}&date_to=${dateTo}`
+  const productAnalytics = await sdk.client.fetch(
+    `/admin/agilo-analytics/products?date_from=${dateFrom}&date_to=${dateTo}`
   );
-  const productAnalytics = await data.json();
   return productAnalytics;
 }
 const useProductAnalytics = (query, options) => {
@@ -1077,21 +1082,14 @@ const useProductAnalytics = (query, options) => {
     ...options
   });
 };
-const BACKEND_URL$1 = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveOrderAnalytics(preset, date) {
-  if (!date || !date.from || !(date == null ? void 0 : date.to)) {
-    const data2 = await fetch(
-      `${BACKEND_URL$1}/admin/agilo-analytics/orders?preset=${preset}`
-    );
-    const orderAnalytics2 = await data2.json();
-    return orderAnalytics2;
+  let url = `/admin/agilo-analytics/orders?preset=${preset}`;
+  if (date && date.from && date.to) {
+    const dateFrom = format(date.from, "yyyy-MM-dd");
+    const dateTo = format(date.to, "yyyy-MM-dd");
+    url = `/admin/agilo-analytics/orders?preset=custom&date_from=${dateFrom}&date_to=${dateTo}`;
   }
-  const dateFrom = format(date.from, "yyyy-MM-dd");
-  const dateTo = format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL$1}/admin/agilo-analytics/orders?date_from=${dateFrom}&date_to=${dateTo}&preset=${preset}`
-  );
-  const orderAnalytics = await data.json();
+  const orderAnalytics = await sdk.client.fetch(url);
   return orderAnalytics;
 }
 const useOrderAnalytics = (preset, query, options) => {
@@ -1194,17 +1192,15 @@ const ProductsTableSkeleton = () => {
     /* @__PURE__ */ jsx(DataTable.Table, {})
   ] });
 };
-const BACKEND_URL = __BACKEND_URL__ === "/" ? "" : __BACKEND_URL__;
 async function retrieveCustomersAnalytics(date) {
   if (!date || !date.from || !(date == null ? void 0 : date.to)) {
     return void 0;
   }
   const dateFrom = format(date.from, "yyyy-MM-dd");
   const dateTo = format(date.to, "yyyy-MM-dd");
-  const data = await fetch(
-    `${BACKEND_URL}/admin/agilo-analytics/customers?date_from=${dateFrom}&date_to=${dateTo}`
+  const customersAnalytics = await sdk.client.fetch(
+    `/admin/agilo-analytics/customers?date_from=${dateFrom}&date_to=${dateTo}`
   );
-  const customersAnalytics = await data.json();
   return customersAnalytics;
 }
 const useCustomerAnalytics = (query, options) => {
@@ -1294,42 +1290,42 @@ const StackedBarChart = ({
 };
 const dummyData = [
   {
-    a: "a",
+    a: "a1",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a2",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a3",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a4",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a5",
     b: "b",
     c: 0,
     d: 0,
     e: /* @__PURE__ */ new Date()
   },
   {
-    a: "a",
+    a: "a6",
     b: "b",
     c: 0,
     d: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilo/medusa-analytics-plugin",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A simple analytics plugin for Medusa",
   "author": "Ante Primorac <ante@agilo.com>",
   "publishConfig": {