fix: update user fields
This commit is contained in:
parent
310f147911
commit
831c254d64
3 changed files with 6 additions and 6 deletions
|
|
@ -5,7 +5,7 @@ import { useEffect, useState } from "react";
|
||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { activityServiceClient } from "@/grpcweb";
|
import { activityServiceClient } from "@/grpcweb";
|
||||||
import useNavigateTo from "@/hooks/useNavigateTo";
|
import useNavigateTo from "@/hooks/useNavigateTo";
|
||||||
import { activityNamePrefix, MemoNamePrefix, useInboxStore, useMemoStore, useUserStore } from "@/store/v1";
|
import { activityNamePrefix, memoNamePrefix, useInboxStore, useMemoStore, useUserStore } from "@/store/v1";
|
||||||
import { Inbox, Inbox_Status } from "@/types/proto/api/v1/inbox_service";
|
import { Inbox, Inbox_Status } from "@/types/proto/api/v1/inbox_service";
|
||||||
import { Memo } from "@/types/proto/api/v1/memo_service";
|
import { Memo } from "@/types/proto/api/v1/memo_service";
|
||||||
import { User } from "@/types/proto/api/v1/user_service";
|
import { User } from "@/types/proto/api/v1/user_service";
|
||||||
|
|
@ -36,7 +36,7 @@ const MemoCommentMessage = ({ inbox }: Props) => {
|
||||||
if (activity.payload?.memoComment) {
|
if (activity.payload?.memoComment) {
|
||||||
const memoCommentPayload = activity.payload.memoComment;
|
const memoCommentPayload = activity.payload.memoComment;
|
||||||
const relatedMemoId = memoCommentPayload.relatedMemoId;
|
const relatedMemoId = memoCommentPayload.relatedMemoId;
|
||||||
const memo = await memoStore.getOrFetchMemoByName(`${MemoNamePrefix}${relatedMemoId}`, {
|
const memo = await memoStore.getOrFetchMemoByName(`${memoNamePrefix}${relatedMemoId}`, {
|
||||||
skipStore: true,
|
skipStore: true,
|
||||||
});
|
});
|
||||||
setRelatedMemo(memo);
|
setRelatedMemo(memo);
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { useState } from "react";
|
||||||
import { toast } from "react-hot-toast";
|
import { toast } from "react-hot-toast";
|
||||||
import { convertFileToBase64 } from "@/helpers/utils";
|
import { convertFileToBase64 } from "@/helpers/utils";
|
||||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { userNamePrefix, useUserStore, useWorkspaceSettingStore } from "@/store/v1";
|
import { useUserStore, useWorkspaceSettingStore } from "@/store/v1";
|
||||||
import { User as UserPb } from "@/types/proto/api/v1/user_service";
|
import { User as UserPb } from "@/types/proto/api/v1/user_service";
|
||||||
import { WorkspaceGeneralSetting, WorkspaceSettingKey } from "@/types/proto/store/workspace_setting";
|
import { WorkspaceGeneralSetting, WorkspaceSettingKey } from "@/types/proto/store/workspace_setting";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
|
|
@ -108,7 +108,7 @@ const UpdateAccountDialog: React.FC<Props> = ({ destroy }: Props) => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const updateMask = [];
|
const updateMask = [];
|
||||||
if (!isEqual(currentUser.name.replace(userNamePrefix, ""), state.username)) {
|
if (!isEqual(currentUser.username, state.username)) {
|
||||||
updateMask.push("username");
|
updateMask.push("username");
|
||||||
}
|
}
|
||||||
if (!isEqual(currentUser.nickname, state.nickname)) {
|
if (!isEqual(currentUser.nickname, state.nickname)) {
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
export const workspaceSettingNamePrefix = "settings/";
|
export const workspaceSettingNamePrefix = "settings/";
|
||||||
export const userNamePrefix = "users/";
|
export const userNamePrefix = "users/";
|
||||||
export const MemoNamePrefix = "memos/";
|
export const memoNamePrefix = "memos/";
|
||||||
export const identityProviderNamePrefix = "identityProviders/";
|
export const identityProviderNamePrefix = "identityProviders/";
|
||||||
export const activityNamePrefix = "activities/";
|
export const activityNamePrefix = "activities/";
|
||||||
|
|
||||||
export const extractMemoIdFromName = (name: string) => {
|
export const extractMemoIdFromName = (name: string) => {
|
||||||
return parseInt(name.split(MemoNamePrefix).pop() || "", 10);
|
return parseInt(name.split(memoNamePrefix).pop() || "", 10);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const extractIdentityProviderIdFromName = (name: string) => {
|
export const extractIdentityProviderIdFromName = (name: string) => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue