From 7e95ca32da0f8401a448b58b47dde3f2f39b4f64 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 10 Oct 2025 07:01:36 +0200
Subject: [PATCH] Bug 40982: Allow to force visibility when needed

The _dt_visibility function is only called when the state is
initialized. Here we want to force the visibility of some columns even
if the state exists already.

The idea of this patch is to add a new 'force_visibility' flag to the
column when the visibility needs to be respected regardless what is in
the state. That should only be used when column cannot be toggled.

Signed-off-by: Slava Shishkin <slavashishkin@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 41b531b315dd818e7278aadee50182e9ca283390)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
---
 .../prog/en/modules/acqui/basket.tt           | 27 +++++++++-----
 koha-tmpl/intranet-tmpl/prog/js/datatables.js | 36 +++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index d0af80fbbb..f54610f210 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -1267,24 +1267,33 @@
     <script>
         $(document).ready(function() {
             var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
+
+            let supplier_report_column = table_settings.columns.find(c => c.columnname == 'supplier_report');
             [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
-                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 1;
-                table_settings.columns.find(c => c.columnname == 'supplier_report').cannot_be_toggled = 1;
+                supplier_report_column.is_hidden = 1;
+                supplier_report_column.cannot_be_toggled = 1;
             [% ELSE %]
-                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 0;
+                supplier_report_column.is_hidden = 0;
             [% END %]
+            supplier_report_column.force_visibility = 1;
+
+            let modify_column = table_settings.columns.find(c => c.columnname == 'modify');
             [% IF ( active && !closedate ) %]
-                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 0;
+                modify_column.is_hidden = 0;
             [% ELSE %]
-                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 1;
-                table_settings.columns.find(c => c.columnname == 'modify').cannot_be_toggled = 1;
+                modify_column.is_hidden = 1;
+                modify_column.cannot_be_toggled = 1;
             [% END %]
+            modify_column.force_visibility = 1;
+
+            let cancel_column = table_settings.columns.find(c => c.columnname == 'cancel');
             [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
-                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 0;
+                cancel_column.is_hidden = 0;
             [% ELSE %]
-                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 1;
-                table_settings.columns.find(c => c.columnname == 'cancel').cannot_be_toggled = 1;
+                cancel_column.is_hidden = 1;
+                cancel_column.cannot_be_toggled = 1;
             [% END %]
+            cancel_column.force_visibility = 1;
 
             $("#orders").kohaTable({
                 bKohaColumnsUseNames: true,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
index 3af04d2a16..68d135b4ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
@@ -950,6 +950,39 @@ function _dt_buttons(params) {
     return buttons;
 }
 
+function _dt_force_visibility(table_settings, table_dt, state) {
+    var columns_settings = table_settings.columns;
+    let i = 0;
+    let use_names = $(table_dt.table().node()).data("bKohaColumnsUseNames");
+    if (use_names) {
+        let force_vis_columns = table_settings.columns.filter(
+            c => c.force_visibility
+        );
+        if (!force_vis_columns.length) return state;
+        table_dt
+            .columns(
+                force_vis_columns
+                    .map(c => "[data-colname='%s']".format(c.columnname))
+                    .join(",")
+            )
+            .every(function () {
+                state.columns[this.index()].visible =
+                    table_settings.columns.find(
+                        c =>
+                            c.columnname ==
+                            this.header().getAttribute("data-colname")
+                    ).is_hidden
+                        ? false
+                        : true;
+            });
+    } else {
+        throw new Error(
+            "Cannot force column visibility without bKohaColumnsUseNames!"
+        );
+    }
+    return state;
+}
+
 function _dt_visibility(table_settings, table_dt) {
     let hidden_ids = [];
     if (table_settings) {
@@ -1183,6 +1216,9 @@ function _dt_save_restore_state(table_settings, external_filter_nodes = {}) {
             delete state.search;
             state.columns.forEach(c => delete c.search);
         }
+
+        state = _dt_force_visibility(table_settings, this.api(), state);
+
         return state;
     };