Commit db63b194 authored by johnnyjoy's avatar johnnyjoy

chore: fix creator id format

parent 9ea2f9f6
......@@ -289,15 +289,15 @@ message ListMemosRequest {
// Optional. The order to sort results by.
// Default to "display_time desc".
// Example: "display_time desc" or "create_time asc"
string order_by = 5 [(google.api.field_behavior) = OPTIONAL];
string order_by = 4 [(google.api.field_behavior) = OPTIONAL];
// Optional. Filter to apply to the list results.
// Filter is a CEL expression to filter memos.
// Refer to `Shortcut.filter`.
string filter = 6 [(google.api.field_behavior) = OPTIONAL];
string filter = 5 [(google.api.field_behavior) = OPTIONAL];
// Optional. If true, show deleted memos in the response.
bool show_deleted = 7 [(google.api.field_behavior) = OPTIONAL];
bool show_deleted = 6 [(google.api.field_behavior) = OPTIONAL];
}
message ListMemosResponse {
......
......@@ -565,13 +565,13 @@ type ListMemosRequest struct {
// Optional. The order to sort results by.
// Default to "display_time desc".
// Example: "display_time desc" or "create_time asc"
OrderBy string `protobuf:"bytes,5,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
OrderBy string `protobuf:"bytes,4,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
// Optional. Filter to apply to the list results.
// Filter is a CEL expression to filter memos.
// Refer to `Shortcut.filter`.
Filter string `protobuf:"bytes,6,opt,name=filter,proto3" json:"filter,omitempty"`
Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`
// Optional. If true, show deleted memos in the response.
ShowDeleted bool `protobuf:"varint,7,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`
ShowDeleted bool `protobuf:"varint,6,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
......@@ -2059,9 +2059,9 @@ const file_api_v1_memo_service_proto_rawDesc = "" +
"\n" +
"page_token\x18\x02 \x01(\tB\x03\xe0A\x01R\tpageToken\x12.\n" +
"\x05state\x18\x03 \x01(\x0e2\x13.memos.api.v1.StateB\x03\xe0A\x01R\x05state\x12\x1e\n" +
"\border_by\x18\x05 \x01(\tB\x03\xe0A\x01R\aorderBy\x12\x1b\n" +
"\x06filter\x18\x06 \x01(\tB\x03\xe0A\x01R\x06filter\x12&\n" +
"\fshow_deleted\x18\a \x01(\bB\x03\xe0A\x01R\vshowDeleted\"\x84\x01\n" +
"\border_by\x18\x04 \x01(\tB\x03\xe0A\x01R\aorderBy\x12\x1b\n" +
"\x06filter\x18\x05 \x01(\tB\x03\xe0A\x01R\x06filter\x12&\n" +
"\fshow_deleted\x18\x06 \x01(\bB\x03\xe0A\x01R\vshowDeleted\"\x84\x01\n" +
"\x11ListMemosResponse\x12(\n" +
"\x05memos\x18\x01 \x03(\v2\x12.memos.api.v1.MemoR\x05memos\x12&\n" +
"\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\x12\x1d\n" +
......
This diff is collapsed.
......@@ -18,7 +18,6 @@ import MemoEditor from "../MemoEditor";
interface Props {
renderer: (memo: Memo) => JSX.Element;
listSort?: (list: Memo[]) => Memo[];
owner?: string;
state?: State;
orderBy?: string;
filter?: string;
......@@ -47,20 +46,10 @@ const PagedMemoList = observer((props: Props) => {
setIsRequesting(true);
try {
const filters = [];
if (props.owner) {
// Extract user ID from owner name (format: users/{user_id})
const userId = props.owner.replace("users/", "");
filters.push(`creator_id == ${userId}`);
}
if (props.filter) {
filters.push(props.filter);
}
const response = await memoStore.fetchMemos({
state: props.state || State.NORMAL,
orderBy: props.orderBy || "display_time desc",
filter: filters.length > 0 ? filters.join(" && ") : undefined,
filter: props.filter,
pageSize: props.pageSize || DEFAULT_LIST_MEMOS_PAGE_SIZE,
pageToken,
});
......@@ -110,7 +99,7 @@ const PagedMemoList = observer((props: Props) => {
// Initial load and reload when props change
useEffect(() => {
refreshList();
}, [props.owner, props.state, props.orderBy, props.filter, props.pageSize]);
}, [props.state, props.orderBy, props.filter, props.pageSize]);
// Auto-fetch more content when list changes and page isn't full
useEffect(() => {
......
......@@ -36,7 +36,6 @@ const Archived = observer(() => {
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
}
owner={user.name}
state={State.ARCHIVED}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
filter={memoFitler}
......
......@@ -23,7 +23,7 @@ const Home = observer(() => {
const selectedShortcut = userStore.state.shortcuts.find((shortcut) => getShortcutId(shortcut.name) === memoFilterStore.shortcut);
const memoFilter = useMemo(() => {
const conditions = [`creator_id == "${extractUserIdFromName(user.name)}"`];
const conditions = [`creator_id == ${extractUserIdFromName(user.name)}`];
if (selectedShortcut?.filter) {
conditions.push(selectedShortcut.filter);
}
......@@ -50,6 +50,7 @@ const Home = observer(() => {
conditions.push(`${factor} >= ${timestampAfter} && ${factor} < ${timestampAfter + 60 * 60 * 24}`);
}
}
console.log("conditions", conditions);
return conditions.length > 0 ? conditions.join(" && ") : undefined;
}, [memoFilterStore.filters, selectedShortcut?.filter]);
......@@ -66,7 +67,6 @@ const Home = observer(() => {
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
}
owner={user.name}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
filter={memoFilter}
/>
......
......@@ -47,7 +47,7 @@ const UserProfile = observer(() => {
return undefined;
}
const conditions = [`creator_id == "${extractUserIdFromName(user.name)}"`];
const conditions = [`creator_id == ${extractUserIdFromName(user.name)}`];
for (const filter of memoFilterStore.filters) {
if (filter.factor === "contentSearch") {
conditions.push(`content.contains("${filter.value}")`);
......@@ -101,7 +101,6 @@ const UserProfile = observer(() => {
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
}
owner={user.name}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
filter={memoFilter}
/>
......
......@@ -1099,13 +1099,13 @@ export const ListMemosRequest: MessageFns<ListMemosRequest> = {
writer.uint32(24).int32(stateToNumber(message.state));
}
if (message.orderBy !== "") {
writer.uint32(42).string(message.orderBy);
writer.uint32(34).string(message.orderBy);
}
if (message.filter !== "") {
writer.uint32(50).string(message.filter);
writer.uint32(42).string(message.filter);
}
if (message.showDeleted !== false) {
writer.uint32(56).bool(message.showDeleted);
writer.uint32(48).bool(message.showDeleted);
}
return writer;
},
......@@ -1141,24 +1141,24 @@ export const ListMemosRequest: MessageFns<ListMemosRequest> = {
message.state = stateFromJSON(reader.int32());
continue;
}
case 5: {
if (tag !== 42) {
case 4: {
if (tag !== 34) {
break;
}
message.orderBy = reader.string();
continue;
}
case 6: {
if (tag !== 50) {
case 5: {
if (tag !== 42) {
break;
}
message.filter = reader.string();
continue;
}
case 7: {
if (tag !== 56) {
case 6: {
if (tag !== 48) {
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment