martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-11 19:19:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rendering lock icon based on key state

Browse Source
This commit is contained in:
Roland Osborne 2022-12-20 22:40:58 -08:00
parent c0942cb4ab
commit a9840cbaec
4 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/web/src/context/useCardContext.hook.js
View File

@ -311,6 +311,22 @@ export function useCardContext() {
console.log(err);
}
},
isUnsealed: (cardId, channelId, sealKey) => {
try {
const card = cards.current.get(cardId);
const channel = card.channels.get(channelId);
const { seals } = JSON.parse(channel.data.channelDetail.data);
for (let i = 0; i < seals.length; i++) {
if (seals[i].publicKey === sealKey.public) {
return sealKey.private != null;
}
}
}
catch(err) {
console.log(err);
}
return false;
},
unsealChannelSummary: (cardId, channelId, sealKey) => {
try {
const card = cards.current.get(cardId);

15
net/web/src/context/useChannelContext.hook.js
View File

@ -164,6 +164,21 @@ export function useChannelContext() {
console.log(err);
}
},
isUnsealed: (channelId, sealKey) => {
try {
const channel = channels.current.get(channelId);
const { seals } = JSON.parse(channel.data.channelDetail.data);
for (let i = 0; i < seals.length; i++) {
if (seals[i].publicKey === sealKey.public) {
return sealKey.private != null;
}
}
}
catch(err) {
console.log(err);
}
return false;
},
unsealChannelSummary: (channelId, sealKey) => {
try {
const channel = channels.current.get(channelId);

10
net/web/src/session/channels/channelItem/ChannelItem.jsx
View File

@ -21,7 +21,15 @@ export function ChannelItem({ item, openChannel, active }) {
<SolutionOutlined />
</div>
<div class="details">
<div class="subject">{ item.subject }</div>
<div class="subject">
{ item.locked && !item.unlocked && (
<LockFilled style={{ paddingRight: 8 }}/>
)}
{ item.locked && item.unlocked && (
<UnlockOutlined style={{ paddingRight: 8 }}/>
)}
<span>{ item.subject }</span>
</div>
<div class="message">{ item.message }</div>
</div>
</div>

32
net/web/src/session/channels/useChannels.hook.js
View File

@ -166,7 +166,12 @@ export function useChannels() {
}
}
else {
chan.unlocked = true;
if (chan.cardId) {
chan.unlocked = card.actions.isUnsealed(chan.cardId, chan.id, account.state.sealKey);
}
else {
chan.unlocked = channel.actions.isUnsealed(chan.id, account.state.sealKey);
}
subject = chan.data.unsealedChannel.subject;
}
}
@ -200,7 +205,7 @@ export function useChannels() {
}
const setMessage = (chan) => {
let message;
let message = '';
if (chan.data.channelSummary?.lastTopic?.dataType === 'superbasictopic') {
try {
message = JSON.parse(chan.data.channelSummary.lastTopic.data).text;
@ -211,17 +216,20 @@ export function useChannels() {
}
if (chan.data.channelSummary?.lastTopic?.dataType === 'sealedtopic') {
try {
if (chan.data.unsealedSummary == null) {
if (chan.cardId) {
card.actions.unsealChannelSummary(chan.cardId, chan.id, account.state.sealKey);
if (chan.unlocked) {
message = "...";
if (chan.data.unsealedSummary == null) {
if (chan.cardId) {
card.actions.unsealChannelSummary(chan.cardId, chan.id, account.state.sealKey);
}
else {
channel.actions.unsealChannelSummary(chan.id, account.state.sealKey);
}
}
else {
channel.actions.unsealChannelSummary(chan.id, account.state.sealKey);
}
}
else {
if (typeof chan.data.unsealedSummary.message.text === 'string') {
chan.message = chan.data.unsealedSummary.message.text;
if (typeof chan.data.unsealedSummary.message.text === 'string') {
message = chan.data.unsealedSummary.message.text;
}
}
}
}
@ -269,7 +277,7 @@ export function useChannels() {
updateState({ channels: filtered });
// eslint-disable-next-line
}, [channel, card, store, filter, state.sealable]);
}, [account, channel, card, store, filter, state.sealable]);
useEffect(() => {
updateState({ display: viewport.state.display });