From bef7af2d0877344b380554d74873198380cfbbd5 Mon Sep 17 00:00:00 2001
From: Nicolas Doby <nicolas.doby@itsonus.fr>
Date: Fri, 25 Nov 2022 15:50:48 +0100
Subject: [PATCH] feat: add draft support

---
 eleventy.config.js                            | 21 ++++++++++----
 src/_layouts/article.njk                      |  7 +++--
 src/_pages/blog/all_articles.njk              |  2 +-
 .../blog/article/benchmark_greenit_2023.md    |  1 +
 .../comment_choisir_erp_responsable.md        |  1 +
 .../ecoconception_web_exposition_celtique.md  |  1 +
 .../impacts_envrionnementaux_du_numerique.md  |  1 +
 src/_pages/blog/article/test.md               | 28 +++++++++++++++++++
 src/_pages/blog/feed/feed.njk                 |  4 +--
 src/_pages/blog/feed/json.njk                 |  2 +-
 src/_pages/blog/index.njk                     |  2 +-
 11 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 src/_pages/blog/article/test.md

diff --git a/eleventy.config.js b/eleventy.config.js
index 25f9e56..5c4d741 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -70,19 +70,30 @@ module.exports = function(eleventyConfig) {
     return Math.min.apply(null, numbers);
   });
 
+  eleventyConfig.addFilter("filterDraft", articles => {
+    return articles.filter(article => !article.data.draft);
+  });
+
   // Return all the tags used in a collection
   eleventyConfig.addFilter("getAllTags", collection => {
-    let tagSet = new Set();
+    let tags = new Map();
     for(let item of collection) {
-      (item.data.tags || []).forEach(tag => tagSet.add(tag));
+      if (item.data.draft) {
+        continue;
+      }
+      (item.data.tags || []).forEach(tag => {
+        let number = tags.get(tag) || 0;
+        tags.set(tag, ++number);
+      });
     }
-    return Array.from(tagSet).sort((a, b) => {
-      return a.localeCompare(b, undefined, {sensitivity: 'base'});
-    });
+    let sortedTags = new Map([...tags.entries()].sort((a, b) => b[1] - a[1]));
+    return Array.from(sortedTags.keys());
   });
 
   eleventyConfig.addFilter("filterTagList", function filterTagList(tags) {
     return (tags || []).filter(tag => ["all", "nav", "article", "articles"].indexOf(tag) === -1);
+    // const filters = ["all", "nav", "article", "articles"];
+    // return new Map([...tags].filter(([k, _]) => filters.indexOf(k) === -1));
   });
 
   eleventyConfig.addFilter("readableAuthors", (authors) => {
diff --git a/src/_layouts/article.njk b/src/_layouts/article.njk
index 950b83e..9264527 100644
--- a/src/_layouts/article.njk
+++ b/src/_layouts/article.njk
@@ -21,10 +21,11 @@ templateClass: tmpl-post
 
   <hr>
 
-  {%- if collections.articles %}
+  {%- set articles = collections.articles | filterDraft %}
+  {%- if articles %}
   {# these filters are locale-aware in 2.0.0-canary.14 #}
-  {%- set previousArticle = collections.articles | getPreviousCollectionItem %}
-  {%- set nextArticle = collections.articles | getNextCollectionItem %}
+  {%- set previousArticle = articles | getPreviousCollectionItem %}
+  {%- set nextArticle = articles | getNextCollectionItem %}
   {%- if nextArticle or previousArticle %}
     <nav class="post-nav">
       <ul>
diff --git a/src/_pages/blog/all_articles.njk b/src/_pages/blog/all_articles.njk
index 504c13f..adac548 100644
--- a/src/_pages/blog/all_articles.njk
+++ b/src/_pages/blog/all_articles.njk
@@ -9,7 +9,7 @@ eleventyNavigation:
   <nav>
     {% include "tagslist.njk" %}
   </nav>
-  {% set articlesList = collections.articles %}
+  {% set articlesList = collections.articles | filterDraft %}
   {% include "articlesList.njk" %}
 </div>
 <aside class="right-side">
diff --git a/src/_pages/blog/article/benchmark_greenit_2023.md b/src/_pages/blog/article/benchmark_greenit_2023.md
index c50089b..f3cd890 100644
--- a/src/_pages/blog/article/benchmark_greenit_2023.md
+++ b/src/_pages/blog/article/benchmark_greenit_2023.md
@@ -8,6 +8,7 @@ tags:
   - ACV
 authors:
   - Margaux Escande
+draft: false
 layout: article.njk
 ---
 À ce jour, le numérique a plus d'impacts environnementaux que l'aviation civile et ses impacts continuent d'augmenter.
diff --git a/src/_pages/blog/article/comment_choisir_erp_responsable.md b/src/_pages/blog/article/comment_choisir_erp_responsable.md
index 6e31385..3f1c9d6 100644
--- a/src/_pages/blog/article/comment_choisir_erp_responsable.md
+++ b/src/_pages/blog/article/comment_choisir_erp_responsable.md
@@ -9,6 +9,7 @@ tags:
   - écoconception
 authors:
   - Margaux Escande
+draft: false
 layout: article.njk
 ---
 
diff --git a/src/_pages/blog/article/ecoconception_web_exposition_celtique.md b/src/_pages/blog/article/ecoconception_web_exposition_celtique.md
index 5396524..8260dec 100644
--- a/src/_pages/blog/article/ecoconception_web_exposition_celtique.md
+++ b/src/_pages/blog/article/ecoconception_web_exposition_celtique.md
@@ -9,6 +9,7 @@ authors:
   - Anne Faubry
   - Aurélie Baton
   - Nicolas Doby
+draft: false
 layout: article.njk
 ---
 En 2022, nous avons conçu et développé le site ["Celtique ? L'expo"](https://www.exposition-celtique.bzh) dans une
diff --git a/src/_pages/blog/article/impacts_envrionnementaux_du_numerique.md b/src/_pages/blog/article/impacts_envrionnementaux_du_numerique.md
index 8c360a4..b4de23a 100644
--- a/src/_pages/blog/article/impacts_envrionnementaux_du_numerique.md
+++ b/src/_pages/blog/article/impacts_envrionnementaux_du_numerique.md
@@ -9,6 +9,7 @@ tags:
   - ACV
 authors:
   - Anthony Lecerf
+draft: false
 layout: article.njk
 ---
 Le numérique est au cœur de notre quotidien et bouleverse nos modes de vie et de travail. Il a également des effets
diff --git a/src/_pages/blog/article/test.md b/src/_pages/blog/article/test.md
new file mode 100644
index 0000000..45e84af
--- /dev/null
+++ b/src/_pages/blog/article/test.md
@@ -0,0 +1,28 @@
+---
+title: "Test"
+description: "test"
+date: 2022-11-25
+tags:
+  - test
+  - test2
+  - test3
+authors:
+  - John Doe
+draft: true
+layout: article.njk
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Delectus deleniti eius, eveniet fugit magni provident
+  vel? Corporis deserunt doloribus ducimus hic iusto nemo neque perspiciatis qui sit totam! Culpa, saepe!
+
+Accusamus consectetur consequatur cupiditate est neque nisi pariatur possimus quisquam quod ratione. Atque dolorem
+  eius excepturi explicabo, illo, inventore ipsam laborum maxime molestias nisi omnis possimus sequi temporibus ut vero.
+
+Accusantium aspernatur beatae commodi corporis, delectus dolore earum et explicabo illo illum ipsa ipsam iste magni
+  maiores minus neque omnis quis rem rerum sapiente sed ullam unde velit vitae voluptatum?
+
+Atque, deserunt enim itaque laborum libero magnam minus pariatur quam, reiciendis repellat suscipit velit. Ad
+  aliquam debitis dolores fuga harum libero minus quaerat quam sequi velit! Recusandae rem, voluptatibus. Possimus?
+
+Amet id itaque numquam obcaecati rem! Mollitia nostrum numquam quod. Aperiam assumenda, delectus dolor fuga fugiat,
+  iste maxime neque pariatur porro provident quaerat vitae voluptas? Dolorem quia quo tempore voluptatem.
diff --git a/src/_pages/blog/feed/feed.njk b/src/_pages/blog/feed/feed.njk
index 32351ae..9e16f4e 100755
--- a/src/_pages/blog/feed/feed.njk
+++ b/src/_pages/blog/feed/feed.njk
@@ -8,13 +8,13 @@ permalink: /blog/feed/feed.xml
 	<subtitle>{{ metadata.description }}</subtitle>
 	<link href="{{ permalink | htmlBaseUrl(metadata.url) }}" rel="self"/>
 	<link href="{{ metadata.url | addPathPrefixToFullUrl }}"/>
-	<updated>{{ collections.articles | getNewestCollectionItemDate | dateToRfc3339 }}</updated>
+	<updated>{{ collections.articles | filterDraft | getNewestCollectionItemDate | dateToRfc3339 }}</updated>
 	<id>{{ metadata.url }}</id>
 	<author>
 		<name>{{ metadata.author.name }}</name>
 		<email>{{ metadata.author.email }}</email>
 	</author>
-	{%- for article in collections.articles | reverse %}
+	{%- for article in collections.articles | filterDraft | reverse %}
 	{% set absolutePostUrl %}{{ article.url | htmlBaseUrl(metadata.url) }}{% endset %}
 	<entry>
 		<title>{{ article.data.title }}</title>
diff --git a/src/_pages/blog/feed/json.njk b/src/_pages/blog/feed/json.njk
index 8db3e24..ca7bcbb 100644
--- a/src/_pages/blog/feed/json.njk
+++ b/src/_pages/blog/feed/json.njk
@@ -14,7 +14,7 @@ permalink: /blog/feed/feed.json
     "url": "{{ metadata.author.url }}"
   },
   "items": [
-    {%- for article in collections.articles | reverse %}
+    {%- for article in collections.articles | filterDraft | reverse %}
     {%- set absoluteArticleUrl = article.url | htmlBaseUrl(metadata.url) %}
     {
       "id": "{{ absoluteArticleUrl }}",
diff --git a/src/_pages/blog/index.njk b/src/_pages/blog/index.njk
index fcdf78b..02a9c61 100644
--- a/src/_pages/blog/index.njk
+++ b/src/_pages/blog/index.njk
@@ -10,7 +10,7 @@ eleventyNavigation:
   <nav>
     {% include "tagslist.njk" %}
   </nav>
-  {% set articlesList = collections.articles | head(-5) %}
+  {% set articlesList = collections.articles | filterDraft | head(-5) %}
   {% include "articlesList.njk" %}
 </div>
 <aside class="right-side">