From 40cfd29b83c67b06d1edeb0567ca1188fbe0df87 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 14 Feb 2024 16:34:20 +0100
Subject: [PATCH] Bug 36084: svc - authorised_values - APIClient now global

APIClient is not a global variable, which will make the next changes
much easier!

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/doc-head-close.inc       |  4 +++
 .../prog/en/modules/circ/article-requests.tt  |  5 ----
 .../prog/en/modules/circ/request-article.tt   |  3 --
 koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 18 ++++-------
 .../intranet-tmpl/prog/js/fetch/api-client.js |  2 ++
 .../js/fetch/authorised-value-api-client.js   | 30 +++++++++++++++++++
 6 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/fetch/authorised-value-api-client.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index e89a1336e3..60264eb4bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -29,6 +29,10 @@
 [% Asset.css("css/print.css", { media = "print" }) | $raw %]
 [% INCLUDE intranetstylesheet.inc %]
 [% IF ( bidi ) %][% Asset.css("css/right-to-left.css") | $raw %][% END %]
+<script type="module">
+    import { APIClient } from '/intranet-tmpl/prog/js/fetch/api-client.js';
+    window.APIClient = APIClient;
+</script>
 
 <script>
 var Koha = {};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index 5b66241152..7b51a5703e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -689,11 +689,6 @@
             HandleMulti(Cancel, $(this).data('ar-id'), $(this));
         });
 
-    </script>
-
-    <script async type="module">
-        import { APIClient } from '/intranet-tmpl/prog/js/fetch/api-client.js';
-
         async function Process( id, a ) {
             var table_row = a.closest('tr');
             var table = a.closest('table');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 4295e07a7d..98f72ebc77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -415,10 +415,7 @@
                 $('#format option[value="'+first_format+'"]').attr('selected', true);
             }
         });
-    </script>
 
-    <script async type="module">
-        import { APIClient } from '/intranet-tmpl/prog/js/fetch/api-client.js';
         $(".ar-update-branchcode").on('change', async function(e){
             var branchcode = this.value;
             var c = confirm(_("Are you sure you want to change the pickup library from %s to %s for this request?").format( previous_branchcode, branchcode ));
diff --git a/koha-tmpl/intranet-tmpl/prog/js/cataloging.js b/koha-tmpl/intranet-tmpl/prog/js/cataloging.js
index 01c9bcfe99..0673a50733 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cataloging.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cataloging.js
@@ -625,24 +625,18 @@ $(document).ready(function() {
             var description      = form.description.value;
             var opac_description = form.opac_description.value;
 
-            var data = "category="+encodeURIComponent(category)
-                +"&value="+encodeURIComponent(value)
-                +"&description="+encodeURIComponent(description)
-                +"&opac_description="+encodeURIComponent(opac_description);
-            $.ajax({
-                type: "POST",
-                url: "/cgi-bin/koha/svc/authorised_values",
-                data: data,
-                success: function(response) {
+            const client = APIClient.authorised_value;
+            client.values.create({category, value, description, opac_description}).then(
+                success => {
                     $('#avCreate').modal('hide');
 
-                    $(current_select2).append('<option selected value="'+response.value+'">'+response.description+'</option>');
+                    $(current_select2).append('<option selected value="'+success.value+'">'+success.description+'</option>');
                     $("#avCreate").modal("hide");
                 },
-                error: function() {
+                error => {
                     $(".avCreate_error").html(__("Something went wrong. Maybe the value already exists?")).show();
                 }
-            });
+            );
             return false;
         }
     });
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/api-client.js
index ed27a7c36c..0f9b151067 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/api-client.js
@@ -1,5 +1,7 @@
 import ArticleRequestAPIClient from "./article-request-api-client.js";
+import AVAPIClient from "./authorised-value-api-client.js";
 
 export const APIClient = {
     article_request: new ArticleRequestAPIClient(),
+    authorised_value: new AVAPIClient(),
 };
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/authorised-value-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/authorised-value-api-client.js
new file mode 100644
index 0000000000..091947a4fa
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/authorised-value-api-client.js
@@ -0,0 +1,30 @@
+import HttpClient from "./http-client.js";
+
+export class AVAPIClient extends HttpClient {
+    constructor() {
+        super({
+            baseURL: "/cgi-bin/koha/svc/authorised_values",
+            headers: {
+                "Content-Type":
+                    "application/x-www-form-urlencoded;charset=utf-8",
+            },
+        });
+    }
+
+    get values() {
+        return {
+            create: value =>
+                this.post({
+                    endpoint: "",
+                    body: "category=%s&value=%s&description=%s&opac_description=%s".format(
+                        encodeURIComponent(value.category),
+                        encodeURIComponent(value.value),
+                        encodeURIComponent(value.description),
+                        encodeURIComponent(value.opac_description),
+                    ),
+                }),
+        };
+    }
+}
+
+export default AVAPIClient;
-- 
2.39.5