@entur-partner/app-shell-standalone 6.0.5-alpha.1 → 6.0.5-alpha.2

package/dist/AppShellStandalone.d.ts

@@ -10,9 +10,6 @@ export interface AppShellStandaloneProps extends Omit<AppShellProps, 'children'>
      */
     getOrganisations: GetOrganisationsFn | string;
     environment?: Environment;
-    /**
-     * Optional PostHog API key for tracking. If not provided, a default Entur Partner key will be used.
-     */
     postHogApiKey?: string;
 }
 export declare const AppShellStandalone: ({ children, audience, domain, clientId, decorateUser, getOrganisations, redirectUri, environment, postHogApiKey, }: AppShellStandaloneProps) => React.JSX.Element;

package/dist/Menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
+import { Environment } from '@entur-partner/common';
 import { AppShellValues, GetOrganisationsFn } from '@entur-partner/app-shell';
-import { Environment } from '@entur-partner/common/src';
-export declare const MESSAGES: {
+export declare const messages: {
     readonly nb: {
         switchLanguage: string;
         logout: string;

package/dist/PostHogProviderWrapper.d.ts

@@ -1,10 +1,15 @@
 import React, { ReactNode } from 'react';
-interface PostHogContextType {
-    isInitialized: boolean;
-    optInPostHog: boolean;
-    setOptInPostHog: React.Dispatch<React.SetStateAction<boolean>>;
-}
-export declare const useOptInPostHog: () => PostHogContextType;
+export declare const useMFPostHog: () => {
+    capture: (event_name: import("posthog-js").EventName, properties?: import("posthog-js").Properties | null | undefined, options?: import("posthog-js").CaptureOptions | undefined) => import("posthog-js").CaptureResult | undefined;
+    alias: (alias: string, original?: string | undefined) => number | void | import("posthog-js").CaptureResult;
+    identify: (new_distinct_id?: string | undefined, userPropertiesToSet?: import("posthog-js").Properties | undefined, userPropertiesToSetOnce?: import("posthog-js").Properties | undefined) => void;
+    register: (properties: import("posthog-js").Properties, days?: number | undefined) => void;
+    register_once: (properties: import("posthog-js").Properties, default_value?: any, days?: number | undefined) => void;
+    unregister: (property: string) => void;
+    group: (groupType: string, groupKey: string, groupPropertiesToSet?: import("posthog-js").Properties | undefined) => void;
+    setPersonProperties: (userPropertiesToSet?: import("posthog-js").Properties | undefined, userPropertiesToSetOnce?: import("posthog-js").Properties | undefined) => void;
+    reset: (reset_device_id?: boolean | undefined) => void;
+};
 type Props = {
     postHogApiKey?: string;
     children: ReactNode;

package/dist/app-shell-standalone.cjs.development.js

@@ -5,15 +5,347 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var common = require('@entur-partner/common');
 var appShell = require('@entur-partner/app-shell');
-var postHog = require('posthog-js');
 var menu = require('@entur/menu');
 var tokens = require('@entur/tokens');
+var postHog = require('posthog-js');
+var react = require('posthog-js/react');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var postHog__default = /*#__PURE__*/_interopDefaultLegacy(postHog);
 
+function _regeneratorRuntime() {
+  _regeneratorRuntime = function () {
+    return e;
+  };
+  var t,
+    e = {},
+    r = Object.prototype,
+    n = r.hasOwnProperty,
+    o = Object.defineProperty || function (t, e, r) {
+      t[e] = r.value;
+    },
+    i = "function" == typeof Symbol ? Symbol : {},
+    a = i.iterator || "@@iterator",
+    c = i.asyncIterator || "@@asyncIterator",
+    u = i.toStringTag || "@@toStringTag";
+  function define(t, e, r) {
+    return Object.defineProperty(t, e, {
+      value: r,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }), t[e];
+  }
+  try {
+    define({}, "");
+  } catch (t) {
+    define = function (t, e, r) {
+      return t[e] = r;
+    };
+  }
+  function wrap(t, e, r, n) {
+    var i = e && e.prototype instanceof Generator ? e : Generator,
+      a = Object.create(i.prototype),
+      c = new Context(n || []);
+    return o(a, "_invoke", {
+      value: makeInvokeMethod(t, r, c)
+    }), a;
+  }
+  function tryCatch(t, e, r) {
+    try {
+      return {
+        type: "normal",
+        arg: t.call(e, r)
+      };
+    } catch (t) {
+      return {
+        type: "throw",
+        arg: t
+      };
+    }
+  }
+  e.wrap = wrap;
+  var h = "suspendedStart",
+    l = "suspendedYield",
+    f = "executing",
+    s = "completed",
+    y = {};
+  function Generator() {}
+  function GeneratorFunction() {}
+  function GeneratorFunctionPrototype() {}
+  var p = {};
+  define(p, a, function () {
+    return this;
+  });
+  var d = Object.getPrototypeOf,
+    v = d && d(d(values([])));
+  v && v !== r && n.call(v, a) && (p = v);
+  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
+  function defineIteratorMethods(t) {
+    ["next", "throw", "return"].forEach(function (e) {
+      define(t, e, function (t) {
+        return this._invoke(e, t);
+      });
+    });
+  }
+  function AsyncIterator(t, e) {
+    function invoke(r, o, i, a) {
+      var c = tryCatch(t[r], t, o);
+      if ("throw" !== c.type) {
+        var u = c.arg,
+          h = u.value;
+        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
+          invoke("next", t, i, a);
+        }, function (t) {
+          invoke("throw", t, i, a);
+        }) : e.resolve(h).then(function (t) {
+          u.value = t, i(u);
+        }, function (t) {
+          return invoke("throw", t, i, a);
+        });
+      }
+      a(c.arg);
+    }
+    var r;
+    o(this, "_invoke", {
+      value: function (t, n) {
+        function callInvokeWithMethodAndArg() {
+          return new e(function (e, r) {
+            invoke(t, n, e, r);
+          });
+        }
+        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+      }
+    });
+  }
+  function makeInvokeMethod(e, r, n) {
+    var o = h;
+    return function (i, a) {
+      if (o === f) throw Error("Generator is already running");
+      if (o === s) {
+        if ("throw" === i) throw a;
+        return {
+          value: t,
+          done: !0
+        };
+      }
+      for (n.method = i, n.arg = a;;) {
+        var c = n.delegate;
+        if (c) {
+          var u = maybeInvokeDelegate(c, n);
+          if (u) {
+            if (u === y) continue;
+            return u;
+          }
+        }
+        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
+          if (o === h) throw o = s, n.arg;
+          n.dispatchException(n.arg);
+        } else "return" === n.method && n.abrupt("return", n.arg);
+        o = f;
+        var p = tryCatch(e, r, n);
+        if ("normal" === p.type) {
+          if (o = n.done ? s : l, p.arg === y) continue;
+          return {
+            value: p.arg,
+            done: n.done
+          };
+        }
+        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
+      }
+    };
+  }
+  function maybeInvokeDelegate(e, r) {
+    var n = r.method,
+      o = e.iterator[n];
+    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
+    var i = tryCatch(o, e.iterator, r.arg);
+    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
+    var a = i.arg;
+    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
+  }
+  function pushTryEntry(t) {
+    var e = {
+      tryLoc: t[0]
+    };
+    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
+  }
+  function resetTryEntry(t) {
+    var e = t.completion || {};
+    e.type = "normal", delete e.arg, t.completion = e;
+  }
+  function Context(t) {
+    this.tryEntries = [{
+      tryLoc: "root"
+    }], t.forEach(pushTryEntry, this), this.reset(!0);
+  }
+  function values(e) {
+    if (e || "" === e) {
+      var r = e[a];
+      if (r) return r.call(e);
+      if ("function" == typeof e.next) return e;
+      if (!isNaN(e.length)) {
+        var o = -1,
+          i = function next() {
+            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
+            return next.value = t, next.done = !0, next;
+          };
+        return i.next = i;
+      }
+    }
+    throw new TypeError(typeof e + " is not iterable");
+  }
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
+    value: GeneratorFunctionPrototype,
+    configurable: !0
+  }), o(GeneratorFunctionPrototype, "constructor", {
+    value: GeneratorFunction,
+    configurable: !0
+  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
+    var e = "function" == typeof t && t.constructor;
+    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
+  }, e.mark = function (t) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
+  }, e.awrap = function (t) {
+    return {
+      __await: t
+    };
+  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
+    return this;
+  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
+    void 0 === i && (i = Promise);
+    var a = new AsyncIterator(wrap(t, r, n, o), i);
+    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
+      return t.done ? t.value : a.next();
+    });
+  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
+    return this;
+  }), define(g, "toString", function () {
+    return "[object Generator]";
+  }), e.keys = function (t) {
+    var e = Object(t),
+      r = [];
+    for (var n in e) r.push(n);
+    return r.reverse(), function next() {
+      for (; r.length;) {
+        var t = r.pop();
+        if (t in e) return next.value = t, next.done = !1, next;
+      }
+      return next.done = !0, next;
+    };
+  }, e.values = values, Context.prototype = {
+    constructor: Context,
+    reset: function (e) {
+      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
+    },
+    stop: function () {
+      this.done = !0;
+      var t = this.tryEntries[0].completion;
+      if ("throw" === t.type) throw t.arg;
+      return this.rval;
+    },
+    dispatchException: function (e) {
+      if (this.done) throw e;
+      var r = this;
+      function handle(n, o) {
+        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
+      }
+      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
+        var i = this.tryEntries[o],
+          a = i.completion;
+        if ("root" === i.tryLoc) return handle("end");
+        if (i.tryLoc <= this.prev) {
+          var c = n.call(i, "catchLoc"),
+            u = n.call(i, "finallyLoc");
+          if (c && u) {
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
+          } else if (c) {
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+          } else {
+            if (!u) throw Error("try statement without catch or finally");
+            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
+          }
+        }
+      }
+    },
+    abrupt: function (t, e) {
+      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
+        var o = this.tryEntries[r];
+        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
+          var i = o;
+          break;
+        }
+      }
+      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
+      var a = i ? i.completion : {};
+      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
+    },
+    complete: function (t, e) {
+      if ("throw" === t.type) throw t.arg;
+      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
+    },
+    finish: function (t) {
+      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
+        var r = this.tryEntries[e];
+        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
+      }
+    },
+    catch: function (t) {
+      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
+        var r = this.tryEntries[e];
+        if (r.tryLoc === t) {
+          var n = r.completion;
+          if ("throw" === n.type) {
+            var o = n.arg;
+            resetTryEntry(r);
+          }
+          return o;
+        }
+      }
+      throw Error("illegal catch attempt");
+    },
+    delegateYield: function (e, r, n) {
+      return this.delegate = {
+        iterator: values(e),
+        resultName: r,
+        nextLoc: n
+      }, "next" === this.method && (this.arg = t), y;
+    }
+  }, e;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+      args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+      _next(undefined);
+    });
+  };
+}
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -29,40 +361,47 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-var PostHogContext = /*#__PURE__*/React.createContext(undefined);
-var useOptInPostHog = function useOptInPostHog() {
-  var context = React.useContext(PostHogContext);
-  if (!context) {
-    throw new Error('useOptInPostHog must be used within a PostHogProvider');
+var useMFPostHog = function useMFPostHog() {
+  var postHog = react.usePostHog();
+  if (!postHog) {
+    throw new Error('PostHog is not initialized. Ensure PostHog API key is provided in the AppShellStandalone.');
   }
-  return context;
+  return {
+    capture: postHog.capture,
+    alias: postHog.alias,
+    identify: postHog.identify,
+    register: postHog.register,
+    register_once: postHog.register_once,
+    unregister: postHog.unregister,
+    group: postHog.group,
+    setPersonProperties: postHog.setPersonProperties,
+    reset: postHog.reset
+  };
 };
 var PostHogProviderWrapper = function PostHogProviderWrapper(_ref) {
   var postHogApiKey = _ref.postHogApiKey,
     children = _ref.children;
-  var _useState = React.useState(false),
-    optInPostHog = _useState[0],
-    setOptInPostHog = _useState[1];
+  var consents = appShell.useConsentManager();
+  React.useEffect(function () {
+    if (!postHogApiKey) {
+      return;
+    }
+    if (consents.PostHog.consentGiven) {
+      postHog__default["default"].opt_in_capturing();
+    } else {
+      postHog__default["default"].opt_out_capturing();
+    }
+  }, [consents.PostHog.consentGiven, postHogApiKey]);
   if (!postHogApiKey) {
-    console.warn('Entur-Partner Warning: PostHog API key is not provided. PostHog will not be initialized.');
-    return React__default["default"].createElement(PostHogContext.Provider, {
-      value: {
-        isInitialized: false,
-        optInPostHog: optInPostHog,
-        setOptInPostHog: setOptInPostHog
-      }
-    }, children);
+    console.warn('AppShellStandalone Warning: PostHog API key is not provided. PostHog will not be initialized.');
+    return React__default["default"].createElement(React__default["default"].Fragment, null, children);
   }
   postHog__default["default"].init(postHogApiKey, {
     api_host: 'https://eu.posthog.com',
     opt_out_capturing_by_default: true
   });
-  return React__default["default"].createElement(PostHogContext.Provider, {
-    value: {
-      isInitialized: true,
-      optInPostHog: optInPostHog,
-      setOptInPostHog: setOptInPostHog
-    }
+  return React__default["default"].createElement(react.PostHogProvider, {
+    client: postHog__default["default"]
   }, children);
 };
 
@@ -71,16 +410,16 @@ var EN_GB = {
   logout: 'Sign out',
   appVersion: 'Versjon',
   myProfile: 'My profile',
-  cookieSettings: 'TEST'
+  cookieSettings: 'Cookie settings'
 };
 var NO_NB = {
   switchLanguage: 'Switch to English',
   logout: 'Logg ut',
   appVersion: 'Version',
   myProfile: 'Min profil',
-  cookieSettings: 'TEST'
+  cookieSettings: 'Cookieinstillinger'
 };
-var MESSAGES = {
+var messages = {
   nb: NO_NB,
   en: EN_GB,
   'nb-NO': NO_NB,
@@ -101,22 +440,18 @@ var Menu = function Menu(_ref) {
     setOrganisationId = _useOrganisation.setOrganisationId,
     organisationId = _useOrganisation.organisationId;
   var items = getItemsForPath('app-shell');
-  var _useOptInPostHog = useOptInPostHog(),
-    isInitialized = _useOptInPostHog.isInitialized,
-    setOptInPostHog = _useOptInPostHog.setOptInPostHog;
+  var mfPostHog = useMFPostHog();
   return React__default["default"].createElement(common.Menu, null, React__default["default"].createElement("div", {
     style: {
       marginLeft: tokens.space.extraLarge2,
       marginTop: tokens.space.large,
       marginBottom: tokens.space.extraLarge
     }
-  }, React__default["default"].createElement("a", {
-    href: "/"
   }, React__default["default"].createElement(common.EnturPartnerLogo, {
     altText: 'Entur partner logo',
     className: "menu-space menu-logo",
     environment: environment
-  }))), React__default["default"].createElement("div", {
+  })), React__default["default"].createElement("div", {
     style: {
       margin: tokens.space.large
     }
@@ -124,18 +459,34 @@ var Menu = function Menu(_ref) {
     space: "small"
   }, React__default["default"].createElement(common.UserMenu, {
     onLanguageChange: setLanguage,
-    onLogout: logout,
+    onLogout: function () {
+      var _onLogout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              mfPostHog.reset();
+              _context.next = 3;
+              return logout();
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onLogout() {
+        return _onLogout.apply(this, arguments);
+      }
+      return onLogout;
+    }(),
     language: language,
-    messages: MESSAGES[language],
+    messages: messages[language],
     userName: user.given_name ? user.given_name + " " + user.family_name : user.name,
     environment: environment,
     showVersionItem: false,
     showMyProfileItem: false,
-    showCookieSettingsItem: isInitialized,
+    showCookieSettingsItem: true,
     onCookieSettingsOpen: function onCookieSettingsOpen() {
-      return setOptInPostHog(function (prev) {
-        return !prev;
-      });
+      window.UC_UI.showSecondLayer();
     },
     onNavigateToMyProfile: function onNavigateToMyProfile() {}
   }), React__default["default"].createElement(appShell.OrganisationSelector, {
@@ -167,6 +518,8 @@ var Menu = function Menu(_ref) {
 var Content = function Content(_ref) {
   var children = _ref.children,
     values = _ref.values;
+  var mfPostHog = useMFPostHog();
+  var consents = appShell.useConsentManager();
   var _useMenu = appShell.useMenu(),
     addItems = _useMenu.addItems,
     _setMFNavigate = _useMenu.setMFNavigate;
@@ -177,6 +530,9 @@ var Content = function Content(_ref) {
     return addItems(items, 'app-shell');
   };
   return React__default["default"].createElement(common.Content, null, children(_extends({}, values, {
+    user: _extends({}, values.user, {
+      consents: consents
+    }),
     language: language,
     navigate: function navigate() {
       {
@@ -188,7 +544,7 @@ var Content = function Content(_ref) {
     setMFNavigate: function setMFNavigate(navigate) {
       return _setMFNavigate('app-shell', navigate);
     },
-    postHogClient: postHog__default["default"]
+    mfPostHog: mfPostHog
   })));
 };
 var AppShellStandalone = function AppShellStandalone(_ref2) {
@@ -211,10 +567,10 @@ var AppShellStandalone = function AppShellStandalone(_ref2) {
   }, function (values) {
     var _languageStorage$get, _organisationStorage$;
     return React__default["default"].createElement(appShell.LanguageProvider, {
-      language: (_languageStorage$get = appShell.languageStorage.get()) != null ? _languageStorage$get : 'nb-NO'
+      language: (_languageStorage$get = appShell.languageStorage.get()) != null ? _languageStorage$get : 'nb'
     }, React__default["default"].createElement(appShell.OrganisationProvider, {
       organisationId: (_organisationStorage$ = appShell.organisationStorage.get()) != null ? _organisationStorage$ : values.user['https://entur.io/organisationID'].toString()
-    }, React__default["default"].createElement(PostHogProviderWrapper, {
+    }, React__default["default"].createElement(appShell.ConsentManagerProvider, null, React__default["default"].createElement(PostHogProviderWrapper, {
       postHogApiKey: postHogApiKey
     }, React__default["default"].createElement(appShell.MenuProvider, null, React__default["default"].createElement(Menu, _extends({}, values, {
       getOrganisations: getOrganisations,
@@ -222,7 +578,7 @@ var AppShellStandalone = function AppShellStandalone(_ref2) {
     })), React__default["default"].createElement(Content, {
       children: children,
       values: values
-    })))));
+    }))))));
   });
 };