({
creatingUser: User.fromPartial({
username: "",
password: "",
@@ -107,9 +107,9 @@ const MemberSection = () => {
await userServiceClient.updateUser({
user: {
name: user.name,
- rowStatus: RowStatus.ARCHIVED,
+ state: State.ARCHIVED,
},
- updateMask: ["row_status"],
+ updateMask: ["state"],
});
fetchUsers();
}
@@ -119,9 +119,9 @@ const MemberSection = () => {
await userServiceClient.updateUser({
user: {
name: user.name,
- rowStatus: RowStatus.ACTIVE,
+ state: State.NORMAL,
},
- updateMask: ["row_status"],
+ updateMask: ["state"],
});
fetchUsers();
};
@@ -197,7 +197,7 @@ const MemberSection = () => {
| {stringifyUserRole(user.role)} |
{user.username}
- {user.rowStatus === RowStatus.ARCHIVED && "(Archived)"}
+ {user.state === State.ARCHIVED && "(Archived)"}
|
{user.nickname} |
{user.email} |
@@ -213,7 +213,7 @@ const MemberSection = () => {
- {user.rowStatus === RowStatus.ACTIVE ? (
+ {user.state === State.NORMAL ? (
) : (
<>
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index a39a3917..5e68e0f4 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -8,7 +8,7 @@ import PagedMemoList from "@/components/PagedMemoList";
import SearchBar from "@/components/SearchBar";
import useCurrentUser from "@/hooks/useCurrentUser";
import { useMemoFilterStore } from "@/store/v1";
-import { RowStatus } from "@/types/proto/api/v1/common";
+import { State } from "@/types/proto/api/v1/common";
import { Memo } from "@/types/proto/api/v1/memo_service";
import { useTranslate } from "@/utils/i18n";
@@ -18,7 +18,7 @@ const Archived = () => {
const memoFilterStore = useMemoFilterStore();
const memoListFilter = useMemo(() => {
- const filters = [`creator == "${user.name}"`, `row_status == "ARCHIVED"`];
+ const filters = [`creator == "${user.name}"`, `state == "ARCHIVED"`];
const contentSearch: string[] = [];
const tagSearch: string[] = [];
for (const filter of memoFilterStore.filters) {
@@ -59,7 +59,7 @@ const Archived = () => {
renderer={(memo: Memo) => }
listSort={(memos: Memo[]) =>
memos
- .filter((memo) => memo.rowStatus === RowStatus.ARCHIVED)
+ .filter((memo) => memo.state === State.ARCHIVED)
.sort((a, b) =>
memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index fc754ceb..9900510f 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -9,7 +9,7 @@ import PagedMemoList from "@/components/PagedMemoList";
import useCurrentUser from "@/hooks/useCurrentUser";
import useResponsiveWidth from "@/hooks/useResponsiveWidth";
import { useMemoFilterStore } from "@/store/v1";
-import { RowStatus } from "@/types/proto/api/v1/common";
+import { State } from "@/types/proto/api/v1/common";
import { Memo } from "@/types/proto/api/v1/memo_service";
const Explore = () => {
@@ -18,7 +18,7 @@ const Explore = () => {
const memoFilterStore = useMemoFilterStore();
const memoListFilter = useMemo(() => {
- const filters = [`row_status == "NORMAL"`, `visibilities == [${user ? "'PUBLIC', 'PROTECTED'" : "'PUBLIC'"}]`];
+ const filters = [`state == "NORMAL"`, `visibilities == [${user ? "'PUBLIC', 'PROTECTED'" : "'PUBLIC'"}]`];
const contentSearch: string[] = [];
const tagSearch: string[] = [];
for (const filter of memoFilterStore.filters) {
@@ -55,7 +55,7 @@ const Explore = () => {
renderer={(memo: Memo) => }
listSort={(memos: Memo[]) =>
memos
- .filter((memo) => memo.rowStatus === RowStatus.ACTIVE)
+ .filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index f98a71be..e67dbf6d 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -10,7 +10,7 @@ import PagedMemoList from "@/components/PagedMemoList";
import useCurrentUser from "@/hooks/useCurrentUser";
import useResponsiveWidth from "@/hooks/useResponsiveWidth";
import { useMemoFilterStore } from "@/store/v1";
-import { RowStatus } from "@/types/proto/api/v1/common";
+import { State } from "@/types/proto/api/v1/common";
import { Memo } from "@/types/proto/api/v1/memo_service";
const Home = () => {
@@ -19,7 +19,7 @@ const Home = () => {
const memoFilterStore = useMemoFilterStore();
const memoListFilter = useMemo(() => {
- const filters = [`creator == "${user.name}"`, `row_status == "NORMAL"`, `order_by_pinned == true`];
+ const filters = [`creator == "${user.name}"`, `state == "NORMAL"`, `order_by_pinned == true`];
const contentSearch: string[] = [];
const tagSearch: string[] = [];
for (const filter of memoFilterStore.filters) {
@@ -69,7 +69,7 @@ const Home = () => {
renderer={(memo: Memo) => }
listSort={(memos: Memo[]) =>
memos
- .filter((memo) => memo.rowStatus === RowStatus.ACTIVE)
+ .filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index d7513299..410282a9 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -12,7 +12,7 @@ import PagedMemoList from "@/components/PagedMemoList";
import UserAvatar from "@/components/UserAvatar";
import useLoading from "@/hooks/useLoading";
import { useMemoFilterStore, useUserStore } from "@/store/v1";
-import { RowStatus } from "@/types/proto/api/v1/common";
+import { State } from "@/types/proto/api/v1/common";
import { Memo } from "@/types/proto/api/v1/memo_service";
import { User } from "@/types/proto/api/v1/user_service";
import { useTranslate } from "@/utils/i18n";
@@ -52,7 +52,7 @@ const UserProfile = () => {
return "";
}
- const filters = [`creator == "${user.name}"`, `row_status == "NORMAL"`, `order_by_pinned == true`];
+ const filters = [`creator == "${user.name}"`, `state == "NORMAL"`, `order_by_pinned == true`];
const contentSearch: string[] = [];
const tagSearch: string[] = [];
for (const filter of memoFilterStore.filters) {
@@ -111,7 +111,7 @@ const UserProfile = () => {
)}
listSort={(memos: Memo[]) =>
memos
- .filter((memo) => memo.rowStatus === RowStatus.ACTIVE)
+ .filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
diff --git a/web/src/store/v1/memoMetadata.ts b/web/src/store/v1/memoMetadata.ts
index ec39921a..22b88f20 100644
--- a/web/src/store/v1/memoMetadata.ts
+++ b/web/src/store/v1/memoMetadata.ts
@@ -27,7 +27,7 @@ export const useMemoMetadataStore = create(
setState: (state: State) => set(state),
getState: () => get(),
fetchMemoMetadata: async (params: { user?: User; location?: Location }) => {
- const filters = [`row_status == "NORMAL"`];
+ const filters = [`state == "NORMAL"`];
if (params.user) {
if (params.location?.pathname === Routes.EXPLORE) {
filters.push(`visibilities == ["PUBLIC", "PROTECTED"]`);