@entur-partner/app-shell-standalone 7.0.0-alpha.1 → 7.0.1

package/dist/AppShellStandalone.d.ts

@@ -1,7 +1,7 @@
 import { type AppShellProps, type GetOrganisationsFn } from "@entur-partner/app-shell";
-import { Environment } from "@entur-partner/common";
+import { type Environment } from "@entur-partner/common";
 import type { MicroFrontendPayload } from "@entur-partner/micro-frontend";
-import React, { type ReactNode } from "react";
+import { type ReactNode } from "react";
 export interface AppShellStandaloneProps extends Omit<AppShellProps, "children"> {
     children: (options: MicroFrontendPayload) => ReactNode;
     /**
@@ -11,6 +11,5 @@ export interface AppShellStandaloneProps extends Omit<AppShellProps, "children">
     getOrganisations: GetOrganisationsFn | string;
     environment?: Environment;
     postHogApiKey?: string;
-    isPublicView?: boolean;
 }
-export declare const AppShellStandalone: ({ children, audience, domain, clientId, decorateUser, getOrganisations, redirectUri, environment, navigate, isPublicView, }: AppShellStandaloneProps) => React.JSX.Element;
+export declare const AppShellStandalone: ({ children, audience, domain, clientId, decorateUser, getOrganisations, redirectUri, environment, navigate, }: AppShellStandaloneProps) => import("react/jsx-runtime").JSX.Element;

package/dist/Menu.d.ts

@@ -1,6 +1,5 @@
 import { type AppShellValues, type GetOrganisationsFn } from "@entur-partner/app-shell";
 import { type Environment } from "@entur-partner/common";
-import React from "react";
 declare global {
     interface Window {
         UC_UI: {
@@ -9,53 +8,9 @@ declare global {
         };
     }
 }
-export declare const EN_GB: {
-    switchLanguage: string;
-    logout: string;
-    appVersion: string;
-    myProfile: string;
-    cookieSettings: string;
-};
-export declare const NO_NB: {
-    switchLanguage: string;
-    logout: string;
-    appVersion: string;
-    myProfile: string;
-    cookieSettings: string;
-};
-export declare const messages: {
-    readonly nb: {
-        switchLanguage: string;
-        logout: string;
-        appVersion: string;
-        myProfile: string;
-        cookieSettings: string;
-    };
-    readonly en: {
-        switchLanguage: string;
-        logout: string;
-        appVersion: string;
-        myProfile: string;
-        cookieSettings: string;
-    };
-    readonly "nb-NO": {
-        switchLanguage: string;
-        logout: string;
-        appVersion: string;
-        myProfile: string;
-        cookieSettings: string;
-    };
-    readonly "en-GB": {
-        switchLanguage: string;
-        logout: string;
-        appVersion: string;
-        myProfile: string;
-        cookieSettings: string;
-    };
-};
 interface MenuProps extends AppShellValues {
     getOrganisations: GetOrganisationsFn | string;
     environment?: Environment;
 }
-export declare const Menu: ({ getOrganisations, user, getToken, logout, environment, }: MenuProps) => React.JSX.Element;
+export declare const Menu: ({ getOrganisations, user, getToken, logout, environment, }: MenuProps) => import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -2,18 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var jsxRuntime = require('react/jsx-runtime');
 var appShell = require('@entur-partner/app-shell');
 var common = require('@entur-partner/common');
-var React = require('react');
 var menu = require('@entur/menu');
 var tokens = require('@entur/tokens');
-var util = require('@entur-partner/util');
-var auth0React = require('@auth0/auth0-react');
-var button = require('@entur/button');
-var layout = require('@entur/layout');
-var loader = require('@entur/loader');
-var classNames = require('classnames');
-var reactRouterDom = require('react-router-dom');
 
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
@@ -158,25 +151,17 @@ function _regeneratorDefine(e, r, n, t) {
   }, _regeneratorDefine(e, r, n, t);
 }
 
-var EN_GB = {
-  switchLanguage: "Bytt til norsk",
-  logout: "Sign out",
-  appVersion: "Versjon",
-  myProfile: "My profile",
-  cookieSettings: "Cookie settings"
-};
-var NO_NB = {
-  switchLanguage: "Switch to English",
-  logout: "Logg ut",
-  appVersion: "Version",
-  myProfile: "Min profil",
-  cookieSettings: "Cookieinstillinger"
-};
-var messages = {
-  nb: NO_NB,
-  en: EN_GB,
-  "nb-NO": NO_NB,
-  "en-GB": EN_GB
+var convertToLocale = function convertToLocale(language) {
+  switch (language) {
+    case "nb":
+    case "nb-NO":
+      return "nb-NO";
+    case "en":
+    case "en-GB":
+      return "en-GB";
+    default:
+      return "nb-NO";
+  }
 };
 var Menu = function Menu(_ref) {
   var getOrganisations = _ref.getOrganisations,
@@ -193,261 +178,84 @@ var Menu = function Menu(_ref) {
     setOrganisationId = _useOrganisation.setOrganisationId,
     organisationId = _useOrganisation.organisationId;
   var items = getItemsForPath("app-shell");
-  util.assertIsDefined(user, "User must be defined to render Menu");
-  util.assertIsDefined(organisationId, "Organisation ID must be defined to render Menu");
-  return React.createElement(common.Menu, null, React.createElement("div", {
-    style: {
-      marginLeft: tokens.space.extraLarge2,
-      marginTop: tokens.space.large,
-      marginBottom: tokens.space.extraLarge
-    }
-  }, React.createElement(common.EnturPartnerLogo, {
-    altText: "Entur partner logo",
-    className: "menu-space menu-logo",
-    environment: environment
-  })), React.createElement("div", {
-    style: {
-      margin: tokens.space.large
-    }
-  }, React.createElement(common.Stack, {
-    space: "small"
-  }, React.createElement(common.UserMenu, {
-    className: "ph-no-capture",
-    onLanguageChange: setLanguage,
-    onLogout: function () {
-      var _onLogout = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
-            case 0:
-              _context.n = 1;
-              return logout();
-            case 1:
-              return _context.a(2);
-          }
-        }, _callee);
-      }));
-      function onLogout() {
-        return _onLogout.apply(this, arguments);
-      }
-      return onLogout;
-    }(),
-    language: language,
-    messages: messages[language],
-    userName: user.given_name ? user.given_name + " " + user.family_name : user.name,
-    environment: environment,
-    showVersionItem: false,
-    showMyProfileItem: false,
-    showCookieSettingsItem: true,
-    onCookieSettingsOpen: function onCookieSettingsOpen() {
-      window.UC_UI.showSecondLayer();
-    },
-    onNavigateToMyProfile: function onNavigateToMyProfile() {}
-  }), React.createElement(appShell.OrganisationSelector, {
-    getOrganisations: getOrganisations,
-    getToken: getToken,
-    selectedOrganisationId: organisationId,
-    onChange: function onChange(organisationId) {
-      return setOrganisationId(organisationId);
-    }
-  }))), React.createElement(menu.SideNavigation, null, items.map(function (_ref2) {
-    var to = _ref2.to,
-      title = _ref2.title,
-      disabled = _ref2.disabled,
-      navigate = _ref2.navigate;
-    var itemProps = {
-      as: appShell.MicroFrontendLink,
-      href: to,
-      navigate: disabled ? null : function () {
-        return navigate(to);
+  var locale = convertToLocale(language);
+  return jsxRuntime.jsxs(common.Menu, {
+    children: [jsxRuntime.jsx("div", {
+      style: {
+        marginLeft: tokens.space.extraLarge2,
+        marginTop: tokens.space.large,
+        marginBottom: tokens.space.extraLarge
       },
-      disabled: !!disabled
-    };
-    return React.createElement(menu.SideNavigationItem, _extends({
-      key: to.toString()
-    }, itemProps), title);
-  })));
-};
-
-var Content$1 = function Content(_ref) {
-  var _organisationId$toStr;
-  var children = _ref.children,
-    values = _ref.values;
-  var _useMenu = appShell.useMenu(),
-    addItems = _useMenu.addItems,
-    _setMFNavigate = _useMenu.setMFNavigate;
-  var organisationId = appShell.useOrganisationId();
-  var _useLanguage = appShell.useLanguage(),
-    language = _useLanguage.language;
-  var addMenuItems = function addMenuItems(items) {
-    return addItems(items, "app-shell");
-  };
-  return React.createElement(common.Content, null, children(_extends({}, values, {
-    language: language,
-    navigate: function navigate() {
-      {
-        console.warn("Calling navigate() from app shell has no effect. It is only provided so that the app shell values are equal to MicroFrontendPayload.");
-      }
-    },
-    addMenuItems: addMenuItems,
-    organisationId: (_organisationId$toStr = organisationId == null ? void 0 : organisationId.toString()) != null ? _organisationId$toStr : "",
-    setMFNavigate: function setMFNavigate(navigate) {
-      return _setMFNavigate("app-shell", navigate);
-    }
-  })));
-};
-var AppShellStandalone = function AppShellStandalone(_ref2) {
-  var children = _ref2.children,
-    audience = _ref2.audience,
-    domain = _ref2.domain,
-    clientId = _ref2.clientId,
-    decorateUser = _ref2.decorateUser,
-    getOrganisations = _ref2.getOrganisations,
-    redirectUri = _ref2.redirectUri,
-    environment = _ref2.environment,
-    navigate = _ref2.navigate,
-    _ref2$isPublicView = _ref2.isPublicView,
-    isPublicView = _ref2$isPublicView === void 0 ? false : _ref2$isPublicView;
-  return React.createElement(appShell.AppShell, {
-    audience: audience,
-    domain: domain,
-    clientId: clientId,
-    decorateUser: decorateUser,
-    redirectUri: redirectUri,
-    environment: environment,
-    navigate: navigate,
-    isPublicView: isPublicView
-  }, function (values) {
-    var _languageStorage$get, _ref3, _organisationStorage$, _values$user;
-    return React.createElement(appShell.LanguageProvider, {
-      language: (_languageStorage$get = appShell.languageStorage.get()) != null ? _languageStorage$get : "nb-NO"
-    }, React.createElement(appShell.OrganisationProvider, {
-      organisationId: (_ref3 = (_organisationStorage$ = appShell.organisationStorage.get()) != null ? _organisationStorage$ : (_values$user = values.user) == null ? void 0 : _values$user["https://entur.io/organisationID"].toString()) != null ? _ref3 : ""
-    }, React.createElement(appShell.MenuProvider, null, isPublicView && React.createElement(Menu, _extends({}, values, {
-      getOrganisations: getOrganisations,
-      environment: environment
-    })), React.createElement(Content$1, {
-      values: values
-    }, children))));
-  });
-};
-
-var BetaTopNavigation = function BetaTopNavigation(_ref) {
-  var _user$name;
-  var environment = _ref.environment;
-  var location = reactRouterDom.useLocation();
-  var _useAuth = auth0React.useAuth0(),
-    isAuthenticated = _useAuth.isAuthenticated,
-    loginWithRedirect = _useAuth.loginWithRedirect,
-    logout = _useAuth.logout,
-    user = _useAuth.user;
-  var _useLanguage = appShell.useLanguage(),
-    language = _useLanguage.language,
-    setLanguage = _useLanguage.setLanguage;
-  var isFrontpage = location.pathname === "/";
-  var _useMenu = appShell.useMenu(),
-    getItemsForPath = _useMenu.getItemsForPath;
-  var items = getItemsForPath("app-shell");
-  return React.createElement(common.BetaTopNavigation, null, React.createElement("nav", {
-    className: classNames("top-navigation", {
-      "top-navigation--frontpage": isFrontpage
-    }),
-    "aria-label": "Navigasjon, hovedseksjoner"
-  }, React.createElement(reactRouterDom.Link, {
-    to: "/",
-    className: "top-navigation__logo"
-  }, React.createElement(common.EnturPartnerLogo, {
-    altText: "Entur partner logo",
-    className: "menu-space menu-logo",
-    environment: environment
-  })), items.filter(function (_ref2) {
-    var isPublic = _ref2.isPublic,
-      disabled = _ref2.disabled;
-    return !disabled && (isPublic || isAuthenticated);
-  }).map(function (_ref3) {
-    var to = _ref3.to,
-      title = _ref3.title,
-      disabled = _ref3.disabled,
-      _navigate = _ref3.navigate;
-    var itemProps = {
-      as: appShell.MicroFrontendLink,
-      to: to,
-      navigate: function navigate() {
-        return _navigate(to);
+      children: jsxRuntime.jsx(common.EnturPartnerLogo, {
+        altText: "Entur partner logo",
+        className: "menu-space menu-logo",
+        environment: environment
+      })
+    }), jsxRuntime.jsx("div", {
+      style: {
+        margin: tokens.space.large
       },
-      disabled: disabled
-    };
-    return React.createElement(NavItem, _extends({
-      key: to.toString()
-    }, itemProps), title);
-  }), React.createElement("div", {
-    className: "top-navigation__actions"
-  }, React.createElement(SkeletonLogInLoader, null,
-  //TODO: Fix contrast
-  isAuthenticated ? React.createElement(layout.Contrast, null, React.createElement(common.UserMenu, {
-    className: "ph-no-capture",
-    onLanguageChange: setLanguage,
-    onLogout: function () {
-      var _onLogout = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
-            case 0:
-              _context.n = 1;
-              return logout({
-                logoutParams: {
-                  returnTo: window.location.origin
+      children: jsxRuntime.jsxs(common.Stack, {
+        space: "small",
+        children: [jsxRuntime.jsx(common.UserMenu, {
+          className: "ph-no-capture",
+          onLocaleChange: setLanguage,
+          onLogout: function () {
+            var _onLogout = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return logout();
+                  case 1:
+                    return _context.a(2);
                 }
-              });
-            case 1:
-              return _context.a(2);
+              }, _callee);
+            }));
+            function onLogout() {
+              return _onLogout.apply(this, arguments);
+            }
+            return onLogout;
+          }(),
+          locale: locale,
+          userName: user.given_name ? user.given_name + " " + user.family_name : user.name,
+          environment: environment,
+          showVersionItem: false,
+          showMyProfileItem: false,
+          showCookieSettingsItem: true,
+          onCookieSettingsOpen: function onCookieSettingsOpen() {
+            window.UC_UI.showSecondLayer();
+          },
+          onNavigateToMyProfile: function onNavigateToMyProfile() {}
+        }), jsxRuntime.jsx(appShell.OrganisationSelector, {
+          getOrganisations: getOrganisations,
+          getToken: getToken,
+          selectedOrganisationId: organisationId,
+          onChange: function onChange(organisationId) {
+            return setOrganisationId(organisationId);
           }
-        }, _callee);
-      }));
-      function onLogout() {
-        return _onLogout.apply(this, arguments);
-      }
-      return onLogout;
-    }(),
-    language: language,
-    messages: messages[language],
-    userName: (_user$name = user == null ? void 0 : user.name) != null ? _user$name : "",
-    environment: environment,
-    showVersionItem: false,
-    showMyProfileItem: false,
-    showCookieSettingsItem: true,
-    onCookieSettingsOpen: function onCookieSettingsOpen() {
-      window.UC_UI.showSecondLayer();
-    },
-    onNavigateToMyProfile: function onNavigateToMyProfile() {}
-  })) : React.createElement(button.SecondaryButton, {
-    onClick: function onClick() {
-      return loginWithRedirect();
-    },
-    className: "top-navigation__button"
-  }, "Log In")))));
-};
-var NavItem = function NavItem(_ref4) {
-  var to = _ref4.to,
-    children = _ref4.children;
-  var location = reactRouterDom.useLocation();
-  var isActive = location.pathname.startsWith(to);
-  return React.createElement(menu.TopNavigationItem, {
-    as: reactRouterDom.Link,
-    to: to,
-    active: isActive
-  }, children);
-};
-var SkeletonLogInLoader = function SkeletonLogInLoader(_ref5) {
-  var children = _ref5.children;
-  var _useAuth2 = auth0React.useAuth0(),
-    isLoading = _useAuth2.isLoading;
-  if (isLoading) {
-    //TODO: A bug with SkeletonRectangle that shows some black bars on top and bottom
-    return React.createElement(layout.Contrast, null, React.createElement(loader.SkeletonRectangle, {
-      width: 130,
-      height: 50
-    }));
-  }
-  return React.createElement(React.Fragment, null, children);
+        })]
+      })
+    }), jsxRuntime.jsx(menu.SideNavigation, {
+      children: items.map(function (_ref2) {
+        var to = _ref2.to,
+          title = _ref2.title,
+          disabled = _ref2.disabled,
+          navigate = _ref2.navigate;
+        var itemProps = {
+          as: appShell.MicroFrontendLink,
+          href: to,
+          navigate: disabled ? null : function () {
+            return navigate(to);
+          },
+          disabled: !!disabled
+        };
+        return jsxRuntime.jsx(menu.SideNavigationItem, _extends({}, itemProps, {
+          children: title
+        }), to.toString());
+      })
+    })]
+  });
 };
 
 var Content = function Content(_ref) {
@@ -456,55 +264,66 @@ var Content = function Content(_ref) {
   var _useMenu = appShell.useMenu(),
     addItems = _useMenu.addItems,
     _setMFNavigate = _useMenu.setMFNavigate;
+  var organisationId = appShell.useOrganisationId();
   var _useLanguage = appShell.useLanguage(),
     language = _useLanguage.language;
   var addMenuItems = function addMenuItems(items) {
     return addItems(items, "app-shell");
   };
-  return React.createElement(common.Content, {
-    className: "eps-public-content"
-  }, children(_extends({}, values, {
-    language: language,
-    navigate: function navigate() {
-      {
-        console.warn("Calling navigate() from app shell has no effect. It is only provided so that the app shell values are equal to MicroFrontendPayload.");
+  return jsxRuntime.jsx(common.Content, {
+    children: children(_extends({}, values, {
+      language: language,
+      navigate: function navigate() {
+        {
+          console.warn("Calling navigate() from app shell has no effect. It is only provided so that the app shell values are equal to MicroFrontendPayload.");
+        }
+      },
+      addMenuItems: addMenuItems,
+      organisationId: organisationId.toString(),
+      setMFNavigate: function setMFNavigate(navigate) {
+        return _setMFNavigate("app-shell", navigate);
       }
-    },
-    addMenuItems: addMenuItems,
-    setMFNavigate: function setMFNavigate(navigate) {
-      return _setMFNavigate("app-shell", navigate);
-    }
-  })));
+    }))
+  });
 };
-var PublicAppShellStandalone = function PublicAppShellStandalone(_ref2) {
-  var children = _ref2.children,
+var AppShellStandalone = function AppShellStandalone(_ref2) {
+  var _children = _ref2.children,
     audience = _ref2.audience,
     domain = _ref2.domain,
     clientId = _ref2.clientId,
     decorateUser = _ref2.decorateUser,
+    getOrganisations = _ref2.getOrganisations,
     redirectUri = _ref2.redirectUri,
     environment = _ref2.environment,
     navigate = _ref2.navigate;
-  return React.createElement(appShell.AppShell, {
+  return jsxRuntime.jsx(appShell.AppShell, {
     audience: audience,
     domain: domain,
     clientId: clientId,
     decorateUser: decorateUser,
     redirectUri: redirectUri,
+    environment: environment,
     navigate: navigate,
-    isPublicView: true
-  }, function (values) {
-    var _languageStorage$get;
-    return React.createElement(appShell.LanguageProvider, {
-      language: (_languageStorage$get = appShell.languageStorage.get()) != null ? _languageStorage$get : "nb-NO"
-    }, React.createElement(appShell.MenuProvider, null, React.createElement(BetaTopNavigation, {
-      environment: environment
-    }), React.createElement(Content, {
-      values: values
-    }, children)));
+    children: function children(values) {
+      var _languageStorage$get, _organisationStorage$;
+      return jsxRuntime.jsx(appShell.LanguageProvider, {
+        language: (_languageStorage$get = appShell.languageStorage.get()) != null ? _languageStorage$get : "nb-NO",
+        children: jsxRuntime.jsx(appShell.OrganisationProvider, {
+          organisationId: (_organisationStorage$ = appShell.organisationStorage.get()) != null ? _organisationStorage$ : values.user["https://entur.io/organisationID"].toString(),
+          children: jsxRuntime.jsxs(appShell.MenuProvider, {
+            children: [jsxRuntime.jsx(Menu, _extends({}, values, {
+              getOrganisations: getOrganisations,
+              environment: environment
+            })), jsxRuntime.jsx(Content, {
+              values: values,
+              children: _children
+            })]
+          })
+        })
+      });
+    }
   });
 };
 
 exports.AppShellStandalone = AppShellStandalone;
-exports.PublicAppShellStandalone = PublicAppShellStandalone;
 //# sourceMappingURL=app-shell-standalone.cjs.development.js.map