fix user picture delete confirmation page

core/templates/core/file_delete_confirm.jinja

@@ -4,15 +4,11 @@
   {% trans %}Delete confirmation{% endtrans %}
 {% endblock %}
 
-{% if is_fragment %}
+{# Don't display tabs and errors #}
-
+{% block tabs %}
-  {# Don't display tabs and errors #}
+{% endblock %}
-  {% block tabs %}
+{% block errors %}
-  {% endblock %}
+{% endblock %}
-  {% block errors %}
-  {% endblock %}
-
-{% endif %}
 
 {% block file %}
   <h2>{% trans %}Delete confirmation{% endtrans %}</h2>
@@ -23,30 +19,32 @@
     {% set action = current %}
   {% endif %}
 
-  <form action="{{ action }}" method="post">
+  <p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
+  <form
+    method="post"
+    {% if is_fragment %}
+      hx-action="{{ action }}"
+      hx-target="#content"
+      hx-swap="innerHTML"
+    {% else %}
+      action="{{ action }}"
+    {% endif %}
+  >
     {% csrf_token %}
-
+    <input type="submit" value="{% trans %}Confirm{% endtrans %}" />
-    <p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
+  </form>
-    <button
+  <form
-      {% if is_fragment %}
+    method="get"
-        hx-post="{{ action }}"
+    {% if is_fragment %}
-        hx-target="#content"
+      hx-action="{{ previous }}"
-        hx-swap="innerHTML"
+      hx-target="#content"
-      {% endif %}
+      hx-swap="innerHTML"
-    >{% trans %}Confirm{% endtrans %}</button>
+    {% else %}
-
+      action="javascript:history.back();"
-    <button
+    {% endif %}
-      {% if is_fragment %}
+  >
-        hx-get="{{ previous }}"
+    <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" />
-        hx-target="#content"
-        hx-swap="innerHTML"
-      {% else %}
-        action="window.history.back()"
-      {% endif %}
-    >{% trans %}Cancel{% endtrans %}</button>
-
   </form>
-
 {% endblock %}
 
 

core/urls.py

@@ -21,7 +21,7 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-from django.urls import path, re_path, register_converter
+from django.urls import path, register_converter
 from django.views.generic import RedirectView
 
 from com.views import NewsListView
@@ -193,27 +193,11 @@ urlpatterns = [
         name="user_gift_delete",
     ),
     # File views
-    re_path(r"^file/$", FileListView.as_view(), name="file_list"),
+    path("file/", FileListView.as_view(), name="file_list"),
-    re_path(
+    path("file/<int:file_id>/", FileView.as_view(), name="file_detail"),
-        r"^file/(?P<file_id>[0-9]+)/$",
+    path("file/<int:file_id>/edit/", FileEditView.as_view(), name="file_edit"),
-        FileView.as_view(),
+    path("file/<int:file_id>/prop/", FileEditPropView.as_view(), name="file_prop"),
-        name="file_detail",
+    path("file/<int:file_id>/delete/", FileDeleteView.as_view(), name="file_delete"),
-    ),
-    re_path(
-        r"^file/(?P<file_id>[0-9]+)/edit/$",
-        FileEditView.as_view(),
-        name="file_edit",
-    ),
-    re_path(
-        r"^file/(?P<file_id>[0-9]+)/prop/$",
-        FileEditPropView.as_view(),
-        name="file_prop",
-    ),
-    re_path(
-        r"^file/(?P<file_id>[0-9]+)/delete/$",
-        FileDeleteView.as_view(),
-        name="file_delete",
-    ),
     path("file/moderation/", FileModerationView.as_view(), name="file_moderation"),
     path(
         "file/<int:file_id>/moderate/", FileModerateView.as_view(), name="file_moderate"

core/views/files.py

@@ -356,15 +356,8 @@ class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
         if "next" in self.request.GET:
             return self.request.GET["next"]
         if self.object.parent is None:
-            return reverse(
+            return reverse("core:file_list")
-                "core:file_list",
+        return reverse("core:file_detail", kwargs={"file_id": self.object.parent.id})
-            )
-        return reverse(
-            "core:file_detail",
-            kwargs={
-                "file_id": self.object.parent.id,
-            },
-        )
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)

pedagogy/schemas.py

@@ -153,7 +153,6 @@ class UeFilterSchema(FilterSchema):
         set[Literal["CS", "TM", "EC", "OM", "QC"]] | None,
         FilterLookup("credit_type__in"),
     ] = None
-    is_open: bool | None = None
     language: str = "FR"
     department: Annotated[set[str] | None, FilterLookup("department__in")] = None
 
@@ -188,10 +187,3 @@ class UeFilterSchema(FilterSchema):
             return Q()
         value.add("AUTUMN_AND_SPRING")
         return Q(semester__in=value)
-
-    def filter_is_open(self, value: bool | None) -> Q:  # noqa: FBT001
-        if value is None:
-            return Q()
-        if not value:
-            return Q(semester="CLOSED")
-        return ~Q(semester="CLOSED")

pedagogy/static/bundled/pedagogy/guide-index.js

@@ -0,0 +1,118 @@
+import {
+  getCurrentUrlParams,
+  History,
+  updateQueryString,
+} from "#core:utils/history.ts";
+import { ueFetchUeList } from "#openapi";
+
+const pageDefault = 1;
+const pageSizeDefault = 100;
+
+document.addEventListener("alpine:init", () => {
+  Alpine.data("ue_search", () => ({
+    ues: {
+      count: 0,
+      next: null,
+      previous: null,
+      results: [],
+    },
+    loading: false,
+    page: pageDefault,
+    // biome-ignore lint/style/useNamingConvention: api is in snake_case
+    page_size: pageSizeDefault,
+    search: "",
+    department: [],
+    // biome-ignore lint/style/useNamingConvention: api is in snake_case
+    credit_type: [],
+    semester: [],
+    // biome-ignore lint/style/useNamingConvention: api is in snake_case
+    to_change: [],
+    pushstate: History.Push,
+
+    update: undefined,
+
+    initializeArgs() {
+      const url = getCurrentUrlParams();
+      this.pushstate = History.Replace;
+
+      this.page = Number.parseInt(url.get("page"), 10) || pageDefault;
+      this.page_size = Number.parseInt(url.get("page_size"), 10) || pageSizeDefault;
+      this.search = url.get("search") || "";
+      this.department = url.getAll("department");
+      this.credit_type = url.getAll("credit_type");
+      /* The semester is easier to use on the backend as an enum (spring/autumn/both/none)
+          and easier to use on the frontend as an array ([spring, autumn]).
+          Thus there is some conversion involved when both communicate together */
+      this.semester = url.has("semester") ? url.get("semester").split("_AND_") : [];
+
+      this.update();
+    },
+
+    async init() {
+      this.update = Alpine.debounce(async () => {
+        /* Create the whole url before changing everything all at once */
+        const first = this.to_change.shift();
+        let url = updateQueryString(first.param, first.value, History.None);
+        for (const value of this.to_change) {
+          url = updateQueryString(value.param, value.value, History.None, url);
+        }
+        updateQueryString(first.param, first.value, this.pushstate, url);
+        await this.fetchData(); /* reload data on form change */
+        this.to_change = [];
+        this.pushstate = History.Push;
+      }, 50);
+
+      const searchParams = ["search", "department", "credit_type", "semester"];
+      const paginationParams = ["page", "page_size"];
+
+      for (const param of searchParams) {
+        this.$watch(param, () => {
+          if (this.pushstate !== History.Push) {
+            /* This means that we are doing a mass param edit */
+            return;
+          }
+          /* Reset pagination on search */
+          this.page = pageDefault;
+          this.page_size = pageSizeDefault;
+        });
+      }
+      for (const param of searchParams.concat(paginationParams)) {
+        this.$watch(param, (value) => {
+          this.to_change.push({ param: param, value: value });
+          this.update();
+        });
+      }
+      window.addEventListener("popstate", () => {
+        this.initializeArgs();
+      });
+      this.initializeArgs();
+    },
+
+    async fetchData() {
+      this.loading = true;
+      const args = {
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        page_size: this.page_size,
+      };
+      for (const [param, value] of new URL(
+        window.location.href,
+      ).searchParams.entries()) {
+        // Deal with array type params
+        if (["credit_type", "department", "semester"].includes(param)) {
+          if (args[param] === undefined) {
+            args[param] = [];
+          }
+          args[param].push(value);
+        } else {
+          args[param] = value;
+        }
+      }
+      this.ues = (await ueFetchUeList({ query: args })).data;
+      this.loading = false;
+    },
+
+    maxPage() {
+      return Math.ceil(this.ues.count / this.page_size);
+    },
+  }));
+});

pedagogy/static/bundled/pedagogy/guide-index.ts

@@ -1,114 +0,0 @@
-import { getCurrentUrlParams, updateQueryString } from "#core:utils/history";
-import { type SimpleUeSchema, ueFetchUeList } from "#openapi";
-
-const pageDefault = 1;
-const pageSizeDefault = 100;
-
-document.addEventListener("alpine:init", () => {
-  Alpine.data("ue_search", () => ({
-    ues: {
-      count: 0,
-      next: null as string | null,
-      previous: null as string | null,
-      results: [] as SimpleUeSchema[],
-    },
-    loading: false,
-    page: pageDefault,
-    // biome-ignore lint/style/useNamingConvention: api is in snake_case
-    page_size: pageSizeDefault,
-    search: "",
-    hideClosedUes: true,
-    department: [] as string[],
-    // biome-ignore lint/style/useNamingConvention: api is in snake_case
-    credit_type: [] as string[],
-    semester: [] as string[],
-    // biome-ignore lint/style/useNamingConvention: api is in snake_case
-    to_change: [] as { param: string; value: string }[],
-
-    // dummy implementation to make TS happy.
-    // The real function is initialized in init
-    update: () => {
-      console.warn("Update not yet initialized");
-    },
-
-    initializeArgs() {
-      const url = getCurrentUrlParams();
-      this.page = Number.parseInt(url.get("page") || pageDefault.toString(), 10);
-      this.page_size = Number.parseInt(
-        url.get("page_size") || pageSizeDefault.toString(),
-        10,
-      );
-      this.search = url.get("search") || "";
-      this.hideClosedUes = url.get("hideClosed") || true;
-      this.department = url.getAll("department");
-      this.credit_type = url.getAll("credit_type");
-      /* The semester is easier to use on the backend as an enum (spring/autumn/both/none)
-          and easier to use on the frontend as an array ([spring, autumn]).
-          Thus there is some conversion involved when both communicate together */
-      this.semester = url.get("semester")?.split("_AND_") || [];
-
-      this.update();
-    },
-
-    async init() {
-      this.update = Alpine.debounce(async () => {
-        /* Create the whole url before changing everything all at once */
-        for (const val of this.to_change) {
-          updateQueryString(val.param, val.value);
-        }
-        await this.fetchData(); /* reload data on form change */
-        this.to_change = [];
-      }, 50);
-
-      const searchParams = [
-        "search",
-        "hideClosedUes",
-        "department",
-        "credit_type",
-        "semester",
-      ];
-      const paginationParams = ["page", "page_size"];
-
-      for (const param of searchParams) {
-        this.$watch(param, () => {
-          /* Reset pagination on search */
-          this.page = pageDefault;
-          this.page_size = pageSizeDefault;
-        });
-      }
-      for (const param of searchParams.concat(paginationParams)) {
-        this.$watch(param, (value: string) => {
-          this.to_change.push({ param: param, value: value });
-          this.update();
-        });
-      }
-      this.initializeArgs();
-    },
-
-    async fetchData() {
-      this.loading = true;
-
-      const res = await ueFetchUeList({
-        query: {
-          // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          page_size: this.page_size,
-          // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          credit_type: this.credit_type.length > 0 ? this.credit_type : undefined,
-          semester: this.semester.length > 0 ? this.semester : undefined,
-          // biome-ignore lint/style/useNamingConvention: api is snake_case
-          is_open: this.hideClosedUes ? true : undefined,
-          department: this.department.length > 0 ? this.department : undefined,
-          search: this.search || undefined,
-        },
-      });
-      if (res.data !== undefined) {
-        this.ues = res.data;
-      }
-      this.loading = false;
-    },
-
-    maxPage() {
-      return Math.ceil(this.ues.count / this.page_size);
-    },
-  }));
-});

pedagogy/templates/pedagogy/guide.jinja

@@ -44,10 +44,6 @@
             x-model.debounce.500ms="search"
           />
         </fieldset>
-        <fieldset>
-          <input type="checkbox" class="switch" x-model="hideClosedUes" id="hide-closed-ues" name="hide-closed-ues">
-          <label for="hide-closed-ues">{% trans %}Hide closed UEs{% endtrans %}</label>
-        </fieldset>
         <div class="row gap-3x margin-bottom radio-guide">
           <fieldset>
             {% set departments = [