Skip to content

fix: block property checks & settings access #19

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

Merged
merged 1 commit into from
Jun 22, 2024
Merged

fix: block property checks & settings access #19

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
28 changes: 15 additions & 13 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ const splitTaskMarkers = (taskMarkers: string | undefined) => {
logseq.useSettingsSchema(SETTINGS_SCHEMA);

function main() {
let SETTINGS = logseq.settings;
let TASK_MARKERS = new Set(splitTaskMarkers(SETTINGS?.taskMarkers as string));
let TASK_MARKERS = new Set(
splitTaskMarkers(logseq.settings?.taskMarkers as string)
);

logseq.onSettingsChanged((_previousSettings, settings) => {
SETTINGS = settings;
TASK_MARKERS = new Set(splitTaskMarkers(SETTINGS?.taskMarkers as string));
TASK_MARKERS = new Set(splitTaskMarkers(settings?.taskMarkers as string));
});

logseq.DB.onChanged(async (event) => {
Expand All @@ -80,43 +80,45 @@ function main() {
return;
}

const hasCompletedProperty = taskBlock.properties?.completed;
const hasTimeProperty = taskBlock.properties?.time;
const hasCompletedProperty =
taskBlock.properties?.[logseq.settings?.completedDateProperty as string];
const hasTimeProperty =
taskBlock.properties?.[logseq.settings?.completedTimeProperty as string];

if (taskBlock.marker === "DONE") {
if (!hasCompletedProperty && SETTINGS?.includeDate) {
if (!hasCompletedProperty && logseq.settings?.includeDate) {
const userConfigs = await logseq.App.getUserConfigs();
let preferredDateFormat = userConfigs.preferredDateFormat;
preferredDateFormat = preferredDateFormat.replace(/E{1,3}/, "EEE"); //handle same E, EE, or EEE bug
const datePage = getDateForPage(new Date(), preferredDateFormat);

logseq.Editor.upsertBlockProperty(
taskBlock.uuid,
SETTINGS?.completedDateProperty as string,
logseq.settings?.completedDateProperty as string,
datePage
);
}

if (!hasTimeProperty && SETTINGS?.includeTime) {
const timeNow = dayjs().format(SETTINGS?.timeFormat as string);
if (!hasTimeProperty && logseq.settings?.includeTime) {
const timeNow = dayjs().format(logseq.settings?.timeFormat as string);
logseq.Editor.upsertBlockProperty(
taskBlock.uuid,
SETTINGS?.completedTimeProperty as string,
logseq.settings?.completedTimeProperty as string,
timeNow
);
}
} else {
if (hasCompletedProperty) {
logseq.Editor.removeBlockProperty(
taskBlock.uuid,
SETTINGS?.completedDateProperty as string
logseq.settings?.completedDateProperty as string
);
}

if (hasTimeProperty) {
logseq.Editor.removeBlockProperty(
taskBlock.uuid,
SETTINGS?.completedTimeProperty as string
logseq.settings?.completedTimeProperty as string
);
}
}
Expand Down