Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update confirm dialog
Steven1ad5d9bf0a34
diff --git a/web/src/components/Dialog/CommonDialog.tsx b/web/src/components/Dialog/CommonDialog.tsxdeleted file mode 100644index f43aea90b..000000000--- a/web/src/components/Dialog/CommonDialog.tsx+++ /dev/null@@ -1,91 +0,0 @@-import { Button, IconButton } from "@mui/joy";-import { DefaultColorPalette } from "@mui/joy/styles/types";-import { useTranslate } from "@/utils/i18n";-import Icon from "../Icon";-import { generateDialog } from "./BaseDialog";-import "@/less/common-dialog.less";--interface Props extends DialogProps {- title: string;- content: string;- style?: DefaultColorPalette;- closeBtnText?: string;- confirmBtnText?: string;- onClose?: () => void;- onConfirm?: () => void;-}--const defaultProps = {- title: "",- content: "",- style: "neutral",- closeBtnText: "common.close",- confirmBtnText: "common.confirm",- onClose: () => null,- onConfirm: () => null,-} as const;--const CommonDialog: React.FC<Props> = (props: Props) => {- const t = useTranslate();- const { title, content, destroy, closeBtnText, confirmBtnText, onClose, onConfirm, style } = {- ...defaultProps,- closeBtnText: t(defaultProps.closeBtnText),- confirmBtnText: t(defaultProps.confirmBtnText),- ...props,- };-- const handleCloseBtnClick = () => {- onClose();- destroy();- };-- const handleConfirmBtnClick = async () => {- onConfirm();- destroy();- };-- return (- <>- <div className="dialog-header-container">- <p className="title-text">{title}</p>- <IconButton size="sm" onClick={handleCloseBtnClick}>- <Icon.X className="w-5 h-auto" />- </IconButton>- </div>- <div className="dialog-content-container">- <p className="content-text">{content}</p>- <div className="mt-4 w-full flex flex-row justify-end items-center gap-2">- <Button color="neutral" variant="plain" onClick={handleCloseBtnClick}>- {closeBtnText}- </Button>- <Button color={style} onClick={handleConfirmBtnClick}>- {confirmBtnText}- </Button>- </div>- </div>- </>- );-};--interface CommonDialogProps {- title: string;- content: string;- className?: string;- style?: DefaultColorPalette;- dialogName: string;- closeBtnText?: string;- confirmBtnText?: string;- onClose?: () => void;- onConfirm?: () => void;-}--export const showCommonDialog = (props: CommonDialogProps) => {- generateDialog(- {- className: `common-dialog ${props?.className ?? ""}`,- dialogName: `common-dialog ${props?.className ?? ""}`,- },- CommonDialog,- props,- );-};diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsxindex f69614298..fafb2c798 100644--- a/web/src/components/HomeSidebar/TagsSection.tsx+++ b/web/src/components/HomeSidebar/TagsSection.tsx@@ -8,7 +8,6 @@ import useCurrentUser from "@/hooks/useCurrentUser";import { useFilterStore } from "@/store/module";import { useMemoList, useTagStore } from "@/store/v1";import { useTranslate } from "@/utils/i18n";-import { showCommonDialog } from "../Dialog/CommonDialog";import Icon from "../Icon";import showRenameTagDialog from "../RenameTagDialog";@@ -42,20 +41,15 @@ const TagsSection = (props: Props) => {};const handleDeleteTag = async (tag: string) => {- showCommonDialog({- title: t("tag.delete-tag"),- content: t("tag.delete-confirm"),- style: "danger",- dialogName: "delete-tag-dialog",- onConfirm: async () => {- await memoServiceClient.deleteMemoTag({- parent: "memos/-",- tag: tag,- });- await tagStore.fetchTags({ location, user }, { skipCache: true });- toast.success(t("message.deleted-successfully"));- },- });+ const confirmed = window.confirm(t("tag.delete-confirm"));+ if (confirmed) {+ await memoServiceClient.deleteMemoTag({+ parent: "memos/-",+ tag: tag,+ });+ await tagStore.fetchTags({ location, user }, { skipCache: true });+ toast.success(t("message.deleted-successfully"));+ }};return (diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsxindex 111a0a111..b1d44f2e1 100644--- a/web/src/components/MemoActionMenu.tsx+++ b/web/src/components/MemoActionMenu.tsx@@ -9,7 +9,6 @@ import { useMemoStore } from "@/store/v1";import { RowStatus } from "@/types/proto/api/v1/common";import { Memo } from "@/types/proto/api/v1/memo_service";import { useTranslate } from "@/utils/i18n";-import { showCommonDialog } from "./Dialog/CommonDialog";import showMemoEditorDialog from "./MemoEditor/MemoEditorDialog";interface Props {@@ -95,19 +94,14 @@ const MemoActionMenu = (props: Props) => {};const handleDeleteMemoClick = async () => {- showCommonDialog({- title: t("memo.delete-memo"),- content: t("memo.delete-confirm"),- style: "danger",- dialogName: "delete-memo-dialog",- onConfirm: async () => {- await memoStore.deleteMemo(memo.name);- toast.success(t("message.deleted-successfully"));- if (isInMemoDetailPage) {- navigateTo("/");- }- },- });+ const confirmed = window.confirm(t("memo.delete-confirm"));+ if (confirmed) {+ await memoStore.deleteMemo(memo.name);+ toast.success(t("message.deleted-successfully"));+ if (isInMemoDetailPage) {+ navigateTo("/");+ }+ }};return (diff --git a/web/src/components/Settings/AccessTokenSection.tsx b/web/src/components/Settings/AccessTokenSection.tsxindex dff68b925..b5bbbd496 100644--- a/web/src/components/Settings/AccessTokenSection.tsx+++ b/web/src/components/Settings/AccessTokenSection.tsx@@ -7,7 +7,6 @@ import useCurrentUser from "@/hooks/useCurrentUser";import { UserAccessToken } from "@/types/proto/api/v1/user_service";import { useTranslate } from "@/utils/i18n";import showCreateAccessTokenDialog from "../CreateAccessTokenDialog";-import { showCommonDialog } from "../Dialog/CommonDialog";import Icon from "../Icon";import LearnMore from "../LearnMore";@@ -38,16 +37,13 @@ const AccessTokenSection = () => {};const handleDeleteAccessToken = async (accessToken: string) => {- showCommonDialog({- title: "Delete Access Token",- content: `Are you sure to delete access token \`${getFormatedAccessToken(accessToken)}\`? You cannot undo this action.`,- style: "danger",- dialogName: "delete-access-token-dialog",- onConfirm: async () => {- await userServiceClient.deleteUserAccessToken({ name: currentUser.name, accessToken: accessToken });- setUserAccessTokens(userAccessTokens.filter((token) => token.accessToken !== accessToken));- },- });+ const confirmed = window.confirm(+ `Are you sure to delete access token \`${getFormatedAccessToken(accessToken)}\`? You cannot undo this action.`,+ );+ if (confirmed) {+ await userServiceClient.deleteUserAccessToken({ name: currentUser.name, accessToken: accessToken });+ setUserAccessTokens(userAccessTokens.filter((token) => token.accessToken !== accessToken));+ }};const getFormatedAccessToken = (accessToken: string) => {diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsxindex b8046c79f..226b0285e 100644--- a/web/src/components/Settings/MemberSection.tsx+++ b/web/src/components/Settings/MemberSection.tsx@@ -9,7 +9,6 @@ import { RowStatus } from "@/types/proto/api/v1/common";import { User, User_Role } from "@/types/proto/api/v1/user_service";import { useTranslate } from "@/utils/i18n";import showChangeMemberPasswordDialog from "../ChangeMemberPasswordDialog";-import { showCommonDialog } from "../Dialog/CommonDialog";import Icon from "../Icon";interface State {@@ -101,23 +100,18 @@ const MemberSection = () => {showChangeMemberPasswordDialog(user);};- const handleArchiveUserClick = (user: User) => {- showCommonDialog({- title: t("setting.member-section.archive-member"),- content: t("setting.member-section.archive-warning", { username: user.nickname }),- style: "danger",- dialogName: "archive-user-dialog",- onConfirm: async () => {- await userServiceClient.updateUser({- user: {- name: user.name,- rowStatus: RowStatus.ARCHIVED,- },- updateMask: ["row_status"],- });- fetchUsers();- },- });+ const handleArchiveUserClick = async (user: User) => {+ const confirmed = window.confirm(t("setting.member-section.archive-warning", { username: user.nickname }));+ if (confirmed) {+ await userServiceClient.updateUser({+ user: {+ name: user.name,+ rowStatus: RowStatus.ARCHIVED,+ },+ updateMask: ["row_status"],+ });+ fetchUsers();+ }};const handleRestoreUserClick = async (user: User) => {@@ -131,17 +125,12 @@ const MemberSection = () => {fetchUsers();};- const handleDeleteUserClick = (user: User) => {- showCommonDialog({- title: t("setting.member-section.delete-member"),- content: t("setting.member-section.delete-warning", { username: user.nickname }),- style: "danger",- dialogName: "delete-user-dialog",- onConfirm: async () => {- await userStore.deleteUser(user.name);- fetchUsers();- },- });+ const handleDeleteUserClick = async (user: User) => {+ const confirmed = window.confirm(t("setting.member-section.delete-warning", { username: user.nickname }));+ if (confirmed) {+ await userStore.deleteUser(user.name);+ fetchUsers();+ }};return (diff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsxindex 0a45a538e..9cf50807a 100644--- a/web/src/components/Settings/SSOSection.tsx+++ b/web/src/components/Settings/SSOSection.tsx@@ -6,7 +6,6 @@ import { identityProviderServiceClient } from "@/grpcweb";import { IdentityProvider } from "@/types/proto/api/v1/idp_service";import { useTranslate } from "@/utils/i18n";import showCreateIdentityProviderDialog from "../CreateIdentityProviderDialog";-import { showCommonDialog } from "../Dialog/CommonDialog";import Icon from "../Icon";import LearnMore from "../LearnMore";@@ -24,23 +23,16 @@ const SSOSection = () => {};const handleDeleteIdentityProvider = async (identityProvider: IdentityProvider) => {- const content = t("setting.sso-section.confirm-delete", { name: identityProvider.title });-- showCommonDialog({- title: t("setting.sso-section.delete-sso"),- content: content,- style: "danger",- dialogName: "delete-identity-provider-dialog",- onConfirm: async () => {- try {- await identityProviderServiceClient.deleteIdentityProvider({ name: identityProvider.name });- } catch (error: any) {- console.error(error);- toast.error(error.details);- }- await fetchIdentityProviderList();- },- });+ const confirmed = window.confirm(t("setting.sso-section.confirm-delete", { name: identityProvider.title }));+ if (confirmed) {+ try {+ await identityProviderServiceClient.deleteIdentityProvider({ name: identityProvider.name });+ } catch (error: any) {+ console.error(error);+ toast.error(error.details);+ }+ await fetchIdentityProviderList();+ }};return (diff --git a/web/src/components/Settings/WebhookSection.tsx b/web/src/components/Settings/WebhookSection.tsxindex ca1559b92..5e5e87dbf 100644--- a/web/src/components/Settings/WebhookSection.tsx+++ b/web/src/components/Settings/WebhookSection.tsx@@ -6,7 +6,6 @@ import useCurrentUser from "@/hooks/useCurrentUser";import { Webhook } from "@/types/proto/api/v1/webhook_service";import { useTranslate } from "@/utils/i18n";import showCreateWebhookDialog from "../CreateWebhookDialog";-import { showCommonDialog } from "../Dialog/CommonDialog";import Icon from "../Icon";const listWebhooks = async (userId: number) => {@@ -33,16 +32,11 @@ const WebhookSection = () => {};const handleDeleteWebhook = async (webhook: Webhook) => {- showCommonDialog({- title: "Delete Webhook",- content: `Are you sure to delete webhook \`${webhook.name}\`? You cannot undo this action.`,- style: "danger",- dialogName: "delete-webhook-dialog",- onConfirm: async () => {- await webhookServiceClient.deleteWebhook({ id: webhook.id });- setWebhooks(webhooks.filter((item) => item.id !== webhook.id));- },- });+ const confirmed = window.confirm(`Are you sure to delete webhook \`${webhook.name}\`? You cannot undo this action.`);+ if (confirmed) {+ await webhookServiceClient.deleteWebhook({ id: webhook.id });+ setWebhooks(webhooks.filter((item) => item.id !== webhook.id));+ }};return (diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsxindex 1477b43b3..c36d358b1 100644--- a/web/src/pages/Archived.tsx+++ b/web/src/pages/Archived.tsx@@ -2,7 +2,6 @@ import { Button, Tooltip } from "@mui/joy";import { ClientError } from "nice-grpc-web";import { useEffect, useState } from "react";import toast from "react-hot-toast";-import { showCommonDialog } from "@/components/Dialog/CommonDialog";import Empty from "@/components/Empty";import Icon from "@/components/Icon";import MemoContent from "@/components/MemoContent";@@ -57,15 +56,10 @@ const Archived = () => {};const handleDeleteMemoClick = async (memo: Memo) => {- showCommonDialog({- title: t("memo.delete-memo"),- content: t("memo.delete-confirm"),- style: "danger",- dialogName: "delete-memo-dialog",- onConfirm: async () => {- await memoStore.deleteMemo(memo.name);- },- });+ const confirmed = window.confirm(t("memo.delete-confirm"));+ if (confirmed) {+ await memoStore.deleteMemo(memo.name);+ }};const handleRestoreMemoClick = async (memo: Memo) => {diff --git a/web/src/pages/Resources.tsx b/web/src/pages/Resources.tsxindex 15397e933..a4767f075 100644--- a/web/src/pages/Resources.tsx+++ b/web/src/pages/Resources.tsx@@ -1,7 +1,6 @@import { Divider, IconButton, Input, Tooltip } from "@mui/joy";import { includes } from "lodash-es";import { useEffect, useState } from "react";-import { showCommonDialog } from "@/components/Dialog/CommonDialog";import Empty from "@/components/Empty";import Icon from "@/components/Icon";import MobileHeader from "@/components/MobileHeader";@@ -58,19 +57,14 @@ const Resources = () => {});}, []);- const handleDeleteUnusedResources = () => {- showCommonDialog({- title: "Delete all unused resources",- content: "Are you sure to delete all unused resources? This action cannot be undone.",- style: "warning",- dialogName: "delete-unused-resources-dialog",- onConfirm: async () => {- for (const resource of unusedResources) {- await resourceServiceClient.deleteResource({ name: resource.name });- }- setResources(resources.filter((resource) => resource.memo));- },- });+ const handleDeleteUnusedResources = async () => {+ const confirmed = window.confirm("Are you sure to delete all unused resources? This action cannot be undone.");+ if (confirmed) {+ for (const resource of unusedResources) {+ await resourceServiceClient.deleteResource({ name: resource.name });+ }+ setResources(resources.filter((resource) => resource.memo));+ }};return (