@edraj/tsdmart 2.0.0 → 2.1.1

package/dmart.model.ts

@@ -3,6 +3,17 @@ export enum Status {
   failed = "failed",
 }
 
+export interface ClientError {
+    code: string,
+    status: string,
+    message: string,
+    request?: {
+        url: string, 
+        method: string
+    },
+    response: ApiResponse
+}
+
 export type Error = {
   type: string;
   code: number;
@@ -236,10 +247,10 @@ export enum ContentTypeMedia {
 export type Payload = {
   content_type: ContentType;
   schema_shortname?: string;
-  checksum: string;
+  checksum?: string;
   body: string | Record<string, any> | any;
-  last_validated: string;
-  validation_status: "valid" | "invalid";
+  last_validated?: string;
+  validation_status?: "valid" | "invalid";
 };
 
 export type MetaExtended = {

package/dmart.service.ts

@@ -4,6 +4,7 @@ import {
     ActionResponse,
     ApiQueryResponse,
     ApiResponse,
+    ClientError,
     ContentType,
     headers,
     LoginResponse,
@@ -16,14 +17,25 @@ import {
     Status,
 } from "./dmart.model";
 
-
 axios.defaults.withCredentials = true;
 axios.defaults.baseURL = "http://localhost:8282";
 
+axios.interceptors.response.use(null, function (error) {
+  // need error.code (enum), error.status (same), error.message (axios)
+  // error.response.data (dmart), error.response.config. method, url,
+  const err: ClientError = {
+    code: error.code,
+    status: error.status,
+    message: error.message,
+    request: {url: error.response?.config?.url, method: error.response?.config?.method},
+    response: error.response?.data
+  }
+  return Promise.reject(err);
+});
 export const dmartClient = axios;
 
 export class Dmart {
-//   static baseURL = "http://localhost:8282";
+  //   static baseURL = "http://localhost:8282";
 
   public static async login(shortname: string, password: string) {
     try {
@@ -114,12 +126,9 @@ export class Dmart {
 
   public static async get_profile() {
     try {
-      const { data } = await axios.get<ProfileResponse>(
-        `user/profile`,
-        {
-          headers,
-        }
-      );
+      const { data } = await axios.get<ProfileResponse>(`user/profile`, {
+        headers,
+      });
       if (typeof localStorage !== "undefined" && data.status === "success") {
         localStorage.setItem(
           "permissions",
@@ -187,16 +196,10 @@ export class Dmart {
   }
 
   public static async request(action: ActionRequest): Promise<ActionResponse> {
-    try {
-      const { data } = await axios.post<ActionResponse>(
-        `managed/request`,
-        action,
-        { headers }
-      );
-      return data;
-    } catch (error: any) {
-      throw error;
-    }
+    const res = await axios.post<ActionResponse>(`managed/request`, action, {
+      headers,
+    });
+    return res?.data;
   }
 
   public static async retrieve_entry(
@@ -229,7 +232,8 @@ export class Dmart {
     resource_type: ResourceType,
     payload_file: File,
     content_type?: ContentType,
-    schema_shortname?: string
+    schema_shortname?: string,
+    scope: string = "managed"
   ): Promise<ApiResponse> {
     const request_record_body: any = {
       resource_type,
@@ -258,7 +262,7 @@ export class Dmart {
 
     try {
       const { data } = await axios.post<ApiResponse>(
-        `managed/resource_with_payload`,
+        `${scope}/resource_with_payload`,
         form_data,
         { headers }
       );
@@ -276,8 +280,7 @@ export class Dmart {
     subpath: string,
     shortname: string,
     query_string?: string,
-    filter_data_assets?: string[],
-    branch_name?: string
+    filter_data_assets?: string[]
   ) {
     try {
       const url = `managed/data-asset`;
@@ -291,7 +294,6 @@ export class Dmart {
           shortname,
           query_string: query_string ?? "SELECT * FROM file",
           filter_data_assets,
-          branch_name,
         },
         { headers }
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edraj/tsdmart",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "A TypeScript implementation of the Dmart that depends on axios.",
   "author": "Kefah T. Issa",
   "email": "kefah.issa@gmail.com",