kmod-cli 1.4.7 → 1.4.9

package/component-templates/providers/refine-provider.tsx

@@ -92,7 +92,7 @@ export interface DeleteManyParams {
 }
 
 export interface CustomParams {
-  url: string;
+  url?: string;
   method?: 'get' | 'post' | 'put' | 'patch' | 'delete';
   payload?: any;
   query?: Record<string, any>;
@@ -160,6 +160,8 @@ export interface UseMutationOptions<TData = any> {
   onError?: (error: DataProviderError) => void;
 }
 
+export type Payload = any;
+
 // ============ UTILITY FUNCTIONS ============
 
 /**
@@ -215,16 +217,23 @@ class DataProvider {
   private options: Required<DataProviderOptions>;
 
   constructor(
-    apiUrl: string, 
-    httpClient: AxiosInstance = axios, 
+    httpClient: AxiosInstance = axios.create(), 
     options: DataProviderOptions = {}
   ) {
-    this.apiUrl = apiUrl.endsWith('/') ? apiUrl.slice(0, -1) : apiUrl;
     this.httpClient = httpClient;
+    
+    // Lấy baseURL từ httpClient
+    const baseURL = httpClient.defaults.baseURL || '';
+    this.apiUrl = baseURL.endsWith('/') ? baseURL.slice(0, -1) : baseURL;
+    
+    if (!this.apiUrl) {
+      console.warn('[DataProvider] No baseURL found in httpClient. Please set baseURL when creating httpClient.');
+    }
+    
     this.cache = new Map();
     this.options = {
       cacheTime: 5 * 60 * 1000,
-      retryCount: 3,
+      retryCount: 1,
       retryDelay: 1000,
       debug: false,
       ...options
@@ -646,15 +655,17 @@ class DataProvider {
   }
 
   async custom<T = any>(params: CustomParams): Promise<CustomResponse<T>> {
-    const { url, method = 'get', payload, query, headers } = params;
-    
+    const { url , method = 'get', payload, query, headers } = params;
+
+    if (!url) throw this.handleError("No url provided");
     try {
       return await this.retryRequest(async () => {
-        const fullUrl = url.startsWith('http') ? url : `${this.apiUrl}${url}`;
-        this.log(`${method.toUpperCase()} ${fullUrl}`, { payload, query });
-        
+        // if url is not absolute, assume it's a relative path
+        const requestUrl = url.startsWith('http') ? url : url;
+        this.log(`${method.toUpperCase()} ${requestUrl}`, { payload, query });
+
         const response = await this.httpClient<T>({
-          url: fullUrl,
+          url: requestUrl,
           method,
           data: payload,
           params: query,
@@ -793,7 +804,7 @@ export function useOne<T = any>(
 
 export function useCreate<T = any, V = any>(
   resource: string,
-  options: UseMutationOptions<T> = {}
+  options: UseMutationOptions<T>
 ) {
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<DataProviderError | null>(null);
@@ -807,7 +818,9 @@ export function useCreate<T = any, V = any>(
     setError(null);
     
     try {
-      const result = await dataProvider.create<T, V>(resource, { variables });
+      const result = await dataProvider.create<T, V>(resource, { 
+        variables
+       });
       if (onSuccess) {
         onSuccess(result.data);
       }
@@ -829,7 +842,7 @@ export function useCreate<T = any, V = any>(
 
 export function useUpdate<T = any, V = any>(
   resource: string,
-  options: UseMutationOptions<T> = {}
+  options: UseMutationOptions<T>
 ) {
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<DataProviderError | null>(null);
@@ -868,7 +881,7 @@ export function useUpdate<T = any, V = any>(
 
 export function useDelete<T = any>(
   resource: string,
-  options: UseMutationOptions<T> = {}
+  options: UseMutationOptions<T>
 ) {
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<DataProviderError | null>(null);
@@ -907,23 +920,29 @@ export function useDelete<T = any>(
 
 export function useCustom<T = any>(
   resource: string,
-  options: UseMutationOptions<T> = {}
+  options: UseMutationOptions<T> & CustomParams
 ) {
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<DataProviderError | null>(null);
   const [customData, setCustomData] = useState<T | null>(null);
 
   const dataProvider = useDataProvider();
-  
+
   const { onSuccess, onError } = options;
-  
+
   const mutate = useCallback(
-    async (variables: any): Promise<T> => {
+    async (variables?: Payload): Promise<T> => {
       setLoading(true);
       setError(null);
-      
+
       try {
-        const result = await dataProvider.custom<T>({ url: resource, ...variables });
+        const result = await dataProvider.custom<T>({
+          url: resource,
+          payload: variables || options.payload || {},
+          method: options.method,
+          headers: options.headers,
+          query: options.query,
+        });
         if (onSuccess) {
           onSuccess(result.data);
         }
@@ -939,10 +958,10 @@ export function useCustom<T = any>(
       } finally {
         setLoading(false);
       }
-    }, 
+    },
     [dataProvider, resource, onSuccess, onError]
   );
-  
+
   return { mutate, loading, error, data: customData };
 }
 
@@ -1188,7 +1207,7 @@ export const cookiesProvider = {
 // });
 
 // const { data, isLoading, error } = useCustom<DataResponse>({
-//   url: '/route_name',
+//   url: '/route_name or api_url/route/...',
 //   method: 'post',
 //   payload: {},
 // });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmod-cli",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "Stack components utilities fast setup in projects",
   "author": "kumo_d",
   "license": "MIT",