Skip to content

Display key verification state in attendee list editor #9544

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.

Sign up for GitHub

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

Open
hdcos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display key verification state in attendee list editor #9544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 35 additions & 4 deletions src/calendar-app/calendar/gui/eventeditor-view/AttendeeListEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ToggleButton } from "../../../../common/gui/base/buttons/ToggleButton.j
import { Icons } from "../../../../common/gui/base/icons/Icons.js"
import { ButtonSize } from "../../../../common/gui/base/ButtonSize.js"
import { lang } from "../../../../common/misc/LanguageViewModel.js"
import { AccountType, CalendarAttendeeStatus } from "../../../../common/api/common/TutanotaConstants.js"
import { AccountType, CalendarAttendeeStatus, PresentableKeyVerificationState } from "../../../../common/api/common/TutanotaConstants.js"
import { RecipientsSearchModel } from "../../../../common/misc/RecipientsSearchModel.js"
import { Guest } from "../../view/CalendarInvites.js"
import { Icon, IconSize } from "../../../../common/gui/base/Icon.js"
Expand Down Expand Up @@ -181,7 +181,9 @@ export class AttendeeListEditor implements Component<AttendeeListEditorAttrs> {
"button.items-center.flex-grow.state-bg.button-content.dropdown-button.pt-s.pb-s.button-min-height",
{
class: option.selectable === false ? `no-hover` : "",
style: { color: option.value === status ? theme.content_button_selected : undefined },
style: {
color: option.value === status ? theme.content_button_selected : undefined,
},
},
option.name,
),
Expand Down Expand Up @@ -237,7 +239,11 @@ export class AttendeeListEditor implements Component<AttendeeListEditorAttrs> {
renderOption: (option) =>
m(
"button.items-center.flex-grow.state-bg.button-content.dropdown-button.pt-s.pb-s.button-min-height",
{ style: { color: selected.address === option.address ? theme.content_button_selected : undefined } },
{
style: {
color: selected.address === option.address ? theme.content_button_selected : undefined,
},
},
option.address,
),
renderDisplay: (option) => m("", option.name ? `${option.name} <${option.address}>` : option.address),
Expand Down Expand Up @@ -298,7 +304,7 @@ export class AttendeeListEditor implements Component<AttendeeListEditorAttrs> {

private renderGuest(guest: Guest, { model }: Pick<AttendeeListEditorAttrs, "model">, password?: string, strength?: number): Children {
const { whoModel } = model.editModels
const { address, name, status } = guest
const { address, name, status, verificationState } = guest
const isMe = guest.address === whoModel.ownGuest?.address
const roleLabel = isMe ? `${lang.get("guest_label")} | ${lang.get("you_label")}` : lang.get("guest_label")
const renderPasswordField = whoModel.isConfidential && password != null && guest.type === RecipientType.EXTERNAL
Expand All @@ -325,6 +331,7 @@ export class AttendeeListEditor implements Component<AttendeeListEditorAttrs> {
m(".flex.flex-column.items-center", [
m(".flex.items-center.flex-grow.full-width", [
this.renderStatusIcon(status),
this.renderAttendeeKeyVerificationStatus(verificationState),
m(".flex.flex-column.flex-grow.min-width-0", [
m(".small", { style: { lineHeight: px(size.vpad_small) } }, roleLabel),
m(".text-ellipsis", name.length > 0 ? `${name} ${address}` : address),
Expand All @@ -351,6 +358,30 @@ export class AttendeeListEditor implements Component<AttendeeListEditorAttrs> {
)
}

private renderAttendeeKeyVerificationStatus(keyVerificationState: PresentableKeyVerificationState) {
switch (keyVerificationState) {
case PresentableKeyVerificationState.SECURE: {
return m(Icon, {
icon: Icons.Shield,
size: IconSize.Large,
style: {
fill: theme.success,
},
})
}
case PresentableKeyVerificationState.ALERT: {
return m(Icon, {
icon: Icons.BrokenShield,
size: IconSize.Large,
style: {
fill: theme.error,
},
})
}
}
return null
}

private renderPasswordField(address: string, password: string, strength: number, whoModel: CalendarEventWhoModel): Children {
const label = lang.get("passwordFor_label", {
"{1}": address,
Expand Down