Skip to content

Test improvements to calcDateOffsetStr and other new tests and edge case fix #698

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
jgclark merged 4 commits into from
Nov 7, 2025
+608 −96
Merged

Test improvements to calcDateOffsetStr and other new tests and edge case fix #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bec831
Test improvements to calcDateOffsetStr and other new tests and edge c…
jgclark Nov 5, 2025
6e56fb9
Refactor week changes and tests for @jgclark
dwertheimer Nov 6, 2025
aef729c
Added notes on which functions need moving. Fix for CI.
jgclark Nov 7, 2025
8e6197c
Re-fix other CI build issues
jgclark Nov 7, 2025
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
13 changes: 4 additions & 9 deletions helpers/NPWindows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
// ----------------------------------------------------------------------------

import { clo, logDebug, logError, logInfo, logWarn } from '@helpers/dev'
import { usersVersionHas } from '@helpers/NPVersions'
import { caseInsensitiveMatch, caseInsensitiveStartsWith } from '@helpers/search'
import { inputIntegerBounded } from '@helpers/userInput'

// ----------------------------------------------------------------------------
// CONSTANTS

export const MAIN_SIDEBAR_CONTROL_BUILD_VERSION = 1440 // v3.19.2
export const FOLDER_VIEWS_CONTROL_BUILD_VERSION = 1340 // v3.18???

// ----------------------------------------------------------------------------
// TYPES

Expand Down Expand Up @@ -78,7 +73,7 @@ export async function setEditorWidth(widthIn?: number, mainSidebarWidth?: number
}

logDebug('setEditorWidth', `Attempting to set width for main NP Window to ${String(width)}`)
if (NotePlan.environment.buildVersion >= MAIN_SIDEBAR_CONTROL_BUILD_VERSION && mainSidebarWidth && !isNaN(mainSidebarWidth)) {
if (usersVersionHas('mainSidebarControl') && mainSidebarWidth && !isNaN(mainSidebarWidth)) {
if (mainSidebarWidth === 0) {
logDebug('setEditorWidth', `- will hide main sidebar`)
NotePlan.toggleSidebar(true, false, true)
Expand Down Expand Up @@ -690,7 +685,7 @@ export async function constrainMainWindow(): Promise<void> {
}

export function logSidebarWidth(): void {
if (NotePlan.environment.buildVersion >= MAIN_SIDEBAR_CONTROL_BUILD_VERSION) {
if (usersVersionHas('mainSidebarControl')) {
const sidebarWidth = NotePlan.getSidebarWidth()
logInfo('logSidebarWidth', `Sidebar width: ${sidebarWidth} -- WARNING: This cannot tell if the sidebar is actually visible or not!`)
} else {
Expand All @@ -700,7 +695,7 @@ export function logSidebarWidth(): void {

// eslint-disable-next-line require-await
export async function setSidebarWidth(widthIn?: number): Promise<void> {
if (NotePlan.environment.buildVersion >= MAIN_SIDEBAR_CONTROL_BUILD_VERSION) {
if (usersVersionHas('mainSidebarControl')) {
const width = widthIn ?? await inputIntegerBounded('Set Width for main NP Window', `Width (pixels)? (up to ${String(NotePlan.environment.screenWidth)})`, NotePlan.environment.screenWidth)
NotePlan.setSidebarWidth(width)
logDebug('setSidebarWidth', `Sidebar width set to ${width}`)
Expand Down
Loading