bananas-commerce-admin 0.17.4 → 0.17.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/dist/esm/components/charts/LineChart.js +9 -1
  2. package/dist/esm/components/charts/LineChart.js.map +1 -1
  3. package/dist/esm/extensions/pos/contrib/PurchaseCountWidget.js +2 -2
  4. package/dist/esm/extensions/pos/contrib/PurchaseCountWidget.js.map +1 -1
  5. package/dist/esm/extensions/subscription/contrib/RunningSubscriptionCountWidget.js +40 -12
  6. package/dist/esm/extensions/subscription/contrib/RunningSubscriptionCountWidget.js.map +1 -1
  7. package/dist/esm/extensions/subscription/index.js +2 -2
  8. package/dist/esm/extensions/subscription/index.js.map +1 -1
  9. package/dist/types/components/charts/LineChart.d.ts +2 -0
  10. package/dist/types/extensions/subscription/contrib/RunningSubscriptionCountWidget.d.ts +2 -2
  11. package/dist/types/extensions/subscription/contrib/SubscriptionStateCountWidget.d.ts +2 -2
  12. package/dist/types/extensions/subscription/types/stats.d.ts +7 -6
  13. package/package.json +1 -1
  14. package/src/components/charts/LineChart.tsx +11 -0
  15. package/src/extensions/pos/contrib/PurchaseCountWidget.tsx +2 -2
  16. package/src/extensions/subscription/contrib/RunningSubscriptionCountWidget.tsx +53 -13
  17. package/src/extensions/subscription/contrib/SubscriptionStateCountWidget.tsx +2 -2
  18. package/src/extensions/subscription/index.tsx +2 -2
  19. package/src/extensions/subscription/types/stats.ts +8 -7
package/dist/esm/components/charts/LineChart.js CHANGED
@@ -11,7 +11,7 @@ const StyledLineChart = styled(MuiLineChart, {
11
11
  stroke: theme.palette.divider,
12
12
  },
13
13
  }));
14
- const LineChart = ({ dataset, series, dataKeyX, dataKeyY, height = 300, granularity = "day", yAxisOptions, }) => {
14
+ const LineChart = ({ dataset, series, dataKeyX, dataKeyY, height = 300, granularity = "day", yAxisOptions, legendProps, }) => {
15
15
  const theme = useTheme();
16
16
  return (React.createElement(StyledLineChart, { dataset: dataset, grid: { horizontal: true }, height: height, series: series ?? [
17
17
  {
@@ -31,7 +31,15 @@ const LineChart = ({ dataset, series, dataKeyX, dataKeyY, height = 300, granular
31
31
  labelStyle: {
32
32
  fontSize: "0.8rem",
33
33
  },
34
+ ...legendProps,
34
35
  },
36
+ // TODO: Make line dashed between point and "today"-point, i.e. "forcast"
37
+ // line: {
38
+ // limit: 5,
39
+ // sxAfter: {
40
+ // strokeDasharray: "10 5",
41
+ // },
42
+ // } as any,
35
43
  }, xAxis: [
36
44
  {
37
45
  dataKey: dataKeyX,
package/dist/esm/components/charts/LineChart.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../src/components/charts/LineChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,EAAE;IAC3C,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,OAAO;CACd,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACf,KAAK,CAAC,WAAW,CAAC;IAChB,0CAA0C,EAAE;QAC1C,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;KAC9B;CACF,CAAC,CACH,CAAC;AAYF,MAAM,SAAS,GAA6B,CAAC,EAC3C,OAAO,EACP,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,MAAM,GAAG,GAAG,EACZ,WAAW,GAAG,KAAK,EACnB,YAAY,GACb,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,CACL,oBAAC,eAAe,IACd,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EACJ,MAAM,IAAI;YACR;gBACE,OAAO,EAAE,QAAQ;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;aAC3E;SACF,EAEH,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE;gBACnD,OAAO,EAAE,CAAC;gBACV,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,EAAE;gBAClB,OAAO,EAAE,EAAE;gBACX,UAAU,EAAE;oBACV,QAAQ,EAAE,QAAQ;iBACnB;aACF;SACF,EACD,KAAK,EAAE;YACL;gBACE,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,OAAO;gBAClB,cAAc,EAAE,qBAAqB,CAAC,WAAW,CAAC;aACnD;SACF,EACD,KAAK,EAAE;YACL;gBACE,GAAG,EAAE,CAAC;gBACN,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;gBACd,GAAG,YAAY;aAChB;SACF,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../src/components/charts/LineChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,EAAE;IAC3C,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,OAAO;CACd,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACf,KAAK,CAAC,WAAW,CAAC;IAChB,0CAA0C,EAAE;QAC1C,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;KAC9B;CACF,CAAC,CACH,CAAC;AAaF,MAAM,SAAS,GAA6B,CAAC,EAC3C,OAAO,EACP,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,MAAM,GAAG,GAAG,EACZ,WAAW,GAAG,KAAK,EACnB,YAAY,EACZ,WAAW,GACZ,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,OAAO,CACL,oBAAC,eAAe,IACd,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EACJ,MAAM,IAAI;YACR;gBACE,OAAO,EAAE,QAAQ;gBACjB,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;aAC3E;SACF,EAEH,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE;gBACnD,OAAO,EAAE,CAAC;gBACV,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,EAAE;gBAClB,OAAO,EAAE,EAAE;gBACX,UAAU,EAAE;oBACV,QAAQ,EAAE,QAAQ;iBACnB;gBACD,GAAG,WAAW;aACf;YACD,yEAAyE;YACzE,UAAU;YACV,cAAc;YACd,eAAe;YACf,+BAA+B;YAC/B,OAAO;YACP,YAAY;SACb,EACD,KAAK,EAAE;YACL;gBACE,OAAO,EAAE,QAAQ;gBACjB,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,OAAO;gBAClB,cAAc,EAAE,qBAAqB,CAAC,WAAW,CAAC;aACnD;SACF,EACD,KAAK,EAAE;YACL;gBACE,GAAG,EAAE,CAAC;gBACN,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;gBACd,GAAG,YAAY;aAChB;SACF,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
package/dist/esm/extensions/pos/contrib/PurchaseCountWidget.js CHANGED
@@ -30,8 +30,8 @@ const PurchaseCountWidget = ({ data: initialData }) => {
30
30
  }, [totalPurchases, filteredAmount]);
31
31
  const isFourColumn = useMemo(() => {
32
32
  // Ugly check to see if the "Total Subscription Count" widget is present
33
- if ("subscription.stats:state-count" in api.operations &&
34
- "dashboard:stats:subscription:count" in api.contrib) {
33
+ if ("subscription.stats:total" in api.operations &&
34
+ "dashboard:stats:subscription:total" in api.contrib) {
35
35
  const [{ component }] = Object.values(api.contrib["dashboard:stats:subscription:count"]);
36
36
  if (component != null) {
37
37
  return hasPermission(user, component.permission);
package/dist/esm/extensions/pos/contrib/PurchaseCountWidget.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PurchaseCountWidget.js","sourceRoot":"","sources":["../../../../../src/extensions/pos/contrib/PurchaseCountWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,QAAQ,MAAM,qCAAqC,CAAC;AAC3D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,GAErB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AAEnF,MAAM,mBAAmB,GAA0C,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE;IAC3F,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAAC;IACxC,MAAM,IAAI,GAAG,WAAW,CAAC;IACzB,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAE3B,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAClC,OAAO,gCAAgC,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE;QACpC,IAAI,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC;QAC9C,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,GAAG,CAAC,CAAC;QAEvC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;IAErC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,wEAAwE;QACxE,IACE,gCAAgC,IAAI,GAAG,CAAC,UAAU;YAClD,oCAAoC,IAAI,GAAG,CAAC,OAAO,EACnD,CAAC;YACD,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC,CAAC;YAEzF,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBACtB,OAAO,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL;QACE,oBAAC,UAAU,IACT,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAC1C,OAAO,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,EAClC,KAAK,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC;YAE7D,oBAAC,QAAQ,IACP,QAAQ,EAAC,MAAM,EACf,QAAQ,EAAC,OAAO,EAChB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EACzE,WAAW,EAAE,MAAM,CAAC,WAAW,GAC/B,CACS;QAEb,oBAAC,UAAU,IACT,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EACpE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAC7B,KAAK,EAAE,CAAC,CAAC,gBAAgB,CAAC;YAE1B,oBAAC,KAAK,IAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBAC/C,oBAAC,KAAK,IAAC,YAAY,EAAC,WAAW,EAAC,WAAW,EAAC,SAAS,EAAC,MAAM,EAAC,MAAM;oBACjE,oBAAC,UAAU,IAAC,SAAS,EAAC,GAAG,EAAC,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAC,IAAI,IAClE,cAAc,CAAC,cAAc,EAAE,CACrB,CACP;gBAER,oBAAC,UAAU,IAAC,KAAK,EAAC,eAAe,EAAC,OAAO,EAAC,UAAU,IACjD,CAAC,CAAC,QAAQ,oBAAoB,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAC3D,CACP,CACG;QAEb,oBAAC,UAAU,IACT,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EACpE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAC7B,KAAK,EAAE,CAAC,CAAC,kBAAkB,CAAC;YAE5B,oBAAC,KAAK,IAAC,MAAM,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC;gBACxB,oBAAC,KAAK,IAAC,YAAY,EAAC,WAAW,EAAC,WAAW,EAAC,SAAS,EAAC,MAAM,EAAC,MAAM;oBACjE,oBAAC,KAAK,IAAC,UAAU,EAAC,UAAU,EAAC,SAAS,EAAC,KAAK,EAAC,QAAQ,EAAC,MAAM,EAAC,GAAG,EAAE,CAAC;wBACjE,oBAAC,UAAU,IAAC,SAAS,EAAC,GAAG,EAAC,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAC,IAAI,IAClE,gBAAgB,CACN;wBACb,oBAAC,UAAU,IAAC,KAAK,EAAC,eAAe,EAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,aAAa,EAAE,WAAW;;4BACvE,MAAM,CAAC,WAAW,CACf,CACP,CACF;gBAER,oBAAC,UAAU,IAAC,KAAK,EAAC,eAAe,EAAC,OAAO,EAAC,UAAU,IACjD,CAAC,CAAC,QAAQ,oBAAoB,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAC3D,CACP,CACG,CACZ,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"PurchaseCountWidget.js","sourceRoot":"","sources":["../../../../../src/extensions/pos/contrib/PurchaseCountWidget.tsx"],"names":[],"mappings":"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"}
package/dist/esm/extensions/subscription/contrib/RunningSubscriptionCountWidget.js CHANGED
@@ -1,28 +1,56 @@
1
- import React from "react";
1
+ import React, { useMemo, useState } from "react";
2
2
  import { useTheme } from "@mui/material/styles";
3
3
  import LineChart from "../../../components/charts/LineChart";
4
4
  import WidgetCard from "../../../components/WidgetCard";
5
5
  import { useDashboardFilter } from "../../../contexts/DashboardFilterContext";
6
6
  import { useI18n } from "../../../contexts/I18nContext";
7
7
  import { granularityLabel } from "../../../types/dashboard";
8
- const RunningSubscriptionCountWidget = ({ data }) => {
8
+ const safeYMax = (value) => (value < 10 ? value + 1 : undefined);
9
+ const RunningSubscriptionCountWidget = ({ data, }) => {
9
10
  const { filter } = useDashboardFilter();
10
11
  const { t } = useI18n();
11
12
  const theme = useTheme();
12
- const maxCount = Math.max(...data.map(({ count }) => count));
13
+ const [highlighted, setHighlighted] = useState("none");
14
+ const [series, yMax] = useMemo(() => {
15
+ const pendingMax = Math.max(...data.map(({ pending }) => pending));
16
+ const runningMax = Math.max(...data.map(({ running }) => running));
17
+ const yMax = highlighted === "none"
18
+ ? safeYMax(Math.max(pendingMax, runningMax))
19
+ : highlighted === "pending"
20
+ ? safeYMax(pendingMax)
21
+ : safeYMax(runningMax);
22
+ const showPending = ["none", "pending"].includes(highlighted);
23
+ const showRunning = ["none", "running"].includes(highlighted);
24
+ const series = [
25
+ {
26
+ id: "pending",
27
+ label: "Pending",
28
+ data: showPending ? undefined : [],
29
+ dataKey: showPending ? "pending" : undefined,
30
+ showMark: data.length <= 1,
31
+ curve: "monotoneX",
32
+ color: theme.palette.info.light,
33
+ },
34
+ {
35
+ id: "running",
36
+ label: "Running",
37
+ data: showRunning ? undefined : [],
38
+ dataKey: showRunning ? "running" : undefined,
39
+ showMark: data.length <= 1,
40
+ curve: "monotoneX",
41
+ color: theme.palette.success.main,
42
+ },
43
+ ];
44
+ return [series, yMax];
45
+ }, [data, highlighted]);
13
46
  return (React.createElement(WidgetCard, { gridColumn: { md: "1 / span 6", sm: "span 1" }, gridRow: { md: "1", xs: "1" }, title: t(`${granularityLabel(filter.granularity)} Running Subscriptions`) },
14
47
  React.createElement(LineChart, { dataKeyX: "timestamp", dataset: data.map(({ timestamp, ...stats }) => ({
15
48
  timestamp: new Date(timestamp),
16
49
  ...stats,
17
- })), granularity: filter.granularity, series: [
18
- {
19
- dataKey: "count",
20
- showMark: data.length <= 1,
21
- curve: "monotoneX",
22
- color: theme.palette.success.main,
23
- },
24
- ], yAxisOptions: {
25
- max: maxCount + 1,
50
+ })), granularity: filter.granularity, legendProps: {
51
+ onItemClick: (_, context) => setHighlighted(highlighted !== context.seriesId ? context.seriesId : "none"),
52
+ }, series: series, yAxisOptions: {
53
+ max: yMax,
26
54
  } })));
27
55
  };
28
56
  export default RunningSubscriptionCountWidget;
package/dist/esm/extensions/subscription/contrib/RunningSubscriptionCountWidget.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RunningSubscriptionCountWidget.js","sourceRoot":"","sources":["../../../../../src/extensions/subscription/contrib/RunningSubscriptionCountWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,SAAS,MAAM,sCAAsC,CAAC;AAC7D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,MAAM,8BAA8B,GAAuC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IACtF,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAAC;IACxC,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7D,OAAO,CACL,oBAAC,UAAU,IACT,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,QAAQ,EAAE,EAC9C,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAC7B,KAAK,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,wBAAwB,CAAC;QAEzE,oBAAC,SAAS,IACR,QAAQ,EAAC,WAAW,EACpB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9C,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC;gBAC9B,GAAG,KAAK;aACT,CAAC,CAAC,EACH,WAAW,EAAE,MAAM,CAAC,WAAW,EAC/B,MAAM,EAAE;gBACN;oBACE,OAAO,EAAE,OAAO;oBAChB,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC;oBAC1B,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;iBAClC;aACF,EACD,YAAY,EAAE;gBACZ,GAAG,EAAE,QAAQ,GAAG,CAAC;aAClB,GACD,CACS,CACd,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,8BAA8B,CAAC"}
1
+ {"version":3,"file":"RunningSubscriptionCountWidget.js","sourceRoot":"","sources":["../../../../../src/extensions/subscription/contrib/RunningSubscriptionCountWidget.tsx"],"names":[],"mappings":"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"}
package/dist/esm/extensions/subscription/index.js CHANGED
@@ -11,7 +11,7 @@ export const contrib = {
11
11
  },
12
12
  },
13
13
  dashboard: {
14
- "dashboard:stats:subscription:count": {
14
+ "dashboard:stats:subscription:total": {
15
15
  component: async () => (await import("./contrib/SubscriptionStateCountWidget")).default,
16
16
  variant: "inline",
17
17
  permission: "subscription.view_subscription",
@@ -21,7 +21,7 @@ export const contrib = {
21
21
  variant: "inline",
22
22
  permission: "subscription.view_subscription",
23
23
  },
24
- "dashboard:stats:subscription:running": {
24
+ "dashboard:stats:subscription:count": {
25
25
  component: async () => (await import("./contrib/RunningSubscriptionCountWidget")).default,
26
26
  variant: "inline",
27
27
  permission: "subscription.view_subscription",
package/dist/esm/extensions/subscription/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/extensions/subscription/index.tsx"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,2CAA2C,CAAC;AAKlF,MAAM,CAAC,MAAM,OAAO,GAAwC;IAC1D,OAAO,EAAE;QACP,6BAA6B,EAAE;YAC7B,KAAK,EAAE,mBAAmB;YAC1B,IAAI,EAAE,yBAAyB;YAC/B,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC,CAAC,OAAO;YAClF,SAAS,EAAE,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM;YAClE,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;KACF;IACD,SAAS,EAAE;QACT,oCAAoC,EAAE;YACpC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC,OAAO;YACvF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;QACD,qCAAqC,EAAE;YACrC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC,OAAO;YACvF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;QACD,sCAAsC,EAAE;YACtC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,0CAA0C,CAAC,CAAC,CAAC,OAAO;YACzF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;KACF;CACO,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/extensions/subscription/index.tsx"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,2CAA2C,CAAC;AAKlF,MAAM,CAAC,MAAM,OAAO,GAAwC;IAC1D,OAAO,EAAE;QACP,6BAA6B,EAAE;YAC7B,KAAK,EAAE,mBAAmB;YAC1B,IAAI,EAAE,yBAAyB;YAC/B,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC,CAAC,OAAO;YAClF,SAAS,EAAE,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM;YAClE,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;KACF;IACD,SAAS,EAAE;QACT,oCAAoC,EAAE;YACpC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC,OAAO;YACvF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;QACD,qCAAqC,EAAE;YACrC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC,OAAO;YACvF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;QACD,oCAAoC,EAAE;YACpC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,0CAA0C,CAAC,CAAC,CAAC,OAAO;YACzF,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gCAAgC;SAC7C;KACF;CACO,CAAC"}
package/dist/types/components/charts/LineChart.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import React from "react";
2
+ import { ChartsLegendProps } from "@mui/x-charts/ChartsLegend";
2
3
  import { DatasetType, MakeOptional } from "@mui/x-charts/internals";
3
4
  import { LineSeriesType } from "@mui/x-charts/models/seriesType";
4
5
  import { Granularity } from "../../types/dashboard";
@@ -17,6 +18,7 @@ export interface LineChartProps {
17
18
  height?: number;
18
19
  granularity?: Granularity;
19
20
  yAxisOptions?: object;
21
+ legendProps?: ChartsLegendProps;
20
22
  }
21
23
  declare const LineChart: React.FC<LineChartProps>;
22
24
  export default LineChart;
package/dist/types/extensions/subscription/contrib/RunningSubscriptionCountWidget.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { ContribComponent } from "../../../types";
2
- import { TimestampStats } from "../types/stats";
3
- declare const RunningSubscriptionCountWidget: ContribComponent<TimestampStats[]>;
2
+ import { SubscriptionStateCountItem } from "../types/stats";
3
+ declare const RunningSubscriptionCountWidget: ContribComponent<SubscriptionStateCountItem[]>;
4
4
  export default RunningSubscriptionCountWidget;
package/dist/types/extensions/subscription/contrib/SubscriptionStateCountWidget.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { ContribComponent } from "../../../types";
2
- import { SubscriptionStateCountItem } from "../types/stats";
3
- declare const SubscriptionStateCountWidget: ContribComponent<SubscriptionStateCountItem[]>;
2
+ import { SubscriptionTotalCountItem } from "../types/stats";
3
+ declare const SubscriptionStateCountWidget: ContribComponent<SubscriptionTotalCountItem[]>;
4
4
  export default SubscriptionStateCountWidget;
package/dist/types/extensions/subscription/types/stats.d.ts CHANGED
@@ -1,10 +1,7 @@
1
- export interface TimestampStats {
2
- timestamp: string;
3
- count: number;
4
- }
5
1
  export interface SubscriptionStateCountItem {
6
- state: string;
7
- count: number;
2
+ timestamp: string;
3
+ pending: number;
4
+ running: number;
8
5
  }
9
6
  export interface SubscriptionEventCountItem {
10
7
  timestamp: string;
@@ -13,3 +10,7 @@ export interface SubscriptionEventCountItem {
13
10
  cancelled: number;
14
11
  ended: number;
15
12
  }
13
+ export interface SubscriptionTotalCountItem {
14
+ state: string;
15
+ count: number;
16
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bananas-commerce-admin",
3
- "version": "0.17.4",
3
+ "version": "0.17.5",
4
4
  "description": "What's this, an admin for apes?",
5
5
  "keywords": [
6
6
  "admin",
package/src/components/charts/LineChart.tsx CHANGED
@@ -1,6 +1,7 @@
1
1
  import React from "react";
2
2
 
3
3
  import { styled, useTheme } from "@mui/material/styles";
4
+ import { ChartsLegendProps } from "@mui/x-charts/ChartsLegend";
4
5
  import { DatasetType, MakeOptional } from "@mui/x-charts/internals";
5
6
  import { LineChart as MuiLineChart } from "@mui/x-charts/LineChart";
6
7
  import { LineSeriesType } from "@mui/x-charts/models/seriesType";
@@ -34,6 +35,7 @@ export interface LineChartProps {
34
35
  height?: number;
35
36
  granularity?: Granularity;
36
37
  yAxisOptions?: object;
38
+ legendProps?: ChartsLegendProps;
37
39
  }
38
40
 
39
41
  const LineChart: React.FC<LineChartProps> = ({
@@ -44,6 +46,7 @@ const LineChart: React.FC<LineChartProps> = ({
44
46
  height = 300,
45
47
  granularity = "day",
46
48
  yAxisOptions,
49
+ legendProps,
47
50
  }) => {
48
51
  const theme = useTheme();
49
52
 
@@ -73,7 +76,15 @@ const LineChart: React.FC<LineChartProps> = ({
73
76
  labelStyle: {
74
77
  fontSize: "0.8rem",
75
78
  },
79
+ ...legendProps,
76
80
  },
81
+ // TODO: Make line dashed between point and "today"-point, i.e. "forcast"
82
+ // line: {
83
+ // limit: 5,
84
+ // sxAfter: {
85
+ // strokeDasharray: "10 5",
86
+ // },
87
+ // } as any,
77
88
  }}
78
89
  xAxis={[
79
90
  {
package/src/extensions/pos/contrib/PurchaseCountWidget.tsx CHANGED
@@ -43,8 +43,8 @@ const PurchaseCountWidget: ContribComponent<PurchaseCountItem[]> = ({ data: init
43
43
  const isFourColumn = useMemo(() => {
44
44
  // Ugly check to see if the "Total Subscription Count" widget is present
45
45
  if (
46
- "subscription.stats:state-count" in api.operations &&
47
- "dashboard:stats:subscription:count" in api.contrib
46
+ "subscription.stats:total" in api.operations &&
47
+ "dashboard:stats:subscription:total" in api.contrib
48
48
  ) {
49
49
  const [{ component }] = Object.values(api.contrib["dashboard:stats:subscription:count"]);
50
50
 
package/src/extensions/subscription/contrib/RunningSubscriptionCountWidget.tsx CHANGED
@@ -1,6 +1,8 @@
1
- import React from "react";
1
+ import React, { useMemo, useState } from "react";
2
2
 
3
3
  import { useTheme } from "@mui/material/styles";
4
+ import { SeriesId } from "@mui/x-charts/internals";
5
+ import { LineSeriesType } from "@mui/x-charts/models/seriesType";
4
6
 
5
7
  import LineChart from "../../../components/charts/LineChart";
6
8
  import WidgetCard from "../../../components/WidgetCard";
@@ -8,14 +10,55 @@ import { useDashboardFilter } from "../../../contexts/DashboardFilterContext";
8
10
  import { useI18n } from "../../../contexts/I18nContext";
9
11
  import { ContribComponent } from "../../../types";
10
12
  import { granularityLabel } from "../../../types/dashboard";
11
- import { TimestampStats } from "../types/stats";
13
+ import { SubscriptionStateCountItem } from "../types/stats";
12
14
 
13
- const RunningSubscriptionCountWidget: ContribComponent<TimestampStats[]> = ({ data }) => {
15
+ const safeYMax = (value: number) => (value < 10 ? value + 1 : undefined);
16
+
17
+ const RunningSubscriptionCountWidget: ContribComponent<SubscriptionStateCountItem[]> = ({
18
+ data,
19
+ }) => {
14
20
  const { filter } = useDashboardFilter();
15
21
  const { t } = useI18n();
16
22
  const theme = useTheme();
17
23
 
18
- const maxCount = Math.max(...data.map(({ count }) => count));
24
+ const [highlighted, setHighlighted] = useState<SeriesId>("none");
25
+
26
+ const [series, yMax] = useMemo(() => {
27
+ const pendingMax = Math.max(...data.map(({ pending }) => pending));
28
+ const runningMax = Math.max(...data.map(({ running }) => running));
29
+ const yMax =
30
+ highlighted === "none"
31
+ ? safeYMax(Math.max(pendingMax, runningMax))
32
+ : highlighted === "pending"
33
+ ? safeYMax(pendingMax)
34
+ : safeYMax(runningMax);
35
+
36
+ const showPending = (["none", "pending"] as SeriesId[]).includes(highlighted);
37
+ const showRunning = (["none", "running"] as SeriesId[]).includes(highlighted);
38
+
39
+ const series = [
40
+ {
41
+ id: "pending",
42
+ label: "Pending",
43
+ data: showPending ? undefined : [],
44
+ dataKey: showPending ? "pending" : undefined,
45
+ showMark: data.length <= 1,
46
+ curve: "monotoneX",
47
+ color: theme.palette.info.light,
48
+ },
49
+ {
50
+ id: "running",
51
+ label: "Running",
52
+ data: showRunning ? undefined : [],
53
+ dataKey: showRunning ? "running" : undefined,
54
+ showMark: data.length <= 1,
55
+ curve: "monotoneX",
56
+ color: theme.palette.success.main,
57
+ },
58
+ ] as LineSeriesType[];
59
+
60
+ return [series, yMax];
61
+ }, [data, highlighted]);
19
62
 
20
63
  return (
21
64
  <WidgetCard
@@ -30,16 +73,13 @@ const RunningSubscriptionCountWidget: ContribComponent<TimestampStats[]> = ({ da
30
73
  ...stats,
31
74
  }))}
32
75
  granularity={filter.granularity}
33
- series={[
34
- {
35
- dataKey: "count",
36
- showMark: data.length <= 1,
37
- curve: "monotoneX",
38
- color: theme.palette.success.main,
39
- },
40
- ]}
76
+ legendProps={{
77
+ onItemClick: (_, context) =>
78
+ setHighlighted(highlighted !== context.seriesId ? context.seriesId : "none"),
79
+ }}
80
+ series={series}
41
81
  yAxisOptions={{
42
- max: maxCount + 1,
82
+ max: yMax,
43
83
  }}
44
84
  />
45
85
  </WidgetCard>
package/src/extensions/subscription/contrib/SubscriptionStateCountWidget.tsx CHANGED
@@ -6,9 +6,9 @@ import WidgetCard from "../../../components/WidgetCard";
6
6
  import { useI18n } from "../../../contexts/I18nContext";
7
7
  import { ContribComponent } from "../../../types";
8
8
  import { capitalize } from "../../../util";
9
- import { SubscriptionStateCountItem } from "../types/stats";
9
+ import { SubscriptionTotalCountItem } from "../types/stats";
10
10
 
11
- const SubscriptionStateCountWidget: ContribComponent<SubscriptionStateCountItem[]> = ({ data }) => {
11
+ const SubscriptionStateCountWidget: ContribComponent<SubscriptionTotalCountItem[]> = ({ data }) => {
12
12
  const { t } = useI18n();
13
13
 
14
14
  if (data.length === 0) return null;
package/src/extensions/subscription/index.tsx CHANGED
@@ -15,7 +15,7 @@ export const contrib: Record<string, ContribComponentMap> = {
15
15
  },
16
16
  },
17
17
  dashboard: {
18
- "dashboard:stats:subscription:count": {
18
+ "dashboard:stats:subscription:total": {
19
19
  component: async () => (await import("./contrib/SubscriptionStateCountWidget")).default,
20
20
  variant: "inline",
21
21
  permission: "subscription.view_subscription",
@@ -25,7 +25,7 @@ export const contrib: Record<string, ContribComponentMap> = {
25
25
  variant: "inline",
26
26
  permission: "subscription.view_subscription",
27
27
  },
28
- "dashboard:stats:subscription:running": {
28
+ "dashboard:stats:subscription:count": {
29
29
  component: async () => (await import("./contrib/RunningSubscriptionCountWidget")).default,
30
30
  variant: "inline",
31
31
  permission: "subscription.view_subscription",
package/src/extensions/subscription/types/stats.ts CHANGED
@@ -1,11 +1,7 @@
1
- export interface TimestampStats {
2
- timestamp: string;
3
- count: number;
4
- }
5
-
6
1
  export interface SubscriptionStateCountItem {
7
- state: string;
8
- count: number;
2
+ timestamp: string;
3
+ pending: number;
4
+ running: number;
9
5
  }
10
6
 
11
7
  export interface SubscriptionEventCountItem {
@@ -15,3 +11,8 @@ export interface SubscriptionEventCountItem {
15
11
  cancelled: number;
16
12
  ended: number;
17
13
  }
14
+
15
+ export interface SubscriptionTotalCountItem {
16
+ state: string;
17
+ count: number;
18
+ }