@abpjs/tenant-management 3.2.0 → 4.0.0

package/dist/hooks/useTenantManagement.d.ts

@@ -1,5 +1,4 @@
-import { ABP } from '@abpjs/core';
-import { TenantManagement } from '../models';
+import type { TenantDto, TenantCreateDto, TenantUpdateDto, GetTenantsInput } from '../proxy/models';
 /**
  * Result from tenant management operations
  */
@@ -19,14 +18,15 @@ export type SortOrder = 'asc' | 'desc' | '';
 export type ModalContentType = 'saveConnStr' | 'saveTenant';
 /**
  * Return type for useTenantManagement hook
+ * @since 4.0.0 - Uses TenantDto, TenantCreateDto, TenantUpdateDto instead of legacy types
  */
 export interface UseTenantManagementReturn {
     /** List of tenants */
-    tenants: TenantManagement.Item[];
+    tenants: TenantDto[];
     /** Total count of tenants */
     totalCount: number;
     /** Currently selected tenant */
-    selectedTenant: TenantManagement.Item | null;
+    selectedTenant: TenantDto | null;
     /** Loading state */
     isLoading: boolean;
     /** Error message if any */
@@ -42,13 +42,13 @@ export interface UseTenantManagementReturn {
     /** Whether the save button should be disabled @since 1.1.0 */
     isDisabledSaveButton: boolean;
     /** Fetch all tenants (with optional params) */
-    fetchTenants: (params?: ABP.PageQueryParams) => Promise<TenantManagementResult>;
+    fetchTenants: (input?: Partial<GetTenantsInput>) => Promise<TenantManagementResult>;
     /** Fetch a tenant by ID */
     fetchTenantById: (id: string) => Promise<TenantManagementResult>;
     /** Create a new tenant */
-    createTenant: (data: TenantManagement.AddRequest) => Promise<TenantManagementResult>;
+    createTenant: (data: TenantCreateDto) => Promise<TenantManagementResult>;
     /** Update an existing tenant */
-    updateTenant: (data: TenantManagement.UpdateRequest) => Promise<TenantManagementResult>;
+    updateTenant: (id: string, data: TenantUpdateDto) => Promise<TenantManagementResult>;
     /** Delete a tenant */
     deleteTenant: (id: string) => Promise<TenantManagementResult>;
     /** Fetch connection string for a tenant */
@@ -58,7 +58,7 @@ export interface UseTenantManagementReturn {
     /** Delete connection string (use shared database) */
     deleteConnectionString: (id: string) => Promise<TenantManagementResult>;
     /** Set selected tenant */
-    setSelectedTenant: (tenant: TenantManagement.Item | null) => void;
+    setSelectedTenant: (tenant: TenantDto | null) => void;
     /** Set use shared database flag */
     setUseSharedDatabase: (value: boolean) => void;
     /** Set default connection string */
@@ -87,6 +87,8 @@ export interface UseTenantManagementReturn {
  * management modal. It handles fetching, creating, updating, and deleting tenants,
  * as well as managing connection strings.
  *
+ * @since 4.0.0 - Uses TenantService (proxy) instead of TenantManagementService
+ *
  * @example
  * ```tsx
  * function TenantModal() {

package/dist/index.d.ts

@@ -1,7 +1,18 @@
 /**
  * @abpjs/tenant-management
  * ABP Framework Tenant Management module for React
- * Translated from @abp/ng.tenant-management v3.2.0
+ * Translated from @abp/ng.tenant-management v4.0.0
+ *
+ * Changes in v4.0.0:
+ * - BREAKING: Removed TenantManagementService (use TenantService from proxy instead)
+ * - BREAKING: Removed deprecated types: TenantManagement.Response, Item, AddRequest, UpdateRequest, DefaultConnectionStringRequest
+ * - BREAKING: useTenantManagement hook now uses TenantService (proxy) internally
+ * - BREAKING: updateTenant signature changed from (data: {id, name}) to (id: string, data: TenantUpdateDto)
+ * - BREAKING: createTenant now takes TenantCreateDto instead of TenantManagement.AddRequest
+ * - BREAKING: fetchTenants now takes Partial<GetTenantsInput> instead of ABP.PageQueryParams
+ * - Updated TenantManagementStateService to use TenantService instead of TenantManagementService
+ * - Updated TenantManagementStateService dispatch methods to use proxy DTOs
+ * - Updated TenantsComponentInputs to use TenantDto instead of legacy Item type
  *
  * Changes in v3.2.0:
  * - Added proxy submodule with typed DTOs and TenantService

package/dist/index.js

@@ -24,7 +24,6 @@ __export(index_exports, {
   TENANT_MANAGEMENT_ROUTE_PATHS: () => TENANT_MANAGEMENT_ROUTE_PATHS,
   TENANT_MANAGEMENT_ROUTE_PROVIDERS: () => TENANT_MANAGEMENT_ROUTE_PROVIDERS,
   TenantManagementModal: () => TenantManagementModal,
-  TenantManagementService: () => TenantManagementService,
   TenantManagementStateService: () => TenantManagementStateService,
   TenantService: () => TenantService,
   configureRoutes: () => configureRoutes,
@@ -212,117 +211,11 @@ var TenantService = class {
   }
 };
 
-// src/services/tenant-management.service.ts
-var TenantManagementService = class {
-  constructor(rest) {
-    /**
-     * The API name used for REST requests.
-     * @since 2.4.0
-     */
-    this.apiName = "default";
-    this.rest = rest;
-  }
-  /**
-   * Get all tenants (paginated)
-   * @param params Optional pagination and filter parameters
-   * @returns Promise with paginated tenant response
-   */
-  getAll(params = {}) {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/multi-tenancy/tenants",
-      params
-    });
-  }
-  /**
-   * Get a tenant by ID
-   * @param id Tenant ID
-   * @returns Promise with tenant item
-   */
-  getById(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/multi-tenancy/tenants/${id}`
-    });
-  }
-  /**
-   * Create a new tenant
-   * @param body Tenant creation request
-   * @returns Promise with created tenant item
-   */
-  create(body) {
-    return this.rest.request({
-      method: "POST",
-      url: "/api/multi-tenancy/tenants",
-      body
-    });
-  }
-  /**
-   * Update an existing tenant
-   * @param body Tenant update request (includes id)
-   * @returns Promise with updated tenant item
-   */
-  update(body) {
-    const { id, ...data } = body;
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/multi-tenancy/tenants/${id}`,
-      body: data
-    });
-  }
-  /**
-   * Delete a tenant
-   * @param id Tenant ID
-   * @returns Promise that resolves when deletion completes
-   */
-  delete(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/multi-tenancy/tenants/${id}`
-    });
-  }
-  /**
-   * Get default connection string for a tenant
-   * @param id Tenant ID
-   * @returns Promise with connection string (empty string if using shared database)
-   */
-  getDefaultConnectionString(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`
-    });
-  }
-  /**
-   * Update default connection string for a tenant
-   * @param payload Request with tenant ID and connection string
-   * @returns Promise that resolves when update completes
-   */
-  updateDefaultConnectionString(payload) {
-    const { id, defaultConnectionString } = payload;
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`,
-      params: { defaultConnectionString }
-    });
-  }
-  /**
-   * Delete default connection string for a tenant (use shared database)
-   * @param id Tenant ID
-   * @returns Promise that resolves when deletion completes
-   */
-  deleteDefaultConnectionString(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`
-    });
-  }
-};
-
 // src/services/tenant-management-state.service.ts
 var TenantManagementStateService = class {
   /**
    * Constructor
-   * @param tenantService Optional TenantManagementService for dispatch methods (v2.0.0)
+   * @param tenantService Optional TenantService for dispatch methods (v4.0.0: uses TenantService instead of TenantManagementService)
    */
   constructor(tenantService) {
     this._tenants = [];
@@ -360,15 +253,6 @@ var TenantManagementStateService = class {
     this._totalCount = count;
     this.notifySubscribers();
   }
-  /**
-   * Update state from a response
-   * @internal
-   */
-  updateFromResponse(response) {
-    this._tenants = [...response.items];
-    this._totalCount = response.totalCount;
-    this.notifySubscribers();
-  }
   /**
    * Reset the state to initial values
    */
@@ -392,67 +276,79 @@ var TenantManagementStateService = class {
     this._subscribers.forEach((callback) => callback());
   }
   // ========================
-  // Dispatch Methods (v2.0.0)
+  // Dispatch Methods (v2.0.0, updated v4.0.0)
   // ========================
   /**
    * Dispatch GetTenants action - fetches tenants from API and updates state
-   * @param params Optional pagination parameters
-   * @returns Promise with the tenant response
+   * @param input Query parameters for tenant list
+   * @returns Promise with the paged tenant result
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantService.getList with GetTenantsInput
    */
-  async dispatchGetTenants(params) {
+  async dispatchGetTenants(input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchGetTenants. Pass it to the constructor."
+        "TenantService is required for dispatchGetTenants. Pass it to the constructor."
       );
     }
-    const response = await this._tenantService.getAll(params);
-    this.updateFromResponse(response);
+    const response = await this._tenantService.getList({
+      filter: "",
+      maxResultCount: 10,
+      skipCount: 0,
+      ...input
+    });
+    this._tenants = [...response.items ?? []];
+    this._totalCount = response.totalCount ?? 0;
+    this.notifySubscribers();
     return response;
   }
   /**
    * Dispatch GetTenantById action - fetches a single tenant by ID
    * @param id Tenant ID
-   * @returns Promise with the tenant item
+   * @returns Promise with the tenant DTO
    * @since 2.0.0
+   * @since 4.0.0 - Returns TenantDto instead of TenantManagement.Item
    */
   async dispatchGetTenantById(id) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchGetTenantById. Pass it to the constructor."
+        "TenantService is required for dispatchGetTenantById. Pass it to the constructor."
       );
     }
-    return this._tenantService.getById(id);
+    return this._tenantService.get(id);
   }
   /**
    * Dispatch CreateTenant action - creates a new tenant and refreshes the list
-   * @param body Tenant creation request
+   * @param input Tenant creation data
    * @returns Promise with the created tenant
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantCreateDto instead of TenantManagement.AddRequest
    */
-  async dispatchCreateTenant(body) {
+  async dispatchCreateTenant(input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchCreateTenant. Pass it to the constructor."
+        "TenantService is required for dispatchCreateTenant. Pass it to the constructor."
       );
     }
-    const result = await this._tenantService.create(body);
+    const result = await this._tenantService.create(input);
     await this.dispatchGetTenants();
     return result;
   }
   /**
    * Dispatch UpdateTenant action - updates an existing tenant and refreshes the list
-   * @param body Tenant update request
+   * @param id Tenant ID
+   * @param input Tenant update data
    * @returns Promise with the updated tenant
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantUpdateDto instead of TenantManagement.UpdateRequest, takes id separately
    */
-  async dispatchUpdateTenant(body) {
+  async dispatchUpdateTenant(id, input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchUpdateTenant. Pass it to the constructor."
+        "TenantService is required for dispatchUpdateTenant. Pass it to the constructor."
       );
     }
-    const result = await this._tenantService.update(body);
+    const result = await this._tenantService.update(id, input);
     await this.dispatchGetTenants();
     return result;
   }
@@ -465,7 +361,7 @@ var TenantManagementStateService = class {
   async dispatchDeleteTenant(id) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchDeleteTenant. Pass it to the constructor."
+        "TenantService is required for dispatchDeleteTenant. Pass it to the constructor."
       );
     }
     await this._tenantService.delete(id);
@@ -485,7 +381,7 @@ var import_react = require("react");
 var import_core2 = require("@abpjs/core");
 function useTenantManagement() {
   const restService = (0, import_core2.useRestService)();
-  const service = (0, import_react.useMemo)(() => new TenantManagementService(restService), [restService]);
+  const service = (0, import_react.useMemo)(() => new TenantService(restService), [restService]);
   const [tenants, setTenants] = (0, import_react.useState)([]);
   const [totalCount, setTotalCount] = (0, import_react.useState)(0);
   const [selectedTenant, setSelectedTenant] = (0, import_react.useState)(null);
@@ -497,13 +393,18 @@ function useTenantManagement() {
   const [sortOrder, setSortOrder] = (0, import_react.useState)("");
   const [visibleFeatures, setVisibleFeatures] = (0, import_react.useState)(false);
   const [featuresProviderKey, setFeaturesProviderKey] = (0, import_react.useState)("");
-  const fetchTenants = (0, import_react.useCallback)(async (params) => {
+  const fetchTenants = (0, import_react.useCallback)(async (input) => {
     setIsLoading(true);
     setError(null);
     try {
-      const response = await service.getAll(params);
-      setTenants(response.items);
-      setTotalCount(response.totalCount);
+      const response = await service.getList({
+        filter: "",
+        maxResultCount: 10,
+        skipCount: 0,
+        ...input
+      });
+      setTenants(response.items ?? []);
+      setTotalCount(response.totalCount ?? 0);
       setIsLoading(false);
       return { success: true };
     } catch (err) {
@@ -518,7 +419,7 @@ function useTenantManagement() {
       setIsLoading(true);
       setError(null);
       try {
-        const tenant = await service.getById(id);
+        const tenant = await service.get(id);
         setSelectedTenant(tenant);
         setIsLoading(false);
         return { success: true };
@@ -537,7 +438,7 @@ function useTenantManagement() {
       setError(null);
       try {
         await service.create(data);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -550,12 +451,12 @@ function useTenantManagement() {
     [service]
   );
   const updateTenant = (0, import_react.useCallback)(
-    async (data) => {
+    async (id, data) => {
       setIsLoading(true);
       setError(null);
       try {
-        await service.update(data);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.update(id, data);
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -573,7 +474,7 @@ function useTenantManagement() {
       setError(null);
       try {
         await service.delete(id);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -609,10 +510,7 @@ function useTenantManagement() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.updateDefaultConnectionString({
-          id,
-          defaultConnectionString: connectionString
-        });
+        await service.updateDefaultConnectionString(id, connectionString);
         setDefaultConnectionString(connectionString);
         setUseSharedDatabase(false);
         setIsLoading(false);
@@ -866,7 +764,7 @@ function TenantManagementModal({
     }
     let result;
     if (isEditing && tenantId) {
-      result = await updateTenant({ id: tenantId, name: tenantName.trim() });
+      result = await updateTenant(tenantId, { name: tenantName.trim() });
     } else {
       const emailValid = validateAdminEmail(adminEmail);
       const passwordValid = validateAdminPassword(adminPassword);
@@ -1091,7 +989,6 @@ TenantManagementModal.componentKey = eTenantManagementComponents.Tenants;
   TENANT_MANAGEMENT_ROUTE_PATHS,
   TENANT_MANAGEMENT_ROUTE_PROVIDERS,
   TenantManagementModal,
-  TenantManagementService,
   TenantManagementStateService,
   TenantService,
   configureRoutes,

package/dist/index.mjs

@@ -173,117 +173,11 @@ var TenantService = class {
   }
 };
 
-// src/services/tenant-management.service.ts
-var TenantManagementService = class {
-  constructor(rest) {
-    /**
-     * The API name used for REST requests.
-     * @since 2.4.0
-     */
-    this.apiName = "default";
-    this.rest = rest;
-  }
-  /**
-   * Get all tenants (paginated)
-   * @param params Optional pagination and filter parameters
-   * @returns Promise with paginated tenant response
-   */
-  getAll(params = {}) {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/multi-tenancy/tenants",
-      params
-    });
-  }
-  /**
-   * Get a tenant by ID
-   * @param id Tenant ID
-   * @returns Promise with tenant item
-   */
-  getById(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/multi-tenancy/tenants/${id}`
-    });
-  }
-  /**
-   * Create a new tenant
-   * @param body Tenant creation request
-   * @returns Promise with created tenant item
-   */
-  create(body) {
-    return this.rest.request({
-      method: "POST",
-      url: "/api/multi-tenancy/tenants",
-      body
-    });
-  }
-  /**
-   * Update an existing tenant
-   * @param body Tenant update request (includes id)
-   * @returns Promise with updated tenant item
-   */
-  update(body) {
-    const { id, ...data } = body;
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/multi-tenancy/tenants/${id}`,
-      body: data
-    });
-  }
-  /**
-   * Delete a tenant
-   * @param id Tenant ID
-   * @returns Promise that resolves when deletion completes
-   */
-  delete(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/multi-tenancy/tenants/${id}`
-    });
-  }
-  /**
-   * Get default connection string for a tenant
-   * @param id Tenant ID
-   * @returns Promise with connection string (empty string if using shared database)
-   */
-  getDefaultConnectionString(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`
-    });
-  }
-  /**
-   * Update default connection string for a tenant
-   * @param payload Request with tenant ID and connection string
-   * @returns Promise that resolves when update completes
-   */
-  updateDefaultConnectionString(payload) {
-    const { id, defaultConnectionString } = payload;
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`,
-      params: { defaultConnectionString }
-    });
-  }
-  /**
-   * Delete default connection string for a tenant (use shared database)
-   * @param id Tenant ID
-   * @returns Promise that resolves when deletion completes
-   */
-  deleteDefaultConnectionString(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/multi-tenancy/tenants/${id}/default-connection-string`
-    });
-  }
-};
-
 // src/services/tenant-management-state.service.ts
 var TenantManagementStateService = class {
   /**
    * Constructor
-   * @param tenantService Optional TenantManagementService for dispatch methods (v2.0.0)
+   * @param tenantService Optional TenantService for dispatch methods (v4.0.0: uses TenantService instead of TenantManagementService)
    */
   constructor(tenantService) {
     this._tenants = [];
@@ -321,15 +215,6 @@ var TenantManagementStateService = class {
     this._totalCount = count;
     this.notifySubscribers();
   }
-  /**
-   * Update state from a response
-   * @internal
-   */
-  updateFromResponse(response) {
-    this._tenants = [...response.items];
-    this._totalCount = response.totalCount;
-    this.notifySubscribers();
-  }
   /**
    * Reset the state to initial values
    */
@@ -353,67 +238,79 @@ var TenantManagementStateService = class {
     this._subscribers.forEach((callback) => callback());
   }
   // ========================
-  // Dispatch Methods (v2.0.0)
+  // Dispatch Methods (v2.0.0, updated v4.0.0)
   // ========================
   /**
    * Dispatch GetTenants action - fetches tenants from API and updates state
-   * @param params Optional pagination parameters
-   * @returns Promise with the tenant response
+   * @param input Query parameters for tenant list
+   * @returns Promise with the paged tenant result
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantService.getList with GetTenantsInput
    */
-  async dispatchGetTenants(params) {
+  async dispatchGetTenants(input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchGetTenants. Pass it to the constructor."
+        "TenantService is required for dispatchGetTenants. Pass it to the constructor."
       );
     }
-    const response = await this._tenantService.getAll(params);
-    this.updateFromResponse(response);
+    const response = await this._tenantService.getList({
+      filter: "",
+      maxResultCount: 10,
+      skipCount: 0,
+      ...input
+    });
+    this._tenants = [...response.items ?? []];
+    this._totalCount = response.totalCount ?? 0;
+    this.notifySubscribers();
     return response;
   }
   /**
    * Dispatch GetTenantById action - fetches a single tenant by ID
    * @param id Tenant ID
-   * @returns Promise with the tenant item
+   * @returns Promise with the tenant DTO
    * @since 2.0.0
+   * @since 4.0.0 - Returns TenantDto instead of TenantManagement.Item
    */
   async dispatchGetTenantById(id) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchGetTenantById. Pass it to the constructor."
+        "TenantService is required for dispatchGetTenantById. Pass it to the constructor."
       );
     }
-    return this._tenantService.getById(id);
+    return this._tenantService.get(id);
   }
   /**
    * Dispatch CreateTenant action - creates a new tenant and refreshes the list
-   * @param body Tenant creation request
+   * @param input Tenant creation data
    * @returns Promise with the created tenant
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantCreateDto instead of TenantManagement.AddRequest
    */
-  async dispatchCreateTenant(body) {
+  async dispatchCreateTenant(input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchCreateTenant. Pass it to the constructor."
+        "TenantService is required for dispatchCreateTenant. Pass it to the constructor."
       );
     }
-    const result = await this._tenantService.create(body);
+    const result = await this._tenantService.create(input);
     await this.dispatchGetTenants();
     return result;
   }
   /**
    * Dispatch UpdateTenant action - updates an existing tenant and refreshes the list
-   * @param body Tenant update request
+   * @param id Tenant ID
+   * @param input Tenant update data
    * @returns Promise with the updated tenant
    * @since 2.0.0
+   * @since 4.0.0 - Uses TenantUpdateDto instead of TenantManagement.UpdateRequest, takes id separately
    */
-  async dispatchUpdateTenant(body) {
+  async dispatchUpdateTenant(id, input) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchUpdateTenant. Pass it to the constructor."
+        "TenantService is required for dispatchUpdateTenant. Pass it to the constructor."
       );
     }
-    const result = await this._tenantService.update(body);
+    const result = await this._tenantService.update(id, input);
     await this.dispatchGetTenants();
     return result;
   }
@@ -426,7 +323,7 @@ var TenantManagementStateService = class {
   async dispatchDeleteTenant(id) {
     if (!this._tenantService) {
       throw new Error(
-        "TenantManagementService is required for dispatchDeleteTenant. Pass it to the constructor."
+        "TenantService is required for dispatchDeleteTenant. Pass it to the constructor."
       );
     }
     await this._tenantService.delete(id);
@@ -446,7 +343,7 @@ import { useState, useCallback, useMemo } from "react";
 import { useRestService } from "@abpjs/core";
 function useTenantManagement() {
   const restService = useRestService();
-  const service = useMemo(() => new TenantManagementService(restService), [restService]);
+  const service = useMemo(() => new TenantService(restService), [restService]);
   const [tenants, setTenants] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
   const [selectedTenant, setSelectedTenant] = useState(null);
@@ -458,13 +355,18 @@ function useTenantManagement() {
   const [sortOrder, setSortOrder] = useState("");
   const [visibleFeatures, setVisibleFeatures] = useState(false);
   const [featuresProviderKey, setFeaturesProviderKey] = useState("");
-  const fetchTenants = useCallback(async (params) => {
+  const fetchTenants = useCallback(async (input) => {
     setIsLoading(true);
     setError(null);
     try {
-      const response = await service.getAll(params);
-      setTenants(response.items);
-      setTotalCount(response.totalCount);
+      const response = await service.getList({
+        filter: "",
+        maxResultCount: 10,
+        skipCount: 0,
+        ...input
+      });
+      setTenants(response.items ?? []);
+      setTotalCount(response.totalCount ?? 0);
       setIsLoading(false);
       return { success: true };
     } catch (err) {
@@ -479,7 +381,7 @@ function useTenantManagement() {
       setIsLoading(true);
       setError(null);
       try {
-        const tenant = await service.getById(id);
+        const tenant = await service.get(id);
         setSelectedTenant(tenant);
         setIsLoading(false);
         return { success: true };
@@ -498,7 +400,7 @@ function useTenantManagement() {
       setError(null);
       try {
         await service.create(data);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -511,12 +413,12 @@ function useTenantManagement() {
     [service]
   );
   const updateTenant = useCallback(
-    async (data) => {
+    async (id, data) => {
       setIsLoading(true);
       setError(null);
       try {
-        await service.update(data);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.update(id, data);
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -534,7 +436,7 @@ function useTenantManagement() {
       setError(null);
       try {
         await service.delete(id);
-        await service.getAll().then((response) => setTenants(response.items));
+        await service.getList({ filter: "", maxResultCount: 10, skipCount: 0 }).then((response) => setTenants(response.items ?? []));
         setIsLoading(false);
         return { success: true };
       } catch (err) {
@@ -570,10 +472,7 @@ function useTenantManagement() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.updateDefaultConnectionString({
-          id,
-          defaultConnectionString: connectionString
-        });
+        await service.updateDefaultConnectionString(id, connectionString);
         setDefaultConnectionString(connectionString);
         setUseSharedDatabase(false);
         setIsLoading(false);
@@ -833,7 +732,7 @@ function TenantManagementModal({
     }
     let result;
     if (isEditing && tenantId) {
-      result = await updateTenant({ id: tenantId, name: tenantName.trim() });
+      result = await updateTenant(tenantId, { name: tenantName.trim() });
     } else {
       const emailValid = validateAdminEmail(adminEmail);
       const passwordValid = validateAdminPassword(adminPassword);
@@ -1057,7 +956,6 @@ export {
   TENANT_MANAGEMENT_ROUTE_PATHS,
   TENANT_MANAGEMENT_ROUTE_PROVIDERS,
   TenantManagementModal,
-  TenantManagementService,
   TenantManagementStateService,
   TenantService,
   configureRoutes,

package/dist/models/index.d.ts

@@ -1,8 +1,8 @@
 /**
  * Tenant Management module type definitions
- * Translated from @abp/ng.tenant-management v3.2.0
+ * Translated from @abp/ng.tenant-management v4.0.0
  */
-import type { ABP, PagedResultDto } from '@abpjs/core';
+import type { PagedResultDto } from '@abpjs/core';
 import type { TenantDto } from '../proxy/models';
 /**
  * TenantManagement namespace containing all tenant-related types
@@ -16,60 +16,16 @@ export declare namespace TenantManagement {
         result: PagedResultDto<TenantDto>;
         selectedItem: TenantDto;
     }
-    /**
-     * API response for tenant list (paginated)
-     * @deprecated To be deleted in v4.0. Use PagedResultDto<TenantDto> from @abpjs/core instead.
-     */
-    type Response = ABP.PagedResponse<Item>;
-    /**
-     * Single tenant item
-     * @deprecated To be deleted in v4.0. Use TenantDto from '@abpjs/tenant-management/proxy' instead.
-     */
-    interface Item {
-        id: string;
-        name: string;
-    }
-    /**
-     * Request payload for creating a new tenant
-     * @since 2.4.0 Added adminEmailAddress and adminPassword fields
-     * @deprecated To be deleted in v4.0. Use TenantCreateDto from '@abpjs/tenant-management/proxy' instead.
-     */
-    interface AddRequest {
-        /** Admin email address for the new tenant */
-        adminEmailAddress: string;
-        /** Admin password for the new tenant */
-        adminPassword: string;
-        /** Tenant name */
-        name: string;
-    }
-    /**
-     * Request payload for updating an existing tenant
-     * @since 2.4.0 No longer extends AddRequest (only id and name needed for update)
-     * @deprecated To be deleted in v4.0. Use TenantUpdateDto from '@abpjs/tenant-management/proxy' instead.
-     */
-    interface UpdateRequest {
-        /** Tenant ID */
-        id: string;
-        /** Tenant name */
-        name: string;
-    }
-    /**
-     * Request payload for updating tenant's default connection string
-     * @deprecated To be deleted in v4.0. Use TenantService.updateDefaultConnectionString instead.
-     */
-    interface DefaultConnectionStringRequest {
-        id: string;
-        defaultConnectionString: string;
-    }
     /**
      * Input props for TenantsComponent
      * @since 2.0.0
+     * @since 4.0.0 - Uses TenantDto instead of legacy Item type
      */
     interface TenantsComponentInputs {
         /** Callback when tenant is created */
-        readonly onTenantCreated?: (tenant: Item) => void;
+        readonly onTenantCreated?: (tenant: TenantDto) => void;
         /** Callback when tenant is updated */
-        readonly onTenantUpdated?: (tenant: Item) => void;
+        readonly onTenantUpdated?: (tenant: TenantDto) => void;
         /** Callback when tenant is deleted */
         readonly onTenantDeleted?: (id: string) => void;
     }

package/dist/proxy/models.d.ts

@@ -20,9 +20,11 @@ export interface GetTenantsInput extends PagedAndSortedResultRequestDto {
  * Extends ExtensibleObject for extra properties support.
  * @since 3.2.0
  */
-export interface TenantCreateOrUpdateDtoBase extends ExtensibleObject {
+export interface TenantCreateOrUpdateDtoBase extends Omit<ExtensibleObject, 'extraProperties'> {
     /** The name of the tenant */
     name: string;
+    /** Extra properties (optional, defaults to empty object) */
+    extraProperties?: Record<string, any>;
 }
 /**
  * DTO for creating a new tenant.
@@ -47,7 +49,9 @@ export interface TenantUpdateDto extends TenantCreateOrUpdateDtoBase {
  * Extends ExtensibleEntityDto with string ID.
  * @since 3.2.0
  */
-export interface TenantDto extends ExtensibleEntityDto<string> {
+export interface TenantDto extends Omit<ExtensibleEntityDto<string>, 'extraProperties'> {
     /** The name of the tenant */
     name: string;
+    /** Extra properties (optional, defaults to empty object) */
+    extraProperties?: Record<string, any>;
 }

package/dist/services/index.d.ts

@@ -1,3 +1,2 @@
-export { TenantManagementService } from './tenant-management.service';
 export { TenantManagementStateService, getTenantManagementStateService, } from './tenant-management-state.service';
 export { TenantService } from '../proxy/tenant.service';

package/dist/services/tenant-management-state.service.d.ts

@@ -1,10 +1,16 @@
 /**
  * Tenant Management State Service
- * Translated from @abp/ng.tenant-management v2.0.0
+ * Translated from @abp/ng.tenant-management v4.0.0
  *
  * This service provides state management for tenant management,
  * equivalent to the Angular NGXS TenantManagementState selectors.
  *
+ * Changes in v4.0.0:
+ * - Now uses TenantService (proxy) instead of TenantManagementService
+ * - Uses TenantDto instead of ABP.BasicItem for tenant state
+ * - Uses proxy DTOs (TenantCreateDto, TenantUpdateDto) for dispatch methods
+ * - Removed updateFromResponse (used deprecated TenantManagement.Response)
+ *
  * Changes in v2.0.0:
  * - Added dispatchGetTenants() method
  * - Added dispatchGetTenantById() method
@@ -12,14 +18,15 @@
  * - Added dispatchUpdateTenant() method
  * - Added dispatchDeleteTenant() method
  */
-import type { ABP } from '@abpjs/core';
-import type { TenantManagement } from '../models';
-import { TenantManagementService } from './tenant-management.service';
+import type { PagedResultDto } from '@abpjs/core';
+import type { TenantDto, TenantCreateDto, TenantUpdateDto, GetTenantsInput } from '../proxy/models';
+import { TenantService } from '../proxy/tenant.service';
 /**
  * State service for managing tenant management state.
  * Provides methods equivalent to Angular's NGXS state selectors and dispatch methods.
  *
  * @since 1.1.0
+ * @since 4.0.0 - Uses TenantService (proxy) instead of TenantManagementService
  */
 export declare class TenantManagementStateService {
     private _tenants;
@@ -28,14 +35,14 @@ export declare class TenantManagementStateService {
     private _tenantService?;
     /**
      * Constructor
-     * @param tenantService Optional TenantManagementService for dispatch methods (v2.0.0)
+     * @param tenantService Optional TenantService for dispatch methods (v4.0.0: uses TenantService instead of TenantManagementService)
      */
-    constructor(tenantService?: TenantManagementService);
+    constructor(tenantService?: TenantService);
     /**
      * Get all tenants
      * Equivalent to Angular's TenantManagementState selector
      */
-    get(): ABP.BasicItem[];
+    get(): TenantDto[];
     /**
      * Get the total count of tenants
      * @since 1.1.0
@@ -45,17 +52,12 @@ export declare class TenantManagementStateService {
      * Set tenants data (called internally by the hook)
      * @internal
      */
-    setTenants(tenants: ABP.BasicItem[]): void;
+    setTenants(tenants: TenantDto[]): void;
     /**
      * Set total count (called internally by the hook)
      * @internal
      */
     setTotalCount(count: number): void;
-    /**
-     * Update state from a response
-     * @internal
-     */
-    updateFromResponse(response: TenantManagement.Response): void;
     /**
      * Reset the state to initial values
      */
@@ -69,32 +71,37 @@ export declare class TenantManagementStateService {
     private notifySubscribers;
     /**
      * Dispatch GetTenants action - fetches tenants from API and updates state
-     * @param params Optional pagination parameters
-     * @returns Promise with the tenant response
+     * @param input Query parameters for tenant list
+     * @returns Promise with the paged tenant result
      * @since 2.0.0
+     * @since 4.0.0 - Uses TenantService.getList with GetTenantsInput
      */
-    dispatchGetTenants(params?: ABP.PageQueryParams): Promise<TenantManagement.Response>;
+    dispatchGetTenants(input?: Partial<GetTenantsInput>): Promise<PagedResultDto<TenantDto>>;
     /**
      * Dispatch GetTenantById action - fetches a single tenant by ID
      * @param id Tenant ID
-     * @returns Promise with the tenant item
+     * @returns Promise with the tenant DTO
      * @since 2.0.0
+     * @since 4.0.0 - Returns TenantDto instead of TenantManagement.Item
      */
-    dispatchGetTenantById(id: string): Promise<TenantManagement.Item>;
+    dispatchGetTenantById(id: string): Promise<TenantDto>;
     /**
      * Dispatch CreateTenant action - creates a new tenant and refreshes the list
-     * @param body Tenant creation request
+     * @param input Tenant creation data
      * @returns Promise with the created tenant
      * @since 2.0.0
+     * @since 4.0.0 - Uses TenantCreateDto instead of TenantManagement.AddRequest
      */
-    dispatchCreateTenant(body: TenantManagement.AddRequest): Promise<TenantManagement.Item>;
+    dispatchCreateTenant(input: TenantCreateDto): Promise<TenantDto>;
     /**
      * Dispatch UpdateTenant action - updates an existing tenant and refreshes the list
-     * @param body Tenant update request
+     * @param id Tenant ID
+     * @param input Tenant update data
      * @returns Promise with the updated tenant
      * @since 2.0.0
+     * @since 4.0.0 - Uses TenantUpdateDto instead of TenantManagement.UpdateRequest, takes id separately
      */
-    dispatchUpdateTenant(body: TenantManagement.UpdateRequest): Promise<TenantManagement.Item>;
+    dispatchUpdateTenant(id: string, input: TenantUpdateDto): Promise<TenantDto>;
     /**
      * Dispatch DeleteTenant action - deletes a tenant and refreshes the list
      * @param id Tenant ID to delete

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abpjs/tenant-management",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "description": "ABP Framework tenant-management components for React - translated from @abp/ng.tenant-management",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -23,8 +23,8 @@
   "dependencies": {
     "@chakra-ui/react": "^3.2.0",
     "@emotion/react": "^11.11.0",
-    "@abpjs/core": "3.2.0",
-    "@abpjs/theme-shared": "3.2.0"
+    "@abpjs/core": "4.0.0",
+    "@abpjs/theme-shared": "4.0.0"
   },
   "devDependencies": {
     "@abp/ng.tenant-management": "3.2.0",

package/dist/__tests__/tenant-management.service.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/services/tenant-management.service.d.ts

@@ -1,63 +0,0 @@
-import { RestService, ABP } from '@abpjs/core';
-import { TenantManagement } from '../models';
-/**
- * Service for tenant management API calls
- * Translated from @abp/ng.tenant-management v2.4.0
- */
-export declare class TenantManagementService {
-    private rest;
-    /**
-     * The API name used for REST requests.
-     * @since 2.4.0
-     */
-    apiName: string;
-    constructor(rest: RestService);
-    /**
-     * Get all tenants (paginated)
-     * @param params Optional pagination and filter parameters
-     * @returns Promise with paginated tenant response
-     */
-    getAll(params?: ABP.PageQueryParams): Promise<TenantManagement.Response>;
-    /**
-     * Get a tenant by ID
-     * @param id Tenant ID
-     * @returns Promise with tenant item
-     */
-    getById(id: string): Promise<TenantManagement.Item>;
-    /**
-     * Create a new tenant
-     * @param body Tenant creation request
-     * @returns Promise with created tenant item
-     */
-    create(body: TenantManagement.AddRequest): Promise<TenantManagement.Item>;
-    /**
-     * Update an existing tenant
-     * @param body Tenant update request (includes id)
-     * @returns Promise with updated tenant item
-     */
-    update(body: TenantManagement.UpdateRequest): Promise<TenantManagement.Item>;
-    /**
-     * Delete a tenant
-     * @param id Tenant ID
-     * @returns Promise that resolves when deletion completes
-     */
-    delete(id: string): Promise<void>;
-    /**
-     * Get default connection string for a tenant
-     * @param id Tenant ID
-     * @returns Promise with connection string (empty string if using shared database)
-     */
-    getDefaultConnectionString(id: string): Promise<string>;
-    /**
-     * Update default connection string for a tenant
-     * @param payload Request with tenant ID and connection string
-     * @returns Promise that resolves when update completes
-     */
-    updateDefaultConnectionString(payload: TenantManagement.DefaultConnectionStringRequest): Promise<void>;
-    /**
-     * Delete default connection string for a tenant (use shared database)
-     * @param id Tenant ID
-     * @returns Promise that resolves when deletion completes
-     */
-    deleteDefaultConnectionString(id: string): Promise<void>;
-}