From cc47e34572c0311d6788bf4ec11e7dcd1b8352a6 Mon Sep 17 00:00:00 2001
From: floxx2112 <florian1.hibert@orange.fr>
Date: Fri, 23 Jun 2023 16:42:01 +0200
Subject: [PATCH] new pipe filter table + rm display all tables on search page

---
 src/CustomInfoTableSearchPipe.ts              | 21 ++++++++++
 src/app/app.module.ts                         |  2 +
 .../joins-page/joins-page.component.html      |  4 +-
 .../request-page/request-page.component.html  |  2 +-
 .../request-page/request-page.component.ts    | 41 ++++++++++++++-----
 src/app/service/info-table.service.ts         |  8 ++++
 6 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 src/CustomInfoTableSearchPipe.ts

diff --git a/src/CustomInfoTableSearchPipe.ts b/src/CustomInfoTableSearchPipe.ts
new file mode 100644
index 0000000..2817dfd
--- /dev/null
+++ b/src/CustomInfoTableSearchPipe.ts
@@ -0,0 +1,21 @@
+import { InfoTable } from './app/model/info-table';
+import { Pipe, PipeTransform } from '@angular/core';
+
+
+@Pipe({
+    name: 'filtertable',
+    pure: false
+})
+export class CustomFilterTable implements PipeTransform {
+    transform(items: InfoTable[], filter: string): any {
+        if (!items || !filter) {
+            return items;
+        }
+        // filter items array, items which match and return true will be
+        // kept, false will be filtered out
+        if(filter){
+          return items.filter(item => item.nameTable.toLowerCase().indexOf(filter) !== -1);
+        }
+
+    }
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 13e65cd..8e7a8a2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -26,6 +26,7 @@ import { ScriptManagementComponent } from './manager/script-management/script-ma
 import { AddScriptComponent } from './manager/add-script/add-script.component';
 import { DndDirective } from './directives/dnd.directive'
 import { CustomFilterScript } from 'src/CustomFilterScript';
+import { CustomFilterTable } from 'src/CustomInfoTableSearchPipe';
 import { EditScriptComponent } from './manager/edit-script/edit-script.component';
 import { TagsManagementComponent } from './manager/tags-management/tags-management.component';
 import { NgMultiSelectDropDownModule } from 'ng-multiselect-dropdown';
@@ -43,6 +44,7 @@ import {MatTooltipModule} from '@angular/material/tooltip';
     RequestPageComponent,
     Custom_Ng2SearchPipe,
     CustomFilterScript,
+    CustomFilterTable,
     JoinsPageComponent,
     CreateJoinsPageComponent,
     JoinsTableComponent,
diff --git a/src/app/joins/joins-page/joins-page.component.html b/src/app/joins/joins-page/joins-page.component.html
index a417d6b..ab914d7 100644
--- a/src/app/joins/joins-page/joins-page.component.html
+++ b/src/app/joins/joins-page/joins-page.component.html
@@ -20,7 +20,7 @@
           <input type="text" class="block w-full my-2 pl-2 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-slate-800 focus:border-slate-800" [(ngModel)]="filterFirstTable" placeholder="Rechercher...">
 
           <select [(ngModel)]="firstTableData" (change)="getColumnsForJoinTwo()" size="5" class="mb-4 bg-gray-50 text-sm text-slate-800 rounded-lg focus:ring-slate-800 focus:border-slate-800 block w-full p-2.5">
-            <option *ngFor="let table of tablesByFirstSchema | filter : filterFirstTable" id="{{ table.id }}" [ngValue]="table">{{ table.nameTable }}</option>
+            <option *ngFor="let table of tablesByFirstSchema | filtertable : filterFirstTable" id="{{ table.id }}" [ngValue]="table">{{ table.nameTable }}</option>
           </select>
           </div>
     </div>
@@ -50,7 +50,7 @@
           <input type="text" class="block w-full my-2 pl-2 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-slate-800 focus:border-slate-800" [(ngModel)]="filterSecondTable" placeholder="Rechercher...">
 
           <select [(ngModel)]="secondTableData" (change)="getColumnsForJoinTwo()"  size="5" class="mb-4 bg-gray-50 text-sm text-slate-800 rounded-lg focus:ring-slate-800 focus:border-slate-800 block w-full p-2.5">
-            <option *ngFor="let table of tablesBySecondSchema | filter : filterSecondTable" id="{{ table.id }}" [ngValue]="table">{{ table.nameTable }}</option>
+            <option *ngFor="let table of tablesBySecondSchema | filtertable : filterSecondTable" id="{{ table.id }}" [ngValue]="table">{{ table.nameTable }}</option>
           </select>
         </div>
     </div>
diff --git a/src/app/search/request-page/request-page.component.html b/src/app/search/request-page/request-page.component.html
index b584607..0da528b 100644
--- a/src/app/search/request-page/request-page.component.html
+++ b/src/app/search/request-page/request-page.component.html
@@ -24,7 +24,7 @@
       <div class="my-2">
 
         <label class="text-black">Tables : </label>
-        <input type="text" class="block w-full my-2 pl-2 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-slate-800 focus:border-slate-800" [(ngModel)]="filterTable" placeholder="Rechercher...">
+        <input type="text" class="block w-full my-2 pl-2 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-slate-800 focus:border-slate-800" [(ngModel)]="filterTable" (ngModelChange)="sortCorrectly()" placeholder="Rechercher..." >
 
         <select [(ngModel)]="tableData" (change)="useSchemaWithTableName()" *ngIf="!tablesBySchema" size="5" class="mb-4 bg-gray-50 text-sm text-slate-800 rounded-lg focus:ring-slate-800 focus:border-slate-800 block w-full p-2.5">
           <option *ngFor="let table of infoTable | filter : filterTable" id="{{ table.id }}" [ngValue]="table">{{ table.nameTable }}</option>
diff --git a/src/app/search/request-page/request-page.component.ts b/src/app/search/request-page/request-page.component.ts
index 57a57dc..f82e565 100644
--- a/src/app/search/request-page/request-page.component.ts
+++ b/src/app/search/request-page/request-page.component.ts
@@ -47,7 +47,7 @@ export class RequestPageComponent implements OnInit {
 
   ngOnInit(): void {;
       this.getSchemas();
-      this.getTables();
+      //this.getTables();
   }
 
   public getSchemas():void {
@@ -72,6 +72,25 @@ export class RequestPageComponent implements OnInit {
     );
   }
 
+  public sortCorrectly(){
+    if(this.filterTable.length > 2){
+      if(this.schemaName){
+        this.infoTableService.getTablesWithFilterAndSchema(this.filterTable, this.schemaName).subscribe(
+          (response: InfoTable[]) => {
+            console.log(response);
+            this.tablesBySchema = response;
+        });
+      } else {
+        this.infoTableService.getTablesWithFilter(this.filterTable).subscribe(
+          (response: InfoTable[]) => {
+            console.log(response);
+            this.infoTable = response;
+        });
+      }
+
+    }
+  }
+
   public divideColumns(nameSch: String, tempsTab: InfoTable):void {
     console.log(nameSch, tempsTab.nameTable)
       this.infoColumnService.getSelectedColumns(nameSch, tempsTab.nameTable).subscribe(
@@ -110,18 +129,17 @@ export class RequestPageComponent implements OnInit {
       if(this.schemaName){
         this.selectedSchema = this.schemaName;
       } else {
-        console.log(this.schemaData)
         this.selectedSchema = this.schemaData.nameSchema;
       }
       if(this.selectedSchema){
-        this.infoTableService.getTablesBySchema(this.selectedSchema).subscribe(
-          (response : InfoTable[]) => {
-            this.tablesBySchema = response;
-          },
-          (error: HttpErrorResponse) => {
-            alert(error.message)
-          }
-        );
+        // this.infoTableService.getTablesBySchema(this.selectedSchema).subscribe(
+        //   (response : InfoTable[]) => {
+        //     this.tablesBySchema = response;
+        //   },
+        //   (error: HttpErrorResponse) => {
+        //     alert(error.message)
+        //   }
+        // );
         if(this.tableData){
           this.divideColumns(this.selectedSchema, this.tableData);
         }
@@ -158,6 +176,9 @@ export class RequestPageComponent implements OnInit {
     this.infoColumn = undefined;
     this.currentTable = undefined;
     this.tableData = undefined;
+    this.filterTable = "";
+    this.infoTable = undefined;
+    this.schemaName = undefined;
   }
 
 }
diff --git a/src/app/service/info-table.service.ts b/src/app/service/info-table.service.ts
index ff672f8..93bd29c 100644
--- a/src/app/service/info-table.service.ts
+++ b/src/app/service/info-table.service.ts
@@ -32,4 +32,12 @@ export class InfoTableService {
   public getSchemasByTable(nameTable : String): Observable<InfoTable[]>{
     return this.http.get<InfoTable[]>(`${this.apiServerUrl}/api/schemas/${nameTable}`);
   }
+
+  public getTablesWithFilter(filter : String): Observable<InfoTable[]>{
+    return this.http.get<InfoTable[]>(`${this.apiServerUrl}/api/tables/filter/${filter}`);
+  }
+
+  public getTablesWithFilterAndSchema(filter : String, schema: String): Observable<InfoTable[]>{
+    return this.http.get<InfoTable[]>(`${this.apiServerUrl}/api/tables/filter/${schema}/${filter}`);
+  }
 }