bananas-commerce-admin 0.10.5 → 0.10.6

package/dist/cjs/Admin.js

@@ -42,9 +42,9 @@ const Router_1 = require("./router/Router");
 const Admin = ({ logo, title, subtitle, version, navigation, extensions, dashboard, basename, basepath, }) => {
     const api = (0, ApiContext_1.useApi)();
     const i18n = (0, I18nContext_1.useI18n)();
-    const { user } = (0, UserContext_1.useUser)();
+    const { hasTriedToFetchUser, user } = (0, UserContext_1.useUser)();
     const hasLoaded = Boolean(api != null && i18n != null);
-    const isLoggedIn = user != null;
+    const hasUser = user != null;
     return (react_1.default.createElement(Box_1.default, { sx: {
             display: "flex",
             position: "fixed",
@@ -54,13 +54,13 @@ const Admin = ({ logo, title, subtitle, version, navigation, extensions, dashboa
             height: "100%",
             flexDirection: "column",
             backgroundColor: "background.default",
-        } }, hasLoaded ? (isLoggedIn ? (react_1.default.createElement(react_router_dom_1.BrowserRouter, { basename: basename },
+        } }, !hasLoaded || !hasTriedToFetchUser ? (react_1.default.createElement(LoadingScreen_1.default, null)) : !hasUser ? (react_1.default.createElement(LoginPage_1.default, { logo: logo, title: title })) : (react_1.default.createElement(react_router_dom_1.BrowserRouter, { basename: basename },
         react_1.default.createElement(RouterContext_1.RouterContextProvider, { basename: basename, stripPathPrefix: basepath },
             react_1.default.createElement(DialogContext_1.default, null,
                 react_1.default.createElement(DialogContext_1.BcomDialog, null),
                 react_1.default.createElement(Box_1.default, { sx: { display: "flex" } },
                     react_1.default.createElement(NavRail_1.default, { navigation: navigation, logo: logo, title: title, subtitle: subtitle, version: version }),
-                    react_1.default.createElement(Router_1.Router, { extensions: extensions, dashboard: dashboard })))))) : (react_1.default.createElement(LoginPage_1.default, { logo: logo, title: title }))) : (react_1.default.createElement(LoadingScreen_1.default, null))));
+                    react_1.default.createElement(Router_1.Router, { extensions: extensions, dashboard: dashboard }))))))));
 };
 exports.Admin = Admin;
 exports.default = exports.Admin;

package/dist/cjs/Admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Admin.js","sourceRoot":"","sources":["../../src/Admin.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,uDAAiD;AACjD,4DAAoC;AACpC,mEAA2C;AAC3C,+EAAuD;AACvD,sDAA+C;AAC/C,0EAA6E;AAC7E,wDAAiD;AACjD,4DAAiE;AACjE,wDAAiD;AACjD,kEAA0C;AAC1C,4CAAsD;AAkB/C,MAAM,KAAK,GAAyB,CAAC,EAC1C,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,SAAS,EACT,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IACrB,MAAM,IAAI,GAAG,IAAA,qBAAO,GAAE,CAAC;IACvB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAO,GAAE,CAAC;IAE3B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,IAAI,IAAI,CAAC;IAEhC,OAAO,CACL,8BAAC,aAAG,IACF,EAAE,EAAE;YACF,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,oBAAoB;SACtC,IAEA,SAAS,CAAC,CAAC,CAAC,CACX,UAAU,CAAC,CAAC,CAAC,CACX,8BAAC,gCAAa,IAAC,QAAQ,EAAE,QAAQ;QAC/B,8BAAC,qCAAqB,IAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ;YAClE,8BAAC,uBAAqB;gBACpB,8BAAC,0BAAU,OAAG;gBACd,8BAAC,aAAG,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;oBAC1B,8BAAC,iBAAO,IACN,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,GAChB;oBAEF,8BAAC,eAAM,IAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAI,CACpD,CACgB,CACF,CACV,CACjB,CAAC,CAAC,CAAC,CACF,8BAAC,mBAAS,IAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAI,CACxC,CACF,CAAC,CAAC,CAAC,CACF,8BAAC,uBAAa,OAAG,CAClB,CACG,CACP,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,KAAK,SA2DhB;AAEF,kBAAe,aAAK,CAAC"}
+{"version":3,"file":"Admin.js","sourceRoot":"","sources":["../../src/Admin.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,uDAAiD;AACjD,4DAAoC;AACpC,mEAA2C;AAC3C,+EAAuD;AACvD,sDAA+C;AAC/C,0EAA6E;AAC7E,wDAAiD;AACjD,4DAAiE;AACjE,wDAAiD;AACjD,kEAA0C;AAC1C,4CAAsD;AAkB/C,MAAM,KAAK,GAAyB,CAAC,EAC1C,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,SAAS,EACT,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IACrB,MAAM,IAAI,GAAG,IAAA,qBAAO,GAAE,CAAC;IACvB,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAO,GAAE,CAAC;IAEhD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,CAAC;IAE7B,OAAO,CACL,8BAAC,aAAG,IACF,EAAE,EAAE;YACF,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;YACd,aAAa,EAAE,QAAQ;YACvB,eAAe,EAAE,oBAAoB;SACtC,IAEA,CAAC,SAAS,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CACpC,8BAAC,uBAAa,OAAG,CAClB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACb,8BAAC,mBAAS,IAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAI,CACxC,CAAC,CAAC,CAAC,CACF,8BAAC,gCAAa,IAAC,QAAQ,EAAE,QAAQ;QAC/B,8BAAC,qCAAqB,IAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ;YAClE,8BAAC,uBAAqB;gBACpB,8BAAC,0BAAU,OAAG;gBACd,8BAAC,aAAG,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;oBAC1B,8BAAC,iBAAO,IACN,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,GAChB;oBAEF,8BAAC,eAAM,IAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAI,CACpD,CACgB,CACF,CACV,CACjB,CACG,CACP,CAAC;AACJ,CAAC,CAAC;AAzDW,QAAA,KAAK,SAyDhB;AAEF,kBAAe,aAAK,CAAC"}

package/dist/cjs/components/Header.js

@@ -1,25 +1,48 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Header = void 0;
-const react_1 = __importDefault(require("react"));
-const Stack_1 = __importDefault(require("@mui/material/Stack"));
-const Header = ({ variant = "default", children, }) => {
-    return (react_1.default.createElement(Stack_1.default, { direction: "column", sx: variant === "opaque"
+const react_1 = __importStar(require("react"));
+const material_1 = require("@mui/material");
+const Header = ({ variant = "default", children, sx: passedSx, ...props }) => {
+    const variantSx = (0, react_1.useMemo)(() => variant === "opaque"
+        ? {
+            backgroundColor: "background.paper",
+            borderBottom: 1,
+            borderColor: "divider",
+            pt: 2,
+        }
+        : variant === "default"
             ? {
-                backgroundColor: "background.paper",
-                borderBottom: 1,
-                borderColor: "divider",
-                pt: 2,
+                background: "background.default",
+                py: 2,
             }
-            : variant === "default"
-                ? {
-                    background: "background.default",
-                    py: 2,
-                }
-                : {} }, children));
+            : {}, [variant]);
+    const sx = (0, react_1.useMemo)(() => ({ ...variantSx, ...passedSx }), [variantSx, passedSx]);
+    return (react_1.default.createElement(material_1.Stack, { direction: "column", sx: sx, ...props }, children));
 };
 exports.Header = Header;
+exports.default = (0, react_1.memo)(exports.Header);
 //# sourceMappingURL=Header.js.map

package/dist/cjs/components/Header.js.map

@@ -1 +1 @@
-{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,gEAAwC;AAMjC,MAAM,MAAM,GAAuD,CAAC,EACzE,OAAO,GAAG,SAAS,EACnB,QAAQ,GACT,EAAE,EAAE;IACH,OAAO,CACL,8BAAC,eAAK,IACJ,SAAS,EAAC,QAAQ,EAClB,EAAE,EACA,OAAO,KAAK,QAAQ;YAClB,CAAC,CAAC;gBACE,eAAe,EAAE,kBAAkB;gBACnC,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,SAAS;gBACtB,EAAE,EAAE,CAAC;aACN;YACH,CAAC,CAAC,OAAO,KAAK,SAAS;gBACrB,CAAC,CAAC;oBACE,UAAU,EAAE,oBAAoB;oBAChC,EAAE,EAAE,CAAC;iBACN;gBACH,CAAC,CAAC,EAAE,IAGT,QAAQ,CACH,CACT,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,MAAM,UA0BjB"}
+{"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6C;AAE7C,4CAAkD;AAM3C,MAAM,MAAM,GAA8B,CAAC,EAChD,OAAO,GAAG,SAAS,EACnB,QAAQ,EACR,EAAE,EAAE,QAAQ,EACZ,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,SAAS,GAAG,IAAA,eAAO,EACvB,GAAG,EAAE,CACH,OAAO,KAAK,QAAQ;QAClB,CAAC,CAAC;YACE,eAAe,EAAE,kBAAkB;YACnC,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,SAAS;YACtB,EAAE,EAAE,CAAC;SACN;QACH,CAAC,CAAC,OAAO,KAAK,SAAS;YACrB,CAAC,CAAC;gBACE,UAAU,EAAE,oBAAoB;gBAChC,EAAE,EAAE,CAAC;aACN;YACH,CAAC,CAAC,EAAE,EACV,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,EAAE,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,QAAQ,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEjF,OAAO,CACL,8BAAC,gBAAK,IAAC,SAAS,EAAC,QAAQ,EAAC,EAAE,EAAE,EAAE,KAAM,KAAK,IACxC,QAAQ,CACH,CACT,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,MAAM,UA+BjB;AAEF,kBAAe,IAAA,YAAI,EAAC,cAAM,CAAC,CAAC"}

package/dist/cjs/components/NavBar/index.js

@@ -40,6 +40,7 @@ const NavBarRoutes_1 = __importDefault(require("./NavBarRoutes"));
 const User_1 = __importDefault(require("./User"));
 const Logout_1 = __importDefault(require("./Logout"));
 const drawerWidth = 240;
+// TODO: Remove
 // TODO: Move `openedMixin` and `closedMixin` to styled, using `ownerState`
 const openedMixin = (theme) => ({
     width: drawerWidth,

package/dist/cjs/components/NavBar/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/NavBar/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoC;AACpC,uDAA+C;AAE/C,4DAAoC;AACpC,kEAA0C;AAC1C,gEAAwC;AACxC,iDAA0E;AAE1E,uDAAyD;AAEzD,0DAAkC;AAClC,4DAAoC;AACpC,kEAA0C;AAC1C,kDAA0B;AAC1B,sDAA8B;AAE9B,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,2EAA2E;AAC3E,MAAM,WAAW,GAAG,CAAC,KAAY,EAAa,EAAE,CAAC,CAAC;IAChD,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE;QAC5C,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK;QACtC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc;KACpD,CAAC;IACF,SAAS,EAAE,QAAQ;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,KAAY,EAAa,EAAE,CAAC,CAAC;IAChD,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE;QAC5C,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK;QACtC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa;KACnD,CAAC;IACF,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,QAAQ,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;IACxC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE;QAC5B,KAAK,EAAE,QAAQ,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KACzC;CACF,CAAC,CAAC;AAUH,MAAM,YAAY,GAAG,IAAA,eAAM,EAAC,gBAAM,EAAE;IAClC,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,MAAM;CACb,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACf,KAAK,CAAC,WAAW,CAAC;IAChB,KAAK,EAAE,WAAW;IAClB,KAAK,EAAE,sBAAsB;IAC7B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc;CAC1E,CAAC,CACH,CAAC;AAEK,MAAM,MAAM,GAA0B,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;IAC9F,MAAM,KAAK,GAAG,IAAA,iBAAQ,GAAE,CAAC;IAEzB,MAAM,QAAQ,GAAG,IAAA,8BAAW,GAAE,CAAC;IAC/B,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,4BAAe,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,CACL,8BAAC,YAAY,IACX,EAAE,EACA;YACE,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,YAAY;YACvB,GAAG,CAAC,IAAI;gBACN,CAAC,CAAC;oBACE,GAAG,WAAW,CAAC,KAAK,CAAC;oBACrB,oBAAoB,EAAE,WAAW,CAAC,KAAK,CAAC;iBACzC;gBACH,CAAC,CAAC;oBACE,GAAG,WAAW,CAAC,KAAK,CAAC;oBACrB,oBAAoB,EAAE,WAAW,CAAC,KAAK,CAAC;iBACzC,CAAC;SACA,EAEV,UAAU,EAAE;YACV,EAAE,EAAE;gBACF,kEAAkE;gBAClE,eAAe,EAAE,aAAa;gBAC9B,WAAW,EAAE,OAAO;gBACpB,KAAK,EAAE,SAAS;aACjB;YACD,SAAS,EAAE,qBAAqB;SACjC,EACD,MAAM,EAAC,MAAM,EACb,OAAO,EAAC,WAAW,EACnB,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,IAAI,EAClB,IAAI,EAAE,IAAI;QAEV,8BAAC,aAAG,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;YAC1B,8BAAC,mBAAS,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAI;YACpD,8BAAC,kBAAQ,IACP,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EACjD,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI,GACf,CACE;QAEN,8BAAC,aAAG,IAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE;YACrC,8BAAC,sBAAY,IAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,GAAI,CAChD;QAEN,8BAAC,eAAK,IAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE;YACvC,8BAAC,cAAI,IAAC,IAAI,EAAE,IAAI,GAAI;YACpB,8BAAC,gBAAM,IAAC,IAAI,EAAE,IAAI,GAAI,CAChB,CACK,CAChB,CAAC;AACJ,CAAC,CAAC;AAjEW,QAAA,MAAM,UAiEjB;AAEF,kBAAe,IAAA,YAAI,EAAC,cAAM,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/NavBar/index.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/containers/ComponentLoader.js

@@ -1,10 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentLoader = exports.DataLoadFailedError = void 0;
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const react_2 = require("react");
 const ApiContext_1 = require("../contexts/ApiContext");
 const useAsyncError_1 = __importDefault(require("../hooks/useAsyncError"));
@@ -40,13 +63,11 @@ const ComponentLoader = ({ operation, ...rest }) => {
 };
 exports.ComponentLoader = ComponentLoader;
 const ComponentLoaderInner = ({ operation, ...rest }) => {
-    const api = (0, ApiContext_1.useApi)();
-    const [data, setData] = react_1.default.useState(null);
+    const [data, setData] = (0, react_1.useState)(null);
     const throwError = (0, useAsyncError_1.default)();
     const component = operation.component.component;
-    const Component = react_1.default.lazy(async () => ({
-        default: await Promise.resolve(component),
-    }));
+    const Component = (0, react_1.useMemo)(() => (0, react_1.lazy)(async () => ({ default: await Promise.resolve(component) })), [component]);
+    const initalLoad = (0, react_1.useRef)(true);
     const refresh = () => {
         operation
             .call(rest)
@@ -60,12 +81,15 @@ const ComponentLoaderInner = ({ operation, ...rest }) => {
         })
             .catch(throwError);
     };
-    react_1.default.useEffect(() => {
-        if (data === null) {
+    (0, react_1.useEffect)(() => {
+        if (initalLoad.current) {
+            initalLoad.current = false;
+        }
+        else {
             refresh();
         }
-    }, [api, data]);
-    return (react_1.default.createElement(react_2.Suspense, { fallback: react_1.default.createElement(LoadingScreen_1.default, null) }, data != null ? react_1.default.createElement(Component, { data: data, refresh: refresh, ...rest }) : react_1.default.createElement(LoadingScreen_1.default, null)));
+    }, [rest.query, rest.params]);
+    return (react_1.default.createElement(react_2.Suspense, { fallback: react_1.default.createElement(LoadingScreen_1.default, null) }, data != null && react_1.default.createElement(Component, { data: data, refresh: refresh, ...rest })));
 };
 exports.default = exports.ComponentLoader;
 //# sourceMappingURL=ComponentLoader.js.map

package/dist/cjs/containers/ComponentLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentLoader.js","sourceRoot":"","sources":["../../../src/containers/ComponentLoader.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ComponentLoader.js","sourceRoot":"","sources":["../../../src/containers/ComponentLoader.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA0E;AAC1E,iCAAiC;AAGjC,uDAAgD;AAChD,2EAAmD;AACnD,oEAA4C;AAG5C,MAAa,mBAAoB,SAAQ,KAAK;IACnC,QAAQ,CAAW;IAE5B,YAAY,QAAkB,EAAE,OAAgB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAPD,kDAOC;AAUM,MAAM,eAAe,GAAmC,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACxF,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IAErB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,4BAA4B,SAAS,EAAE,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,CAAC,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,0CAA0C,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;IACvC,6DAA6D;IAC7D,0DAA0D;IAC1D,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;IAC3C,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC;IACzC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;IAE7C,OAAO,CACL,8BAAC,oBAAoB,IACnB,SAAS,EAAE,SAAqE,KAC5E,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,eAAe,mBA8B1B;AAEF,MAAM,oBAAoB,GAAwC,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC3F,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;IAEnC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC;IAChD,MAAM,SAAS,GAAG,IAAA,eAAO,EACvB,GAAG,EAAE,CAAC,IAAA,YAAI,EAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EACvE,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,SAAS;aACN,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACvB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,UAAU,CACR,IAAI,mBAAmB,CACrB,QAAQ,EACR,yBAAyB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAClE,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9B,OAAO,CACL,8BAAC,gBAAQ,IAAC,QAAQ,EAAE,8BAAC,uBAAa,OAAG,IAClC,IAAI,IAAI,IAAI,IAAI,8BAAC,SAAS,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,KAAM,IAAI,GAAI,CAC7D,CACZ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,uBAAe,CAAC"}

package/dist/cjs/containers/PageLoader.js

@@ -42,51 +42,50 @@ class PageLoadFailedError extends Error {
 exports.PageLoadFailedError = PageLoadFailedError;
 const PageLoader = ({ route, page, offline, request, defaultRequest, }) => {
     offline ??= false;
-    const Page = (0, react_1.lazy)(async () => ({
-        default: await Promise.resolve(page),
-    }));
+    const Page = (0, react_1.useMemo)(() => (0, react_1.lazy)(async () => ({ default: await Promise.resolve(page) })), [page]);
     const api = (0, ApiContext_1.useApi)();
     const params = (0, react_router_dom_1.useParams)();
     const [searchParams] = (0, react_router_dom_1.useSearchParams)();
     const [data, setData] = (0, react_1.useState)(null);
     const throwError = (0, useAsyncError_1.default)();
+    // TODO: Please don't to this many requests man :(
     const refresh = () => {
-        if (!offline) {
-            const query = Array.from(searchParams.entries()).length == 0
-                ? defaultRequest?.query != null
-                    ? defaultRequest.query instanceof URLSearchParams
-                        ? defaultRequest.query.entries()
-                        : Object.entries(defaultRequest.query)
-                    : []
-                : searchParams.entries();
-            api.operations[route.id]
-                .call({
-                params: { ...params, ...request?.params },
-                query: new URLSearchParams([
-                    ...Array.from(query),
-                    ...Array.from(request?.query != null
-                        ? request.query instanceof URLSearchParams
-                            ? request.query.entries()
-                            : Object.entries(request.query)
-                        : []),
-                ]),
-            })
-                .then(async (response) => {
-                if (response.ok) {
-                    setData(await response.json());
-                }
-                else {
-                    throwError(new PageLoadFailedError(response, `Page data load failed with ${response.status} ${response.statusText}`));
-                }
-            })
-                .catch(throwError);
-        }
+        if (offline)
+            return;
+        const query = Array.from(searchParams.entries()).length === 0
+            ? defaultRequest?.query != null
+                ? defaultRequest.query instanceof URLSearchParams
+                    ? defaultRequest.query.entries()
+                    : Object.entries(defaultRequest.query)
+                : []
+            : searchParams.entries();
+        api.operations[route.id]
+            .call({
+            params: { ...params, ...request?.params },
+            query: new URLSearchParams([
+                ...Array.from(query),
+                ...Array.from(request?.query != null
+                    ? request.query instanceof URLSearchParams
+                        ? request.query.entries()
+                        : Object.entries(request.query)
+                    : []),
+            ]),
+        })
+            .then(async (response) => {
+            if (response.ok) {
+                setData(await response.json());
+            }
+            else {
+                throwError(new PageLoadFailedError(response, `Page data load failed with ${response.status} ${response.statusText}`));
+            }
+        })
+            .catch(throwError);
     };
-    react_1.default.useEffect(() => {
-        if (data === null)
+    (0, react_1.useEffect)(() => {
+        if (data == null)
             refresh();
-    }, [api, params, searchParams, data]);
-    return (react_1.default.createElement(react_1.Suspense, { fallback: react_1.default.createElement(LoadingScreen_1.default, null) }, data != null || offline ? react_1.default.createElement(Page, { data: data, refresh: refresh }) : react_1.default.createElement(LoadingScreen_1.default, null)));
+    }, [params, searchParams, data]);
+    return (react_1.default.createElement(react_1.Suspense, { fallback: react_1.default.createElement(LoadingScreen_1.default, null) }, Boolean(data != null || offline) && react_1.default.createElement(Page, { data: data, refresh: refresh })));
 };
 exports.default = PageLoader;
 //# sourceMappingURL=PageLoader.js.map

package/dist/cjs/containers/PageLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageLoader.js","sourceRoot":"","sources":["../../../src/containers/PageLoader.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PageLoader.js","sourceRoot":"","sources":["../../../src/containers/PageLoader.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4E;AAC5E,uDAA8D;AAE9D,uDAAgD;AAEhD,2EAAmD;AAEnD,oEAA4C;AAE5C,MAAa,mBAAoB,SAAQ,KAAK;IACnC,QAAQ,CAAW;IAE5B,YAAY,QAAkB,EAAE,OAAgB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAPD,kDAOC;AAUD,MAAM,UAAU,GAA8B,CAAC,EAC7C,KAAK,EACL,IAAI,EACJ,OAAO,EACP,OAAO,EACP,cAAc,GACf,EAAE,EAAE;IACH,OAAO,KAAK,KAAK,CAAC;IAElB,MAAM,IAAI,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,IAAA,YAAI,EAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACjG,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IACrB,MAAM,MAAM,GAAG,IAAA,4BAAS,GAAE,CAAC;IAC3B,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,kCAAe,GAAE,CAAC;IAEzC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;IAEnC,kDAAkD;IAClD,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,OAAO;YAAE,OAAO;QAEpB,MAAM,KAAK,GACT,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;YAC7C,CAAC,CAAC,cAAc,EAAE,KAAK,IAAI,IAAI;gBAC7B,CAAC,CAAC,cAAc,CAAC,KAAK,YAAY,eAAe;oBAC/C,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE;oBAChC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC;gBACxC,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAE7B,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;aACrB,IAAI,CAAC;YACJ,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE;YACzC,KAAK,EAAE,IAAI,eAAe,CAAC;gBACzB,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBACpB,GAAG,KAAK,CAAC,IAAI,CACX,OAAO,EAAE,KAAK,IAAI,IAAI;oBACpB,CAAC,CAAC,OAAO,CAAC,KAAK,YAAY,eAAe;wBACxC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE;wBACzB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;oBACjC,CAAC,CAAC,EAAE,CACP;aACF,CAAC;SACH,CAAC;aACD,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACvB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,UAAU,CACR,IAAI,mBAAmB,CACrB,QAAQ,EACR,8BAA8B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACvE,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAU,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;IAC9B,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAEjC,OAAO,CACL,8BAAC,gBAAQ,IAAC,QAAQ,EAAE,8BAAC,uBAAa,OAAG,IAClC,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,8BAAC,IAAI,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,CAClE,CACZ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,UAAU,CAAC"}

package/dist/cjs/contexts/DashboardFilterContext.js

@@ -24,35 +24,71 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDashboardFilter = exports.DashboardFilterContext = void 0;
+exports.filterToQueryParams = filterToQueryParams;
 const react_1 = __importStar(require("react"));
 const luxon_1 = require("luxon");
-const initialFilter = () => {
-    const storedFilter = sessionStorage.getItem("dashboard-filter");
-    if (storedFilter == null) {
-        return {
-            start_date: luxon_1.DateTime.now().minus({ days: 6 }),
-            end_date: luxon_1.DateTime.now(),
-            granularity: "day",
-        };
-    }
-    const parsed = JSON.parse(storedFilter);
-    const filter = {
-        ...parsed,
-        start_date: luxon_1.DateTime.fromISO(parsed.start_date),
-        end_date: luxon_1.DateTime.fromISO(parsed.end_date),
+const RouterContext_1 = require("./RouterContext");
+const contrib_1 = require("../extensions/pos/types/contrib");
+/**
+ * The default filter for the dashboard,used when the filter is not present in the URL.
+ * Might as well be a function to avoid stale dates.
+ */
+const defaultFilter = () => ({
+    startDate: luxon_1.DateTime.now().minus({ days: 6 }),
+    endDate: luxon_1.DateTime.now(),
+    endDateInclusive: luxon_1.DateTime.now().plus({ days: 1 }),
+    granularity: "day",
+});
+/**
+ * Load the initial filter from session storage.
+ * If the filter is not present or invalid, return `defaultFilter`.
+ */
+const loadInitialFilter = () => {
+    // try to get a filter from the URL
+    const url = new URL(window.location.href);
+    // The URL always has to store the inclusive date since the backend expects it.
+    const end_date_inclusive = url.searchParams.get("end_date");
+    const start_date = url.searchParams.get("start_date");
+    const granularity = url.searchParams.get("granularity");
+    if (start_date == null || end_date_inclusive == null)
+        return defaultFilter();
+    if (!(0, contrib_1.isGranularity)(granularity))
+        return defaultFilter();
+    const startDate = luxon_1.DateTime.fromISO(start_date);
+    const endDateInclusive = luxon_1.DateTime.fromISO(end_date_inclusive);
+    return {
+        startDate,
+        endDateInclusive,
+        endDate: endDateInclusive.minus({ days: 1 }),
+        granularity,
     };
-    return filter;
 };
 exports.DashboardFilterContext = react_1.default.createContext(undefined);
 const useDashboardFilter = () => react_1.default.useContext(exports.DashboardFilterContext);
 exports.useDashboardFilter = useDashboardFilter;
-const DashboardFilterContextProvider = ({ children }) => {
-    const [filter, setFilter] = (0, react_1.useState)(initialFilter());
-    const handleSetFilter = (0, react_1.useCallback)((filter) => {
-        sessionStorage.setItem("dashboard-filter", JSON.stringify(filter));
-        setFilter(filter);
-    }, []);
-    return (react_1.default.createElement(exports.DashboardFilterContext.Provider, { value: { filter, setFilter: handleSetFilter } }, children));
+/**
+ * Convert `DashboardFilter` to a query string that can be used in the URL.
+ * Uses the inclusive `end_date` to make sure the backend always get the correct date.
+ */
+function filterToQueryParams({ startDate, endDateInclusive, granularity, }) {
+    const start_date = startDate.toISO();
+    const end_date = endDateInclusive.toISO();
+    if (start_date == null || end_date == null)
+        return null;
+    return { start_date, end_date, granularity };
+}
+const DashboardFilterContextProvider = ({ children, }) => {
+    const { navigate } = (0, RouterContext_1.useRouter)();
+    const [filter, setFilter] = (0, react_1.useState)(loadInitialFilter());
+    (0, react_1.useEffect)(() => {
+        const query = filterToQueryParams(filter);
+        if (query == null) {
+            console.error("Invalid filter", filter);
+            return;
+        }
+        navigate(undefined, { query, replace: true });
+    }, [filter]);
+    return (react_1.default.createElement(exports.DashboardFilterContext.Provider, { value: { filter, setFilter } }, children));
 };
 exports.default = DashboardFilterContextProvider;
 //# sourceMappingURL=DashboardFilterContext.js.map

package/dist/cjs/contexts/DashboardFilterContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardFilterContext.js","sourceRoot":"","sources":["../../../src/contexts/DashboardFilterContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,iCAAiC;AAcjC,MAAM,aAAa,GAAG,GAAoB,EAAE;IAC1C,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEhE,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO;YACL,UAAU,EAAE,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAC7C,QAAQ,EAAE,gBAAQ,CAAC,GAAG,EAAE;YACxB,WAAW,EAAE,KAAK;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAExC,MAAM,MAAM,GAAoB;QAC9B,GAAG,MAAM;QACT,UAAU,EAAE,gBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;QAC/C,QAAQ,EAAE,gBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;KAC5C,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAG,eAAK,CAAC,aAAa,CACvD,SAA8C,CAC/C,CAAC;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,eAAK,CAAC,UAAU,CAAC,8BAAsB,CAAC,CAAC;AAApE,QAAA,kBAAkB,sBAAkD;AAMjF,MAAM,8BAA8B,GAAG,CAAC,EAAE,QAAQ,EAAuC,EAAE,EAAE;IAC3F,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,aAAa,EAAE,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAuB,EAAE,EAAE;QAC9D,cAAc,CAAC,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,8BAAC,8BAAsB,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,IAC3E,QAAQ,CACuB,CACnC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,8BAA8B,CAAC"}
+{"version":3,"file":"DashboardFilterContext.js","sourceRoot":"","sources":["../../../src/contexts/DashboardFilterContext.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/contexts/RouterContext.js

@@ -94,7 +94,7 @@ const RouterContextProvider = ({ children, ...props }) => {
         // Direct operation id routes, requires reversing the operation id
         if (typeof route === "string") {
             const routeInfo = getRoute(route);
-            if (routeInfo === undefined) {
+            if (routeInfo == null) {
                 enqueueSnackbar("Failed to navigate, view console for more info", {
                     variant: "error",
                 });
@@ -103,7 +103,7 @@ const RouterContextProvider = ({ children, ...props }) => {
             route = routeInfo;
         }
         let pathname = route?.path;
-        if (pathname) {
+        if (pathname != null) {
             for (const [key, value] of Object.entries(options?.params ?? {})) {
                 pathname = pathname.replace(`:${key}`, encodeURIComponent(value));
             }

package/dist/cjs/contexts/RouterContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterContext.js","sourceRoot":"","sources":["../../../src/contexts/RouterContext.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouterContext.js","sourceRoot":"","sources":["../../../src/contexts/RouterContext.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/contexts/UserContext.js

@@ -25,18 +25,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserContextProvider = exports.useUser = void 0;
 const react_1 = __importStar(require("react"));
+const useStorage_1 = require("../hooks/useStorage");
 const ApiContext_1 = require("./ApiContext");
 const UserContext = react_1.default.createContext(undefined);
 const useUser = () => react_1.default.useContext(UserContext);
 exports.useUser = useUser;
 const UserContextProvider = ({ children }) => {
     const api = (0, ApiContext_1.useApi)();
-    const [user, setUser] = (0, react_1.useState)(null);
+    const [user, setUser] = (0, useStorage_1.useSessionStorage)("bcom-admin.user");
+    const [hasTriedToFetchUser, setHasTriedToFetchUser] = (0, react_1.useState)(false);
     (0, react_1.useEffect)(() => {
-        if (api != null && user == null) {
-            api.getAuthenticatedUser().then((u) => setUser(u));
-        }
-    }, [user, api]);
+        const getInitialUser = async () => {
+            if (api == null)
+                return;
+            const user = (await api.getAuthenticatedUser()) ?? undefined; // `undefined` has meaning here! It resets the sessionStorage.
+            setUser(user);
+            setHasTriedToFetchUser(true);
+        };
+        if (!hasTriedToFetchUser)
+            getInitialUser();
+    }, [hasTriedToFetchUser, user, api]);
     const login = async (username, password) => {
         const response = await api?.operations["bananas.login:create"].call({
             body: { username, password },
@@ -46,8 +54,10 @@ const UserContextProvider = ({ children }) => {
             setUser(user);
             return user;
         }
-        setUser(null);
-        return null;
+        else {
+            setUser(undefined);
+            return null;
+        }
     };
     const changePassword = async (oldPassword, newPassword1, newPassword2) => {
         const response = await api?.operations["bananas.change_password:create"].call({
@@ -64,12 +74,12 @@ const UserContextProvider = ({ children }) => {
     const logout = async () => {
         const response = await api?.operations["bananas.logout:create"].call();
         if (response?.ok) {
-            setUser(null);
+            setUser(undefined);
             return;
         }
         throw new Error("Could not log out");
     };
-    return (react_1.default.createElement(UserContext.Provider, { value: { user, login, logout, changePassword } }, children));
+    return (react_1.default.createElement(UserContext.Provider, { value: { user, login, logout, changePassword, hasTriedToFetchUser } }, children));
 };
 exports.UserContextProvider = UserContextProvider;
 exports.default = UserContext;

package/dist/cjs/contexts/UserContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserContext.js","sourceRoot":"","sources":["../../../src/contexts/UserContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAmD;AAEnD,6CAAsC;AAuBtC,MAAM,WAAW,GAAG,eAAK,CAAC,aAAa,CAAc,SAAmC,CAAC,CAAC;AACnF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,eAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAA9C,QAAA,OAAO,WAAuC;AAEpD,MAAM,mBAAmB,GAAsC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrF,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IACrB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAc,IAAI,CAAC,CAAC;IAEpD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAChC,GAAG,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAEhB,MAAM,KAAK,GAAG,KAAK,EAAE,QAAgB,EAAE,QAAgB,EAAE,EAAE;QACzD,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC;YAClE,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;SAC7B,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,WAAmB,EACnB,YAAoB,EACpB,YAAoB,EACpB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,gCAAgC,CAAC,CAAC,IAAI,CAAC;YAC5E,IAAI,EAAE;gBACJ,YAAY,EAAE,WAAW;gBACzB,aAAa,EAAE,YAAY;gBAC3B,aAAa,EAAE,YAAY;aAC5B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC;QAEvE,IAAI,QAAQ,EAAE,EAAE,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,OAAO;QACT,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,CACL,8BAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,IACjE,QAAQ,CACY,CACxB,CAAC;AACJ,CAAC,CAAC;AA3DW,QAAA,mBAAmB,uBA2D9B;AAEF,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"UserContext.js","sourceRoot":"","sources":["../../../src/contexts/UserContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAmD;AAEnD,oDAAwD;AACxD,6CAAsC;AA2BtC,MAAM,WAAW,GAAG,eAAK,CAAC,aAAa,CAAc,SAAmC,CAAC,CAAC;AACnF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,eAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAA9C,QAAA,OAAO,WAAuC;AAEpD,MAAM,mBAAmB,GAAsC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrF,MAAM,GAAG,GAAG,IAAA,mBAAM,GAAE,CAAC;IACrB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,8BAAiB,EAAmB,iBAAiB,CAAC,CAAC;IAC/E,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAEtE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;YAChC,IAAI,GAAG,IAAI,IAAI;gBAAE,OAAO;YACxB,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,8DAA8D;YAC5H,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,IAAI,CAAC,mBAAmB;YAAE,cAAc,EAAE,CAAC;IAC7C,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAErC,MAAM,KAAK,GAAG,KAAK,EAAE,QAAgB,EAAE,QAAgB,EAAE,EAAE;QACzD,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC;YAClE,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;SAC7B,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,WAAmB,EACnB,YAAoB,EACpB,YAAoB,EACpB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,gCAAgC,CAAC,CAAC,IAAI,CAAC;YAC5E,IAAI,EAAE;gBACJ,YAAY,EAAE,WAAW;gBACzB,aAAa,EAAE,YAAY;gBAC3B,aAAa,EAAE,YAAY;aAC5B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,MAAM,GAAG,EAAE,UAAU,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC;QAEvE,IAAI,QAAQ,EAAE,EAAE,EAAE,CAAC;YACjB,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,OAAO,CACL,8BAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,IACtF,QAAQ,CACY,CACxB,CAAC;AACJ,CAAC,CAAC;AAjEW,QAAA,mBAAmB,uBAiE9B;AAEF,kBAAe,WAAW,CAAC"}

package/dist/cjs/extensions/bananas/pages/me/list.js

@@ -27,22 +27,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
-const Grid_1 = __importDefault(require("@mui/material/Grid"));
-const Paper_1 = __importDefault(require("@mui/material/Paper"));
+// power off icon
+const PowerSettingsNew_1 = __importDefault(require("@mui/icons-material/PowerSettingsNew"));
+const material_1 = require("@mui/material");
 const TitleBar_1 = require("../../../../components/TitleBar");
 const Header_1 = require("../../../../components/Header");
 const Content_1 = __importDefault(require("../../../../containers/Content"));
 const UserContext_1 = require("../../../../contexts/UserContext");
 const PasswordChangeForm_1 = __importDefault(require("../../components/PasswordChangeForm"));
 const MePage = () => {
-    const { user } = (0, UserContext_1.useUser)();
+    const { logout, user } = (0, UserContext_1.useUser)();
+    const handleLogout = (0, react_1.useCallback)(() => logout(), [logout]);
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(Header_1.Header, null,
-            react_1.default.createElement(TitleBar_1.TitleBar, { title: user?.username ?? "Me" })),
+            react_1.default.createElement(TitleBar_1.TitleBar, { title: user?.username ?? "Me" },
+                react_1.default.createElement(material_1.Button, { color: "error", variant: "contained", onClick: handleLogout, size: "large", startIcon: react_1.default.createElement(PowerSettingsNew_1.default, null) }, "Logout"))),
         react_1.default.createElement(Content_1.default, null,
-            react_1.default.createElement(Grid_1.default, { item: true },
-                react_1.default.createElement(Paper_1.default, { sx: { p: 3, alignSelf: "flex-start", width: "fit-content" }, elevation: 1 },
-                    react_1.default.createElement(PasswordChangeForm_1.default, null))))));
+            react_1.default.createElement(material_1.Paper, { sx: { p: 3, alignSelf: "flex-start", width: "fit-content" }, elevation: 1 },
+                react_1.default.createElement(PasswordChangeForm_1.default, null)))));
 };
 exports.default = (0, react_1.memo)(MePage);
 //# sourceMappingURL=list.js.map

package/dist/cjs/extensions/bananas/pages/me/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/extensions/bananas/pages/me/list.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoC;AAEpC,8DAAsC;AACtC,gEAAwC;AAExC,8DAA2D;AAC3D,0DAAuD;AACvD,6EAAqD;AACrD,kEAA2D;AAE3D,6FAAqE;AAErE,MAAM,MAAM,GAAkB,GAAG,EAAE;IACjC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAO,GAAE,CAAC;IAE3B,OAAO,CACL;QACE,8BAAC,eAAM;YACL,8BAAC,mBAAQ,IAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,IAAI,IAAI,GAAI,CACpC;QACT,8BAAC,iBAAO;YACN,8BAAC,cAAI,IAAC,IAAI;gBACR,8BAAC,eAAK,IAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC;oBAC9E,8BAAC,4BAAkB,OAAG,CAChB,CACH,CACC,CACT,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../src/extensions/bananas/pages/me/list.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiD;AAEjD,iBAAiB;AACjB,4FAAwE;AACxE,4CAA8C;AAE9C,8DAA2D;AAC3D,0DAAuD;AACvD,6EAAqD;AACrD,kEAA2D;AAE3D,6FAAqE;AAErE,MAAM,MAAM,GAAkB,GAAG,EAAE;IACjC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAO,GAAE,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3D,OAAO,CACL;QACE,8BAAC,eAAM;YACL,8BAAC,mBAAQ,IAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,IAAI,IAAI;gBACrC,8BAAC,iBAAM,IACL,KAAK,EAAC,OAAO,EACb,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,8BAAC,0BAAoB,OAAG,aAG5B,CACA,CACJ;QAET,8BAAC,iBAAO;YACN,8BAAC,gBAAK,IAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC;gBAC9E,8BAAC,4BAAkB,OAAG,CAChB,CACA,CACT,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,IAAA,YAAI,EAAC,MAAM,CAAC,CAAC"}