@entur-partner/app-shell 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://bitbucket.org/enturas/entur-partner-packages/compare/@entur-partner/app-shell@2.1.2...@entur-partner/app-shell@2.2.0) (2022-03-21)
+
+### Features
+
+- **app-shell:** add optional fetching of organisations in app-shell ([3f27f8c](https://bitbucket.org/enturas/entur-partner-packages/commits/3f27f8c4632198f2d52ab29cd0e07f9567aa78ac))
+
+## [2.1.2](https://bitbucket.org/enturas/entur-partner-packages/compare/@entur-partner/app-shell@2.1.1...@entur-partner/app-shell@2.1.2) (2022-03-09)
+
+### Bug Fixes
+
+- **deps:** update entur packages ([22224c2](https://bitbucket.org/enturas/entur-partner-packages/commits/22224c223cd111224f5654ced91879a7c06d2fa1))
+
+## [2.1.1](https://bitbucket.org/enturas/entur-partner-packages/compare/@entur-partner/app-shell@2.1.0...@entur-partner/app-shell@2.1.1) (2022-02-10)
+
+**Note:** Version bump only for package @entur-partner/app-shell
+
 # [2.1.0](https://bitbucket.org/enturas/entur-partner-packages/compare/@entur-partner/app-shell@2.0.24...@entur-partner/app-shell@2.1.0) (2022-02-07)
 
 ### Bug Fixes

package/dist/OrganisationSelector.d.ts

@@ -7,7 +7,7 @@ export interface Organisation {
 }
 export interface OrganisationSelectorProps {
     getToken: (options?: GetTokenSilentlyOptions) => Promise<string>;
-    getOrganisations: GetOrganisationsFn;
+    getOrganisations: GetOrganisationsFn | string;
     value: string;
     onChange: (id: string) => void;
     [key: string]: any;

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

@@ -2,17 +2,19 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
 var React = require('react');
-var React__default = _interopDefault(React);
 var loader = require('@entur/loader');
 var alert = require('@entur/alert');
 var tokens = require('@entur/tokens');
 var util = require('@entur-partner/util');
-var createAuth0Client = _interopDefault(require('@auth0/auth0-spa-js'));
+var createAuth0Client = require('@auth0/auth0-spa-js');
 var common = require('@entur-partner/common');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var createAuth0Client__default = /*#__PURE__*/_interopDefaultLegacy(createAuth0Client);
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -82,18 +84,17 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
-}
+var runtime = {exports: {}};
+
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
-var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
-  /**
-   * Copyright (c) 2014-present, Facebook, Inc.
-   *
-   * This source code is licensed under the MIT license found in the
-   * LICENSE file in the root directory of this source tree.
-   */
-  var runtime = function (exports) {
+(function (module) {
+  var runtime = /*#__PURE__*/function (exports) {
 
     var Op = Object.prototype;
     var hasOwn = Op.hasOwnProperty;
@@ -179,13 +180,11 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
 
 
     var IteratorPrototype = {};
-
-    IteratorPrototype[iteratorSymbol] = function () {
+    define(IteratorPrototype, iteratorSymbol, function () {
       return this;
-    };
-
+    });
     var getProto = Object.getPrototypeOf;
-    var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+    var NativeIteratorPrototype = getProto && /*#__PURE__*/getProto( /*#__PURE__*/getProto( /*#__PURE__*/values([])));
 
     if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
       // This environment has a native %IteratorPrototype%; use it instead
@@ -193,10 +192,11 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
       IteratorPrototype = NativeIteratorPrototype;
     }
 
-    var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
-    GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
-    GeneratorFunctionPrototype.constructor = GeneratorFunction;
-    GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
+    var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = /*#__PURE__*/Object.create(IteratorPrototype);
+    GeneratorFunction.prototype = GeneratorFunctionPrototype;
+    define(Gp, "constructor", GeneratorFunctionPrototype);
+    define(GeneratorFunctionPrototype, "constructor", GeneratorFunction);
+    GeneratorFunction.displayName = /*#__PURE__*/define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
     // Iterator interface in terms of a single ._invoke method.
 
     function defineIteratorMethods(prototype) {
@@ -300,11 +300,9 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
     }
 
     defineIteratorMethods(AsyncIterator.prototype);
-
-    AsyncIterator.prototype[asyncIteratorSymbol] = function () {
+    define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
       return this;
-    };
-
+    });
     exports.AsyncIterator = AsyncIterator; // Note that simple async functions are implemented on top of
     // AsyncIterator objects; they just return a Promise for the value of
     // the final result produced by the iterator.
@@ -481,13 +479,12 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
     // object to not be returned from this call. This ensures that doesn't happen.
     // See https://github.com/facebook/regenerator/issues/274 for more details.
 
-    Gp[iteratorSymbol] = function () {
+    define(Gp, iteratorSymbol, function () {
       return this;
-    };
-
-    Gp.toString = function () {
+    });
+    define(Gp, "toString", function () {
       return "[object Generator]";
-    };
+    });
 
     function pushTryEntry(locs) {
       var entry = {
@@ -792,25 +789,32 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
   // as the regeneratorRuntime namespace. Otherwise create a new empty
   // object. Either way, the resulting object will be used to initialize
   // the regeneratorRuntime variable at the top of this file.
-   module.exports );
+  module.exports );
 
   try {
     regeneratorRuntime = runtime;
   } catch (accidentalStrictMode) {
     // This module should not be running in strict mode, so the above
     // assignment should always work unless something is misconfigured. Just
-    // in case runtime.js accidentally runs in strict mode, we can escape
+    // in case runtime.js accidentally runs in strict mode, in modern engines
+    // we can explicitly access globalThis. In older engines we can escape
     // strict mode using a global Function call. This could conceivably fail
     // if a Content Security Policy forbids using Function, but in that case
     // the proper solution is to fix the accidental strict mode problem. If
     // you've misconfigured your bundler to force strict mode and applied a
     // CSP to forbid Function, and you're not willing to fix either of those
     // problems, please detail your unique predicament in a GitHub issue.
-    Function("r", "regeneratorRuntime = r")(runtime);
+    if (typeof globalThis === "object") {
+      globalThis.regeneratorRuntime = runtime;
+    } else {
+      Function("r", "regeneratorRuntime = r")(runtime);
+    }
   }
-});
+})(runtime);
 
-var initialState = {
+var _regeneratorRuntime = runtime.exports;
+
+var initialState$1 = {
   status: 'AUTHENTICATING'
 };
 function authReducer(state, event) {
@@ -822,7 +826,7 @@ function authReducer(state, event) {
       };
 
     case 'LOGOUT':
-      return initialState;
+      return initialState$1;
 
     case 'ERROR':
       return {
@@ -840,6 +844,7 @@ function authReducer(state, event) {
   }
 }
 
+var _excluded$2 = ["children", "decorateUser"];
 var POST_LOGIN_ROUTE_KEY = '@entur-partner:post-login-route';
 
 var redirect = function redirect(pathname) {
@@ -851,21 +856,21 @@ var redirect = function redirect(pathname) {
 }; // TODO: replace with react-router history
 
 
-var Auth0Context = /*#__PURE__*/React__default.createContext(undefined);
+var Auth0Context = /*#__PURE__*/React__default["default"].createContext(undefined);
 var useAuth = function useAuth() {
   var auth = React.useContext(Auth0Context);
   util.assertIsDefined(auth, 'A `<Auth0Provider>` component needs to be higher up in the component hierarchy.');
   return auth;
 };
-var initialState$1 = {
+var initialState = {
   status: 'AUTHENTICATING'
 };
 var AuthProvider = function AuthProvider(_ref) {
   var children = _ref.children,
       decorateUser = _ref.decorateUser,
-      initOptions = _objectWithoutPropertiesLoose(_ref, ["children", "decorateUser"]);
+      initOptions = _objectWithoutPropertiesLoose(_ref, _excluded$2);
 
-  var _useReducer = React.useReducer(authReducer, initialState$1),
+  var _useReducer = React.useReducer(authReducer, initialState),
       state = _useReducer[0],
       dispatch = _useReducer[1];
 
@@ -875,14 +880,14 @@ var AuthProvider = function AuthProvider(_ref) {
 
   React.useEffect(function () {
     var initAuth0 = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var client, route, postLoginRoute, isAuthenticated, auth0User, token, user;
-        return runtime_1.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return createAuth0Client(initOptions);
+                return createAuth0Client__default["default"](initOptions);
 
               case 2:
                 client = _context.sent;
@@ -976,10 +981,10 @@ var AuthProvider = function AuthProvider(_ref) {
   };
 
   var login = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(redirectUri) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(redirectUri) {
       var _window, location;
 
-      return runtime_1.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -1008,8 +1013,8 @@ var AuthProvider = function AuthProvider(_ref) {
   }();
 
   var getToken = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(options) {
-      return runtime_1.wrap(function _callee3$(_context3) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
@@ -1029,7 +1034,7 @@ var AuthProvider = function AuthProvider(_ref) {
     };
   }();
 
-  return React__default.createElement(Auth0Context.Provider, {
+  return React__default["default"].createElement(Auth0Context.Provider, {
     value: _extends({}, state, {
       auth0Client: auth0Client,
       logout: logout,
@@ -1064,28 +1069,28 @@ var Authenticate = function Authenticate(_ref2) {
 
   switch (status) {
     case 'NOT_AUTHENTICATED':
-      return React__default.createElement(Login, {
+      return React__default["default"].createElement(Login, {
         redirectUri: redirectUri
       });
 
     case 'AUTHENTICATED':
       util.assertIsDefined(user);
-      return React__default.createElement(React__default.Fragment, null, children({
+      return React__default["default"].createElement(React__default["default"].Fragment, null, children({
         user: user,
         logout: logout,
         getToken: getToken
       }));
 
     case 'AUTHENTICATING':
-      return React__default.createElement(loader.Loader, {
+      return React__default["default"].createElement(loader.Loader, {
         style: {
           marginTop: tokens.space.extraLarge9
         }
       }, "Authenticating");
 
     case 'ERROR':
-       console.error(error);
-      return React__default.createElement(alert.BannerAlertBox, {
+      console.error(error);
+      return React__default["default"].createElement(alert.BannerAlertBox, {
         variant: "error",
         title: "Authentication failed",
         style: {
@@ -1106,18 +1111,20 @@ var AppShell = function AppShell(_ref3) {
       clientId = _ref3.clientId,
       redirectUri = _ref3.redirectUri,
       decorateUser = _ref3.decorateUser;
-  return React__default.createElement(AuthProvider, {
+  return React__default["default"].createElement(AuthProvider, {
     audience: audience,
     domain: domain,
     client_id: clientId,
     decorateUser: decorateUser
-  }, React__default.createElement(Authenticate, {
+  }, React__default["default"].createElement(Authenticate, {
     redirectUri: redirectUri
   }, function (params) {
     return children(params);
   }));
 };
 
+var _excluded$1 = ["navigate", "children", "onClick", "target"];
+
 function isModifiedEvent(event) {
   return !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);
 }
@@ -1127,9 +1134,9 @@ var MicroFrontendLink = function MicroFrontendLink(_ref) {
       children = _ref.children,
       _onClick = _ref.onClick,
       target = _ref.target,
-      rest = _objectWithoutPropertiesLoose(_ref, ["navigate", "children", "onClick", "target"]);
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded$1);
 
-  return React__default.createElement("a", Object.assign({
+  return React__default["default"].createElement("a", _extends({
     onClick: function onClick(event) {
       try {
         if (_onClick) _onClick(event);
@@ -1143,15 +1150,15 @@ var MicroFrontendLink = function MicroFrontendLink(_ref) {
       !target || target === '_self') && // let browser handle "target=_blank" etc.
       !isModifiedEvent(event) // ignore clicks with modifier keys
       ) {
-          event.preventDefault();
-          navigate();
-        }
+        event.preventDefault();
+        navigate();
+      }
     },
     target: target
   }, rest), children);
 };
 
-var MenuContext = /*#__PURE__*/React__default.createContext({
+var MenuContext = /*#__PURE__*/React__default["default"].createContext({
   addItems: function addItems() {},
   getItemsForPath: function getItemsForPath() {
     return [];
@@ -1205,7 +1212,7 @@ var MenuProvider = function MenuProvider(_ref) {
     });
   };
 
-  return React__default.createElement(MenuContext.Provider, {
+  return React__default["default"].createElement(MenuContext.Provider, {
     value: {
       addItems: addItems,
       getItemsForPath: function getItemsForPath(path) {
@@ -1238,7 +1245,7 @@ var languageStorage = {
   }
 };
 
-var OrganisationContext = /*#__PURE__*/React__default.createContext(undefined);
+var OrganisationContext = /*#__PURE__*/React__default["default"].createContext(undefined);
 var useOrganisation = function useOrganisation() {
   var context = React.useContext(OrganisationContext);
   util.assertIsDefined(context);
@@ -1269,7 +1276,7 @@ var OrganisationProvider = function OrganisationProvider(_ref) {
       orgId = _useOrganisationState[0],
       setOrganisationId = _useOrganisationState[1];
 
-  return React__default.createElement(OrganisationContext.Provider, {
+  return React__default["default"].createElement(OrganisationContext.Provider, {
     value: {
       organisationId: orgId,
       setOrganisationId: setOrganisationId
@@ -1277,7 +1284,7 @@ var OrganisationProvider = function OrganisationProvider(_ref) {
   }, children);
 };
 
-var LanguageContext = /*#__PURE__*/React__default.createContext(undefined);
+var LanguageContext = /*#__PURE__*/React__default["default"].createContext(undefined);
 
 var useLanguageState = function useLanguageState(language) {
   var _useState = React.useState(language),
@@ -1303,7 +1310,7 @@ var LanguageProvider = function LanguageProvider(_ref) {
       activeLanguage = _useLanguageState[0],
       setLanguage = _useLanguageState[1];
 
-  return React__default.createElement(LanguageContext.Provider, {
+  return React__default["default"].createElement(LanguageContext.Provider, {
     value: {
       language: activeLanguage,
       setLanguage: setLanguage
@@ -1311,12 +1318,13 @@ var LanguageProvider = function LanguageProvider(_ref) {
   }, children);
 };
 
+var _excluded = ["getToken", "getOrganisations", "value", "onChange"];
 var OrganisationSelector = function OrganisationSelector(_ref) {
   var getToken = _ref.getToken,
       getOrganisations = _ref.getOrganisations,
       value = _ref.value,
       onChange = _ref.onChange,
-      rest = _objectWithoutPropertiesLoose(_ref, ["getToken", "getOrganisations", "value", "onChange"]);
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
   var _useState = React.useState([]),
       organisations = _useState[0],
@@ -1331,9 +1339,9 @@ var OrganisationSelector = function OrganisationSelector(_ref) {
 
   React.useEffect(function () {
     var fetchOrganisations = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var token, organisations;
-        return runtime_1.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1342,15 +1350,39 @@ var OrganisationSelector = function OrganisationSelector(_ref) {
 
               case 2:
                 token = _context.sent;
-                _context.next = 5;
+
+                if (!(typeof getOrganisations === 'string')) {
+                  _context.next = 9;
+                  break;
+                }
+
+                _context.next = 6;
+                return fetch(getOrganisations, {
+                  headers: {
+                    Authorization: "Bearer " + token,
+                    Accept: 'application/json'
+                  }
+                }).then(function (response) {
+                  return response.json();
+                });
+
+              case 6:
+                organisations = _context.sent;
+                _context.next = 12;
+                break;
+
+              case 9:
+                _context.next = 11;
                 return getOrganisations(token);
 
-              case 5:
+              case 11:
                 organisations = _context.sent;
+
+              case 12:
                 setOrganisations(organisations);
                 setStatus('SUCCESS');
 
-              case 8:
+              case 14:
               case "end":
                 return _context.stop();
             }
@@ -1374,16 +1406,16 @@ var OrganisationSelector = function OrganisationSelector(_ref) {
 
   switch (status) {
     case 'LOADING':
-      return React__default.createElement("div", {
+      return React__default["default"].createElement("div", {
         className: "eds-contrast"
-      }, React__default.createElement(loader.SkeletonRectangle, {
+      }, React__default["default"].createElement(loader.SkeletonRectangle, {
         style: {
           height: '2.4rem'
         }
       }));
 
     case 'SUCCESS':
-      return React__default.createElement(common.OrganisationDropDown, Object.assign({
+      return React__default["default"].createElement(common.OrganisationDropDown, _extends({
         label: language === 'nb' ? 'Organisasjon' : 'Organisation',
         selectedOrganisationId: value,
         organisations: organisations,