Adjust automatic table generation to respect existing list order, ins…

…tead of re-sorting based on shortname due to range behaviour
trafiklab · Feb 3, 2025 · 94a2b76 · 94a2b76
1 parent 3ee874a
commit 94a2b76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/themes/trafiklab-2024/layouts/shortcodes/stip-data-availability-static.html b/themes/trafiklab-2024/layouts/shortcodes/stip-data-availability-static.html
@@ -1,6 +1,8 @@
 {{ $data := slice }}
 {{ $url := "https://prod-stip-pingdom-status-export.s3.eu-central-1.amazonaws.com/data-availability.json" }}
-{{ with resources.GetRemote $url }}
+{{ $cacheKey := print $url (now.Format "2006-01-02 15:04") }}
+{{ $opts := dict "key" $cacheKey }}
+{{ with resources.GetRemote $url $opts }}
 {{ $data = . | transform.Unmarshal }}
 {{ end }}
 
@@ -15,9 +17,9 @@
 </tr>
 </thead>
 <tbody>
-{{ range $key, $value := $data }}
+{{ range $value := $data }}
 {{ if not (eq (printf "%T" $value) "string") }}
-{{ if eq (index $value "staticData") true }}
+{{ if and (eq (index $value "staticData") true)  (eq (index $value "trafiklabEnabled") true) }}
 <tr>
     <td>{{ .name }}</td>
     <td><code>{{.shortname}}</code></td>
@@ -27,7 +29,7 @@
 {{ end }}
 {{ end }}
 <tr>
-    <td class="tl-muted" colspan="3">Last updated: {{ strings.Substr (index $data "last-update") 0 10 }}</td>
+    <td class="tl-muted" colspan="3">Last updated: {{ now.Format "2006-01-02" }}</td>
 </tr>
 </tbody>
 </table>

diff --git a/themes/trafiklab-2024/layouts/shortcodes/stip-data-availability.html b/themes/trafiklab-2024/layouts/shortcodes/stip-data-availability.html
@@ -1,6 +1,6 @@
 {{ $data := slice }}
 {{ $url := "https://prod-stip-pingdom-status-export.s3.eu-central-1.amazonaws.com/data-availability.json" }}
-{{ $cacheKey := print $url (now.Format "2006-01-02") }}
+{{ $cacheKey := print $url (now.Format "2006-01-02 15:04") }}
 {{ $opts := dict "key" $cacheKey }}
 {{ with resources.GetRemote $url $opts }}
 {{ $data = . | transform.Unmarshal }}
@@ -20,9 +20,9 @@
 </tr>
 </thead>
 <tbody>
-{{ range $key, $value := $data }}
+{{ range $value := $data }}
 {{ if not (eq (printf "%T" $value) "string") }}
-{{ if eq (index $value "staticData") true }}
+{{ if and (eq (index $value "staticData") true)  (eq (index $value "trafiklabEnabled") true) }}
 <tr>
     <td>{{ .name }}</td>
     <td><code>{{.shortname}}</code></td>
@@ -35,7 +35,7 @@
 {{ end }}
 {{ end }}
 <tr>
-    <td class="tl-muted" colspan="5">Last updated: {{ strings.Substr (index $data "last-update") 0 10 }}</td>
+    <td class="tl-muted" colspan="5">Last updated: {{ now.Format "2006-01-02" }}</td>
 </tr>
 </tbody>
 </table>