Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement pinned messages #2011

Merged
merged 88 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from 83 commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
2056521
chore: do not open new tab when user is signed in
Silver-IT Apr 19, 2024
22ff2a8
fix: wrong position of parentheses
Silver-IT May 16, 2024
2450dd1
feat: implement pinned message tooltip
Silver-IT May 17, 2024
32f61bb
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT May 17, 2024
2762dc1
chore: revert unrelated changes
Silver-IT May 17, 2024
c6a6514
feat: created PinnedMessages component
Silver-IT May 20, 2024
75623f5
chore: removed ProfileCard inside pinned message
Silver-IT May 20, 2024
9d9ec80
chore: optimized codes
Silver-IT May 20, 2024
762d2b3
feat: add tooltip for unpin button
Silver-IT May 20, 2024
3f28847
fix: css space issue between user avatar and sender name in message b…
Silver-IT May 20, 2024
5b05ef4
chore: reverted change which is not related to the current issue
Silver-IT May 20, 2024
b5f76af
chore: do not open new tab when user is signed in
Silver-IT Apr 19, 2024
b64b14a
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT May 22, 2024
d937f8c
feat: improved style of pin button
Silver-IT May 22, 2024
0e5e759
feat: improve css for pinned messages
Silver-IT May 22, 2024
2563ae1
feat: contract implemented for pinning message
Silver-IT May 23, 2024
4933e73
chore: improved getters name to keep consistency
Silver-IT May 23, 2024
a024084
feat: linked pinned messages to the component
Silver-IT May 23, 2024
982b901
chore: do not open new tab when user is signed in
Silver-IT Apr 19, 2024
7400850
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT May 23, 2024
75df3ac
chore: reverted unrelated changes
Silver-IT May 23, 2024
c415903
feat: updated style of Button to list pinned messages
Silver-IT May 23, 2024
81f35b5
feat: pin message
Silver-IT May 23, 2024
0f87321
feat: unpin message & sort pinned messages
Silver-IT May 23, 2024
85c17bb
feat: scroll to pinned message
Silver-IT May 23, 2024
e9334bd
feat: pinned messages would be updated if the original message is cha…
Silver-IT May 23, 2024
b6378d2
feat: add poll to pinned messages
Silver-IT May 24, 2024
37edff8
feat: only text and poll can be pinned
Silver-IT May 24, 2024
cdfdc48
feat: update pinned messages whenever original message is updated
Silver-IT May 24, 2024
52cb12c
feat: preview attachments inside pinned messages
Silver-IT May 24, 2024
400f9e6
feat: stop propagation in download attachment action inside pinned me…
Silver-IT May 24, 2024
51a47ba
feat: display reactions to the pinned messages
Silver-IT May 24, 2024
6c9d78b
feat: implemented pinned by
Silver-IT May 24, 2024
70938ae
chore: do not open new tab when user is signed in
Silver-IT Apr 19, 2024
abd55ce
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT May 26, 2024
5d53f2e
chore: reverted unrelated changes
Silver-IT May 26, 2024
7d28f75
fix: css styles for responsive
Silver-IT May 27, 2024
790c469
feat: mobile design for pinned messages
Silver-IT May 27, 2024
5735238
feat: implementING cypress test cases
Silver-IT May 27, 2024
4a834eb
feat: completed test cases for pinned messages
Silver-IT May 27, 2024
7c5e687
feat: add confirm dialog when unpin message
Silver-IT May 27, 2024
b18ca8c
feat: handle mentions in pinned messages
Silver-IT May 28, 2024
d920f7f
chore: do not open new tab when user is signed in
Silver-IT Apr 19, 2024
82b6462
fix: resolved conflicts
Silver-IT May 31, 2024
7c68517
chore: improved style removing margin
Silver-IT May 31, 2024
15b5587
fix: resolved conflicts
Silver-IT Jun 5, 2024
d2ead74
fix: error in passing params
Silver-IT Jun 5, 2024
f34b94b
fix: update pinnedMessages when the original messages are edited
Silver-IT Jun 5, 2024
d144286
feat: implement markdown and all mentions inside pinned messages
Silver-IT Jun 5, 2024
2c21f6a
fix: resolved conflicts
Silver-IT Jun 11, 2024
172db19
chore: remove useless args in chatroom contract functions and Travis …
Silver-IT Jun 11, 2024
f01b309
chore: removed useless args and Travis retry
Silver-IT Jun 11, 2024
ad9b4be
chore: removed useless args
Silver-IT Jun 11, 2024
9efac8c
fix: cypress error
Silver-IT Jun 11, 2024
8b027ee
fix: errors from cypress and initializing new chatroom state in ChatMain
Silver-IT Jun 11, 2024
9f73902
fix: error in cypress
Silver-IT Jun 11, 2024
65fe105
chore: minor updates and Travis retry
Silver-IT Jun 11, 2024
c3566b4
feat: updated position of *N Pinned* in GroupChat
Silver-IT Jun 11, 2024
41b594e
fix: error in using getter
Silver-IT Jun 11, 2024
cf56b33
feat: improved pinned style
Silver-IT Jun 11, 2024
58f8446
fix: error in logout and wait invocations from UNREAD_MESSAGES_QUEUE
Silver-IT Jun 12, 2024
2b02bb7
fix: cypress error
Silver-IT Jun 12, 2024
749571e
chore: updated comment
Silver-IT Jun 12, 2024
ff486f3
fix: Cypress error in logout before waiting for UNREAD_MESSAGES_QUEUE
Silver-IT Jun 12, 2024
9aa182c
fix: update readUntilMessage before update contract state in Cypress …
Silver-IT Jun 12, 2024
34a1f58
chore: added comment and Travis retry to check if it passes in a row
Silver-IT Jun 12, 2024
cf4cd75
chore: fix wrong indent
Silver-IT Jun 12, 2024
ecb063c
chore: add comment and Travis retry
Silver-IT Jun 12, 2024
e21a7c4
chore: Travis passes in a rowgit add .!
Silver-IT Jun 12, 2024
8ea8dca
chore: reverted unrelated code changes
Silver-IT Jun 12, 2024
8e612d8
chore: reverted changes
Silver-IT Jun 12, 2024
550e915
fix: tiny error
Silver-IT Jun 12, 2024
ca43ec2
feat: added 'unpin message' in message actions
Silver-IT Jun 13, 2024
ab4d91d
fix: error to display pinned messages in DM
Silver-IT Jun 13, 2024
cf81c6e
fix: error while logging out
Silver-IT Jun 13, 2024
2a621cb
fix: DRY
Silver-IT Jun 14, 2024
3e6c4e7
fix: syntax errors
Silver-IT Jun 14, 2024
9193318
fix: resolved conflicts
Silver-IT Jun 15, 2024
5641972
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT Jun 18, 2024
37e3ab6
fix: error in using variable 'hash'
Silver-IT Jun 18, 2024
13eb1da
Merge branch 'master' into 1963-design-for-pinned-messages-in-chat
Silver-IT Jun 18, 2024
511b190
fix: remove useless ipmort
Silver-IT Jun 18, 2024
7a03e0d
fix: flow error regarding variable initialization
Silver-IT Jun 18, 2024
cda579d
fix: optimization and added comments
Silver-IT Jun 19, 2024
1c8d7ff
fix: resolved conflicts
Silver-IT Jun 19, 2024
9be73e3
fix: resolved flow lint error
Silver-IT Jun 19, 2024
d71fd7a
fix: text overflow error inside PinnedMessages
Silver-IT Jun 19, 2024
31441ff
fix: to remove mhash in the query after hightlight it
Silver-IT Jun 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/assets/style/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ $icons: (
tag: "\f02b",
times: "\f00d",
times-circle: "\f057",
thumbtack: "\f08D",
undo: "\f0e2",
user: "\f007",
user-plus: "\f234",
Expand Down
2 changes: 2 additions & 0 deletions frontend/controller/actions/chatroom.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ export default (sbp('sbp/selectors/register', {
...encryptedAction('gi.actions/chatroom/deleteMessage', L('Failed to delete message.')),
...encryptedAction('gi.actions/chatroom/deleteAttachment', L('Failed to delete attachment of message.')),
...encryptedAction('gi.actions/chatroom/makeEmotion', L('Failed to make emotion.')),
...encryptedAction('gi.actions/chatroom/pinMessage', L('Failed to pin message.')),
...encryptedAction('gi.actions/chatroom/unpinMessage', L('Failed to unpin message.')),
...encryptedAction('gi.actions/chatroom/join', L('Failed to join chat channel.'), async (sendMessage, params, signingKeyId) => {
const rootState = sbp('state/vuex/state')
const userID = params.data.memberID || rootState.loggedIn.identityContractID
Expand Down
3 changes: 2 additions & 1 deletion frontend/controller/actions/identity.js
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,8 @@ export default (sbp('sbp/selectors/register', {
}

if (deleteResult?.some(r => r.status === 'rejected')) {
console.error('[gi.actions/identity/removeFiles] Some CIDs could not be deleted', deleteResult.map((r, i) => r.status === 'rejected' && toDelete[i]).filter(Boolean))
console.error('[gi.actions/identity/removeFiles] Some CIDs could not be deleted',
(deleteResult || []).map((r, i) => r.status === 'rejected' && toDelete[i]).filter(Boolean))
throw new Error('Some CIDs could not be deleted')
}
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/model/chatroom/vuexModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const getters = {
Object.keys(rootState[cId].chatRooms).includes(chatRoomID))
},
chatRoomsInDetail (state, getters, rootState) {
const chatRoomsInDetail = merge({}, getters.getGroupChatRooms)
const chatRoomsInDetail = merge({}, getters.groupChatRooms)
for (const contractID in chatRoomsInDetail) {
const chatRoom = rootState[contractID]
if (chatRoom && chatRoom.attributes &&
Expand Down
Loading
Loading