From 24b258d74756a75b46a79da5212e070ab59dc523 Mon Sep 17 00:00:00 2001
From: sumeyye <sum.the.developer@gmail.com>
Date: Mon, 15 Jun 2026 16:52:07 +0300
Subject: [PATCH] update: tenant-management package for the latest upgrade
 (state management and html properties)

---
 .../packages/tenant-management/project.json   |  2 +-
 .../components/tenants/tenants.component.html |  6 +++---
 .../components/tenants/tenants.component.ts   | 21 ++++++-------------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/npm/ng-packs/packages/tenant-management/project.json b/npm/ng-packs/packages/tenant-management/project.json
index 9bbd10d632..4488303275 100644
--- a/npm/ng-packs/packages/tenant-management/project.json
+++ b/npm/ng-packs/packages/tenant-management/project.json
@@ -31,7 +31,7 @@
       "executor": "@nx/vitest:test",
       "outputs": ["{options.reportsDirectory}"],
       "options": {
-        "reportsDirectory": "../../coverage/packages/tenant-management"
+        "reportsDirectory": "{projectRoot}/../../coverage/packages/tenant-management"
       }
     }
   }
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
index b914bdf15b..9aa7c404d7 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
@@ -1,4 +1,4 @@
-<abp-page [title]="'AbpTenantManagement::Tenants' | abpLocalization" [toolbar]="data.items">
+<abp-page [title]="'AbpTenantManagement::Tenants' | abpLocalization" [toolbar]="data().items">
   <div id="wrapper" class="card">
     <div class="card-body">
       <div id="data-tables-table-filter" class="data-tables-filter mb-3">
@@ -13,8 +13,8 @@
       </div>
 
       <abp-extensible-table
-        [data]="data.items || []"
-        [recordsTotal]="data.totalCount || 0"
+        [data]="data().items"
+        [recordsTotal]="data().totalCount"
         [list]="list"
       ></abp-extensible-table>
     </div>
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
index ae57743972..f0d8ae36e2 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
@@ -24,7 +24,8 @@ import {
   FormPropData,
   generateFormFromProps,
 } from '@abp/ng.components/extensible';
-import { Component, DOCUMENT, inject, Injector, makeStateKey, OnInit } from '@angular/core';
+import { Component, DOCUMENT, inject, Injector, makeStateKey } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import {
   FormsModule,
   ReactiveFormsModule,
@@ -61,7 +62,7 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
     NgxValidateCoreModule,
   ],
 })
-export class TenantsComponent implements OnInit {
+export class TenantsComponent {
   protected readonly list = inject(ListService<GetTenantsInput>);
   protected readonly confirmationService = inject(ConfirmationService);
   protected readonly service = inject(TenantService);
@@ -70,7 +71,9 @@ export class TenantsComponent implements OnInit {
   private readonly injector = inject(Injector);
   private document = inject(DOCUMENT);
 
-  data: PagedResultDto<TenantDto> = { items: [], totalCount: 0 };
+  readonly data = toSignal(this.list.hookToQuery(query => this.service.getList(query)), {
+    initialValue: { items: [], totalCount: 0 } as PagedResultDto<TenantDto>,
+  });
 
   selected!: TenantDto;
 
@@ -95,10 +98,6 @@ export class TenantsComponent implements OnInit {
     this.visibleFeatures = value;
   };
 
-  ngOnInit() {
-    this.hookToQuery();
-  }
-
   private createTenantForm() {
     const data = new FormPropData(this.injector, this.selected);
     this.tenantForm = generateFormFromProps(data);
@@ -153,14 +152,6 @@ export class TenantsComponent implements OnInit {
       });
   }
 
-  hookToQuery() {
-    this.list
-      .hookToQuery(query => this.service.getList(query))
-      .subscribe(res => {
-        this.data = res;
-      });
-  }
-
   onSharedDatabaseChange(value: boolean) {
     if (!value) {
       setTimeout(() => {