From f2cbff367920fd4ec7f867824fadf18710c03516 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 1 Apr 2025 12:28:30 -0400 Subject: [PATCH 1/4] listings - sort categories case-insensitively --- .../types/website/listing/website-listing-categories.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/project/types/website/listing/website-listing-categories.ts b/src/project/types/website/listing/website-listing-categories.ts index e86d6bfa110..a558ae58eeb 100644 --- a/src/project/types/website/listing/website-listing-categories.ts +++ b/src/project/types/website/listing/website-listing-categories.ts @@ -1,7 +1,7 @@ /* * website-listing-categories.ts * - * Copyright (C) 2020-2022 Posit Software, PBC + * Copyright (C) 2020-2025 Posit Software, PBC */ import { Document } from "deno_dom/deno-dom-wasm-noinit.ts"; import { @@ -72,7 +72,12 @@ export function categorySidebar( categoriesEl.appendChild(allEl); } - for (const cat of Object.keys(cats).sort()) { + console.log("HERE"); + for ( + const cat of Object.keys(cats).sort((a: string, b: string) => + a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()) + ) + ) { const count = cats[cat]; const catEl = categoryElement(doc, cat, formatFn(cat, count), cat); categoriesEl.appendChild(catEl); From 0e96fc0dbcbbb664db7efe9418475d6dbe79a131 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 1 Apr 2025 12:32:11 -0400 Subject: [PATCH 2/4] remove console.log --- src/project/types/website/listing/website-listing-categories.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/project/types/website/listing/website-listing-categories.ts b/src/project/types/website/listing/website-listing-categories.ts index a558ae58eeb..5b8d59c4c78 100644 --- a/src/project/types/website/listing/website-listing-categories.ts +++ b/src/project/types/website/listing/website-listing-categories.ts @@ -72,7 +72,6 @@ export function categorySidebar( categoriesEl.appendChild(allEl); } - console.log("HERE"); for ( const cat of Object.keys(cats).sort((a: string, b: string) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()) From 7c2631f42847fdf2fe7b172c551d930a4bb03070 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 1 Apr 2025 12:32:58 -0400 Subject: [PATCH 3/4] listings - sort categories case-insensitively (#8238) --- .../2025/04/01/issue-8238/.gitignore | 1 + .../2025/04/01/issue-8238/_quarto.yml | 21 ++++++++++++++++ .../smoke-all/2025/04/01/issue-8238/about.qmd | 5 ++++ .../smoke-all/2025/04/01/issue-8238/index.qmd | 25 +++++++++++++++++++ .../2025/04/01/issue-8238/lab-reports/1.qmd | 8 ++++++ .../2025/04/01/issue-8238/lab-reports/2.qmd | 8 ++++++ .../2025/04/01/issue-8238/styles.css | 1 + 7 files changed, 69 insertions(+) create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/.gitignore create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/_quarto.yml create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/about.qmd create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/index.qmd create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/1.qmd create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/2.qmd create mode 100644 tests/docs/smoke-all/2025/04/01/issue-8238/styles.css diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/.gitignore b/tests/docs/smoke-all/2025/04/01/issue-8238/.gitignore new file mode 100644 index 00000000000..075b2542afb --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/.gitignore @@ -0,0 +1 @@ +/.quarto/ diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/_quarto.yml b/tests/docs/smoke-all/2025/04/01/issue-8238/_quarto.yml new file mode 100644 index 00000000000..606ef4457bd --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/_quarto.yml @@ -0,0 +1,21 @@ +project: + type: website + +website: + title: "issue-8238" + navbar: + left: + - href: index.qmd + text: Home + - about.qmd + +format: + html: + theme: + - cosmo + - brand + css: styles.css + toc: true + + + diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/about.qmd b/tests/docs/smoke-all/2025/04/01/issue-8238/about.qmd new file mode 100644 index 00000000000..07c5e7f9d13 --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/about.qmd @@ -0,0 +1,5 @@ +--- +title: "About" +--- + +About this site diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/index.qmd b/tests/docs/smoke-all/2025/04/01/issue-8238/index.qmd new file mode 100644 index 00000000000..129b8d634d1 --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/index.qmd @@ -0,0 +1,25 @@ +--- +title: "issue-8238" +listing: + - id: reports + contents: "lab-reports" + type: table + fields: [title, author, reading-time] + categories: true +_quarto: + render-project: true + tests: + html: + ensureHtmlElements: + - ['div.quarto-listing-category div.category:nth-child(2)[data-category="YWFyZHZhcms="]'] + - [] +--- + +This is a Quarto website. + +To learn more about Quarto websites visit . + +## Reports + +:::{#reports} +::: diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/1.qmd b/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/1.qmd new file mode 100644 index 00000000000..88b18d74791 --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/1.qmd @@ -0,0 +1,8 @@ +--- +title: Aardvark +author: Anthony +categories: + - aardvark +--- + +## It starts with aardvarks \ No newline at end of file diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/2.qmd b/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/2.qmd new file mode 100644 index 00000000000..0a045bb6949 --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/lab-reports/2.qmd @@ -0,0 +1,8 @@ +--- +title: Zebra +author: Zack +categories: + - Zebra +--- + +## It ends with Zebras \ No newline at end of file diff --git a/tests/docs/smoke-all/2025/04/01/issue-8238/styles.css b/tests/docs/smoke-all/2025/04/01/issue-8238/styles.css new file mode 100644 index 00000000000..2ddf50c7b42 --- /dev/null +++ b/tests/docs/smoke-all/2025/04/01/issue-8238/styles.css @@ -0,0 +1 @@ +/* css styles */ From f043f9b652c452f26492d1925f035f6211146b0e Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 1 Apr 2025 12:33:52 -0400 Subject: [PATCH 4/4] changelog --- news/changelog-1.7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/news/changelog-1.7.md b/news/changelog-1.7.md index 77edde36a73..b39c5ae6d4a 100644 --- a/news/changelog-1.7.md +++ b/news/changelog-1.7.md @@ -21,6 +21,7 @@ All changes included in 1.7: ## Website projects +- ([#8238](https://github.com/quarto-dev/quarto-cli/issues/8238)): Listing categories are now sorted case-insensitively. - ([#11701](https://github.com/quarto-dev/quarto-cli/issues/11701)): Wrap HTML emitted by EJS templates in `{=html}` blocks to avoid memory blowup issues with Pandoc's parser. - ([#12134](https://github.com/quarto-dev/quarto-cli/issues/12134)): Forward `logo.small` images in `_brand.yml` files to a website `favicon`.