fixed all organization at admin

d-rec · Aug 8, 2024 · f2b08da · f2b08da
1 parent f2cd901
commit f2b08da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/app/auth/services/admin.service.ts b/src/app/auth/services/admin.service.ts
@@ -32,6 +32,16 @@ export class AdminService {
       ) {
         searchUrl += `&organizationName=${searchData.organizationName}`;
       }
+
+      if (
+        !(
+          searchData.organizationType === undefined ||
+          searchData.organizationType === '' ||
+          searchData.organizationType === null
+        )
+      ) {
+        searchUrl += `&organizationType=${searchData.organizationType}`;
+      }
     }
     return this.httpClient.get<any>(searchUrl);
   }

diff --git a/src/app/view/organization/admin-organization/admin-organization.component.ts b/src/app/view/organization/admin-organization/admin-organization.component.ts
@@ -78,6 +78,7 @@ export class AdminOrganizationComponent {
 
     this.FilterForm = this.formBuilder.group({
       organizationName: [],
+      organizationType: '',
     });
   }
   ngOnInit() {
@@ -165,19 +166,15 @@ export class AdminOrganizationComponent {
   }
   getAllOrganization(page: number) {
     const limit = 20;
+    this.FilterForm.value['organizationType'] = 'ApiUser';
     this.adminService
       .GetAllOrganization(page, limit, this.FilterForm.value)
       .subscribe(
         (data) => {
           this.showlist = true;
           this.loading = false;
           this.data = data;
-          this.dataSource = new MatTableDataSource(
-            this.data.organizations.filter(
-              (org: OrganizationInformation) =>
-                org.organizationType != 'ApiUser',
-            ),
-          );
+          this.dataSource = new MatTableDataSource(this.data.organizations);
           this.totalRows = this.data.totalCount;
           this.totalPages = this.data.totalPages;
           this.dataSource.sort = this.sort;