Mise à jour et ajout de 'components'

src/app/components/shared/helpers-jump/jump-table.component.ts

@@ -3,10 +3,12 @@ import { NgIf, DecimalPipe, DatePipe } from '@angular/common';
 import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Router, RouterLink } from '@angular/router';
 import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatMenuModule } from '@angular/material/menu';
 import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatSort, MatSortModule } from '@angular/material/sort';
@@ -16,18 +18,17 @@ import { Observable, Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
-import { Errors, Jump, JumpList, JumpListConfig, JumpViewResults } from 'src/app/core/models';
+import { Errors, Jump, JumpList, JumpListConfig } from 'src/app/core/models';
 import { JumpsService, BackendService } from 'src/app/core/services';
 import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent } from 'src/app/components/shared/dialogs'
-import { environment } from 'src/environments/environment';
 
 @Component({
     standalone: true,
     imports: [
         NgIf, DecimalPipe, DatePipe, RouterLink, FormsModule, ReactiveFormsModule, NgxSkeletonLoaderModule,
         MatFormFieldModule, MatInputModule, 
-        MatProgressSpinnerModule, MatButtonModule, MatIconModule, MatPaginatorModule, 
-        MatTableModule, MatSortModule, MatSnackBarModule, MatDialogModule,
+        MatProgressSpinnerModule, MatButtonModule, MatCardModule, MatIconModule, MatMenuModule,
+        MatPaginatorModule, MatTableModule, MatSortModule, MatSnackBarModule, MatDialogModule,
         JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent
     ],
     selector: 'huapp-jump-table',
@@ -36,10 +37,12 @@ import { environment } from 'src/environments/environment';
 })
 export class JumpTableComponent implements OnChanges, OnDestroy {
     private _jumps: Subscription = new Subscription();
+    private _lastjump: Subscription = new Subscription();
     errors!: Errors;
     query: JumpListConfig = { type: 'all', filters: {} };
     jump: Jump = {} as Jump;
     jumps!: MatTableDataSource<Jump>;
+    lastjump: Jump = {} as Jump;
     jumpsCount = 0;
     currentPage = 1;
     displayedColumns: string[] = [
@@ -93,14 +96,19 @@ export class JumpTableComponent implements OnChanges, OnDestroy {
         this.loading = true;
         this.query = this.config;
         this.runQuery();
-        //this.loadJumps();
     }
 
     ngOnDestroy() {
         this._jumps.unsubscribe();
+        this._lastjump.unsubscribe();
     }
 
     runQuery() {
+        const lastjump$: Observable<Jump> = this.jumpsService.getLastJump();
+        this._lastjump = lastjump$.subscribe((jump) => {
+            this.lastjump = jump;
+        });
+
         if (this.limit) {
             this.query.filters.limit = this.limit;
             this.query.filters.offset = (this.limit * (this.currentPage - 1));
@@ -126,27 +134,6 @@ export class JumpTableComponent implements OnChanges, OnDestroy {
         });
     }
 
-    loadJumps() {
-        const jumps$: Observable<JumpViewResults> = this._dataService.getJumps();
-        this._jumps = jumps$.subscribe((jumpList) => {
-            //console.log('ngOnInit');
-            //console.log(res);
-            //console.log(res["rows"]);
-            this.jumpsCount = jumpList.total_rows;
-            //this.last_jump = jumpList.rows[0];
-            this.jumps = new MatTableDataSource<Jump>(jumpList.rows)
-            this.jumps.paginator = this.paginator;
-            this.jumps.sort = this.sort;
-            console.log(this.jumps);
-        });
-        /*
-        .subscribe((res) => this.jumps = new MatTableDataSource<Jump>(res["rows"]));
-        */
-        //
-        //.subscribe((res) => this.jumps = res["rows"]);
-        //.subscribe((res) => console.log(res["rows"]));
-    }
-
     deleteJump(slug: string) {
         this.isDeleting = true;
         this.jumpsService.destroy(slug).pipe(take(1))
@@ -209,14 +196,6 @@ export class JumpTableComponent implements OnChanges, OnDestroy {
         }
     }
 
-    private _openSnackBar(content: string, title: string) {
-        this.snackBar.open(content, title, {
-            horizontalPosition: <MatSnackBarHorizontalPosition>'end',
-            verticalPosition: <MatSnackBarVerticalPosition>'bottom',
-            duration: 4000,
-        });
-    }
-
     private _onDelete(slug: string): void {
         try {
             this.isDeleting = true;
@@ -280,6 +259,14 @@ export class JumpTableComponent implements OnChanges, OnDestroy {
         }
     }
 
+    private _openSnackBar(content: string, title: string) {
+        this.snackBar.open(content, title, {
+            horizontalPosition: <MatSnackBarHorizontalPosition>'end',
+            verticalPosition: <MatSnackBarVerticalPosition>'bottom',
+            duration: 4000,
+        });
+    }
+
     private _resetErrors(): void {
         this.errors = { errors: {} };
     }