Merge branch 'd2api-updates'

dhis2 · Nov 25, 2024 · 32d802c · 32d802c
2 parents 4d0dd13 + bd1ed8b
commit 32d802c
Showing 1 changed file with 40 additions and 9 deletions.
diff --git a/src/js/d2api.js b/src/js/d2api.js
@@ -1,7 +1,3 @@
-const dhisDevConfig = DHIS_CONFIG;  
-const isDev = "baseUrl" in dhisDevConfig;
-const baseUrl = isDev ? dhisDevConfig.baseUrl : "../../..";
-
 // Helper function to set headers for development mode
 const getHeaders = () => {
     let headers = new Headers();
@@ -35,7 +31,17 @@ const validateUID = (endpoint) => {
 };
 
 
-//GET from API async
+// Helper function to handle API errors and throw detailed error messages
+const handleApiError = async (response) => {
+    let errorMessage = "Network response was not ok";
+    let errorDetail = await response.json(); // Capture the error response body text
+
+    errorMessage = errorDetail.message || errorMessage;
+
+    throw new Error(`${response.statusText} - ${errorMessage}`);
+};
+
+// GET from API async
 export const d2Get = async (endpoint) => {
     try {
         endpoint = formatEndpoint(endpoint);
@@ -45,7 +51,7 @@ export const d2Get = async (endpoint) => {
             headers: headers
         });
         if (!response.ok) {
-            throw new Error("Network response was not ok " + response.statusText);
+            await handleApiError(response); // Handle the error response
         }
         let data = await response.json();
         return data;
@@ -56,7 +62,7 @@ export const d2Get = async (endpoint) => {
     }
 };
 
-//POST to API async
+// POST to API async
 export const d2PostJson = async (endpoint, body) => {
     try {
         endpoint = formatEndpoint(endpoint);
@@ -68,7 +74,7 @@ export const d2PostJson = async (endpoint, body) => {
             body: JSON.stringify(body)
         });
         if (!response.ok) {
-            throw new Error("Network response was not ok " + response.statusText);
+            await handleApiError(response); // Handle the error response
         }
         let data = await response.json();
         return data;
@@ -96,7 +102,7 @@ export const d2PutJson = async (endpoint, body) => {
             body: JSON.stringify(body)
         });
         if (!response.ok) {
-            throw new Error("Network response was not ok " + response.statusText);
+            await handleApiError(response); // Handle the error response
         }
         let data = await response.json();
         return data;
@@ -106,3 +112,28 @@ export const d2PutJson = async (endpoint, body) => {
         throw error;
     }
 };
+
+// DELETE from API async
+export const d2Delete = async (endpoint) => {
+    try {
+        endpoint = formatEndpoint(endpoint);
+
+        if (!validateUID(endpoint)) {
+            console.warn("Warning: The endpoint does not end with a valid 11-character UID");
+        }
+
+        let headers = getHeaders();
+        let response = await fetch(baseUrl + endpoint, {
+            method: "DELETE",
+            headers: headers
+        });
+        if (!response.ok) {
+            await handleApiError(response); // Handle the error response
+        }
+        return { status: "success" };
+    } catch (error) {
+        console.log("ERROR in DELETE:");
+        console.log(error);
+        throw error;
+    }
+};