@agilemotion/oui-react-js 1.8.31 → 1.8.32
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/dist/ApplicationManager.js +6 -0
- package/dist/DynamicJS.js +1 -0
- package/dist/RestService.js +4 -0
- package/dist/components/AlertBar.js +1 -1
- package/dist/components/Button.css +3 -0
- package/dist/components/Button.js +2 -1
- package/dist/components/Icon.js +7 -0
- package/dist/components/SocketManager.js +2 -0
- package/dist/components/Toolbar.js +4 -7
- package/dist/components/customInput/File.js +1 -2
- package/dist/components/form/IconField.js +3 -1
- package/dist/components/layout/WindowViewPort.js +5 -2
- package/dist/components/media/ClosablePanel.css +1 -1
- package/dist/components/media/ToolbarButton.js +2 -1
- package/dist/components/media/TrainingRoom.js +8 -0
- package/dist/components/media/VCRoom.js +15 -1
- package/dist/components/media/chat/ChatRoom.js +6 -17
- package/dist/components/media/chat/ChatRoomItem.js +8 -8
- package/dist/components/media/chat/ChatRooms.scss +27 -13
- package/dist/event/EventType.js +1 -0
- package/dist/event/Observable.js +4 -4
- package/dist/event/RouteActionHandler.js +1 -3
- package/dist/js/ProcurementMeetings.js +11 -7
- package/package.json +1 -1
|
@@ -359,6 +359,12 @@ class ApplicationManager {
|
|
|
359
359
|
const view = viewContextElement.getView();
|
|
360
360
|
if (view) {
|
|
361
361
|
viewContextElement.closeView(viewId, forward);
|
|
362
|
+
if (key === 'window') {
|
|
363
|
+
_Observable.default.emitContextChangeEvent(applicationContext, {
|
|
364
|
+
windowView: null
|
|
365
|
+
});
|
|
366
|
+
applicationContext.windowView = null;
|
|
367
|
+
}
|
|
362
368
|
break;
|
|
363
369
|
}
|
|
364
370
|
}
|
package/dist/DynamicJS.js
CHANGED
|
@@ -90,6 +90,7 @@ class DynamicJS {
|
|
|
90
90
|
if (!_Utils.default.isNull(event)) {
|
|
91
91
|
eventParam = {};
|
|
92
92
|
eventParam.data = event.data;
|
|
93
|
+
eventParam.viewId = event.viewId;
|
|
93
94
|
}
|
|
94
95
|
try {
|
|
95
96
|
// NB : The javascript serializer uses UCT for dates and it is 2 hours behind. TODO : use DateUtils.makeDateReplacer
|
package/dist/RestService.js
CHANGED
|
@@ -114,6 +114,7 @@ class RestService {
|
|
|
114
114
|
}
|
|
115
115
|
if (requestBody !== null || service.method === 'POST') {
|
|
116
116
|
this.fetchWithCustomConfig({
|
|
117
|
+
viewId: request.viewId,
|
|
117
118
|
url,
|
|
118
119
|
serviceType: request.service.type,
|
|
119
120
|
method: 'POST',
|
|
@@ -131,6 +132,7 @@ class RestService {
|
|
|
131
132
|
});
|
|
132
133
|
} else if (contentType === 'application/pdf' || contentType === 'application/vnd.ms-excel') {
|
|
133
134
|
this.fetchWithCustomConfig({
|
|
135
|
+
viewId: request.viewId,
|
|
134
136
|
url,
|
|
135
137
|
serviceType: request.service.type,
|
|
136
138
|
secure: request.secure,
|
|
@@ -144,6 +146,7 @@ class RestService {
|
|
|
144
146
|
});
|
|
145
147
|
} else {
|
|
146
148
|
this.fetchWithCustomConfig({
|
|
149
|
+
viewId: request.viewId,
|
|
147
150
|
url,
|
|
148
151
|
serviceType: request.service.type,
|
|
149
152
|
secure: !service.url.startsWith('http://'),
|
|
@@ -208,6 +211,7 @@ class RestService {
|
|
|
208
211
|
}
|
|
209
212
|
}
|
|
210
213
|
this.fetchWithCustomConfig({
|
|
214
|
+
viewId: request.viewId,
|
|
211
215
|
url: location + _ApplicationManager.default.getContextRoot() + '/' + module + '/api/v1/rpc/invoke',
|
|
212
216
|
serviceType: request.service.type,
|
|
213
217
|
secure: true,
|
|
@@ -20,7 +20,7 @@ const AlertBar = /*#__PURE__*/_react.default.memo(props => {
|
|
|
20
20
|
let defaultAction = {
|
|
21
21
|
actionType: 'script',
|
|
22
22
|
script: {
|
|
23
|
-
lines: [
|
|
23
|
+
lines: [`if('${props.viewId}' === $event.viewId) {`, ` @#{${props.config.id}}.message = $event.data.message`, ` @#{${props.config.id}}.variant = $event.data.messageType === 'ERROR' ? 'danger' : $event.data.messageType === 'WARN' ? 'warning' : $event.data.messageType === 'SUCCESS' ? 'success' : 'info'`, `}`]
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
if (_Utils.default.isNull(eventHandlingConfig.subscriptions)) {
|
|
@@ -15,6 +15,7 @@ var _Event = _interopRequireDefault(require("../event/Event"));
|
|
|
15
15
|
var _EventType = _interopRequireDefault(require("../event/EventType"));
|
|
16
16
|
var _ApplicationManager = _interopRequireDefault(require("../ApplicationManager"));
|
|
17
17
|
var _DynamicJS = _interopRequireDefault(require("../DynamicJS"));
|
|
18
|
+
require("./Button.css");
|
|
18
19
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
19
20
|
const useStyles = (0, _styles.makeStyles)(theme => ({
|
|
20
21
|
root: {
|
|
@@ -94,7 +95,7 @@ const Button = props => {
|
|
|
94
95
|
};
|
|
95
96
|
};
|
|
96
97
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
|
|
97
|
-
className: classes.root
|
|
98
|
+
className: `${classes.root} oui button`,
|
|
98
99
|
style: {
|
|
99
100
|
width: props.attributes?.style?.width,
|
|
100
101
|
display: visible ? 'block' : 'none'
|
package/dist/components/Icon.js
CHANGED
|
@@ -45,6 +45,7 @@ var _Help = _interopRequireDefault(require("@mui/icons-material/Help"));
|
|
|
45
45
|
var _Link = _interopRequireDefault(require("@mui/icons-material/Link"));
|
|
46
46
|
var _Visibility = _interopRequireDefault(require("@mui/icons-material/Visibility"));
|
|
47
47
|
var _Done = _interopRequireDefault(require("@mui/icons-material/Done"));
|
|
48
|
+
var _Phone = _interopRequireDefault(require("@mui/icons-material/Phone"));
|
|
48
49
|
var _Cancel = _interopRequireDefault(require("@mui/icons-material/Cancel"));
|
|
49
50
|
var _colors = require("@mui/material/colors");
|
|
50
51
|
var _iconsMaterial = require("@mui/icons-material");
|
|
@@ -254,6 +255,12 @@ class Icon extends _react.Component {
|
|
|
254
255
|
color: _colors.red[500]
|
|
255
256
|
}
|
|
256
257
|
});
|
|
258
|
+
} else if (this.props.id === 'PHONE') {
|
|
259
|
+
return /*#__PURE__*/_react.default.createElement(_Phone.default, {
|
|
260
|
+
style: {
|
|
261
|
+
color: '#2e7d32'
|
|
262
|
+
}
|
|
263
|
+
});
|
|
257
264
|
}
|
|
258
265
|
return null;
|
|
259
266
|
}
|
|
@@ -123,6 +123,7 @@ class SocketManager {
|
|
|
123
123
|
meetingId: meetingId
|
|
124
124
|
}).catch(error => {});
|
|
125
125
|
}
|
|
126
|
+
_ApplicationManager.default.setHasActiveMeeting(false);
|
|
126
127
|
};
|
|
127
128
|
endSession = meetingId => {
|
|
128
129
|
if (this.socket) {
|
|
@@ -136,6 +137,7 @@ class SocketManager {
|
|
|
136
137
|
}).catch(error => {});
|
|
137
138
|
}).catch(error => {});
|
|
138
139
|
}
|
|
140
|
+
_ApplicationManager.default.setHasActiveMeeting(false);
|
|
139
141
|
};
|
|
140
142
|
createEvent() {
|
|
141
143
|
let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
@@ -21,6 +21,7 @@ var _ClickAwayListener = _interopRequireDefault(require("@mui/material/ClickAway
|
|
|
21
21
|
var _MenuList = _interopRequireDefault(require("@mui/material/MenuList"));
|
|
22
22
|
var _Popper = _interopRequireDefault(require("@mui/material/Popper"));
|
|
23
23
|
var _MenuItem = _interopRequireDefault(require("./menu/MenuItem"));
|
|
24
|
+
require("./Button.css");
|
|
24
25
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
25
26
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
26
27
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -137,15 +138,11 @@ const Toolbar = props => {
|
|
|
137
138
|
setOpen(prevOpen => !prevOpen);
|
|
138
139
|
};
|
|
139
140
|
function getDefaultStyle(item) {
|
|
140
|
-
return {
|
|
141
|
+
return _Utils.default.mergeStyles({
|
|
141
142
|
height: item.type === 'toolbarSpacer' ? item.attributes?.style?.height ? item.attributes?.style?.height : '100%' : null,
|
|
142
143
|
width: item.type === 'toolbarSpacer' ? '2' ? item.attributes?.style?.width : '100%' : null,
|
|
143
|
-
minWidth: item.type === 'toolbarSpacer' ? '2' : _Utils.default.isNull(item.attributes) || _Utils.default.isNull(item.attributes['label']) ? '
|
|
144
|
-
|
|
145
|
-
marginRight: 4,
|
|
146
|
-
marginBottom: 4,
|
|
147
|
-
marginTop: item.type === 'toolbarSpacer' ? '6px' : 0
|
|
148
|
-
};
|
|
144
|
+
minWidth: item.type === 'toolbarSpacer' ? '2' : _Utils.default.isNull(item.attributes) || _Utils.default.isNull(item.attributes['label']) ? '0px' : null
|
|
145
|
+
}, item);
|
|
149
146
|
}
|
|
150
147
|
function renderItem(item, defaultId) {
|
|
151
148
|
if (_Utils.default.isNull(item.id)) {
|
|
@@ -64,8 +64,7 @@ const File = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forwar
|
|
|
64
64
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
65
65
|
className: 'col-*-*',
|
|
66
66
|
style: {
|
|
67
|
-
marginLeft: '0'
|
|
68
|
-
width: '72px'
|
|
67
|
+
marginLeft: '0'
|
|
69
68
|
}
|
|
70
69
|
}, /*#__PURE__*/_react.default.createElement("input", {
|
|
71
70
|
accept: "*/*",
|
|
@@ -12,7 +12,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
|
12
12
|
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
13
13
|
const IconWrapper = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forwardRef((props, ref) => {
|
|
14
14
|
const base = props.base;
|
|
15
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.config.attributes?.label && /*#__PURE__*/_react.default.createElement("div",
|
|
15
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.config.attributes?.label && /*#__PURE__*/_react.default.createElement("div", {
|
|
16
|
+
style: _Utils.default.mergeStyles({}, props.config)
|
|
17
|
+
}, /*#__PURE__*/_react.default.createElement("label", null, _Utils.default.getComponentAttribute(props.config, 'label', ''))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
|
|
16
18
|
id: props.config.iconId,
|
|
17
19
|
color: props.config.iconColor
|
|
18
20
|
})));
|
|
@@ -27,7 +27,8 @@ const WindowViewContainer = props => {
|
|
|
27
27
|
setView(context.windowView);
|
|
28
28
|
if (!_Utils.default.isNull(context.pinned)) {
|
|
29
29
|
setPinned(context.pinned);
|
|
30
|
-
}
|
|
30
|
+
}
|
|
31
|
+
if (_Utils.default.isNull(context.windowView)) {
|
|
31
32
|
setPinned(false);
|
|
32
33
|
}
|
|
33
34
|
if (!_Utils.default.isNull(context.defaultDisplayState)) {
|
|
@@ -80,7 +81,9 @@ const WindowViewContainer = props => {
|
|
|
80
81
|
});
|
|
81
82
|
setPinned(!pinned);
|
|
82
83
|
},
|
|
83
|
-
onClose: () => {
|
|
84
|
+
onClose: () => {
|
|
85
|
+
setPinned(false);
|
|
86
|
+
}
|
|
84
87
|
}, /*#__PURE__*/_react.default.createElement(_View.View, {
|
|
85
88
|
config: view.config,
|
|
86
89
|
key: view.config.id,
|
|
@@ -33,7 +33,8 @@ const ToolbarButton = props => {
|
|
|
33
33
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
34
34
|
ref: ref,
|
|
35
35
|
style: {
|
|
36
|
-
width: '100%'
|
|
36
|
+
width: isVisible ? '100%' : 0,
|
|
37
|
+
minWidth: isVisible ? '100%' : 0
|
|
37
38
|
}
|
|
38
39
|
}, !isVisible ? /*#__PURE__*/_react.default.createElement("div", {
|
|
39
40
|
style: {
|
|
@@ -65,6 +65,13 @@ const TrainingRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.defaul
|
|
|
65
65
|
const [screenShared, setScreenShared] = _react.default.useState(null);
|
|
66
66
|
const [startScreenSharing, setStartScreenSharing] = _react.default.useState(false);
|
|
67
67
|
const [raisedHands, setRaisedHands] = (0, _react.useState)([]);
|
|
68
|
+
const api = () => {
|
|
69
|
+
return {
|
|
70
|
+
loadChats() {
|
|
71
|
+
fetchChats();
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
};
|
|
68
75
|
const handler = () => {
|
|
69
76
|
return {
|
|
70
77
|
get id() {
|
|
@@ -234,6 +241,7 @@ const TrainingRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.defaul
|
|
|
234
241
|
};
|
|
235
242
|
(0, _react.useEffect)(() => {
|
|
236
243
|
eventHandler.api = handler();
|
|
244
|
+
props.handle.api = api();
|
|
237
245
|
});
|
|
238
246
|
(0, _react.useEffect)(() => {
|
|
239
247
|
if (props.settings) {
|
|
@@ -12,6 +12,7 @@ var _TrainingRoom = _interopRequireDefault(require("./TrainingRoom"));
|
|
|
12
12
|
var _Observable = _interopRequireDefault(require("../../event/Observable"));
|
|
13
13
|
var _Event = _interopRequireDefault(require("../../event/Event"));
|
|
14
14
|
var _EventType = _interopRequireDefault(require("../../event/EventType"));
|
|
15
|
+
var _ApplicationManager = _interopRequireDefault(require("../../ApplicationManager"));
|
|
15
16
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
16
17
|
const WAITING_FOR_OTHERS_TO_JOIN_MESSAGE = exports.WAITING_FOR_OTHERS_TO_JOIN_MESSAGE = 'Waiting for others to join';
|
|
17
18
|
const SYSTEM_ERROR_MESSAGE = exports.SYSTEM_ERROR_MESSAGE = 'A system error has occurred. Please try again later or contact your system administrator';
|
|
@@ -20,6 +21,7 @@ const STREAM_ERROR_MESSAGE = exports.STREAM_ERROR_MESSAGE = 'The system cannot i
|
|
|
20
21
|
const VCRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forwardRef((props, ref) => {
|
|
21
22
|
const [settings, setSettings] = _react.default.useState(null);
|
|
22
23
|
const [calendarEvent, setCalendarEvent] = _react.default.useState(null);
|
|
24
|
+
const vcHandle = {};
|
|
23
25
|
_react.default.useEffect(() => {
|
|
24
26
|
props.handle.api = api();
|
|
25
27
|
});
|
|
@@ -29,6 +31,14 @@ const VCRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forw
|
|
|
29
31
|
_Observable.default.addSystemSubscriptions(props.viewId, parsedConfig);
|
|
30
32
|
let event = new _Event.default(props.handle, props.viewId, null);
|
|
31
33
|
_Observable.default.fireEvent(_EventType.default.COMPONENT_LOAD, event);
|
|
34
|
+
return () => {
|
|
35
|
+
let event = new _Event.default(props.handle, props.viewId, {
|
|
36
|
+
meetingId: _ApplicationManager.default.getActiveMeetingKey()
|
|
37
|
+
});
|
|
38
|
+
_Observable.default.fireEvent(_EventType.default.MEETING_ENDED, event);
|
|
39
|
+
|
|
40
|
+
//eventManager.clearComponentEventListeners(props.handle);
|
|
41
|
+
};
|
|
32
42
|
}, []);
|
|
33
43
|
const api = () => {
|
|
34
44
|
return {
|
|
@@ -40,6 +50,9 @@ const VCRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forw
|
|
|
40
50
|
},
|
|
41
51
|
set calendarEvent(calendarEvent) {
|
|
42
52
|
setCalendarEvent(calendarEvent);
|
|
53
|
+
},
|
|
54
|
+
loadChats() {
|
|
55
|
+
vcHandle.api.loadChats();
|
|
43
56
|
}
|
|
44
57
|
};
|
|
45
58
|
};
|
|
@@ -62,7 +75,8 @@ const VCRoom = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forw
|
|
|
62
75
|
}
|
|
63
76
|
}, props.config.roomType === 'training' ? /*#__PURE__*/_react.default.createElement(_TrainingRoom.default, {
|
|
64
77
|
settings: settings,
|
|
65
|
-
calendarEvent: calendarEvent
|
|
78
|
+
calendarEvent: calendarEvent,
|
|
79
|
+
handle: vcHandle
|
|
66
80
|
}) : /*#__PURE__*/_react.default.createElement("div", null, "Unknown room type"))));
|
|
67
81
|
}));
|
|
68
82
|
var _default = exports.default = VCRoom;
|
|
@@ -18,7 +18,6 @@ var _LottieIcon = _interopRequireDefault(require("../../LottieIcon"));
|
|
|
18
18
|
var _reactFeather = require("react-feather");
|
|
19
19
|
var _Utils = _interopRequireDefault(require("../../../Utils"));
|
|
20
20
|
var _VCEventType = require("../VCEventType");
|
|
21
|
-
var _iconsMaterial = require("@mui/icons-material");
|
|
22
21
|
var _linkifyReact = _interopRequireDefault(require("linkify-react"));
|
|
23
22
|
var _File = _interopRequireDefault(require("../../customInput/File"));
|
|
24
23
|
var _ApplicationManager = _interopRequireDefault(require("../../../ApplicationManager"));
|
|
@@ -32,6 +31,7 @@ var _SocketManager = _interopRequireDefault(require("../../SocketManager"));
|
|
|
32
31
|
var _Icon = _interopRequireDefault(require("../../Icon"));
|
|
33
32
|
var _ChatPoll = _interopRequireDefault(require("./ChatPoll"));
|
|
34
33
|
var _PollContainer = _interopRequireDefault(require("./PollContainer"));
|
|
34
|
+
var _iconsMaterial = require("@mui/icons-material");
|
|
35
35
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
36
36
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
37
37
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -619,7 +619,7 @@ const ChatRoom = props => {
|
|
|
619
619
|
className: "cv-poll-choice-details"
|
|
620
620
|
}, /*#__PURE__*/_react.default.createElement("span", {
|
|
621
621
|
className: "cv-choice-percentage"
|
|
622
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
622
|
+
}, /*#__PURE__*/_react.default.createElement(Info, {
|
|
623
623
|
className: "selected-choice-icon"
|
|
624
624
|
})), /*#__PURE__*/_react.default.createElement("span", {
|
|
625
625
|
className: "cv-choice-text"
|
|
@@ -649,17 +649,9 @@ const ChatRoom = props => {
|
|
|
649
649
|
className: "chatroom"
|
|
650
650
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
651
651
|
className: "chatroom__header"
|
|
652
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
653
|
-
className: "chatroom__headerleft"
|
|
654
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
655
|
-
className: 'chat-avatar'
|
|
656
|
-
}, /*#__PURE__*/_react.default.createElement(_material.Avatar, {
|
|
657
|
-
style: {
|
|
658
|
-
backgroundColor: props.chatTab ? 'transparent' : null
|
|
659
|
-
}
|
|
660
|
-
}, selectedChat.type === 'CALENDAR_MEETING' || selectedChat.participants.length > 2 ? /*#__PURE__*/_react.default.createElement(_reactFeather.Calendar, null) : _Utils.default.getInitials(selectedChat.participants.find(p => p.username !== currentUser.username).name))), /*#__PURE__*/_react.default.createElement("h5", null, getChatRoomTitle())), /*#__PURE__*/_react.default.createElement("div", {
|
|
652
|
+
}, !props.chatTab && /*#__PURE__*/_react.default.createElement("div", {
|
|
661
653
|
className: "chatroom__headerright"
|
|
662
|
-
},
|
|
654
|
+
}, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
|
|
663
655
|
title: "Poll"
|
|
664
656
|
}, /*#__PURE__*/_react.default.createElement(_material.IconButton, {
|
|
665
657
|
onClick: e => {
|
|
@@ -667,7 +659,7 @@ const ChatRoom = props => {
|
|
|
667
659
|
}
|
|
668
660
|
}, /*#__PURE__*/_react.default.createElement(_iconsMaterial.Poll, {
|
|
669
661
|
style: {
|
|
670
|
-
color: props.chatTab ? '
|
|
662
|
+
color: props.chatTab ? 'red' : null,
|
|
671
663
|
marginTop: props.chatTab ? '8px' : null
|
|
672
664
|
}
|
|
673
665
|
})))))), mode === 'POLL' ? /*#__PURE__*/_react.default.createElement(_ChatPoll.default, {
|
|
@@ -687,10 +679,7 @@ const ChatRoom = props => {
|
|
|
687
679
|
}, messages.sort((a, b) => new Date(a.createdDate) - new Date(b.createdDate))?.map(renderMessage)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), mode === 'CHAT' && !props.readOnly && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("form", {
|
|
688
680
|
className: "chatroom__sendMessage"
|
|
689
681
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
690
|
-
className: "message__imageSelector"
|
|
691
|
-
style: {
|
|
692
|
-
width: '72px'
|
|
693
|
-
}
|
|
682
|
+
className: "message__imageSelector"
|
|
694
683
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
695
684
|
className: 'chat-input',
|
|
696
685
|
style: {
|
|
@@ -7,12 +7,10 @@ exports.default = void 0;
|
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
8
|
var _material = require("@mui/material");
|
|
9
9
|
var _moment = _interopRequireDefault(require("moment"));
|
|
10
|
-
var _reactRouterDom = require("react-router-dom");
|
|
11
|
-
var _Icon = _interopRequireDefault(require("../Icon"));
|
|
12
10
|
var _reactFeather = require("react-feather");
|
|
13
|
-
var _Utils = _interopRequireDefault(require("
|
|
14
|
-
var
|
|
15
|
-
var _SocketManager = _interopRequireDefault(require("../../
|
|
11
|
+
var _Utils = _interopRequireDefault(require("../../../Utils"));
|
|
12
|
+
var _ApplicationManager = _interopRequireDefault(require("../../../ApplicationManager"));
|
|
13
|
+
var _SocketManager = _interopRequireDefault(require("../../SocketManager"));
|
|
16
14
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
17
15
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
18
16
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -21,9 +19,9 @@ const ChatRoomItem = props => {
|
|
|
21
19
|
event,
|
|
22
20
|
selectedChat
|
|
23
21
|
} = props;
|
|
24
|
-
const [currentUser, setCurrentUser] = (0, _react.useState)(
|
|
22
|
+
const [currentUser, setCurrentUser] = (0, _react.useState)(_ApplicationManager.default.getUserDetails());
|
|
25
23
|
(0, _react.useEffect)(() => {
|
|
26
|
-
setCurrentUser(
|
|
24
|
+
setCurrentUser(_ApplicationManager.default.getUserDetails());
|
|
27
25
|
}, []);
|
|
28
26
|
const goToRoom = id => {
|
|
29
27
|
props.selectionHandler(event);
|
|
@@ -48,7 +46,9 @@ const ChatRoomItem = props => {
|
|
|
48
46
|
color: "error",
|
|
49
47
|
badgeContent: getUnreadMessagesCount(),
|
|
50
48
|
max: 9
|
|
51
|
-
}, /*#__PURE__*/_react.default.createElement(_material.Avatar, null, event.type === 'CALENDAR_MEETING' || event.participants.length > 2 ? /*#__PURE__*/_react.default.createElement(_reactFeather.Calendar,
|
|
49
|
+
}, /*#__PURE__*/_react.default.createElement(_material.Avatar, null, event.type === 'CALENDAR_MEETING' || event.participants.length > 2 ? /*#__PURE__*/_react.default.createElement(_reactFeather.Calendar, {
|
|
50
|
+
color: _ApplicationManager.default.getApplicationPrimaryColor()
|
|
51
|
+
}) : _Utils.default.getInitials(event.participants.find(p => p.userId !== currentUser.userId).name))), /*#__PURE__*/_react.default.createElement("div", {
|
|
52
52
|
className: "chatroom__info"
|
|
53
53
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
54
54
|
className: "chatRoom__title"
|
|
@@ -19,10 +19,10 @@
|
|
|
19
19
|
|
|
20
20
|
.file-upload {
|
|
21
21
|
position: absolute;
|
|
22
|
-
margin-top: 8px;
|
|
23
|
-
margin-left: -
|
|
22
|
+
margin-top: -8px;
|
|
23
|
+
margin-left: -48px;
|
|
24
24
|
z-index: 1;
|
|
25
|
-
width:
|
|
25
|
+
width: 24px;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
.chat-input {
|
|
@@ -33,27 +33,40 @@
|
|
|
33
33
|
overflow: hidden;
|
|
34
34
|
text-overflow: ellipsis;
|
|
35
35
|
white-space: nowrap;
|
|
36
|
-
|
|
36
|
+
top: -8px;
|
|
37
|
+
font-size: 14px;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
.chat-input span {
|
|
41
|
+
width: 32px;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
.chat-input button {
|
|
45
|
+
top: 8px;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
.chat-input label svg {
|
|
49
|
+
height: 24px;
|
|
37
50
|
}
|
|
38
51
|
|
|
39
52
|
.chat-avatar {
|
|
40
53
|
|
|
41
54
|
}
|
|
42
55
|
|
|
43
|
-
.
|
|
56
|
+
.chatroom {
|
|
44
57
|
display: flex;
|
|
45
58
|
flex-direction: column;
|
|
46
59
|
|
|
47
|
-
.
|
|
60
|
+
.chatroom__rooms {
|
|
48
61
|
max-height: 84.7vh;
|
|
49
62
|
overflow: auto;
|
|
50
63
|
}
|
|
51
64
|
|
|
52
|
-
.
|
|
65
|
+
.chatroom__rooms::-webkit-scrollbar {
|
|
53
66
|
display: none;
|
|
54
67
|
}
|
|
55
68
|
|
|
56
|
-
.
|
|
69
|
+
.chatroom__header {
|
|
57
70
|
display: flex;
|
|
58
71
|
flex-direction: row;
|
|
59
72
|
align-items: center;
|
|
@@ -142,7 +155,7 @@
|
|
|
142
155
|
width: 100%;
|
|
143
156
|
height: 100%;
|
|
144
157
|
max-height: 100%;
|
|
145
|
-
padding: 8px;
|
|
158
|
+
padding: 0 8px;
|
|
146
159
|
|
|
147
160
|
.image__text {
|
|
148
161
|
padding: 0 9%;
|
|
@@ -153,13 +166,10 @@
|
|
|
153
166
|
.chatroom__header {
|
|
154
167
|
display: flex;
|
|
155
168
|
flex-direction: row;
|
|
156
|
-
|
|
157
|
-
justify-content: space-around;
|
|
158
|
-
padding: 4px 4px 4px 8px;
|
|
169
|
+
padding: 0 4px 0 8px;
|
|
159
170
|
padding-right: 7%;
|
|
160
171
|
border-bottom: 1px solid #e1e1e1;
|
|
161
172
|
width: 100%;
|
|
162
|
-
margin-bottom: 16px;
|
|
163
173
|
|
|
164
174
|
.chatroom__headerleft {
|
|
165
175
|
display: flex;
|
|
@@ -193,6 +203,10 @@
|
|
|
193
203
|
align-items: center;
|
|
194
204
|
margin: 0 9% 0 3%;
|
|
195
205
|
|
|
206
|
+
.message__imageSelector {
|
|
207
|
+
width: 48px;
|
|
208
|
+
}
|
|
209
|
+
|
|
196
210
|
.message__imageSelector > input {
|
|
197
211
|
display: none;
|
|
198
212
|
}
|
package/dist/event/EventType.js
CHANGED
package/dist/event/Observable.js
CHANGED
|
@@ -52,8 +52,7 @@ class Observable {
|
|
|
52
52
|
if (!_Utils.default.isNull(eventHandlingConfig)) {
|
|
53
53
|
let subscriptions = eventHandlingConfig.subscriptions;
|
|
54
54
|
for (const subscription of subscriptions) {
|
|
55
|
-
|
|
56
|
-
this.addSubscription(new _EventListener.default(componentHandle, domain, !_Utils.default.isNull(subscription.publisher) ? subscription.publisher : componentHandle.api.id, subscription.eventType, subscription.actions));
|
|
55
|
+
this.addSubscription(new _EventListener.default(componentHandle, viewId, !_Utils.default.isNull(subscription.publisher) ? subscription.publisher : componentHandle.api.id, subscription.eventType, subscription.actions));
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
};
|
|
@@ -130,14 +129,15 @@ class Observable {
|
|
|
130
129
|
let viewId = be.viewId;
|
|
131
130
|
if (!_Utils.default.isNull(sourceId)) {
|
|
132
131
|
for (const subscription of this.subscriptions) {
|
|
132
|
+
let domain = subscription.publisherDomain ? subscription.publisherDomain : viewId;
|
|
133
133
|
if (log === true) {
|
|
134
|
-
console.log("VIEW CHECK: " + (
|
|
134
|
+
console.log("VIEW CHECK: " + domain + " ==? " + viewId + " - " + (domain === viewId || _ApplicationManager.SYSTEM_EVENT === viewId));
|
|
135
135
|
console.log("PUBLISHER CHECK: " + subscription.getPublisher() + " : " + sourceId);
|
|
136
136
|
console.log("EVENT TYPE CHECK: " + subscription.getEventType() + " : " + eventType);
|
|
137
137
|
console.log("FULL CHECK: " + ((subscription.getViewId() === viewId || _ApplicationManager.SYSTEM_EVENT === viewId) && subscription.getPublisher() === sourceId && subscription.getEventType() === eventType));
|
|
138
138
|
console.log("\n");
|
|
139
139
|
}
|
|
140
|
-
if ((
|
|
140
|
+
if ((domain === viewId || _ApplicationManager.SYSTEM_EVENT === viewId) && subscription.getPublisher() === sourceId && subscription.getEventType() === eventType) {
|
|
141
141
|
if (!_Utils.default.isNull(subscription.getActions())) {
|
|
142
142
|
for (let j = 0; j < subscription.getActions().length; j++) {
|
|
143
143
|
let action = subscription.getActions()[j];
|
|
@@ -123,9 +123,7 @@ class RouteActionHandler {
|
|
|
123
123
|
//applicationManager.navigate('/view/unload');
|
|
124
124
|
_ApplicationManager.default.navigate('/view/' + data.id);
|
|
125
125
|
} else {
|
|
126
|
-
|
|
127
|
-
_ApplicationManager.default.openWindowView(view);
|
|
128
|
-
}
|
|
126
|
+
_ApplicationManager.default.openWindowView(view);
|
|
129
127
|
}
|
|
130
128
|
} else {
|
|
131
129
|
_ApplicationManager.default.openPopupView(view);
|
|
@@ -13,7 +13,7 @@ class ProcurementMeetings {
|
|
|
13
13
|
constructor(resolver) {
|
|
14
14
|
this.resolver = resolver;
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
emitSocketEvent = (systemEventType, data, meeting) => {
|
|
17
17
|
let receipientIds = [];
|
|
18
18
|
for (const attendee of meeting.attendees) {
|
|
19
19
|
let username = attendee.username;
|
|
@@ -21,15 +21,17 @@ class ProcurementMeetings {
|
|
|
21
21
|
receipientIds.push(username);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
console.log("Starting meeting : ", receipientIds);
|
|
25
24
|
let eventData = {
|
|
26
|
-
systemEventType:
|
|
25
|
+
systemEventType: systemEventType,
|
|
27
26
|
recipients: receipientIds,
|
|
28
|
-
data:
|
|
29
|
-
procurementNumber: meeting.procurementNumber
|
|
30
|
-
}
|
|
27
|
+
data: data
|
|
31
28
|
};
|
|
32
|
-
|
|
29
|
+
_SocketManager.default.emitEvent(_VCEventType.VCEventType.SYSTEM_EVENT, eventData);
|
|
30
|
+
};
|
|
31
|
+
startMeeting = meeting => {
|
|
32
|
+
this.emitSocketEvent("startMeeting", {
|
|
33
|
+
procurementNumber: meeting.procurementNumber
|
|
34
|
+
}, meeting);
|
|
33
35
|
};
|
|
34
36
|
handleSystemEvent = (event, meeting, viewId) => {
|
|
35
37
|
console.log("PROCESSING MEETING SYSTEM EVENT : ", event);
|
|
@@ -53,6 +55,8 @@ class ProcurementMeetings {
|
|
|
53
55
|
viewId: 'procurementMeetingSession'
|
|
54
56
|
});
|
|
55
57
|
}
|
|
58
|
+
} else if (event.systemEventType === 'openPoll') {
|
|
59
|
+
_ApplicationManager.default.resolveComponentApi("vcRoom").loadChats();
|
|
56
60
|
}
|
|
57
61
|
};
|
|
58
62
|
}
|