@entur-partner/app-shell 2.1.0 → 2.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/app-shell.cjs.development.js +65 -58
- package/dist/app-shell.cjs.development.js.map +1 -1
- package/dist/app-shell.cjs.production.min.js +1 -1
- package/dist/app-shell.cjs.production.min.js.map +1 -1
- package/dist/app-shell.esm.js +41 -36
- package/dist/app-shell.esm.js.map +1 -1
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [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)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @entur-partner/app-shell
|
|
9
|
+
|
|
6
10
|
# [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)
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
|
@@ -2,17 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
|
|
6
|
-
|
|
7
5
|
var React = require('react');
|
|
8
|
-
var React__default = _interopDefault(React);
|
|
9
6
|
var loader = require('@entur/loader');
|
|
10
7
|
var alert = require('@entur/alert');
|
|
11
8
|
var tokens = require('@entur/tokens');
|
|
12
9
|
var util = require('@entur-partner/util');
|
|
13
|
-
var createAuth0Client =
|
|
10
|
+
var createAuth0Client = require('@auth0/auth0-spa-js');
|
|
14
11
|
var common = require('@entur-partner/common');
|
|
15
12
|
|
|
13
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
14
|
+
|
|
15
|
+
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
16
|
+
var createAuth0Client__default = /*#__PURE__*/_interopDefaultLegacy(createAuth0Client);
|
|
17
|
+
|
|
16
18
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
17
19
|
try {
|
|
18
20
|
var info = gen[key](arg);
|
|
@@ -82,18 +84,17 @@ function _objectWithoutPropertiesLoose(source, excluded) {
|
|
|
82
84
|
return target;
|
|
83
85
|
}
|
|
84
86
|
|
|
85
|
-
|
|
86
|
-
return module = { exports: {} }, fn(module, module.exports), module.exports;
|
|
87
|
-
}
|
|
87
|
+
var runtime = {exports: {}};
|
|
88
88
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
89
|
+
/**
|
|
90
|
+
* Copyright (c) 2014-present, Facebook, Inc.
|
|
91
|
+
*
|
|
92
|
+
* This source code is licensed under the MIT license found in the
|
|
93
|
+
* LICENSE file in the root directory of this source tree.
|
|
94
|
+
*/
|
|
95
|
+
|
|
96
|
+
(function (module) {
|
|
97
|
+
var runtime = /*#__PURE__*/function (exports) {
|
|
97
98
|
|
|
98
99
|
var Op = Object.prototype;
|
|
99
100
|
var hasOwn = Op.hasOwnProperty;
|
|
@@ -185,7 +186,7 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
|
|
|
185
186
|
};
|
|
186
187
|
|
|
187
188
|
var getProto = Object.getPrototypeOf;
|
|
188
|
-
var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
|
|
189
|
+
var NativeIteratorPrototype = getProto && /*#__PURE__*/getProto( /*#__PURE__*/getProto( /*#__PURE__*/values([])));
|
|
189
190
|
|
|
190
191
|
if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
|
|
191
192
|
// This environment has a native %IteratorPrototype%; use it instead
|
|
@@ -193,10 +194,10 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
|
|
|
193
194
|
IteratorPrototype = NativeIteratorPrototype;
|
|
194
195
|
}
|
|
195
196
|
|
|
196
|
-
var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
|
|
197
|
+
var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = /*#__PURE__*/Object.create(IteratorPrototype);
|
|
197
198
|
GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
|
|
198
199
|
GeneratorFunctionPrototype.constructor = GeneratorFunction;
|
|
199
|
-
GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
|
|
200
|
+
GeneratorFunction.displayName = /*#__PURE__*/define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
|
|
200
201
|
// Iterator interface in terms of a single ._invoke method.
|
|
201
202
|
|
|
202
203
|
function defineIteratorMethods(prototype) {
|
|
@@ -792,7 +793,7 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
|
|
|
792
793
|
// as the regeneratorRuntime namespace. Otherwise create a new empty
|
|
793
794
|
// object. Either way, the resulting object will be used to initialize
|
|
794
795
|
// the regeneratorRuntime variable at the top of this file.
|
|
795
|
-
|
|
796
|
+
module.exports );
|
|
796
797
|
|
|
797
798
|
try {
|
|
798
799
|
regeneratorRuntime = runtime;
|
|
@@ -808,9 +809,11 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
|
|
|
808
809
|
// problems, please detail your unique predicament in a GitHub issue.
|
|
809
810
|
Function("r", "regeneratorRuntime = r")(runtime);
|
|
810
811
|
}
|
|
811
|
-
});
|
|
812
|
+
})(runtime);
|
|
812
813
|
|
|
813
|
-
var
|
|
814
|
+
var _regeneratorRuntime = runtime.exports;
|
|
815
|
+
|
|
816
|
+
var initialState$1 = {
|
|
814
817
|
status: 'AUTHENTICATING'
|
|
815
818
|
};
|
|
816
819
|
function authReducer(state, event) {
|
|
@@ -822,7 +825,7 @@ function authReducer(state, event) {
|
|
|
822
825
|
};
|
|
823
826
|
|
|
824
827
|
case 'LOGOUT':
|
|
825
|
-
return initialState;
|
|
828
|
+
return initialState$1;
|
|
826
829
|
|
|
827
830
|
case 'ERROR':
|
|
828
831
|
return {
|
|
@@ -840,6 +843,7 @@ function authReducer(state, event) {
|
|
|
840
843
|
}
|
|
841
844
|
}
|
|
842
845
|
|
|
846
|
+
var _excluded$2 = ["children", "decorateUser"];
|
|
843
847
|
var POST_LOGIN_ROUTE_KEY = '@entur-partner:post-login-route';
|
|
844
848
|
|
|
845
849
|
var redirect = function redirect(pathname) {
|
|
@@ -851,21 +855,21 @@ var redirect = function redirect(pathname) {
|
|
|
851
855
|
}; // TODO: replace with react-router history
|
|
852
856
|
|
|
853
857
|
|
|
854
|
-
var Auth0Context = /*#__PURE__*/React__default.createContext(undefined);
|
|
858
|
+
var Auth0Context = /*#__PURE__*/React__default["default"].createContext(undefined);
|
|
855
859
|
var useAuth = function useAuth() {
|
|
856
860
|
var auth = React.useContext(Auth0Context);
|
|
857
861
|
util.assertIsDefined(auth, 'A `<Auth0Provider>` component needs to be higher up in the component hierarchy.');
|
|
858
862
|
return auth;
|
|
859
863
|
};
|
|
860
|
-
var initialState
|
|
864
|
+
var initialState = {
|
|
861
865
|
status: 'AUTHENTICATING'
|
|
862
866
|
};
|
|
863
867
|
var AuthProvider = function AuthProvider(_ref) {
|
|
864
868
|
var children = _ref.children,
|
|
865
869
|
decorateUser = _ref.decorateUser,
|
|
866
|
-
initOptions = _objectWithoutPropertiesLoose(_ref,
|
|
870
|
+
initOptions = _objectWithoutPropertiesLoose(_ref, _excluded$2);
|
|
867
871
|
|
|
868
|
-
var _useReducer = React.useReducer(authReducer, initialState
|
|
872
|
+
var _useReducer = React.useReducer(authReducer, initialState),
|
|
869
873
|
state = _useReducer[0],
|
|
870
874
|
dispatch = _useReducer[1];
|
|
871
875
|
|
|
@@ -875,14 +879,14 @@ var AuthProvider = function AuthProvider(_ref) {
|
|
|
875
879
|
|
|
876
880
|
React.useEffect(function () {
|
|
877
881
|
var initAuth0 = /*#__PURE__*/function () {
|
|
878
|
-
var _ref2 = _asyncToGenerator( /*#__PURE__*/
|
|
882
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
879
883
|
var client, route, postLoginRoute, isAuthenticated, auth0User, token, user;
|
|
880
|
-
return
|
|
884
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
881
885
|
while (1) {
|
|
882
886
|
switch (_context.prev = _context.next) {
|
|
883
887
|
case 0:
|
|
884
888
|
_context.next = 2;
|
|
885
|
-
return
|
|
889
|
+
return createAuth0Client__default["default"](initOptions);
|
|
886
890
|
|
|
887
891
|
case 2:
|
|
888
892
|
client = _context.sent;
|
|
@@ -976,10 +980,10 @@ var AuthProvider = function AuthProvider(_ref) {
|
|
|
976
980
|
};
|
|
977
981
|
|
|
978
982
|
var login = /*#__PURE__*/function () {
|
|
979
|
-
var _ref3 = _asyncToGenerator( /*#__PURE__*/
|
|
983
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(redirectUri) {
|
|
980
984
|
var _window, location;
|
|
981
985
|
|
|
982
|
-
return
|
|
986
|
+
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
983
987
|
while (1) {
|
|
984
988
|
switch (_context2.prev = _context2.next) {
|
|
985
989
|
case 0:
|
|
@@ -1008,8 +1012,8 @@ var AuthProvider = function AuthProvider(_ref) {
|
|
|
1008
1012
|
}();
|
|
1009
1013
|
|
|
1010
1014
|
var getToken = /*#__PURE__*/function () {
|
|
1011
|
-
var _ref4 = _asyncToGenerator( /*#__PURE__*/
|
|
1012
|
-
return
|
|
1015
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
|
|
1016
|
+
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
1013
1017
|
while (1) {
|
|
1014
1018
|
switch (_context3.prev = _context3.next) {
|
|
1015
1019
|
case 0:
|
|
@@ -1029,7 +1033,7 @@ var AuthProvider = function AuthProvider(_ref) {
|
|
|
1029
1033
|
};
|
|
1030
1034
|
}();
|
|
1031
1035
|
|
|
1032
|
-
return React__default.createElement(Auth0Context.Provider, {
|
|
1036
|
+
return React__default["default"].createElement(Auth0Context.Provider, {
|
|
1033
1037
|
value: _extends({}, state, {
|
|
1034
1038
|
auth0Client: auth0Client,
|
|
1035
1039
|
logout: logout,
|
|
@@ -1064,28 +1068,28 @@ var Authenticate = function Authenticate(_ref2) {
|
|
|
1064
1068
|
|
|
1065
1069
|
switch (status) {
|
|
1066
1070
|
case 'NOT_AUTHENTICATED':
|
|
1067
|
-
return React__default.createElement(Login, {
|
|
1071
|
+
return React__default["default"].createElement(Login, {
|
|
1068
1072
|
redirectUri: redirectUri
|
|
1069
1073
|
});
|
|
1070
1074
|
|
|
1071
1075
|
case 'AUTHENTICATED':
|
|
1072
1076
|
util.assertIsDefined(user);
|
|
1073
|
-
return React__default.createElement(React__default.Fragment, null, children({
|
|
1077
|
+
return React__default["default"].createElement(React__default["default"].Fragment, null, children({
|
|
1074
1078
|
user: user,
|
|
1075
1079
|
logout: logout,
|
|
1076
1080
|
getToken: getToken
|
|
1077
1081
|
}));
|
|
1078
1082
|
|
|
1079
1083
|
case 'AUTHENTICATING':
|
|
1080
|
-
return React__default.createElement(loader.Loader, {
|
|
1084
|
+
return React__default["default"].createElement(loader.Loader, {
|
|
1081
1085
|
style: {
|
|
1082
1086
|
marginTop: tokens.space.extraLarge9
|
|
1083
1087
|
}
|
|
1084
1088
|
}, "Authenticating");
|
|
1085
1089
|
|
|
1086
1090
|
case 'ERROR':
|
|
1087
|
-
|
|
1088
|
-
return React__default.createElement(alert.BannerAlertBox, {
|
|
1091
|
+
console.error(error);
|
|
1092
|
+
return React__default["default"].createElement(alert.BannerAlertBox, {
|
|
1089
1093
|
variant: "error",
|
|
1090
1094
|
title: "Authentication failed",
|
|
1091
1095
|
style: {
|
|
@@ -1106,18 +1110,20 @@ var AppShell = function AppShell(_ref3) {
|
|
|
1106
1110
|
clientId = _ref3.clientId,
|
|
1107
1111
|
redirectUri = _ref3.redirectUri,
|
|
1108
1112
|
decorateUser = _ref3.decorateUser;
|
|
1109
|
-
return React__default.createElement(AuthProvider, {
|
|
1113
|
+
return React__default["default"].createElement(AuthProvider, {
|
|
1110
1114
|
audience: audience,
|
|
1111
1115
|
domain: domain,
|
|
1112
1116
|
client_id: clientId,
|
|
1113
1117
|
decorateUser: decorateUser
|
|
1114
|
-
}, React__default.createElement(Authenticate, {
|
|
1118
|
+
}, React__default["default"].createElement(Authenticate, {
|
|
1115
1119
|
redirectUri: redirectUri
|
|
1116
1120
|
}, function (params) {
|
|
1117
1121
|
return children(params);
|
|
1118
1122
|
}));
|
|
1119
1123
|
};
|
|
1120
1124
|
|
|
1125
|
+
var _excluded$1 = ["navigate", "children", "onClick", "target"];
|
|
1126
|
+
|
|
1121
1127
|
function isModifiedEvent(event) {
|
|
1122
1128
|
return !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);
|
|
1123
1129
|
}
|
|
@@ -1127,9 +1133,9 @@ var MicroFrontendLink = function MicroFrontendLink(_ref) {
|
|
|
1127
1133
|
children = _ref.children,
|
|
1128
1134
|
_onClick = _ref.onClick,
|
|
1129
1135
|
target = _ref.target,
|
|
1130
|
-
rest = _objectWithoutPropertiesLoose(_ref,
|
|
1136
|
+
rest = _objectWithoutPropertiesLoose(_ref, _excluded$1);
|
|
1131
1137
|
|
|
1132
|
-
return React__default.createElement("a",
|
|
1138
|
+
return React__default["default"].createElement("a", _extends({
|
|
1133
1139
|
onClick: function onClick(event) {
|
|
1134
1140
|
try {
|
|
1135
1141
|
if (_onClick) _onClick(event);
|
|
@@ -1143,15 +1149,15 @@ var MicroFrontendLink = function MicroFrontendLink(_ref) {
|
|
|
1143
1149
|
!target || target === '_self') && // let browser handle "target=_blank" etc.
|
|
1144
1150
|
!isModifiedEvent(event) // ignore clicks with modifier keys
|
|
1145
1151
|
) {
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1152
|
+
event.preventDefault();
|
|
1153
|
+
navigate();
|
|
1154
|
+
}
|
|
1149
1155
|
},
|
|
1150
1156
|
target: target
|
|
1151
1157
|
}, rest), children);
|
|
1152
1158
|
};
|
|
1153
1159
|
|
|
1154
|
-
var MenuContext = /*#__PURE__*/React__default.createContext({
|
|
1160
|
+
var MenuContext = /*#__PURE__*/React__default["default"].createContext({
|
|
1155
1161
|
addItems: function addItems() {},
|
|
1156
1162
|
getItemsForPath: function getItemsForPath() {
|
|
1157
1163
|
return [];
|
|
@@ -1205,7 +1211,7 @@ var MenuProvider = function MenuProvider(_ref) {
|
|
|
1205
1211
|
});
|
|
1206
1212
|
};
|
|
1207
1213
|
|
|
1208
|
-
return React__default.createElement(MenuContext.Provider, {
|
|
1214
|
+
return React__default["default"].createElement(MenuContext.Provider, {
|
|
1209
1215
|
value: {
|
|
1210
1216
|
addItems: addItems,
|
|
1211
1217
|
getItemsForPath: function getItemsForPath(path) {
|
|
@@ -1238,7 +1244,7 @@ var languageStorage = {
|
|
|
1238
1244
|
}
|
|
1239
1245
|
};
|
|
1240
1246
|
|
|
1241
|
-
var OrganisationContext = /*#__PURE__*/React__default.createContext(undefined);
|
|
1247
|
+
var OrganisationContext = /*#__PURE__*/React__default["default"].createContext(undefined);
|
|
1242
1248
|
var useOrganisation = function useOrganisation() {
|
|
1243
1249
|
var context = React.useContext(OrganisationContext);
|
|
1244
1250
|
util.assertIsDefined(context);
|
|
@@ -1269,7 +1275,7 @@ var OrganisationProvider = function OrganisationProvider(_ref) {
|
|
|
1269
1275
|
orgId = _useOrganisationState[0],
|
|
1270
1276
|
setOrganisationId = _useOrganisationState[1];
|
|
1271
1277
|
|
|
1272
|
-
return React__default.createElement(OrganisationContext.Provider, {
|
|
1278
|
+
return React__default["default"].createElement(OrganisationContext.Provider, {
|
|
1273
1279
|
value: {
|
|
1274
1280
|
organisationId: orgId,
|
|
1275
1281
|
setOrganisationId: setOrganisationId
|
|
@@ -1277,7 +1283,7 @@ var OrganisationProvider = function OrganisationProvider(_ref) {
|
|
|
1277
1283
|
}, children);
|
|
1278
1284
|
};
|
|
1279
1285
|
|
|
1280
|
-
var LanguageContext = /*#__PURE__*/React__default.createContext(undefined);
|
|
1286
|
+
var LanguageContext = /*#__PURE__*/React__default["default"].createContext(undefined);
|
|
1281
1287
|
|
|
1282
1288
|
var useLanguageState = function useLanguageState(language) {
|
|
1283
1289
|
var _useState = React.useState(language),
|
|
@@ -1303,7 +1309,7 @@ var LanguageProvider = function LanguageProvider(_ref) {
|
|
|
1303
1309
|
activeLanguage = _useLanguageState[0],
|
|
1304
1310
|
setLanguage = _useLanguageState[1];
|
|
1305
1311
|
|
|
1306
|
-
return React__default.createElement(LanguageContext.Provider, {
|
|
1312
|
+
return React__default["default"].createElement(LanguageContext.Provider, {
|
|
1307
1313
|
value: {
|
|
1308
1314
|
language: activeLanguage,
|
|
1309
1315
|
setLanguage: setLanguage
|
|
@@ -1311,12 +1317,13 @@ var LanguageProvider = function LanguageProvider(_ref) {
|
|
|
1311
1317
|
}, children);
|
|
1312
1318
|
};
|
|
1313
1319
|
|
|
1320
|
+
var _excluded = ["getToken", "getOrganisations", "value", "onChange"];
|
|
1314
1321
|
var OrganisationSelector = function OrganisationSelector(_ref) {
|
|
1315
1322
|
var getToken = _ref.getToken,
|
|
1316
1323
|
getOrganisations = _ref.getOrganisations,
|
|
1317
1324
|
value = _ref.value,
|
|
1318
1325
|
onChange = _ref.onChange,
|
|
1319
|
-
rest = _objectWithoutPropertiesLoose(_ref,
|
|
1326
|
+
rest = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
1320
1327
|
|
|
1321
1328
|
var _useState = React.useState([]),
|
|
1322
1329
|
organisations = _useState[0],
|
|
@@ -1331,9 +1338,9 @@ var OrganisationSelector = function OrganisationSelector(_ref) {
|
|
|
1331
1338
|
|
|
1332
1339
|
React.useEffect(function () {
|
|
1333
1340
|
var fetchOrganisations = /*#__PURE__*/function () {
|
|
1334
|
-
var _ref2 = _asyncToGenerator( /*#__PURE__*/
|
|
1341
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
1335
1342
|
var token, organisations;
|
|
1336
|
-
return
|
|
1343
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
1337
1344
|
while (1) {
|
|
1338
1345
|
switch (_context.prev = _context.next) {
|
|
1339
1346
|
case 0:
|
|
@@ -1374,16 +1381,16 @@ var OrganisationSelector = function OrganisationSelector(_ref) {
|
|
|
1374
1381
|
|
|
1375
1382
|
switch (status) {
|
|
1376
1383
|
case 'LOADING':
|
|
1377
|
-
return React__default.createElement("div", {
|
|
1384
|
+
return React__default["default"].createElement("div", {
|
|
1378
1385
|
className: "eds-contrast"
|
|
1379
|
-
}, React__default.createElement(loader.SkeletonRectangle, {
|
|
1386
|
+
}, React__default["default"].createElement(loader.SkeletonRectangle, {
|
|
1380
1387
|
style: {
|
|
1381
1388
|
height: '2.4rem'
|
|
1382
1389
|
}
|
|
1383
1390
|
}));
|
|
1384
1391
|
|
|
1385
1392
|
case 'SUCCESS':
|
|
1386
|
-
return React__default.createElement(common.OrganisationDropDown,
|
|
1393
|
+
return React__default["default"].createElement(common.OrganisationDropDown, _extends({
|
|
1387
1394
|
label: language === 'nb' ? 'Organisasjon' : 'Organisation',
|
|
1388
1395
|
selectedOrganisationId: value,
|
|
1389
1396
|
organisations: organisations,
|