Skip to content

fix: add selection uids for created/edited date and user (#181) #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salmonumbrella wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add selection uids for created/edited date and user (#181) #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/utils/predefinedSelections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,29 @@ const getArgValue = (key: string, result: QueryResult) => {
return val;
};

const getUserDisplayNameById = (id?: number) => {
const getUserById = (id?: number) => {
if (!id) {
return "Anonymous User";
return { displayName: "Anonymous User", uid: "" };
}
const pageId = window.roamAlphaAPI.pull("[:user/display-page]", id)?.[
":user/display-page"
]?.[":db/id"];
if (!pageId) {
return "Anonymous User";
return { displayName: "Anonymous User", uid: "" };
}
return (
window.roamAlphaAPI.pull("[:node/title]", pageId)?.[":node/title"] ||
"Anonymous User"
);
const page = window.roamAlphaAPI.pull("[:node/title :block/uid]", pageId);
return {
displayName: page?.[":node/title"] || "Anonymous User",
uid: page?.[":block/uid"] || "",
};
};

const formatUser = (id?: number) => {
const { displayName, uid } = getUserById(id);
return {
"": displayName,
"-uid": uid,
};
};

const formatDate = ({
Expand All @@ -69,6 +78,7 @@ const formatDate = ({
}) => {
const exec = regex.exec(key);
const date = new Date(value || 0);
const dateUid = window.roamAlphaAPI.util.dateToPageUid(date);
const arg = exec?.[1] || "";
const parseArg = () => {
if (/since/i.test(arg)) {
Expand Down Expand Up @@ -111,6 +121,7 @@ const formatDate = ({
return {
"": date,
"-display": parseArg(),
"-uid": dateUid,
};
};

Expand Down Expand Up @@ -270,15 +281,15 @@ const predefinedSelections: PredefinedSelection[] = [
test: CREATE_BY_TEST,
pull: ({ returnNode }) => `(pull ?${returnNode} [:create/user])`,
mapper: (r) => {
return getUserDisplayNameById(r?.[":create/user"]?.[":db/id"]);
return formatUser(r?.[":create/user"]?.[":db/id"]);
},
suggestions: CREATE_BY_SUGGESTIONS,
},
{
test: EDIT_BY_TEST,
pull: ({ returnNode }) => `(pull ?${returnNode} [:edit/user])`,
mapper: (r) => {
return getUserDisplayNameById(r?.[":edit/user"]?.[":db/id"]);
return formatUser(r?.[":edit/user"]?.[":db/id"]);
},
suggestions: EDIT_BY_SUGGESTIONS,
},
Expand Down Expand Up @@ -319,9 +330,9 @@ const predefinedSelections: PredefinedSelection[] = [
value: r?.[":edit/time"],
})
: field === ":create/user"
? getUserDisplayNameById(r?.[":create/user"]?.[":db/id"])
? formatUser(r?.[":create/user"]?.[":db/id"])
: field === ":edit/user"
? getUserDisplayNameById(r?.[":edit/user"]?.[":db/id"])
? formatUser(r?.[":edit/user"]?.[":db/id"])
: REGEX_TEST.test(match)
? {
"":
Expand Down