From 27eb2e7629e572c86c709208c99003f009c89dc2 Mon Sep 17 00:00:00 2001
From: Keksonoid <keksonoid98@gmail.com>
Date: Mon, 12 May 2025 13:52:41 +0500
Subject: [PATCH] fix back button and fix dublicate request

---
 .../companies-page.component.ts               | 25 ++++++++++++++++---
 .../company-page/company-page.component.html  | 11 +++++---
 .../company-page/company-page.component.ts    | 21 ++++++++++++++++
 .../pagination-buttons.component.ts           | 14 +++++++++--
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/app/modules/companies/components/companies-page/companies-page.component.ts b/src/app/modules/companies/components/companies-page/companies-page.component.ts
index 6a302be..fcfee1b 100644
--- a/src/app/modules/companies/components/companies-page/companies-page.component.ts
+++ b/src/app/modules/companies/components/companies-page/companies-page.component.ts
@@ -19,6 +19,7 @@ export class CompaniesPageComponent implements OnInit, OnDestroy {
   source: PaginatedList<Company> | null = null;
   currentPage: number = 1;
   searchQuery: string = "";
+  private skipNextQueryParamsUpdate: boolean = false;
 
   constructor(
     private readonly service: CompaniesService,
@@ -32,6 +33,11 @@ export class CompaniesPageComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.route.queryParams.pipe(untilDestroyed(this)).subscribe(params => {
+      if (this.skipNextQueryParamsUpdate) {
+        this.skipNextQueryParamsUpdate = false;
+        return;
+      }
+      
       this.currentPage = params['page'] ? Number(params['page']) : 1;
       this.searchQuery = params['search'] || '';
       this.loadData(this.currentPage, false);
@@ -45,7 +51,8 @@ export class CompaniesPageComponent implements OnInit, OnDestroy {
         "company_reviews",
         this.searchQuery,
       );
-      this.updateUrlParams(1);
+      this.currentPage = 1;
+      this.loadData(1, true);
     }
   }
 
@@ -67,22 +74,24 @@ export class CompaniesPageComponent implements OnInit, OnDestroy {
       this.searchQuery,
     );
     
+    this.skipNextQueryParamsUpdate = true;
     this.router.navigate([], {
       relativeTo: this.route,
       queryParams: {},
     });
     
+    this.currentPage = 1;
     this.loadData(1, false);
   }
 
   loadData(pageToLoad: number, updateUrl: boolean = true): void {
     this.companies = null;
     this.source = null;
+    this.currentPage = pageToLoad;
 
     if (updateUrl) {
+      this.skipNextQueryParamsUpdate = true;
       this.updateUrlParams(pageToLoad);
-    } else {
-      this.currentPage = pageToLoad;
     }
 
     this.service
@@ -113,7 +122,15 @@ export class CompaniesPageComponent implements OnInit, OnDestroy {
   }
 
   navigateToCompany(id: string): void {
-    this.router.navigate(["/companies", id]);
+    const state: { page: number; search?: string } = {
+      page: this.currentPage
+    };
+    
+    if (this.searchQuery && this.searchQuery.length >= 3) {
+      state.search = this.searchQuery;
+    }
+    
+    this.router.navigate(["/companies", id], { state });
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/modules/companies/components/company-page/company-page.component.html b/src/app/modules/companies/components/company-page/company-page.component.html
index 333f513..74d4bdb 100644
--- a/src/app/modules/companies/components/company-page/company-page.component.html
+++ b/src/app/modules/companies/components/company-page/company-page.component.html
@@ -43,10 +43,13 @@
       </div>
 
       <div class="d-flex justify-content-between">
-        <app-go-back-button
-          [routerLink]="'/companies'"
-          [text]="'К списку компаний'"
-        />
+        <button
+          type="button"
+          class="btn btn-outline-dark small"
+          (click)="goBackToList()"
+        >
+          <span class="small"><i class="bi bi-arrow-left me-1"></i>К списку компаний</span>
+        </button>
         <button
           type="button"
           *ngIf="company.reviewsCount > 0"
diff --git a/src/app/modules/companies/components/company-page/company-page.component.ts b/src/app/modules/companies/components/company-page/company-page.component.ts
index 62ef62e..d5143cf 100644
--- a/src/app/modules/companies/components/company-page/company-page.component.ts
+++ b/src/app/modules/companies/components/company-page/company-page.component.ts
@@ -20,6 +20,8 @@ export class CompanyPageComponent implements OnInit, OnDestroy {
 
   private readonly activateRoute: ActivatedRouteExtended;
   private isAuthenticated = false;
+  private previousPage: number | null = null;
+  private previousSearchQuery: string | null = null;
 
   constructor(
     private readonly service: CompaniesService,
@@ -31,6 +33,11 @@ export class CompanyPageComponent implements OnInit, OnDestroy {
     private readonly gtag: GoogleAnalyticsService,
   ) {
     this.activateRoute = new ActivatedRouteExtended(activatedRoute);
+    const queryParams = this.router.getCurrentNavigation()?.extras.state;
+    if (queryParams) {
+      this.previousPage = queryParams['page'] || null;
+      this.previousSearchQuery = queryParams['search'] || null;
+    }
   }
 
   ngOnInit(): void {
@@ -64,6 +71,20 @@ export class CompanyPageComponent implements OnInit, OnDestroy {
       });
   }
 
+  goBackToList(): void {
+    if (this.previousPage) {
+      const queryParams: any = { page: this.previousPage };
+      
+      if (this.previousSearchQuery) {
+        queryParams.search = this.previousSearchQuery;
+      }
+      
+      this.router.navigate(['/companies'], { queryParams });
+    } else {
+      this.router.navigate(['/companies']);
+    }
+  }
+
   leaveReview(): void {
     if (this.company == null) {
       return;
diff --git a/src/app/shared/components/pagination-buttons/pagination-buttons.component.ts b/src/app/shared/components/pagination-buttons/pagination-buttons.component.ts
index 9a808f8..8b28590 100644
--- a/src/app/shared/components/pagination-buttons/pagination-buttons.component.ts
+++ b/src/app/shared/components/pagination-buttons/pagination-buttons.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from "@angular/core";
 import { PaginatedModel } from "@models/paginated-list";
 
 @Component({
@@ -6,7 +6,7 @@ import { PaginatedModel } from "@models/paginated-list";
   templateUrl: "./pagination-buttons.component.html",
   standalone: false,
 })
-export class PaginationButtonsComponent implements OnInit {
+export class PaginationButtonsComponent implements OnInit, OnChanges {
   @Input()
   source: PaginatedModel | null = null;
 
@@ -37,6 +37,16 @@ export class PaginationButtonsComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.generatePages();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes['source'] || changes['currentPage']) {
+      this.generatePages();
+    }
+  }
+
+  private generatePages(): void {
     if (this.source) {
       this.lastPage = Math.ceil(this.source.totalItems / this.source.pageSize);
       const allPages = Array.from(Array(this.lastPage).keys()).map(