-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #470 from buttercup/fix/post-release-fixes
Post V3 release fixes
- Loading branch information
Showing
15 changed files
with
313 additions
and
66 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| import React, { useCallback, useMemo } from "react"; | ||
| import { Button, Classes, Dialog, DialogBody, InputGroup, Intent } from "@blueprintjs/core"; | ||
| import { SearchResult } from "buttercup"; | ||
| import cn from "classnames"; | ||
| import styled from "styled-components"; | ||
| import { t } from "../../../shared/i18n/trans.js"; | ||
| import { copyTextToClipboard } from "../../services/clipboard.js"; | ||
| import { getToaster } from "../../../shared/services/notifications.js"; | ||
| import { localisedErrorMessage } from "../../../shared/library/error.js"; | ||
|
|
||
| interface EntryInfoDialogProps { | ||
| entry: SearchResult | null; | ||
| onClose: () => void; | ||
| } | ||
|
|
||
| interface EntryProperty { | ||
| key: string; | ||
| sensitive: boolean; | ||
| title: string; | ||
| value: string; | ||
| } | ||
|
|
||
| const InfoDialog = styled(Dialog)` | ||
| max-width: 90%; | ||
| `; | ||
| const InfoDialogBody = styled(DialogBody)` | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: stretch; | ||
| align-items: flex-start; | ||
| overflow-x: hidden; | ||
| `; | ||
| const InfoTable = styled.table` | ||
| table-layout: fixed; | ||
| width: 100%; | ||
| `; | ||
|
|
||
| export function EntryInfoDialog(props: EntryInfoDialogProps) { | ||
| const { entry, onClose } = props; | ||
| const properties = useMemo(() => entry ? orderProperties(entry.properties) : [], [entry]); | ||
| const handleCopyClick = useCallback(async (property: string, value: string) => { | ||
| try { | ||
| await copyTextToClipboard(value); | ||
| getToaster().show({ | ||
| intent: Intent.SUCCESS, | ||
| message: t("popup.entries.info.copy-success", { property }), | ||
| timeout: 4000 | ||
| }); | ||
| } catch (err) { | ||
| getToaster().show({ | ||
| intent: Intent.DANGER, | ||
| message: t("popup.entries.info.copy-error", { message: localisedErrorMessage(err) }), | ||
| timeout: 10000 | ||
| }); | ||
| } | ||
| }, []); | ||
| return ( | ||
| <InfoDialog | ||
| icon="info-sign" | ||
| isCloseButtonShown | ||
| isOpen={!!entry} | ||
| onClose={onClose} | ||
| title={entry?.properties.title ?? "Untitled Entry"} | ||
| > | ||
| <InfoDialogBody> | ||
| <InfoTable className={cn(Classes.HTML_TABLE, Classes.COMPACT, Classes.HTML_TABLE_STRIPED)}> | ||
| <tbody> | ||
| {properties.map(property => ( | ||
| <tr key={property.key}> | ||
| <td style={{ width: "100%" }}> | ||
| {property.title}<br /> | ||
| <InputGroup | ||
| type={property.sensitive ? "password" : "text"} | ||
| value={property.value} | ||
| readOnly | ||
| rightElement={ | ||
| <Button | ||
| icon="clipboard" | ||
| minimal | ||
| onClick={() => handleCopyClick(property.title, property.value)} | ||
| title={t("popup.entries.info.copy-tooltip")} | ||
| /> | ||
| } | ||
| /> | ||
| </td> | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </InfoTable> | ||
| </InfoDialogBody> | ||
| </InfoDialog> | ||
| ); | ||
| } | ||
|
|
||
| function orderProperties(properties: Record<string, string>): Array<EntryProperty> { | ||
| const working = { ...properties }; | ||
| delete working["title"]; | ||
| const output: Array<EntryProperty> = []; | ||
| if (working["username"]) { | ||
| output.push({ | ||
| key: "username", | ||
| sensitive: false, | ||
| title: "Username", | ||
| value: properties["username"] | ||
| }); | ||
| delete working["username"]; | ||
| } | ||
| if (working["password"]) { | ||
| output.push({ | ||
| key: "password", | ||
| sensitive: true, | ||
| title: "Password", | ||
| value: properties["password"] | ||
| }); | ||
| delete working["password"]; | ||
| } | ||
| for (const prop in working) { | ||
| output.push({ | ||
| key: prop, | ||
| sensitive: false, | ||
| title: prop, | ||
| value: working[prop] | ||
| }); | ||
| } | ||
| return output; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.