powr-sdk-web 6.5.0 → 6.6.0

package/dist/admin/index.js

@@ -287,7 +287,9 @@ var AdminDashboard = function AdminDashboard(_ref2) {
       onError: function onError(message) {
         return alert(message);
       }
-    } : {};
+    } : currentSection === 'pageviews' ? roleOptions ? {
+      roleOptions: roleOptions
+    } : {} : {};
     return /*#__PURE__*/_react["default"].createElement(_react.Suspense, {
       fallback: /*#__PURE__*/_react["default"].createElement("div", {
         style: styles.loading

package/dist/track/admin.js

@@ -10,6 +10,10 @@ var _auth = require("../utils/auth");
 var _config = require("../config");
 var _session = require("../session");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -25,14 +29,25 @@ function when(value) {
   if (Number.isNaN(date.getTime())) return "";
   return date.toLocaleString();
 }
+function roleLabel(access, roleOptions) {
+  var match = (roleOptions || []).find(function (option) {
+    return Number(option.value) === Number(access);
+  });
+  return match ? String(match.label || "") : "";
+}
+function isStudent(access, roleOptions) {
+  return /^student/i.test(roleLabel(access, roleOptions));
+}
 function PowrPageviewsAdmin(_ref) {
+  var _report$visited, _report$pages;
   var projectId = _ref.projectId,
-    apiUrl = _ref.apiUrl;
+    apiUrl = _ref.apiUrl,
+    roleOptions = _ref.roleOptions;
   var session = (0, _session.usePowrSession)();
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
-    rows = _useState2[0],
-    setRows = _useState2[1];
+    report = _useState2[0],
+    setReport = _useState2[1];
   var _useState3 = (0, _react.useState)(true),
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
@@ -69,11 +84,11 @@ function PowrPageviewsAdmin(_ref) {
               }
               return _context.a(2);
             case 2:
-              if (!ok || !(data !== null && data !== void 0 && data.success)) {
-                setError((data === null || data === void 0 ? void 0 : data.message) || "Failed to load page views.");
-                setRows([]);
+              if (!ok || !(data !== null && data !== void 0 && data.success) || !data.data || Array.isArray(data.data)) {
+                setError((data === null || data === void 0 ? void 0 : data.message) || "Failed to load visits.");
+                setReport(null);
               } else {
-                setRows(Array.isArray(data.data) ? data.data : []);
+                setReport(data.data);
               }
               setLoading(false);
             case 3:
@@ -87,7 +102,7 @@ function PowrPageviewsAdmin(_ref) {
     }();
     load()["catch"](function () {
       if (!stopped) {
-        setError("Failed to load page views.");
+        setError("Failed to load visits.");
         setLoading(false);
       }
     });
@@ -95,16 +110,51 @@ function PowrPageviewsAdmin(_ref) {
       stopped = true;
     };
   }, [projectId, apiUrl, session === null || session === void 0 ? void 0 : session.token]);
-  if (loading) return /*#__PURE__*/_react["default"].createElement("p", null, "Loading page views\u2026");
+  if (loading) return /*#__PURE__*/_react["default"].createElement("p", null, "Loading visits\u2026");
   if (error) return /*#__PURE__*/_react["default"].createElement("p", null, error);
-  if (!rows.length) return /*#__PURE__*/_react["default"].createElement("p", null, "No page views in the last 7 days.");
-  return /*#__PURE__*/_react["default"].createElement("table", {
+  var people = Array.isArray(report === null || report === void 0 ? void 0 : report.people) ? report.people : [];
+  var students = roleOptions ? people.filter(function (person) {
+    return isStudent(person.access, roleOptions);
+  }).length : null;
+  if (!people.length) return /*#__PURE__*/_react["default"].createElement("p", null, "No visits in the last 7 days.");
+  var numbers = [].concat(_toConsumableArray(students === null ? [] : [{
+    label: "Students",
+    value: students
+  }]), [{
+    label: "Visited",
+    value: (_report$visited = report.visited) !== null && _report$visited !== void 0 ? _report$visited : people.length
+  }, {
+    label: "Pages",
+    value: (_report$pages = report.pages) !== null && _report$pages !== void 0 ? _report$pages : 0
+  }]);
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: "flex",
+      gap: 28,
+      margin: "4px 0 18px"
+    }
+  }, numbers.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: item.label
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        fontSize: 28,
+        fontWeight: 700,
+        lineHeight: 1.1
+      }
+    }, item.value), /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        fontSize: 13,
+        color: "#6b7280"
+      }
+    }, item.label));
+  })), /*#__PURE__*/_react["default"].createElement("table", {
     style: {
       width: "100%",
       borderCollapse: "collapse",
       fontSize: 14
     }
-  }, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, ["When", "Page", "Referrer", "Session"].map(function (label) {
+  }, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, ["Who", "Role", "Last seen", "Pages"].map(function (label) {
     return /*#__PURE__*/_react["default"].createElement("th", {
       key: label,
       style: {
@@ -113,30 +163,30 @@ function PowrPageviewsAdmin(_ref) {
         borderBottom: "1px solid #e5e7eb"
       }
     }, label);
-  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, rows.map(function (row) {
+  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, people.map(function (person) {
     return /*#__PURE__*/_react["default"].createElement("tr", {
-      key: String(row._id)
+      key: person.userId
     }, /*#__PURE__*/_react["default"].createElement("td", {
       style: {
         padding: "8px 6px",
-        borderBottom: "1px solid #f3f4f6",
-        whiteSpace: "nowrap"
+        borderBottom: "1px solid #f3f4f6"
       }
-    }, when(row.createdAt)), /*#__PURE__*/_react["default"].createElement("td", {
+    }, person.name), /*#__PURE__*/_react["default"].createElement("td", {
       style: {
         padding: "8px 6px",
         borderBottom: "1px solid #f3f4f6"
       }
-    }, row.page), /*#__PURE__*/_react["default"].createElement("td", {
+    }, roleLabel(person.access, roleOptions)), /*#__PURE__*/_react["default"].createElement("td", {
       style: {
         padding: "8px 6px",
-        borderBottom: "1px solid #f3f4f6"
+        borderBottom: "1px solid #f3f4f6",
+        whiteSpace: "nowrap"
       }
-    }, row.referrer || ""), /*#__PURE__*/_react["default"].createElement("td", {
+    }, when(person.lastSeen)), /*#__PURE__*/_react["default"].createElement("td", {
       style: {
         padding: "8px 6px",
         borderBottom: "1px solid #f3f4f6"
       }
-    }, row.session));
-  })));
+    }, person.pages));
+  }))));
 }

package/dist/track/index.js

@@ -8,13 +8,14 @@ var _react = require("react");
 var _auth = require("../utils/auth");
 var _config = require("../config");
 var _session = require("../session");
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var SESSION_KEY = "powr-track-session";
+var DAY_KEY = "powr-track-day";
+function localDay() {
+  var now = new Date();
+  var month = String(now.getMonth() + 1).padStart(2, "0");
+  var day = String(now.getDate()).padStart(2, "0");
+  return "".concat(now.getFullYear(), "-").concat(month, "-").concat(day);
+}
 function sessionId() {
   var existing = window.sessionStorage.getItem(SESSION_KEY);
   if (existing && /^[A-Za-z0-9_-]{8,64}$/.test(existing)) return existing;
@@ -22,32 +23,9 @@ function sessionId() {
   window.sessionStorage.setItem(SESSION_KEY, next);
   return next;
 }
-function watchPath(onChange) {
-  if (!window.history.__powrTrack) {
-    window.history.__powrTrack = true;
-    ["pushState", "replaceState"].forEach(function (method) {
-      var original = window.history[method];
-      window.history[method] = function powrTrackHistory() {
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-        var result = original.apply(this, args);
-        window.dispatchEvent(new Event("powr-path"));
-        return result;
-      };
-    });
-    window.addEventListener("popstate", function () {
-      window.dispatchEvent(new Event("powr-path"));
-    });
-  }
-  window.addEventListener("powr-path", onChange);
-  return function () {
-    return window.removeEventListener("powr-path", onChange);
-  };
-}
 
 /**
- * One signed-in page view per path. Renders nothing.
+ * One signed-in visit per day. Renders nothing.
  * Posts to the Powr host. A storage `NEXT_PUBLIC_POWR_URL` does not redirect this call.
  * The host stores Login As as the admin, from the JWT.
  */
@@ -56,39 +34,28 @@ function PowrBaseTracker(_ref) {
     projectId = _ref.projectId;
   var session = (0, _session.usePowrSession)();
   var token = (session === null || session === void 0 ? void 0 : session.token) || "";
-  var lastPage = (0, _react.useRef)("");
+  var sent = (0, _react.useRef)(false);
   (0, _react.useEffect)(function () {
-    if (!token || typeof window === "undefined") return undefined;
-    var stopped = false;
-    lastPage.current = "";
-    var send = function send() {
-      if (stopped) return;
-      var page = window.location.pathname || "/";
-      if (!page.startsWith("/") || page === lastPage.current) return;
-      var referrer = lastPage.current || window.document.referrer || "";
-      lastPage.current = page;
-      var host = apiUrl || _config.DEFAULT_POWR_API_URL;
-      (0, _auth.apiCall)(host, "/track", projectId, {
-        method: "POST",
-        headers: {
-          Authorization: "Bearer ".concat(token)
-        },
-        body: _objectSpread({
-          page: page,
-          session: sessionId()
-        }, referrer ? {
-          referrer: referrer
-        } : {})
-      })["catch"](function () {});
-    };
-    send();
-    var unlisten = watchPath(function () {
-      send();
+    if (!token || !projectId || typeof window === "undefined") return undefined;
+    var stamp = "".concat(projectId, ":").concat(localDay());
+    if (sent.current || window.localStorage.getItem(DAY_KEY) === stamp) return undefined;
+    sent.current = true;
+    var host = apiUrl || _config.DEFAULT_POWR_API_URL;
+    (0, _auth.apiCall)(host, "/track", projectId, {
+      method: "POST",
+      headers: {
+        Authorization: "Bearer ".concat(token)
+      },
+      body: {
+        page: window.location.pathname || "/",
+        session: sessionId()
+      }
+    }).then(function (result) {
+      if (result && result.ok) window.localStorage.setItem(DAY_KEY, stamp);else sent.current = false;
+    })["catch"](function () {
+      sent.current = false;
     });
-    return function () {
-      stopped = true;
-      unlisten();
-    };
+    return undefined;
   }, [token, apiUrl, projectId]);
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "powr-sdk-web",
-    "version": "6.5.0",
+    "version": "6.6.0",
     "main": "dist/index.js",
     "files": [
         "dist"