sceyt-chat-react-uikit 1.7.8-beta.10 → 1.7.8-beta.11
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/index.js +87 -21
- package/index.modern.js +87 -21
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -9334,7 +9334,8 @@ var initialState = {
|
|
|
9334
9334
|
draggedAttachments: [],
|
|
9335
9335
|
draftIsRemoved: '',
|
|
9336
9336
|
channelInviteKeys: {},
|
|
9337
|
-
joinableChannel: null
|
|
9337
|
+
joinableChannel: null,
|
|
9338
|
+
channelInviteKeyAvailable: true
|
|
9338
9339
|
};
|
|
9339
9340
|
var channelSlice = createSlice({
|
|
9340
9341
|
name: 'channels',
|
|
@@ -9640,6 +9641,9 @@ var channelSlice = createSlice({
|
|
|
9640
9641
|
},
|
|
9641
9642
|
setJoinableChannel: function setJoinableChannel(state, action) {
|
|
9642
9643
|
state.joinableChannel = action.payload.channel;
|
|
9644
|
+
},
|
|
9645
|
+
setChannelInviteKeyAvailable: function setChannelInviteKeyAvailable(state, action) {
|
|
9646
|
+
state.channelInviteKeyAvailable = action.payload.available;
|
|
9643
9647
|
}
|
|
9644
9648
|
},
|
|
9645
9649
|
extraReducers: function extraReducers(builder) {
|
|
@@ -9684,7 +9688,8 @@ var _channelSlice$actions = channelSlice.actions,
|
|
|
9684
9688
|
setHideChannelList = _channelSlice$actions.setHideChannelList,
|
|
9685
9689
|
setDraftIsRemoved = _channelSlice$actions.setDraftIsRemoved,
|
|
9686
9690
|
setChannelInviteKeys = _channelSlice$actions.setChannelInviteKeys,
|
|
9687
|
-
setJoinableChannel = _channelSlice$actions.setJoinableChannel
|
|
9691
|
+
setJoinableChannel = _channelSlice$actions.setJoinableChannel,
|
|
9692
|
+
setChannelInviteKeyAvailable = _channelSlice$actions.setChannelInviteKeyAvailable;
|
|
9688
9693
|
var ChannelReducer = channelSlice.reducer;
|
|
9689
9694
|
|
|
9690
9695
|
var CREATE_CHANNEL = 'CREATE_CHANNEL';
|
|
@@ -11980,7 +11985,8 @@ var initialState$2 = {
|
|
|
11980
11985
|
rolesMap: {},
|
|
11981
11986
|
restricted: {
|
|
11982
11987
|
isRestricted: false,
|
|
11983
|
-
fromChannel: false
|
|
11988
|
+
fromChannel: false,
|
|
11989
|
+
members: []
|
|
11984
11990
|
},
|
|
11985
11991
|
openInviteModal: false
|
|
11986
11992
|
};
|
|
@@ -12069,9 +12075,11 @@ var memberSlice = createSlice({
|
|
|
12069
12075
|
setActionIsRestricted: function setActionIsRestricted(state, action) {
|
|
12070
12076
|
var _action$payload2 = action.payload,
|
|
12071
12077
|
isRestricted = _action$payload2.isRestricted,
|
|
12072
|
-
fromChannel = _action$payload2.fromChannel
|
|
12078
|
+
fromChannel = _action$payload2.fromChannel,
|
|
12079
|
+
members = _action$payload2.members;
|
|
12073
12080
|
state.restricted.isRestricted = isRestricted;
|
|
12074
12081
|
state.restricted.fromChannel = fromChannel;
|
|
12082
|
+
state.restricted.members = members;
|
|
12075
12083
|
},
|
|
12076
12084
|
setOpenInviteModal: function setOpenInviteModal(state, action) {
|
|
12077
12085
|
state.openInviteModal = action.payload.open;
|
|
@@ -12587,6 +12595,11 @@ var switchChannelActionAC = function switchChannelActionAC(channel, updateActive
|
|
|
12587
12595
|
}
|
|
12588
12596
|
};
|
|
12589
12597
|
};
|
|
12598
|
+
var setChannelInviteKeyAvailableAC = function setChannelInviteKeyAvailableAC(available) {
|
|
12599
|
+
return setChannelInviteKeyAvailable({
|
|
12600
|
+
available: available
|
|
12601
|
+
});
|
|
12602
|
+
};
|
|
12590
12603
|
var updateChannelAC = function updateChannelAC(channelId, config) {
|
|
12591
12604
|
return {
|
|
12592
12605
|
type: UPDATE_CHANNEL,
|
|
@@ -13295,10 +13308,11 @@ var setMembersHasNextAC = function setMembersHasNextAC(hasNext) {
|
|
|
13295
13308
|
hasNext: hasNext
|
|
13296
13309
|
});
|
|
13297
13310
|
};
|
|
13298
|
-
var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fromChannel) {
|
|
13311
|
+
var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fromChannel, members) {
|
|
13299
13312
|
return setActionIsRestricted({
|
|
13300
13313
|
isRestricted: isRestricted,
|
|
13301
|
-
fromChannel: fromChannel
|
|
13314
|
+
fromChannel: fromChannel,
|
|
13315
|
+
members: members || []
|
|
13302
13316
|
});
|
|
13303
13317
|
};
|
|
13304
13318
|
var setOpenInviteModalAC = function setOpenInviteModalAC(open) {
|
|
@@ -16288,7 +16302,7 @@ function createChannel(action) {
|
|
|
16288
16302
|
break;
|
|
16289
16303
|
}
|
|
16290
16304
|
_context.n = 18;
|
|
16291
|
-
return effects.put(setActionIsRestrictedAC(true, false));
|
|
16305
|
+
return effects.put(setActionIsRestrictedAC(true, false, null));
|
|
16292
16306
|
case 18:
|
|
16293
16307
|
log.error(_t, 'Error on create channel');
|
|
16294
16308
|
case 19:
|
|
@@ -18340,13 +18354,20 @@ function getChannelByInviteKey(action) {
|
|
|
18340
18354
|
case 4:
|
|
18341
18355
|
window.history.pushState({}, '', window.location.pathname);
|
|
18342
18356
|
case 5:
|
|
18343
|
-
_context33.n =
|
|
18357
|
+
_context33.n = 8;
|
|
18344
18358
|
break;
|
|
18345
18359
|
case 6:
|
|
18346
18360
|
_context33.p = 6;
|
|
18347
18361
|
_t33 = _context33.v;
|
|
18348
|
-
|
|
18362
|
+
if (!(_t33.code === 1109)) {
|
|
18363
|
+
_context33.n = 7;
|
|
18364
|
+
break;
|
|
18365
|
+
}
|
|
18366
|
+
_context33.n = 7;
|
|
18367
|
+
return effects.put(setChannelInviteKeyAvailableAC(false));
|
|
18349
18368
|
case 7:
|
|
18369
|
+
log.error('ERROR in get channel by invite key', _t33);
|
|
18370
|
+
case 8:
|
|
18350
18371
|
return _context33.a(2);
|
|
18351
18372
|
}
|
|
18352
18373
|
}, _marked33, null, [[0, 6]]);
|
|
@@ -22536,7 +22557,7 @@ function loadMoreMembers(action) {
|
|
|
22536
22557
|
}, _marked2$3, null, [[0, 7, 8, 10]]);
|
|
22537
22558
|
}
|
|
22538
22559
|
function addMembers(action) {
|
|
22539
|
-
var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _t3;
|
|
22560
|
+
var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _action$payload, _t3;
|
|
22540
22561
|
return _regenerator().w(function (_context3) {
|
|
22541
22562
|
while (1) switch (_context3.p = _context3.n) {
|
|
22542
22563
|
case 0:
|
|
@@ -22604,7 +22625,7 @@ function addMembers(action) {
|
|
|
22604
22625
|
break;
|
|
22605
22626
|
}
|
|
22606
22627
|
_context3.n = 8;
|
|
22607
|
-
return effects.put(setActionIsRestrictedAC(true, true));
|
|
22628
|
+
return effects.put(setActionIsRestrictedAC(true, true, (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.members) || []));
|
|
22608
22629
|
case 8:
|
|
22609
22630
|
log.error('error on add members... ', _t3);
|
|
22610
22631
|
case 9:
|
|
@@ -22765,11 +22786,11 @@ function reportMember(action) {
|
|
|
22765
22786
|
}, _marked7$2, null, [[1, 3]]);
|
|
22766
22787
|
}
|
|
22767
22788
|
function getRoles(action) {
|
|
22768
|
-
var _action$
|
|
22789
|
+
var _action$payload2, timeout, attempts, SceytChatClient, roles, _t8;
|
|
22769
22790
|
return _regenerator().w(function (_context8) {
|
|
22770
22791
|
while (1) switch (_context8.p = _context8.n) {
|
|
22771
22792
|
case 0:
|
|
22772
|
-
_action$
|
|
22793
|
+
_action$payload2 = action.payload, timeout = _action$payload2.timeout, attempts = _action$payload2.attempts;
|
|
22773
22794
|
_context8.p = 1;
|
|
22774
22795
|
SceytChatClient = getClient();
|
|
22775
22796
|
if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
|
|
@@ -23310,6 +23331,9 @@ var channelInviteKeysSelector = function channelInviteKeysSelector(store) {
|
|
|
23310
23331
|
var joinableChannelSelector = function joinableChannelSelector(store) {
|
|
23311
23332
|
return store.ChannelReducer.joinableChannel;
|
|
23312
23333
|
};
|
|
23334
|
+
var channelInviteKeyAvailableSelector = function channelInviteKeyAvailableSelector(store) {
|
|
23335
|
+
return store.ChannelReducer.channelInviteKeyAvailable;
|
|
23336
|
+
};
|
|
23313
23337
|
|
|
23314
23338
|
var activeChannelMembersSelector = function activeChannelMembersSelector(store) {
|
|
23315
23339
|
return store.MembersReducer.activeChannelMembers;
|
|
@@ -23899,7 +23923,7 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
|
|
|
23899
23923
|
textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
|
|
23900
23924
|
linkColor = _useColor[THEME_COLORS.LINK_COLOR];
|
|
23901
23925
|
var handleClose = function handleClose() {
|
|
23902
|
-
dispatch(setActionIsRestrictedAC(false, false));
|
|
23926
|
+
dispatch(setActionIsRestrictedAC(false, false, null));
|
|
23903
23927
|
};
|
|
23904
23928
|
var handleInvite = function handleInvite() {
|
|
23905
23929
|
dispatch(setOpenInviteModalAC(true));
|
|
@@ -23919,23 +23943,64 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
|
|
|
23919
23943
|
}), /*#__PURE__*/React__default.createElement(PopupName, {
|
|
23920
23944
|
color: textPrimary,
|
|
23921
23945
|
marginBottom: '20px'
|
|
23922
|
-
},
|
|
23946
|
+
}, fromChannel ? 'Privacy note' : "Can't create group"), /*#__PURE__*/React__default.createElement(PopupDescription, {
|
|
23923
23947
|
color: textPrimary,
|
|
23924
23948
|
highlightColor: linkColor
|
|
23925
|
-
},
|
|
23949
|
+
}, fromChannel ? 'Couldn’t add the user. Please invite them directly instead.' : 'Not everyone can be added to this group.')), /*#__PURE__*/React__default.createElement(PopupFooter, {
|
|
23926
23950
|
backgroundColor: surface1
|
|
23927
|
-
}, /*#__PURE__*/React__default.createElement(Button, {
|
|
23951
|
+
}, fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
|
|
23928
23952
|
type: 'button',
|
|
23929
23953
|
color: textPrimary,
|
|
23930
23954
|
backgroundColor: 'transparent',
|
|
23931
23955
|
onClick: handleClose
|
|
23932
|
-
}, "Cancel"),
|
|
23956
|
+
}, "Cancel")), /*#__PURE__*/React__default.createElement(Button, {
|
|
23957
|
+
type: 'button',
|
|
23958
|
+
backgroundColor: accentColor,
|
|
23959
|
+
color: textOnPrimary,
|
|
23960
|
+
borderRadius: '8px',
|
|
23961
|
+
onClick: fromChannel ? handleInvite : handleClose
|
|
23962
|
+
}, fromChannel ? 'Invite' : 'Cancel'))));
|
|
23963
|
+
};
|
|
23964
|
+
|
|
23965
|
+
var UnavailableInviteKeyPopup = function UnavailableInviteKeyPopup() {
|
|
23966
|
+
var dispatch = useDispatch();
|
|
23967
|
+
var _useColor = useColors(),
|
|
23968
|
+
background = _useColor[THEME_COLORS.BACKGROUND],
|
|
23969
|
+
textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
|
|
23970
|
+
surface1 = _useColor[THEME_COLORS.SURFACE_1],
|
|
23971
|
+
iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
|
|
23972
|
+
accentColor = _useColor[THEME_COLORS.ACCENT],
|
|
23973
|
+
textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
|
|
23974
|
+
linkColor = _useColor[THEME_COLORS.LINK_COLOR];
|
|
23975
|
+
var handleClose = function handleClose() {
|
|
23976
|
+
dispatch(setChannelInviteKeyAvailableAC(true));
|
|
23977
|
+
};
|
|
23978
|
+
return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
|
|
23979
|
+
backgroundColor: background,
|
|
23980
|
+
maxWidth: '520px',
|
|
23981
|
+
minWidth: '520px',
|
|
23982
|
+
padding: '0'
|
|
23983
|
+
}, /*#__PURE__*/React__default.createElement(PopupBody, {
|
|
23984
|
+
paddingH: '24px',
|
|
23985
|
+
paddingV: '24px'
|
|
23986
|
+
}, /*#__PURE__*/React__default.createElement(CloseIcon, {
|
|
23987
|
+
color: iconPrimary,
|
|
23988
|
+
onClick: handleClose
|
|
23989
|
+
}), /*#__PURE__*/React__default.createElement(PopupName, {
|
|
23990
|
+
color: textPrimary,
|
|
23991
|
+
marginBottom: '20px'
|
|
23992
|
+
}, "Failed to join"), /*#__PURE__*/React__default.createElement(PopupDescription, {
|
|
23993
|
+
color: textPrimary,
|
|
23994
|
+
highlightColor: linkColor
|
|
23995
|
+
}, "You can't join the group or community as the invite link was reset.")), /*#__PURE__*/React__default.createElement(PopupFooter, {
|
|
23996
|
+
backgroundColor: surface1
|
|
23997
|
+
}, /*#__PURE__*/React__default.createElement(Button, {
|
|
23933
23998
|
type: 'button',
|
|
23934
23999
|
backgroundColor: accentColor,
|
|
23935
24000
|
color: textOnPrimary,
|
|
23936
24001
|
borderRadius: '8px',
|
|
23937
|
-
onClick:
|
|
23938
|
-
}, "
|
|
24002
|
+
onClick: handleClose
|
|
24003
|
+
}, "Close"))));
|
|
23939
24004
|
};
|
|
23940
24005
|
|
|
23941
24006
|
var _templateObject$5, _templateObject2$4, _templateObject3$4;
|
|
@@ -23982,6 +24047,7 @@ var SceytChat = function SceytChat(_ref) {
|
|
|
23982
24047
|
setSceytChatClient = _useState[1];
|
|
23983
24048
|
var connectionStatus = useSelector(connectionStatusSelector, reactRedux.shallowEqual);
|
|
23984
24049
|
var restricted = useSelector(restrictedSelector, reactRedux.shallowEqual);
|
|
24050
|
+
var channelInviteKeyAvailable = useSelector(channelInviteKeyAvailableSelector, reactRedux.shallowEqual);
|
|
23985
24051
|
var _useState2 = React.useState(true),
|
|
23986
24052
|
tabIsActive = _useState2[0],
|
|
23987
24053
|
setTabIsActive = _useState2[1];
|
|
@@ -24228,7 +24294,7 @@ var SceytChat = function SceytChat(_ref) {
|
|
|
24228
24294
|
chatMinWidth: chatMinWidth
|
|
24229
24295
|
}, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
|
|
24230
24296
|
fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
|
|
24231
|
-
}))) : '', !embeddedJoinGroupPopup && joinPopup);
|
|
24297
|
+
}), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
|
|
24232
24298
|
};
|
|
24233
24299
|
var Container$2 = styled__default.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n display: flex;\n height: 100vh;\n"])));
|
|
24234
24300
|
var ChatContainer = styled__default.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n display: flex;\n height: 100%;\n max-height: 100vh;\n min-width: ", ";\n background-color: ", ";\n position: relative;\n\n /* Global highlighted background styles */\n ::selection {\n background-color: ", ";\n }\n\n ::-moz-selection {\n background-color: ", ";\n }\n\n /* For text selection highlighting */\n *::selection {\n background-color: ", ";\n }\n\n *::-moz-selection {\n background-color: ", ";\n }\n"])), function (props) {
|
package/index.modern.js
CHANGED
|
@@ -9333,7 +9333,8 @@ var initialState = {
|
|
|
9333
9333
|
draggedAttachments: [],
|
|
9334
9334
|
draftIsRemoved: '',
|
|
9335
9335
|
channelInviteKeys: {},
|
|
9336
|
-
joinableChannel: null
|
|
9336
|
+
joinableChannel: null,
|
|
9337
|
+
channelInviteKeyAvailable: true
|
|
9337
9338
|
};
|
|
9338
9339
|
var channelSlice = createSlice({
|
|
9339
9340
|
name: 'channels',
|
|
@@ -9639,6 +9640,9 @@ var channelSlice = createSlice({
|
|
|
9639
9640
|
},
|
|
9640
9641
|
setJoinableChannel: function setJoinableChannel(state, action) {
|
|
9641
9642
|
state.joinableChannel = action.payload.channel;
|
|
9643
|
+
},
|
|
9644
|
+
setChannelInviteKeyAvailable: function setChannelInviteKeyAvailable(state, action) {
|
|
9645
|
+
state.channelInviteKeyAvailable = action.payload.available;
|
|
9642
9646
|
}
|
|
9643
9647
|
},
|
|
9644
9648
|
extraReducers: function extraReducers(builder) {
|
|
@@ -9683,7 +9687,8 @@ var _channelSlice$actions = channelSlice.actions,
|
|
|
9683
9687
|
setHideChannelList = _channelSlice$actions.setHideChannelList,
|
|
9684
9688
|
setDraftIsRemoved = _channelSlice$actions.setDraftIsRemoved,
|
|
9685
9689
|
setChannelInviteKeys = _channelSlice$actions.setChannelInviteKeys,
|
|
9686
|
-
setJoinableChannel = _channelSlice$actions.setJoinableChannel
|
|
9690
|
+
setJoinableChannel = _channelSlice$actions.setJoinableChannel,
|
|
9691
|
+
setChannelInviteKeyAvailable = _channelSlice$actions.setChannelInviteKeyAvailable;
|
|
9687
9692
|
var ChannelReducer = channelSlice.reducer;
|
|
9688
9693
|
|
|
9689
9694
|
var CREATE_CHANNEL = 'CREATE_CHANNEL';
|
|
@@ -11979,7 +11984,8 @@ var initialState$2 = {
|
|
|
11979
11984
|
rolesMap: {},
|
|
11980
11985
|
restricted: {
|
|
11981
11986
|
isRestricted: false,
|
|
11982
|
-
fromChannel: false
|
|
11987
|
+
fromChannel: false,
|
|
11988
|
+
members: []
|
|
11983
11989
|
},
|
|
11984
11990
|
openInviteModal: false
|
|
11985
11991
|
};
|
|
@@ -12068,9 +12074,11 @@ var memberSlice = createSlice({
|
|
|
12068
12074
|
setActionIsRestricted: function setActionIsRestricted(state, action) {
|
|
12069
12075
|
var _action$payload2 = action.payload,
|
|
12070
12076
|
isRestricted = _action$payload2.isRestricted,
|
|
12071
|
-
fromChannel = _action$payload2.fromChannel
|
|
12077
|
+
fromChannel = _action$payload2.fromChannel,
|
|
12078
|
+
members = _action$payload2.members;
|
|
12072
12079
|
state.restricted.isRestricted = isRestricted;
|
|
12073
12080
|
state.restricted.fromChannel = fromChannel;
|
|
12081
|
+
state.restricted.members = members;
|
|
12074
12082
|
},
|
|
12075
12083
|
setOpenInviteModal: function setOpenInviteModal(state, action) {
|
|
12076
12084
|
state.openInviteModal = action.payload.open;
|
|
@@ -12586,6 +12594,11 @@ var switchChannelActionAC = function switchChannelActionAC(channel, updateActive
|
|
|
12586
12594
|
}
|
|
12587
12595
|
};
|
|
12588
12596
|
};
|
|
12597
|
+
var setChannelInviteKeyAvailableAC = function setChannelInviteKeyAvailableAC(available) {
|
|
12598
|
+
return setChannelInviteKeyAvailable({
|
|
12599
|
+
available: available
|
|
12600
|
+
});
|
|
12601
|
+
};
|
|
12589
12602
|
var updateChannelAC = function updateChannelAC(channelId, config) {
|
|
12590
12603
|
return {
|
|
12591
12604
|
type: UPDATE_CHANNEL,
|
|
@@ -13294,10 +13307,11 @@ var setMembersHasNextAC = function setMembersHasNextAC(hasNext) {
|
|
|
13294
13307
|
hasNext: hasNext
|
|
13295
13308
|
});
|
|
13296
13309
|
};
|
|
13297
|
-
var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fromChannel) {
|
|
13310
|
+
var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fromChannel, members) {
|
|
13298
13311
|
return setActionIsRestricted({
|
|
13299
13312
|
isRestricted: isRestricted,
|
|
13300
|
-
fromChannel: fromChannel
|
|
13313
|
+
fromChannel: fromChannel,
|
|
13314
|
+
members: members || []
|
|
13301
13315
|
});
|
|
13302
13316
|
};
|
|
13303
13317
|
var setOpenInviteModalAC = function setOpenInviteModalAC(open) {
|
|
@@ -16287,7 +16301,7 @@ function createChannel(action) {
|
|
|
16287
16301
|
break;
|
|
16288
16302
|
}
|
|
16289
16303
|
_context.n = 18;
|
|
16290
|
-
return put(setActionIsRestrictedAC(true, false));
|
|
16304
|
+
return put(setActionIsRestrictedAC(true, false, null));
|
|
16291
16305
|
case 18:
|
|
16292
16306
|
log.error(_t, 'Error on create channel');
|
|
16293
16307
|
case 19:
|
|
@@ -18339,13 +18353,20 @@ function getChannelByInviteKey(action) {
|
|
|
18339
18353
|
case 4:
|
|
18340
18354
|
window.history.pushState({}, '', window.location.pathname);
|
|
18341
18355
|
case 5:
|
|
18342
|
-
_context33.n =
|
|
18356
|
+
_context33.n = 8;
|
|
18343
18357
|
break;
|
|
18344
18358
|
case 6:
|
|
18345
18359
|
_context33.p = 6;
|
|
18346
18360
|
_t33 = _context33.v;
|
|
18347
|
-
|
|
18361
|
+
if (!(_t33.code === 1109)) {
|
|
18362
|
+
_context33.n = 7;
|
|
18363
|
+
break;
|
|
18364
|
+
}
|
|
18365
|
+
_context33.n = 7;
|
|
18366
|
+
return put(setChannelInviteKeyAvailableAC(false));
|
|
18348
18367
|
case 7:
|
|
18368
|
+
log.error('ERROR in get channel by invite key', _t33);
|
|
18369
|
+
case 8:
|
|
18349
18370
|
return _context33.a(2);
|
|
18350
18371
|
}
|
|
18351
18372
|
}, _marked33, null, [[0, 6]]);
|
|
@@ -22535,7 +22556,7 @@ function loadMoreMembers(action) {
|
|
|
22535
22556
|
}, _marked2$3, null, [[0, 7, 8, 10]]);
|
|
22536
22557
|
}
|
|
22537
22558
|
function addMembers(action) {
|
|
22538
|
-
var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _t3;
|
|
22559
|
+
var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _action$payload, _t3;
|
|
22539
22560
|
return _regenerator().w(function (_context3) {
|
|
22540
22561
|
while (1) switch (_context3.p = _context3.n) {
|
|
22541
22562
|
case 0:
|
|
@@ -22603,7 +22624,7 @@ function addMembers(action) {
|
|
|
22603
22624
|
break;
|
|
22604
22625
|
}
|
|
22605
22626
|
_context3.n = 8;
|
|
22606
|
-
return put(setActionIsRestrictedAC(true, true));
|
|
22627
|
+
return put(setActionIsRestrictedAC(true, true, (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.members) || []));
|
|
22607
22628
|
case 8:
|
|
22608
22629
|
log.error('error on add members... ', _t3);
|
|
22609
22630
|
case 9:
|
|
@@ -22764,11 +22785,11 @@ function reportMember(action) {
|
|
|
22764
22785
|
}, _marked7$2, null, [[1, 3]]);
|
|
22765
22786
|
}
|
|
22766
22787
|
function getRoles(action) {
|
|
22767
|
-
var _action$
|
|
22788
|
+
var _action$payload2, timeout, attempts, SceytChatClient, roles, _t8;
|
|
22768
22789
|
return _regenerator().w(function (_context8) {
|
|
22769
22790
|
while (1) switch (_context8.p = _context8.n) {
|
|
22770
22791
|
case 0:
|
|
22771
|
-
_action$
|
|
22792
|
+
_action$payload2 = action.payload, timeout = _action$payload2.timeout, attempts = _action$payload2.attempts;
|
|
22772
22793
|
_context8.p = 1;
|
|
22773
22794
|
SceytChatClient = getClient();
|
|
22774
22795
|
if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
|
|
@@ -23309,6 +23330,9 @@ var channelInviteKeysSelector = function channelInviteKeysSelector(store) {
|
|
|
23309
23330
|
var joinableChannelSelector = function joinableChannelSelector(store) {
|
|
23310
23331
|
return store.ChannelReducer.joinableChannel;
|
|
23311
23332
|
};
|
|
23333
|
+
var channelInviteKeyAvailableSelector = function channelInviteKeyAvailableSelector(store) {
|
|
23334
|
+
return store.ChannelReducer.channelInviteKeyAvailable;
|
|
23335
|
+
};
|
|
23312
23336
|
|
|
23313
23337
|
var activeChannelMembersSelector = function activeChannelMembersSelector(store) {
|
|
23314
23338
|
return store.MembersReducer.activeChannelMembers;
|
|
@@ -23898,7 +23922,7 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
|
|
|
23898
23922
|
textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
|
|
23899
23923
|
linkColor = _useColor[THEME_COLORS.LINK_COLOR];
|
|
23900
23924
|
var handleClose = function handleClose() {
|
|
23901
|
-
dispatch(setActionIsRestrictedAC(false, false));
|
|
23925
|
+
dispatch(setActionIsRestrictedAC(false, false, null));
|
|
23902
23926
|
};
|
|
23903
23927
|
var handleInvite = function handleInvite() {
|
|
23904
23928
|
dispatch(setOpenInviteModalAC(true));
|
|
@@ -23918,23 +23942,64 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
|
|
|
23918
23942
|
}), /*#__PURE__*/React__default.createElement(PopupName, {
|
|
23919
23943
|
color: textPrimary,
|
|
23920
23944
|
marginBottom: '20px'
|
|
23921
|
-
},
|
|
23945
|
+
}, fromChannel ? 'Privacy note' : "Can't create group"), /*#__PURE__*/React__default.createElement(PopupDescription, {
|
|
23922
23946
|
color: textPrimary,
|
|
23923
23947
|
highlightColor: linkColor
|
|
23924
|
-
},
|
|
23948
|
+
}, fromChannel ? 'Couldn’t add the user. Please invite them directly instead.' : 'Not everyone can be added to this group.')), /*#__PURE__*/React__default.createElement(PopupFooter, {
|
|
23925
23949
|
backgroundColor: surface1
|
|
23926
|
-
}, /*#__PURE__*/React__default.createElement(Button, {
|
|
23950
|
+
}, fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
|
|
23927
23951
|
type: 'button',
|
|
23928
23952
|
color: textPrimary,
|
|
23929
23953
|
backgroundColor: 'transparent',
|
|
23930
23954
|
onClick: handleClose
|
|
23931
|
-
}, "Cancel"),
|
|
23955
|
+
}, "Cancel")), /*#__PURE__*/React__default.createElement(Button, {
|
|
23956
|
+
type: 'button',
|
|
23957
|
+
backgroundColor: accentColor,
|
|
23958
|
+
color: textOnPrimary,
|
|
23959
|
+
borderRadius: '8px',
|
|
23960
|
+
onClick: fromChannel ? handleInvite : handleClose
|
|
23961
|
+
}, fromChannel ? 'Invite' : 'Cancel'))));
|
|
23962
|
+
};
|
|
23963
|
+
|
|
23964
|
+
var UnavailableInviteKeyPopup = function UnavailableInviteKeyPopup() {
|
|
23965
|
+
var dispatch = useDispatch();
|
|
23966
|
+
var _useColor = useColors(),
|
|
23967
|
+
background = _useColor[THEME_COLORS.BACKGROUND],
|
|
23968
|
+
textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
|
|
23969
|
+
surface1 = _useColor[THEME_COLORS.SURFACE_1],
|
|
23970
|
+
iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
|
|
23971
|
+
accentColor = _useColor[THEME_COLORS.ACCENT],
|
|
23972
|
+
textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
|
|
23973
|
+
linkColor = _useColor[THEME_COLORS.LINK_COLOR];
|
|
23974
|
+
var handleClose = function handleClose() {
|
|
23975
|
+
dispatch(setChannelInviteKeyAvailableAC(true));
|
|
23976
|
+
};
|
|
23977
|
+
return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
|
|
23978
|
+
backgroundColor: background,
|
|
23979
|
+
maxWidth: '520px',
|
|
23980
|
+
minWidth: '520px',
|
|
23981
|
+
padding: '0'
|
|
23982
|
+
}, /*#__PURE__*/React__default.createElement(PopupBody, {
|
|
23983
|
+
paddingH: '24px',
|
|
23984
|
+
paddingV: '24px'
|
|
23985
|
+
}, /*#__PURE__*/React__default.createElement(CloseIcon, {
|
|
23986
|
+
color: iconPrimary,
|
|
23987
|
+
onClick: handleClose
|
|
23988
|
+
}), /*#__PURE__*/React__default.createElement(PopupName, {
|
|
23989
|
+
color: textPrimary,
|
|
23990
|
+
marginBottom: '20px'
|
|
23991
|
+
}, "Failed to join"), /*#__PURE__*/React__default.createElement(PopupDescription, {
|
|
23992
|
+
color: textPrimary,
|
|
23993
|
+
highlightColor: linkColor
|
|
23994
|
+
}, "You can't join the group or community as the invite link was reset.")), /*#__PURE__*/React__default.createElement(PopupFooter, {
|
|
23995
|
+
backgroundColor: surface1
|
|
23996
|
+
}, /*#__PURE__*/React__default.createElement(Button, {
|
|
23932
23997
|
type: 'button',
|
|
23933
23998
|
backgroundColor: accentColor,
|
|
23934
23999
|
color: textOnPrimary,
|
|
23935
24000
|
borderRadius: '8px',
|
|
23936
|
-
onClick:
|
|
23937
|
-
}, "
|
|
24001
|
+
onClick: handleClose
|
|
24002
|
+
}, "Close"))));
|
|
23938
24003
|
};
|
|
23939
24004
|
|
|
23940
24005
|
var _templateObject$5, _templateObject2$4, _templateObject3$4;
|
|
@@ -23981,6 +24046,7 @@ var SceytChat = function SceytChat(_ref) {
|
|
|
23981
24046
|
setSceytChatClient = _useState[1];
|
|
23982
24047
|
var connectionStatus = useSelector(connectionStatusSelector, shallowEqual);
|
|
23983
24048
|
var restricted = useSelector(restrictedSelector, shallowEqual);
|
|
24049
|
+
var channelInviteKeyAvailable = useSelector(channelInviteKeyAvailableSelector, shallowEqual);
|
|
23984
24050
|
var _useState2 = useState(true),
|
|
23985
24051
|
tabIsActive = _useState2[0],
|
|
23986
24052
|
setTabIsActive = _useState2[1];
|
|
@@ -24227,7 +24293,7 @@ var SceytChat = function SceytChat(_ref) {
|
|
|
24227
24293
|
chatMinWidth: chatMinWidth
|
|
24228
24294
|
}, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
|
|
24229
24295
|
fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
|
|
24230
|
-
}))) : '', !embeddedJoinGroupPopup && joinPopup);
|
|
24296
|
+
}), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
|
|
24231
24297
|
};
|
|
24232
24298
|
var Container$2 = styled.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n display: flex;\n height: 100vh;\n"])));
|
|
24233
24299
|
var ChatContainer = styled.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n display: flex;\n height: 100%;\n max-height: 100vh;\n min-width: ", ";\n background-color: ", ";\n position: relative;\n\n /* Global highlighted background styles */\n ::selection {\n background-color: ", ";\n }\n\n ::-moz-selection {\n background-color: ", ";\n }\n\n /* For text selection highlighting */\n *::selection {\n background-color: ", ";\n }\n\n *::-moz-selection {\n background-color: ", ";\n }\n"])), function (props) {
|