@agilemotion/oui-react-js 1.3.9 → 1.4.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.
Files changed (93) hide show
  1. package/dist/{ApplicationContext.js → ApplicationManager.js} +196 -74
  2. package/dist/BasicApp.js +66 -63
  3. package/dist/BasicAppHome.js +85 -118
  4. package/dist/BusinessPortalAppHome.js +9 -15
  5. package/dist/DynamicJS.js +7 -3
  6. package/dist/RestUtils.js +13 -14
  7. package/dist/Utils.js +15 -9
  8. package/dist/WithRouter.js +34 -0
  9. package/dist/assets/scss/black-dashboard-react/custom/_sidebar-and-main-panel.scss +1 -1
  10. package/dist/components/AlertBar.js +1 -1
  11. package/dist/components/Button.js +34 -25
  12. package/dist/components/Calendar.js +9 -45
  13. package/dist/components/DataGrid.js +49 -18
  14. package/dist/components/DataGridColumn.js +1 -1
  15. package/dist/components/DataGridFilter.js +2 -2
  16. package/dist/components/Dialog.js +1 -1
  17. package/dist/components/DocumentViewer.js +5 -5
  18. package/dist/components/FileThumb.js +30 -19
  19. package/dist/components/Graph.js +10 -2
  20. package/dist/components/GraphNode.js +1 -1
  21. package/dist/components/HtmlPanel.js +10 -5
  22. package/dist/components/Icon.js +8 -0
  23. package/dist/components/PopupView.js +1 -1
  24. package/dist/components/Portlet.js +100 -0
  25. package/dist/components/SignaturePanel.js +1 -1
  26. package/dist/components/SocketManager.js +2 -2
  27. package/dist/components/StepperTitleBar.js +4 -4
  28. package/dist/components/TabPanel.js +11 -3
  29. package/dist/components/TableCellContent.js +1 -1
  30. package/dist/components/TemplateDesigner.js +11 -11
  31. package/dist/components/TitleBar.js +4 -3
  32. package/dist/components/Toolbar.js +42 -11
  33. package/dist/components/Tree.js +3 -3
  34. package/dist/components/dashboard/BasicBusinessAppDashboard.js +9 -7
  35. package/dist/components/dashboard/components/Header.js +1 -1
  36. package/dist/components/dashboard/components/blackDashboard/sidebar/Sidebar.css +7 -0
  37. package/dist/components/dashboard/components/blackDashboard/sidebar/Sidebar.js +74 -72
  38. package/dist/components/form/AutoComplete.js +31 -30
  39. package/dist/components/form/BaseField.js +38 -26
  40. package/dist/components/form/DatePicker.js +5 -2
  41. package/dist/components/form/FieldSet.js +11 -19
  42. package/dist/components/form/Form.js +24 -16
  43. package/dist/components/form/ImageEditor.js +4 -4
  44. package/dist/components/form/MultiFileUploadField.js +15 -14
  45. package/dist/components/form/RadioGroup.js +10 -11
  46. package/dist/components/form/Section.js +10 -0
  47. package/dist/components/form/TimePicker.js +1 -0
  48. package/dist/components/form/UploadField.js +115 -108
  49. package/dist/components/layout/Layout.js +65 -12
  50. package/dist/components/layout/View.css +1 -0
  51. package/dist/components/layout/View.js +20 -23
  52. package/dist/components/layout/ViewContainer.css +3 -0
  53. package/dist/components/layout/ViewContainer.js +59 -0
  54. package/dist/components/layout/ViewPort.js +50 -80
  55. package/dist/components/layout/Window.css +18 -0
  56. package/dist/components/layout/Window.js +287 -0
  57. package/dist/components/layout/WindowViewPort.js +71 -0
  58. package/dist/components/media/MediaSoupHelper.js +1 -1
  59. package/dist/components/media/Toolbar.css +18 -3
  60. package/dist/components/media/Toolbar.js +80 -56
  61. package/dist/components/media/TrainingRoom.js +97 -20
  62. package/dist/components/media/VCRoom.js +1 -1
  63. package/dist/components/media/VCRoomParticipant.js +17 -15
  64. package/dist/components/media/VCRoomRecorder.js +223 -0
  65. package/dist/components/media/VCRoomWorkspace.js +169 -156
  66. package/dist/components/media/VideoPlayer.css +10 -0
  67. package/dist/components/media/VideoPlayer.js +86 -0
  68. package/dist/components/menu/MenuButton.js +22 -6
  69. package/dist/components/menu/MenuLink.js +13 -10
  70. package/dist/components/navbars/HomeNavbar.js +2 -2
  71. package/dist/components/navbars/PortalNavbar.js +3 -3
  72. package/dist/components/signatures/AgilitySignaturePanel.js +4 -4
  73. package/dist/components/signatures/ImageSignatureInput.js +4 -4
  74. package/dist/components/signatures/SignatureInput.js +4 -4
  75. package/dist/components/signatures/SignatureTemplateDesigner.js +6 -6
  76. package/dist/event/ActionHandlers.js +3 -3
  77. package/dist/event/Observable.js +33 -15
  78. package/dist/event/RouteActionHandler.js +38 -29
  79. package/dist/event/ServiceCallActionHandler.js +4 -2
  80. package/dist/event/SignalGraphActionHandler.js +2 -2
  81. package/dist/js/Calendar.js +220 -0
  82. package/dist/js/Media.js +2 -2
  83. package/dist/view/Dashboard.js +34 -28
  84. package/dist/view/Views.js +30 -0
  85. package/dist/view/security/ChangePasswordBasic.js +6 -4
  86. package/dist/view/security/ForgotPassword.js +4 -4
  87. package/dist/view/security/ForgotPasswordBasic.js +4 -4
  88. package/dist/view/security/Login.js +4 -4
  89. package/dist/view/security/LoginBasic.js +5 -5
  90. package/dist/view/security/LoginBusinessPortal.js +4 -4
  91. package/dist/view/security/ResetPassword.js +4 -4
  92. package/dist/view/security/ResetPasswordBasic.js +6 -4
  93. package/package.json +8 -14
@@ -5,21 +5,15 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- var _react = _interopRequireWildcard(require("react"));
9
-
10
- var _reactRedux = require("react-redux");
8
+ var _react = _interopRequireDefault(require("react"));
11
9
 
12
10
  var _reactRouterDom = require("react-router-dom");
13
11
 
14
- var _redux = require("redux");
15
-
16
- var _DashboardStore = require("./redux/store/DashboardStore");
17
-
18
12
  var _LoadingIndicator = _interopRequireDefault(require("./components/LoadingIndicator"));
19
13
 
20
14
  var _BasicBusinessAppDashboard = _interopRequireDefault(require("./components/dashboard/BasicBusinessAppDashboard"));
21
15
 
22
- var _ApplicationContext = _interopRequireWildcard(require("./ApplicationContext"));
16
+ var _ApplicationManager = _interopRequireWildcard(require("./ApplicationManager"));
23
17
 
24
18
  var _TokenManager = _interopRequireDefault(require("./security/TokenManager"));
25
19
 
@@ -33,154 +27,127 @@ var _RestUtils = require("./RestUtils");
33
27
 
34
28
  var _SocketManager = _interopRequireDefault(require("./components/SocketManager"));
35
29
 
36
- var _SocketRequest = _interopRequireDefault(require("./components/media/SocketRequest"));
37
-
38
- var _Event = _interopRequireDefault(require("./event/Event"));
39
-
40
- var _Observable = _interopRequireDefault(require("./event/Observable"));
41
-
42
- var _EventType = _interopRequireDefault(require("./event/EventType"));
43
-
44
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
30
+ require("../skins.css");
45
31
 
46
32
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
47
33
 
48
34
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
49
35
 
36
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
37
+
50
38
  const location = window.location.protocol + "//" + window.location.hostname;
51
39
 
52
- const propHandler = state => {
53
- let isLoading = state.dashboard.isLoading;
54
- let dashboardSettings = state.dashboard.dashboardSettings;
55
- return {
56
- isLoading: isLoading,
57
- error: state.error,
58
- dashboardSettings: dashboardSettings
59
- };
60
- };
40
+ const BasicAppHome = props => {
41
+ const navigate = (0, _reactRouterDom.useNavigate)();
61
42
 
62
- class BasicAppHome extends _react.Component {
63
- constructor(props) {
64
- super(props);
65
- this.state = {
66
- dashboardSettings: null,
67
- message: "",
68
- open: false,
69
- avatarUrl: location + this.props.contextRoot + this.props.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken"),
70
- tokenRefreshMonitorStarted: false
71
- };
72
- }
43
+ const [dashboardSettings, setDashboardSettings] = _react.default.useState();
73
44
 
74
- componentDidMount() {
75
- _ApplicationContext.default.setApplicationHistory(this.props.history);
45
+ const [loadingColor, setLoadingColor] = _react.default.useState(null);
76
46
 
77
- _ApplicationContext.default.setServiceApiPath(this.props.serviceApiPath);
47
+ const [open, setOpen] = _react.default.useState(false);
78
48
 
79
- _ApplicationContext.default.setUIConfigPath(this.props.uiConfigPath);
49
+ const [avatarUrl, setAvatarUrl] = _react.default.useState(location + props.contextRoot + props.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken"));
80
50
 
81
- _ApplicationContext.default.setContextRoot(this.props.contextRoot);
51
+ const [tokenRefreshMonitorStarted, setTokenRefreshMonitorStarted] = _react.default.useState(false);
82
52
 
83
- _ApplicationContext.default.setFilesApiPath(this.props.filesApiPath);
53
+ _react.default.useEffect(() => {
54
+ _ApplicationManager.default.setApplicationHistory(props.history);
84
55
 
85
- this.props.getDashboardSettings(location + this.props.contextRoot + "/system/api/v1/setup");
86
- (0, _RestUtils.sendRequest)(location + _ApplicationContext.default.getContextRoot() + '/auth/api/v1/user/avatar/getId', response => {
87
- sessionStorage.setItem("userAvatarId", response);
88
- }, e => {});
89
- }
56
+ _ApplicationManager.default.setServiceApiPath(props.serviceApiPath);
90
57
 
91
- componentDidUpdate(prevProps) {
92
- if (JSON.stringify(prevProps.dashboardSettings) !== JSON.stringify(this.props.dashboardSettings) && !this.props.error) {
93
- this.setState({
94
- dashboardSettings: this.props.dashboardSettings
95
- });
58
+ _ApplicationManager.default.setUIConfigPath(props.uiConfigPath);
96
59
 
97
- if (!this.state.tokenRefreshMonitorStarted && !_Utils.default.isNull(this.props.dashboardSettings)) {
98
- _TokenManager.default.startTokenRefreshMonitor(location + this.props.contextRoot + this.props.authUrl + "/refresh", this.props.dashboardSettings.userName);
60
+ _ApplicationManager.default.setContextRoot(props.contextRoot);
99
61
 
100
- this.setState({
101
- tokenRefreshMonitorStarted: true
102
- });
62
+ _ApplicationManager.default.setFilesApiPath(props.filesApiPath);
103
63
 
104
- if (!_Utils.default.isNull(this.props.dashboardSettings.userAvatar)) {
105
- this.setState({
106
- avatarUrl: this.props.dashboardSettings.userAvatar.url
107
- });
108
- }
64
+ _ApplicationManager.default.setNavigator(path => {
65
+ navigate(path);
66
+ });
109
67
 
110
- let avatarListener = {};
111
- avatarListener.type = _ApplicationContext.AVATAR_LISTENER_TYPE;
68
+ (0, _RestUtils.sendRequest)(location + props.contextRoot + "/system/api/v1/setup", response => {
69
+ setDashboardSettings(response);
70
+ (0, _RestUtils.sendRequest)(location + _ApplicationManager.default.getContextRoot() + '/auth/api/v1/user/avatar/getId', response => {
71
+ sessionStorage.setItem("userAvatarId", response);
72
+ }, e => {});
73
+ }, () => {});
74
+ }, []);
112
75
 
113
- avatarListener.handler = avatar => {
114
- this.setState({
115
- avatarUrl: avatar.url
116
- });
117
- };
76
+ _react.default.useEffect(() => {
77
+ setDashboardSettings(props.dashboardSettings);
78
+ }, [props.dashboardSettings]);
118
79
 
119
- _ApplicationContext.default.addApplicationListener(avatarListener);
80
+ _react.default.useEffect(() => {
81
+ if (dashboardSettings && !tokenRefreshMonitorStarted) {
82
+ _TokenManager.default.startTokenRefreshMonitor(location + props.contextRoot + props.authUrl + "/refresh", dashboardSettings.userName);
120
83
 
121
- _ApplicationContext.default.setApplicationThemeColors(this.props.dashboardSettings.systemProfileDto.firstCorporateBrandColor, this.props.dashboardSettings.systemProfileDto.secondCorporateBrandColor);
84
+ setTokenRefreshMonitorStarted(true);
122
85
 
123
- this.setState({
124
- loadingColor: this.props.dashboardSettings.systemProfileDto.firstCorporateBrandColor
125
- });
86
+ if (!_Utils.default.isNull(dashboardSettings.userAvatar)) {
87
+ setAvatarUrl(avatarUrl);
126
88
  }
127
- }
128
89
 
129
- if (prevProps.error !== this.props.error && this.props.error) {
130
- this.setState({
131
- message: "A system error has accured"
132
- });
90
+ let avatarListener = {};
91
+ avatarListener.type = _ApplicationManager.AVATAR_LISTENER_TYPE;
92
+
93
+ avatarListener.handler = avatar => {
94
+ setAvatarUrl(avatarUrl);
95
+ };
96
+
97
+ _ApplicationManager.default.addApplicationListener(avatarListener);
98
+
99
+ _ApplicationManager.default.setApplicationThemeColors(dashboardSettings.systemProfileDto.firstCorporateBrandColor, dashboardSettings.systemProfileDto.secondCorporateBrandColor);
100
+
101
+ _ApplicationManager.default.setDashboardSettings(dashboardSettings);
102
+
103
+ setLoadingColor(dashboardSettings.systemProfileDto.firstCorporateBrandColor);
133
104
  }
134
- }
105
+ }, [dashboardSettings]);
135
106
 
136
- logout() {
137
- (0, _RestUtils.sendRequest)(location + this.props.contextRoot + this.props.authUrl + "/logout", response => {
107
+ const logout = () => {
108
+ (0, _RestUtils.sendRequest)(location + props.contextRoot + props.authUrl + "/logout", response => {
138
109
  sessionStorage.removeItem("accessToken");
139
110
  sessionStorage.removeItem("refreshToken");
140
111
  sessionStorage.removeItem("idToken");
141
112
  sessionStorage.removeItem("lastLogin");
142
113
 
143
- _ApplicationContext.default.clear();
114
+ _ApplicationManager.default.clear();
144
115
 
145
116
  _SocketManager.default.disconnect();
146
117
 
147
- this.props.history.push('/login');
118
+ _ApplicationManager.default.navigate('/login');
148
119
  }, e => {
149
120
  console.error('Error loging out');
150
121
  }, true);
151
- }
152
-
153
- render() {
154
- return /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement("div", {
155
- className: "main w-100 h-100 d-inline-block"
156
- }, /*#__PURE__*/_react.default.createElement("div", {
157
- className: "w-100 h-100"
158
- }, this.state.dashboardSettings !== null ? /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
159
- theme: (0, _core.createMuiTheme)({
160
- palette: {
161
- primary: {
162
- main: this.state.dashboardSettings.systemProfileDto.firstCorporateBrandColor
163
- },
164
- secondary: {
165
- main: this.state.dashboardSettings.systemProfileDto.secondCorporateBrandColor
166
- }
122
+ };
123
+
124
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_Utils.default.isNull(dashboardSettings) && /*#__PURE__*/_react.default.createElement("div", {
125
+ className: "".concat("main w-100 h-100 d-inline-block " + dashboardSettings.systemProfileDto.organisation.code.toLowerCase() + "-skin")
126
+ }, /*#__PURE__*/_react.default.createElement("div", {
127
+ className: "w-100 h-100"
128
+ }, /*#__PURE__*/_react.default.createElement(_ThemeProvider.default, {
129
+ theme: (0, _core.createMuiTheme)({
130
+ palette: {
131
+ primary: {
132
+ main: dashboardSettings.systemProfileDto.firstCorporateBrandColor
133
+ },
134
+ secondary: {
135
+ main: dashboardSettings.systemProfileDto.secondCorporateBrandColor
167
136
  }
168
- })
169
- }, /*#__PURE__*/_react.default.createElement(_BasicBusinessAppDashboard.default, {
170
- logoutCallBack: () => {
171
- this.logout();
172
- },
173
- settings: this.state.dashboardSettings,
174
- avatar: this.state.avatarUrl,
175
- logo: this.state.dashboardSettings.logo,
176
- appLogoPath: this.props.appLogoPath
177
- })) : null), /*#__PURE__*/_react.default.createElement(_LoadingIndicator.default, {
178
- color: this.state.loadingColor
179
- })));
180
- }
181
-
182
- }
183
-
184
- var _default = (0, _reactRouterDom.withRouter)((0, _reactRedux.connect)(propHandler, dispatch => (0, _redux.bindActionCreators)(_DashboardStore.actionCreators, dispatch))(BasicAppHome));
137
+ }
138
+ })
139
+ }, /*#__PURE__*/_react.default.createElement(_BasicBusinessAppDashboard.default, {
140
+ logoutCallBack: () => {
141
+ logout();
142
+ },
143
+ settings: dashboardSettings,
144
+ avatar: avatarUrl,
145
+ logo: dashboardSettings.logo,
146
+ appLogoPath: props.appLogoPath
147
+ }))), /*#__PURE__*/_react.default.createElement(_LoadingIndicator.default, {
148
+ color: loadingColor
149
+ })));
150
+ };
185
151
 
152
+ var _default = BasicAppHome;
186
153
  exports.default = _default;
@@ -13,7 +13,7 @@ var _LoadingIndicator = _interopRequireDefault(require("./components/LoadingIndi
13
13
 
14
14
  var _BusinessPortalAppDashboard = _interopRequireDefault(require("./components/dashboard/BusinessPortalAppDashboard"));
15
15
 
16
- var _ApplicationContext = _interopRequireDefault(require("./ApplicationContext"));
16
+ var _ApplicationManager = _interopRequireDefault(require("./ApplicationManager"));
17
17
 
18
18
  var _TokenManager = _interopRequireDefault(require("./security/TokenManager"));
19
19
 
@@ -21,8 +21,6 @@ var _Utils = _interopRequireDefault(require("./Utils"));
21
21
 
22
22
  var _reactPromiseTracker = require("react-promise-tracker");
23
23
 
24
- var _reactRouter = require("react-router");
25
-
26
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
27
25
 
28
26
  const location = window.location.protocol + "//" + window.location.hostname;
@@ -52,19 +50,15 @@ const BusinessPortalAppHome = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_re
52
50
 
53
51
  const [avatarUrl, setAvatarUrl] = _react.default.useState(location + props.contextRoot + props.implConfig.authUrl + "/user/avatar?" + "access_token=" + sessionStorage.getItem("accessToken") + "&idToken=" + sessionStorage.getItem("idToken"));
54
52
 
55
- const history = (0, _reactRouter.useHistory)();
56
-
57
53
  _react.default.useEffect(() => {
58
54
  if (dashboardSettings === null) {
59
- _ApplicationContext.default.setApplicationHistory(history);
60
-
61
- _ApplicationContext.default.setServiceApiPath(props.implConfig.serviceApiPath);
55
+ _ApplicationManager.default.setServiceApiPath(props.implConfig.serviceApiPath);
62
56
 
63
- _ApplicationContext.default.setUIConfigPath(props.implConfig.uiConfigPath);
57
+ _ApplicationManager.default.setUIConfigPath(props.implConfig.uiConfigPath);
64
58
 
65
- _ApplicationContext.default.setContextRoot(props.contextRoot);
59
+ _ApplicationManager.default.setContextRoot(props.contextRoot);
66
60
 
67
- _ApplicationContext.default.setFilesApiPath(props.implConfig.filesApiPath);
61
+ _ApplicationManager.default.setFilesApiPath(props.implConfig.filesApiPath);
68
62
 
69
63
  let cid = sessionStorage.getItem("cid");
70
64
 
@@ -83,9 +77,9 @@ const BusinessPortalAppHome = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_re
83
77
  setDashboardSettings(JSON.parse(data));
84
78
  }).catch(e => {
85
79
  if (e.code === 401) {
86
- _ApplicationContext.default.clear();
80
+ _ApplicationManager.default.clear();
87
81
 
88
- _ApplicationContext.default.getApplicationHistory().push('/login');
82
+ _ApplicationManager.default.getApplicationHistory().push('/login');
89
83
  }
90
84
 
91
85
  setHasClientError(true);
@@ -105,7 +99,7 @@ const BusinessPortalAppHome = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_re
105
99
  setAvatarUrl(dashboardSettings.userAvatar.url);
106
100
  }
107
101
 
108
- _ApplicationContext.default.setApplicationThemeColors(dashboardSettings.primaryColor, dashboardSettings.secondaryColor);
102
+ _ApplicationManager.default.setApplicationThemeColors(dashboardSettings.primaryColor, dashboardSettings.secondaryColor);
109
103
 
110
104
  setLoadingColor(dashboardSettings.primaryColor);
111
105
  }
@@ -117,7 +111,7 @@ const BusinessPortalAppHome = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_re
117
111
  sessionStorage.removeItem("idToken");
118
112
  sessionStorage.removeItem("lastLogin");
119
113
 
120
- _ApplicationContext.default.clear();
114
+ _ApplicationManager.default.clear();
121
115
 
122
116
  history.push('/login');
123
117
  };
package/dist/DynamicJS.js CHANGED
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.TEMPLATE_REGEX = void 0;
7
7
 
8
- var _ApplicationContext = _interopRequireWildcard(require("./ApplicationContext"));
8
+ var _ApplicationManager = _interopRequireWildcard(require("./ApplicationManager"));
9
9
 
10
10
  var _Utils = _interopRequireDefault(require("./Utils"));
11
11
 
@@ -30,11 +30,11 @@ class DynamicJS {
30
30
  _defineProperty(this, "removeKeys", (keys = [], o = {}) => o ? keys.reduce((r, k) => this.removeKey(k, r), o) : null);
31
31
 
32
32
  _defineProperty(this, "evaluateExpression", expression => {
33
- return _ApplicationContext.default.resolveExpressionValue(expression);
33
+ return _ApplicationManager.default.resolveExpressionValue(expression);
34
34
  });
35
35
 
36
36
  _defineProperty(this, "parseScript", (script, componentId, isScriptlet) => {
37
- let parsedScript = script.replace(/#this/g, '#' + componentId).replace(/isNull/g, 'this.isNull').replace(/removeKeys/g, 'this.removeKeys').replace(/\$application/g, _ApplicationContext.APP_VARIABLE).replace(/isEmpty/g, 'this.isEmpty');
37
+ let parsedScript = script.replace(/#this/g, '#' + componentId).replace(/isNull/g, 'this.isNull').replace(/removeKeys/g, 'this.removeKeys').replace(/\$application/g, '@#{' + _ApplicationManager.APP_VARIABLE + "}").replace(/isEmpty/g, 'this.isEmpty');
38
38
  let matches = parsedScript.match(TEMPLATE_REGEX);
39
39
 
40
40
  if (!_Utils.default.isNull(matches)) {
@@ -86,6 +86,10 @@ class DynamicJS {
86
86
 
87
87
  for (const line of script.lines) {
88
88
  scriptBody += this.parseScriptLine(line, valuesMap);
89
+
90
+ if (!line.endsWith(";")) {
91
+ scriptBody += ";";
92
+ }
89
93
  }
90
94
 
91
95
  return this.executeScript(name, scriptBody, componentId, false, event);
package/dist/RestUtils.js CHANGED
@@ -9,7 +9,7 @@ var _Utils = _interopRequireDefault(require("./Utils"));
9
9
 
10
10
  var _reactPromiseTracker = require("react-promise-tracker");
11
11
 
12
- var _ApplicationContext = _interopRequireDefault(require("./ApplicationContext"));
12
+ var _ApplicationManager = _interopRequireDefault(require("./ApplicationManager"));
13
13
 
14
14
  var _Event = _interopRequireDefault(require("./event/Event"));
15
15
 
@@ -46,7 +46,7 @@ class RestUtils {
46
46
  }
47
47
 
48
48
  invokeRest(service, component, viewId, successCallback, errorCallback, invalidParamCallback, returnValueBinding, successMessage, event = null) {
49
- let url = service.url.startsWith('http://') || service.url.startsWith('https://') ? service.url : location + "".concat(_ApplicationContext.default.getContextRoot() + service.url);
49
+ let url = service.url.startsWith('http://') || service.url.startsWith('https://') ? service.url : location + "".concat(_ApplicationManager.default.getContextRoot() + service.url);
50
50
  let requestBody = null;
51
51
 
52
52
  if (!_Utils.default.isNull(service.parameters)) {
@@ -55,7 +55,7 @@ class RestUtils {
55
55
  let requestBodyParamFound = false;
56
56
 
57
57
  for (const parameter of service.parameters) {
58
- let parameterValue = _ApplicationContext.default.resolveParameterValue(parameter, event ? event.data : null);
58
+ let parameterValue = _ApplicationManager.default.resolveParameterValue(parameter, event ? event.data : null);
59
59
 
60
60
  if (!_Utils.default.isNull(parameter.validator) && !_Utils.default.evaluateBooleanExpression(parameter.validator.nullable, parameter.name) && this.isParamValueNull(parameterValue)) {
61
61
  if (!_Utils.default.isNull(invalidParamCallback)) {
@@ -135,8 +135,7 @@ class RestUtils {
135
135
  }
136
136
 
137
137
  if (requestBody !== null && service.method === 'GET') {
138
- console.error('A request body parameter cannot be specified for a GET request');
139
- return;
138
+ throw new Error('A request body parameter cannot be specified for a GET request');
140
139
  }
141
140
 
142
141
  if (requestBody !== null || service.method === 'POST') {
@@ -210,7 +209,7 @@ class RestUtils {
210
209
  parameter.name = parameterConfig.name;
211
210
  parameter.index = parameterConfig.index;
212
211
 
213
- let val = _ApplicationContext.default.resolveParameterValue(parameterConfig, event ? event.data : null);
212
+ let val = _ApplicationManager.default.resolveParameterValue(parameterConfig, event ? event.data : null);
214
213
 
215
214
  if (!_Utils.default.isNull(val)) {
216
215
  parameter.value = val.value; // TODO : Make the default object type a library setting
@@ -243,7 +242,7 @@ class RestUtils {
243
242
  }
244
243
  }
245
244
 
246
- this.doFetch(location + _ApplicationContext.default.getContextRoot() + '/' + module + '/api/v1/rpc/invoke', response => {
245
+ this.doFetch(location + _ApplicationManager.default.getContextRoot() + '/' + module + '/api/v1/rpc/invoke', response => {
247
246
  if (!_Utils.default.isNull(viewId) && !_Utils.default.isNull(component)) {
248
247
  let path = _Utils.default.getPropertyChainPath(returnValueBinding);
249
248
 
@@ -329,8 +328,8 @@ class RestUtils {
329
328
 
330
329
  url += 'access_token=' + accessToken;
331
330
  url += '&idToken=' + idToken;
332
- url += '&themePrimaryColor=' + encodeURIComponent(_ApplicationContext.default.getApplicationPrimaryColor());
333
- url += '&themeSecondaryColor=' + encodeURIComponent(_ApplicationContext.default.getApplicationSecondaryColor());
331
+ url += '&themePrimaryColor=' + encodeURIComponent(_ApplicationManager.default.getApplicationPrimaryColor());
332
+ url += '&themeSecondaryColor=' + encodeURIComponent(_ApplicationManager.default.getApplicationSecondaryColor());
334
333
  window.open(encodeURI(url), '_blank');
335
334
  } else {
336
335
  if (_Utils.default.isNull(track) || track === true) {
@@ -350,9 +349,9 @@ class RestUtils {
350
349
  if (e.code === 401 && !url.endsWith('/logout')) {
351
350
  errorCallback(e);
352
351
 
353
- _ApplicationContext.default.clear();
352
+ _ApplicationManager.default.clear();
354
353
 
355
- _ApplicationContext.default.getApplicationHistory().push('/login');
354
+ _ApplicationManager.default.navigate('/login');
356
355
  }
357
356
 
358
357
  if (errorCallback !== null) {
@@ -380,7 +379,7 @@ class RestUtils {
380
379
  let responseData = response ? response.data : null;
381
380
 
382
381
  if (response && responseData && response.dataType === 'message') {
383
- let event = new _Event.default(_ApplicationContext.default, viewId, responseData);
382
+ let event = new _Event.default(_ApplicationManager.default, viewId, responseData);
384
383
 
385
384
  _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);
386
385
 
@@ -392,9 +391,9 @@ class RestUtils {
392
391
  } else if (!_Utils.default.isNull(successMessage)) {
393
392
  let message = {
394
393
  messageType: 'SUCCESS',
395
- message: _ApplicationContext.default.populateTemplate(successMessage, response ? response.data : null)
394
+ message: _ApplicationManager.default.populateTemplate(successMessage, response ? response.data : null)
396
395
  };
397
- let event = new _Event.default(_ApplicationContext.default, viewId, message);
396
+ let event = new _Event.default(_ApplicationManager.default, viewId, message);
398
397
 
399
398
  _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);
400
399
 
package/dist/Utils.js CHANGED
@@ -9,7 +9,7 @@ var _DynamicJS = _interopRequireDefault(require("./DynamicJS"));
9
9
 
10
10
  var _Event = _interopRequireDefault(require("./event/Event"));
11
11
 
12
- var _ApplicationContext = _interopRequireDefault(require("./ApplicationContext"));
12
+ var _ApplicationManager = _interopRequireDefault(require("./ApplicationManager"));
13
13
 
14
14
  var _Observable = _interopRequireDefault(require("./event/Observable"));
15
15
 
@@ -146,10 +146,10 @@ class Utils {
146
146
  result.message = "";
147
147
  let value;
148
148
 
149
- if (currentValue !== null) {
149
+ if (!this.isNull(currentValue)) {
150
150
  value = currentValue;
151
151
  } else {
152
- value = values[id];
152
+ value = JSON.parse(JSON.stringify(values))[id];
153
153
  }
154
154
 
155
155
  let hasErrors = false;
@@ -318,6 +318,16 @@ class Utils {
318
318
  });
319
319
  }
320
320
 
321
+ static mergeObjects(source, target) {
322
+ let properties = Object.getOwnPropertyNames(source);
323
+
324
+ for (const property of properties) {
325
+ target[property] = source[property];
326
+ }
327
+
328
+ return target;
329
+ }
330
+
321
331
  }
322
332
 
323
333
  exports.default = Utils;
@@ -388,11 +398,7 @@ _defineProperty(Utils, "mergeStyles", (defaultStyle, config) => {
388
398
  let configStyle = Utils.getComponentAttribute(config, 'style', null);
389
399
 
390
400
  if (configStyle) {
391
- let properties = Object.getOwnPropertyNames(configStyle);
392
-
393
- for (const property of properties) {
394
- defaultStyle[property] = configStyle[property];
395
- }
401
+ return Utils.mergeObjects(configStyle, defaultStyle);
396
402
  }
397
403
 
398
404
  return defaultStyle;
@@ -403,7 +409,7 @@ _defineProperty(Utils, "publishErrorMessage", (messageText, viewId, component =
403
409
  messageType: 'ERROR',
404
410
  message: messageText
405
411
  };
406
- let event = new _Event.default(_ApplicationContext.default, viewId, message);
412
+ let event = new _Event.default(_ApplicationManager.default, viewId, message);
407
413
 
408
414
  _Observable.default.fireEvent(_EventType.default.MESSAGE_ARRIVED, event);
409
415
 
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _reactRouterDom = require("react-router-dom");
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
+
14
+ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
15
+
16
+ function withRouter(Component) {
17
+ function ComponentWithRouterProp(props) {
18
+ let location = (0, _reactRouterDom.useLocation)();
19
+ let navigate = (0, _reactRouterDom.useNavigate)();
20
+ let params = (0, _reactRouterDom.useParams)();
21
+ return /*#__PURE__*/_react.default.createElement(Component, _extends({}, props, {
22
+ router: {
23
+ location,
24
+ navigate,
25
+ params
26
+ }
27
+ }));
28
+ }
29
+
30
+ return ComponentWithRouterProp;
31
+ }
32
+
33
+ var _default = withRouter;
34
+ exports.default = _default;
@@ -459,7 +459,7 @@
459
459
  }
460
460
 
461
461
  > .content {
462
- padding: 78px 16px 30px 344px;
462
+ padding: 78px 8px 30px 336px;
463
463
  min-height: 100vh;
464
464
  }
465
465
 
@@ -39,7 +39,7 @@ const AlertBar = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
39
39
  // Add default subscription
40
40
  eventHandlingConfig.subscriptions = [];
41
41
  let subscription = {
42
- publisher: 'applicationContext',
42
+ publisher: 'applicationManager',
43
43
  eventType: _EventType.default.MESSAGE_ARRIVED,
44
44
  actions: [defaultAction]
45
45
  };