From b479414bc232049d5c64a93139c44b087ae25598 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 12 Jun 2024 00:54:22 +0200
Subject: [PATCH] [FIX] callbacks elements

---
 .../externalRestApi/typescript/TsApiGeneration.java  |  4 ++--
 src/resources/rest-tools.ts                          | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java b/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java
index c9d18b4..b1b470d 100644
--- a/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java
+++ b/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java
@@ -192,7 +192,7 @@ public class TsApiGeneration {
 				data.append("\n\t\t\tdata,");
 			}
 			if (needGenerateProgress) {
-				data.append("\n\t\t\tcallback,");
+				data.append("\n\t\t\tcallbacks,");
 			}
 			data.append("\n\t\t}: {");
 			data.append("\n\t\trestConfig: RESTConfig,");
@@ -350,7 +350,7 @@ public class TsApiGeneration {
 				data.append("\n\t\t\tdata,");
 			}
 			if (needGenerateProgress) {
-				data.append("\n\t\t\tcallback,");
+				data.append("\n\t\t\tcallbacks,");
 			}
 			data.append("\n\t\t}");
 			if (returnComplexModel != null) {
diff --git a/src/resources/rest-tools.ts b/src/resources/rest-tools.ts
index 041f350..2fac824 100644
--- a/src/resources/rest-tools.ts
+++ b/src/resources/rest-tools.ts
@@ -237,7 +237,7 @@ export function RESTRequest({
   data,
   params,
   queries,
-  callback,
+  callbacks,
 }: RESTRequestType): Promise<ModelResponseHttp> {
   // Create the URL PATH:
   let generateUrl = RESTUrl({ restModel, restConfig, data, params, queries });
@@ -268,10 +268,10 @@ export function RESTRequest({
   return new Promise((resolve, reject) => {
     let action: undefined | Promise<Response> = undefined;
     if (
-      isNullOrUndefined(callback) ||
-      (isNullOrUndefined(callback.progressDownload) &&
-        isNullOrUndefined(callback.progressUpload) &&
-        isNullOrUndefined(callback.abortHandle))
+      isNullOrUndefined(callbacks) ||
+      (isNullOrUndefined(callbacks.progressDownload) &&
+        isNullOrUndefined(callbacks.progressUpload) &&
+        isNullOrUndefined(callbacks.abortHandle))
     ) {
       // No information needed: call the generic fetch interface
       action = fetch(generateUrl, {
@@ -288,7 +288,7 @@ export function RESTRequest({
           headers,
           body,
         },
-        callback
+        callbacks
       );
     }
     action