Skip to content

Commit 5e0eefb

Browse files
authored
Merge pull request #3704 from ilandikov/fix/toggling-query-file-defaults
fix: toggling query file defaults can show and hide fields again
2 parents a1a284a + c2d3a80 commit 5e0eefb

4 files changed

+17
-16
lines changed

src/Renderer/HtmlQueryResultsRenderer.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class HtmlQueryResultsRenderer extends QueryResultsRendererBase {
2828
protected readonly obsidianComponent: Component | null;
2929
protected readonly obsidianApp: App;
3030

31-
private readonly taskLineRenderer: TaskLineRenderer;
31+
private taskLineRenderer: TaskLineRenderer;
3232

3333
// document.createElement() creates dummy elements that must be overwritten later
3434
// with the values of elements that will be rendered
@@ -60,7 +60,11 @@ export class HtmlQueryResultsRenderer extends QueryResultsRendererBase {
6060
this.textRenderer = textRenderer;
6161
this.queryRendererParameters = queryRendererParameters;
6262

63-
this.taskLineRenderer = new TaskLineRenderer({
63+
this.taskLineRenderer = this.createTaskLineRenderer();
64+
}
65+
66+
private createTaskLineRenderer() {
67+
return new TaskLineRenderer({
6468
textRenderer: this.textRenderer,
6569
obsidianApp: this.obsidianApp,
6670
obsidianComponent: this.obsidianComponent,
@@ -70,7 +74,7 @@ export class HtmlQueryResultsRenderer extends QueryResultsRendererBase {
7074
}
7175

7276
protected beginRender(): void {
73-
return;
77+
this.taskLineRenderer = this.createTaskLineRenderer();
7478
}
7579

7680
protected renderSearchResultsHeader(_queryResult: QueryResult): void {

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_-_sequences_global_query_change_to_query_layout_option.approved.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ <h2>Initial results:</h2>
1313
<button test-icon="lucide-copy" test-tooltip="Copy results"></button>
1414
</div>
1515
<pre class="plugin-tasks-query-explanation">
16-
Explanation of the global query:
17-
18-
No filters supplied. All tasks will match the query.
19-
20-
hide due date
21-
2216
Explanation of this Tasks code block query:
2317

2418
No filters supplied. All tasks will match the query.
2519
</pre
2620
>
27-
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-dueDate tasks-layout-hide-urgency">
21+
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency">
2822
<li
2923
class="task-list-item plugin-tasks-list-item"
3024
data-task-due="today"
@@ -36,6 +30,9 @@ <h2>Initial results:</h2>
3630
<input class="task-list-item-checkbox" type="checkbox" data-line="0" />
3731
<span class="tasks-list-text">
3832
<span class="task-description"><span>parent</span></span>
33+
<span class="task-due" data-task-due="today" title="Click to edit due date, Right-click for more options">
34+
<span>📅 2025-12-01</span>
35+
</span>
3936
</span>
4037
<span class="task-extras">
4138
<span class="tasks-backlink">
@@ -109,6 +106,9 @@ <h2>Check that urgency is shown by global query:</h2>
109106
<input class="task-list-item-checkbox" type="checkbox" data-line="0" />
110107
<span class="tasks-list-text">
111108
<span class="task-description"><span>parent</span></span>
109+
<span class="task-due" data-task-due="today" title="Click to edit due date, Right-click for more options">
110+
<span>📅 2025-12-01</span>
111+
</span>
112112
</span>
113113
<span class="task-extras">
114114
<span class="tasks-urgency">10.75</span>

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_-_sequences_global_query_change_to_task_layout_option.approved.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ <h2>Check that due date is hidden by global query:</h2>
106106
<input class="task-list-item-checkbox" type="checkbox" data-line="0" />
107107
<span class="tasks-list-text">
108108
<span class="task-description"><span>parent</span></span>
109-
<span class="task-due" data-task-due="today" title="Click to edit due date, Right-click for more options">
110-
<span>📅 2025-12-01</span>
111-
</span>
112109
</span>
113110
<span class="task-extras">
114111
<span class="tasks-backlink">

tests/Renderer/QueryResultsRenderer.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ beforeEach(() => {
2828
afterEach(() => {
2929
jest.useRealTimers();
3030
resetSettings();
31+
GlobalQuery.getInstance().reset();
3132
});
3233

3334
function makeQueryResultsRenderer(source: string, tasksFile: TasksFile, allTasks: Task[]) {
@@ -135,9 +136,9 @@ class RendererStoryboard {
135136
describe('QueryResultsRenderer - sequences', () => {
136137
const parent = new TaskBuilder().description('parent').dueDate('2025-12-01').build();
137138
const child = new TaskBuilder().description('child').indentation(' ').id('childID').parent(parent).build();
138-
const parentAndChild: Task[] = [parent, child];
139+
const parentAndChild = [parent, child];
139140

140-
it.failing('global query change to task layout option', async () => {
141+
it('global query change to task layout option', async () => {
141142
// see issue #3702
142143
const source = 'explain';
143144
const storyboard = new RendererStoryboard(source, parentAndChild);
@@ -160,7 +161,6 @@ describe('QueryResultsRenderer - sequences', () => {
160161
});
161162

162163
it('global query change to query layout option', async () => {
163-
// see issue #3702
164164
const source = 'explain';
165165
const storyboard = new RendererStoryboard(source, parentAndChild);
166166
const urgency = '<span class="tasks-urgency">10.75</span>';

0 commit comments

Comments
 (0)