From a87016a23f95455ceaff5249d5ff26279cb5f6c7 Mon Sep 17 00:00:00 2001
From: Sli <antoine@bartuccio.fr>
Date: Thu, 20 Feb 2025 18:13:40 +0100
Subject: [PATCH] Apply some review comments

---
 sas/static/bundled/sas/album-index.ts     |  8 +++++-
 sas/templates/sas/album.jinja             |  4 +--
 sas/templates/sas/download_pictures.jinja | 30 -----------------------
 sas/templates/sas/macros.jinja            | 30 ++++++++++++++++++++++-
 sas/templates/sas/user_pictures.jinja     |  2 +-
 5 files changed, 39 insertions(+), 35 deletions(-)
 delete mode 100644 sas/templates/sas/download_pictures.jinja

diff --git a/sas/static/bundled/sas/album-index.ts b/sas/static/bundled/sas/album-index.ts
index 8f0b119f..ff0976d9 100644
--- a/sas/static/bundled/sas/album-index.ts
+++ b/sas/static/bundled/sas/album-index.ts
@@ -17,7 +17,6 @@ document.addEventListener("alpine:init", () => {
     page: Number.parseInt(initialUrlParams.get("page")) || 1,
     pushstate: History.Push /* Used to avoid pushing a state on a back action */,
     loading: false,
-    config: {} as AlbumConfig,
 
     async init() {
       await this.fetchPictures();
@@ -34,6 +33,13 @@ document.addEventListener("alpine:init", () => {
       this.config = config;
     },
 
+    getPage(page: number) {
+      return this.pictures.slice(
+        (page - 1) * config.maxPageSize,
+        config.maxPageSize * page,
+      );
+    },
+
     async fetchPictures() {
       this.loading = true;
       this.pictures = await paginated(picturesFetchPictures, {
diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja
index 0e5762b8..172e81ab 100644
--- a/sas/templates/sas/album.jinja
+++ b/sas/templates/sas/album.jinja
@@ -1,6 +1,6 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import paginate_alpine %}
-{% from "sas/download_pictures.jinja" import download_button %}
+{% from "sas/macros.jinja" import download_button %}
 
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ static('sas/css/album.scss') }}">
@@ -73,7 +73,7 @@
 
     <h4>{% trans %}Pictures{% endtrans %}</h4>
     <div class="photos" :aria-busy="loading">
-      <template x-for="picture in pictures.slice((page - 1) * config.maxPageSize, config.maxPageSize * page)">
+      <template x-for="picture in getPage(page)">
         <a :href="picture.sas_url">
           <div
             class="photo"
diff --git a/sas/templates/sas/download_pictures.jinja b/sas/templates/sas/download_pictures.jinja
deleted file mode 100644
index d89b1b41..00000000
--- a/sas/templates/sas/download_pictures.jinja
+++ /dev/null
@@ -1,30 +0,0 @@
-{# Helper macro to create a download button for a
-  record of albums with alpine
-
-  This needs to be used inside an alpine environment.
-  Downloaded pictures will be `pictures` from the 
-  parent data store.
-
-  Note:
-    This requires importing `bundled/sas/pictures-download-index.ts`
-
-  Parameters:
-    name (str): name displayed on the button
- #}
-{% macro download_button(name) %}
-  <div x-data="pictures_download">
-    <div x-show="pictures.length > 0" x-cloak>
-      <button
-        :disabled="isDownloading"
-        class="btn btn-blue"
-        @click="downloadZip()"
-      >
-        <i class="fa fa-download"></i>
-        {%- if name != "" -%}
-          {{ name }}
-        {%- endif -%}
-      </button>
-      <progress x-ref="progress" x-show="isDownloading"></progress>
-    </div>
-  </div>
-{% endmacro %}
diff --git a/sas/templates/sas/macros.jinja b/sas/templates/sas/macros.jinja
index a16f5da5..665813fb 100644
--- a/sas/templates/sas/macros.jinja
+++ b/sas/templates/sas/macros.jinja
@@ -33,4 +33,32 @@
     {{ print_path(file.parent) }}
     <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
   {% endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
+
+{# Helper macro to create a download button for a
+  record of albums with alpine
+
+  This needs to be used inside an alpine environment.
+  Downloaded pictures will be `pictures` from the 
+  parent data store.
+
+  Note:
+    This requires importing `bundled/sas/pictures-download-index.ts`
+
+  Parameters:
+    name (str): name displayed on the button
+ #}
+{% macro download_button(name) %}
+  <div x-data="pictures_download">
+    <div x-show="pictures.length > 0" x-cloak>
+      <button
+        :disabled="isDownloading"
+        class="btn btn-blue"
+        @click="downloadZip()"
+      >
+        <i class="fa fa-download"></i>{{ name }}
+      </button>
+      <progress x-ref="progress" x-show="isDownloading"></progress>
+    </div>
+  </div>
+{% endmacro %}
diff --git a/sas/templates/sas/user_pictures.jinja b/sas/templates/sas/user_pictures.jinja
index 1350c7d9..0d896652 100644
--- a/sas/templates/sas/user_pictures.jinja
+++ b/sas/templates/sas/user_pictures.jinja
@@ -1,5 +1,5 @@
 {% extends "core/base.jinja" %}
-{% from "sas/download_pictures.jinja" import download_button %}
+{% from "sas/macros.jinja" import download_button %}
 
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ static('sas/css/album.scss') }}">