From 6eab904a93d686a844279ebb86662a40b2ebcdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20V=C4=A9nh=20Thi=E1=BB=87n=20Ph=C3=BAc?=
 <phuc.tranvinhthien@axonactive.com>
Date: Wed, 7 Aug 2024 15:13:49 +0700
Subject: [PATCH 01/11] MARP-798 Update Cursor for pages

---
 .../product/product-card/product-card.component.scss  |  1 +
 .../add-feedback-dialog.component.html                |  2 +-
 .../show-feedbacks-dialog.component.html              |  2 +-
 .../product-detail-version-action.component.html      |  4 ++--
 .../product-detail/product-detail.component.html      | 10 +++++-----
 .../product-filter/product-filter.component.scss      |  6 +++++-
 .../src/app/modules/product/product.component.scss    |  1 +
 .../shared/components/footer/footer.component.html    | 11 ++++++-----
 .../header/search-bar/search-bar.component.scss       |  1 +
 .../theme-selection/theme-selection.component.scss    |  1 +
 .../src/app/shared/constants/common.constant.ts       |  9 ++++++---
 marketplace-ui/src/assets/scss/custom-style.scss      |  7 +++++++
 12 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/marketplace-ui/src/app/modules/product/product-card/product-card.component.scss b/marketplace-ui/src/app/modules/product/product-card/product-card.component.scss
index 46683984f..16b6e5e61 100644
--- a/marketplace-ui/src/app/modules/product/product-card/product-card.component.scss
+++ b/marketplace-ui/src/app/modules/product/product-card/product-card.component.scss
@@ -6,6 +6,7 @@ img {
 .card {
   background-color: var(--ivy-secondary-bg);
   border: 1px solid var(--ivy-border-color);
+  cursor: pointer;
 }
 
 .card__title {
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html
index 9eca9042f..6ef300d1c 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/add-feedback-dialog.component.html
@@ -6,7 +6,7 @@
       aria-label="Close"
       (click)="activeModal.dismiss()"></button>
   </div>
-  <div class="modal-body modal-body-wrapper">
+  <div class="modal-body modal-body-wrapper default-cursor">
     <h4 class="add-feedback-title text-primary">
       {{ 'common.feedback.addFeedbackTitle' | translate }}
     </h4>
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/show-feedbacks-dialog/show-feedbacks-dialog.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/show-feedbacks-dialog/show-feedbacks-dialog.component.html
index b95d33308..00fe180c8 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/show-feedbacks-dialog/show-feedbacks-dialog.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/show-feedbacks-dialog/show-feedbacks-dialog.component.html
@@ -1,4 +1,4 @@
-<div class="modal-content-wrapper">
+<div class="modal-content-wrapper default-cursor">
   <div class="modal-header border-bottom-0">
     <button
       type="button"
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
index 5c1bffebf..8bf18adda 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
@@ -39,7 +39,7 @@
       <select id="verions-selector" [(ngModel)]="selectedVersion"
         [ngClass]="{'indicator-arrow__up': isVersionsDropDownShow()}" (click)="onShowVersions()" name="Version"
         (change)="onSelectVersion()"
-        class="form-select form-select-sm versions-selector__dropdown border__dropdown fs-md"
+        class="form-select form-select-sm versions-selector__dropdown border__dropdown fs-md pointer-cursor"
         aria-label=".form-select-sm example">
         @for (item of versions(); track $index) {
         <option [value]="item">{{ item }}</option>
@@ -62,4 +62,4 @@
     </div>
   </form>
 </div>
-}
\ No newline at end of file
+}
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
index 73592b411..ce0c7134f 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
@@ -19,14 +19,14 @@
             <div class="logo__image-container">
               <img class="logo__image" [src]="productDetail().logoUrl" alt="" />
             </div>
-            <h1 class="product-title align-items-start">
+            <h1 class="product-title align-items-start default-cursor">
               {{
                 productDetail().names
                   | multilingualism: languageService.selectedLanguage()
               }}
             </h1>
           </div>
-          <div class="d-flex flex-row align-items-start module-gap">
+          <div class="d-flex flex-row align-items-start module-gap default-cursor">
             <div
               class="analysis-container d-flex flex-column align-items-start p-0">
               <app-product-star-rating-number
@@ -140,7 +140,7 @@ <h4 class="analysis-title text-primary text-capitalize mb-0">
           </div>
         </div>
 
-        <div class="tab-content col-12">
+        <div class="tab-content col-12 default-cursor">
           <div
             class="tab-pane fade show"
             [class.active]="activeTab === 'description'"
@@ -187,7 +187,7 @@ <h4 class="analysis-title text-primary text-capitalize mb-0">
       </div>
 
       <div
-        class="info-tab d-none d-xl-block d-flex flex-column flex-grow-1 align-items-start col-xl-3">
+        class="info-tab d-none d-xl-block d-flex flex-column flex-grow-1 align-items-start col-xl-3 default-cursor">
         <app-product-detail-information-tab
           [productDetail]="productDetail()"
           [selectedVersion]="
@@ -197,7 +197,7 @@ <h4 class="analysis-title text-primary text-capitalize mb-0">
     </div>
   </div>
   <hr />
-  <div style="margin-bottom: 8rem">
+  <div class="default-cursor" style="margin-bottom: 8rem">
     @if (productDetail() && productFeedbackService.totalElements() > 0) {
       <app-product-detail-feedback [isMobileMode]="isMobileMode()" />
     } @else {
diff --git a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.scss b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.scss
index 2f6af7cb1..9879139a1 100644
--- a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.scss
+++ b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.scss
@@ -31,7 +31,11 @@ $rowHeight: 37px;
   padding: 10px 15px;
   margin: 0 15px 0 0;
   gap: 10px;
-  cursor: default;
+  cursor: pointer;
+}
+
+.sort-type {
+  cursor: pointer;
 }
 
 .sort-container__label {
diff --git a/marketplace-ui/src/app/modules/product/product.component.scss b/marketplace-ui/src/app/modules/product/product.component.scss
index 7e15fb0b1..6cda7e207 100644
--- a/marketplace-ui/src/app/modules/product/product.component.scss
+++ b/marketplace-ui/src/app/modules/product/product.component.scss
@@ -4,6 +4,7 @@
 
 .mt-8 {
   margin-top: 8rem;
+  cursor: default;
 }
 
 .not-found-result {
diff --git a/marketplace-ui/src/app/shared/components/footer/footer.component.html b/marketplace-ui/src/app/shared/components/footer/footer.component.html
index f9a831c6d..6c8b11172 100644
--- a/marketplace-ui/src/app/shared/components/footer/footer.component.html
+++ b/marketplace-ui/src/app/shared/components/footer/footer.component.html
@@ -16,7 +16,7 @@
           alt="Axon Ivy"/>
       </div>
       <div
-        class="text-secondary"
+        class="text-secondary default-cursor"
         [innerHtml]="'common.footer.newVersionsInfo' | translate"></div>
       <div class="button-container flex-row">
         <button
@@ -38,6 +38,7 @@
           <li class="nav-item">
             <a
               class="nav-link"
+              [href]="item.link"
               [ngClass]="
                   item.link === '/' ? 'text-primary fw-bold' : 'text-muted'
                 "
@@ -57,10 +58,10 @@
       <!-- Left -->
       <div
         class="flex-row navbar-nav me-auto mb-lg-0 flex-wrap w-md-100 justify-content-center text-center footer__ivy-policy">
-        @for (link of ivyFooterLinks; track $index) {
-        <div class="link--left" [class]="link.containerStyleClass">
-          <a class="nav-link text-secondary h5-text" aria-current="page">
-            {{ link.label | translate }}
+        @for (ivyFooterLink of ivyFooterLinks; track $index) {
+        <div class="link--left" [class]="ivyFooterLink.containerStyleClass">
+          <a class="nav-link text-secondary h5-text" aria-current="page" [href]="ivyFooterLink.link">
+            {{ ivyFooterLink.label | translate }}
           </a>
         </div>
         }
diff --git a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.scss b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.scss
index e5650f91d..b0aab7d64 100644
--- a/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.scss
+++ b/marketplace-ui/src/app/shared/components/header/search-bar/search-bar.component.scss
@@ -5,6 +5,7 @@
 }
 
 .bi-search {
+  cursor: pointer;
   font-size: 16.5px;
 }
 
diff --git a/marketplace-ui/src/app/shared/components/header/theme-selection/theme-selection.component.scss b/marketplace-ui/src/app/shared/components/header/theme-selection/theme-selection.component.scss
index 4db4a38be..6fc8ffa46 100644
--- a/marketplace-ui/src/app/shared/components/header/theme-selection/theme-selection.component.scss
+++ b/marketplace-ui/src/app/shared/components/header/theme-selection/theme-selection.component.scss
@@ -6,5 +6,6 @@
 }
 
 i {
+  cursor: pointer;
   font-size: 16.5px;
 }
diff --git a/marketplace-ui/src/app/shared/constants/common.constant.ts b/marketplace-ui/src/app/shared/constants/common.constant.ts
index 9bae36ea2..18e04db5b 100644
--- a/marketplace-ui/src/app/shared/constants/common.constant.ts
+++ b/marketplace-ui/src/app/shared/constants/common.constant.ts
@@ -55,15 +55,18 @@ export const SOCIAL_MEDIA_LINK = [
 export const IVY_FOOTER_LINKS = [
   {
     containerStyleClass: 'w-md-100 footer__ivy-tag',
-    label: 'common.footer.ivyCompanyInfo'
+    label: 'common.footer.ivyCompanyInfo',
+    link: ''
   },
   {
     containerStyleClass: 'footer__ivy-policy-tag',
-    label: 'common.footer.privacyPolicy'
+    label: 'common.footer.privacyPolicy',
+    link: ''
   },
   {
     containerStyleClass: 'footer__ivy-term-of-service-tag',
-    label: 'common.footer.termsOfService'
+    label: 'common.footer.termsOfService',
+    link: ''
   }
 ];
 
diff --git a/marketplace-ui/src/assets/scss/custom-style.scss b/marketplace-ui/src/assets/scss/custom-style.scss
index bd64efaf1..78961f4cb 100644
--- a/marketplace-ui/src/assets/scss/custom-style.scss
+++ b/marketplace-ui/src/assets/scss/custom-style.scss
@@ -248,6 +248,13 @@ p {
   }
   /** End Star Rating Summary **/
 }
+.default-cursor {
+  cursor: default;
+}
+
+.pointer-cursor {
+  cursor: pointer;
+}
 
 *:focus {
   box-shadow: none !important;

From f532fbdc9fd216f5d5f8a55efff01a0d34851239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20V=C4=A9nh=20Thi=E1=BB=87n=20Ph=C3=BAc?=
 <phuc.tranvinhthien@axonactive.com>
Date: Wed, 7 Aug 2024 16:51:28 +0700
Subject: [PATCH 02/11] MARP-798 Update pointer-cursor for "Choose artifact"
 select

---
 .../product-detail-version-action.component.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
index 8bf18adda..28d71be0a 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html
@@ -21,7 +21,7 @@
         }}
       </label>
       <select id="artifacts-selector" [(ngModel)]="selectedArtifact" name="Artifact"
-        class="form-select form-select-sm artifacts-selector__dropdown border__dropdown fs-md"
+        class="form-select form-select-sm artifacts-selector__dropdown border__dropdown fs-md pointer-cursor"
         aria-label=".form-select-sm">
         @for (item of artifacts(); track $index) {
         <option class="option" [value]="item.downloadUrl">

From 7019b7431be6fba1838f47cd6f5a7cff816e32a7 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Fri, 9 Aug 2024 18:05:40 +0700
Subject: [PATCH 03/11] add auto scroll to top interval

---
 .../product-detail/product-detail.component.ts       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index efab63cf3..d00d64802 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -29,7 +29,7 @@ import { AuthService } from '../../../auth/auth.service';
 import { ProductStarRatingNumberComponent } from './product-star-rating-number/product-star-rating-number.component';
 import { ProductInstallationCountActionComponent } from './product-installation-count-action/product-installation-count-action.component';
 import { ProductTypeIconPipe } from '../../../shared/pipes/icon.pipe';
-import { Observable } from 'rxjs';
+import { interval, Observable, Subscription } from 'rxjs';
 import { ProductStarRatingService } from './product-detail-feedback/product-star-rating-panel/product-star-rating.service';
 import { RoutingQueryParamService } from '../../../shared/services/routing.query.param.service';
 
@@ -92,6 +92,7 @@ export class ProductDetailComponent {
   showPopup!: boolean;
   isMobileMode = signal<boolean>(false);
   installationCount = 0;
+  intervalSub!: Subscription;
 
   @HostListener('window:popstate', ['$event'])
   onPopState() {
@@ -102,7 +103,14 @@ export class ProductDetailComponent {
     this.updateDropdownSelection();
   }
 
+
   constructor() {
+    const intevalSub = interval(500).subscribe(() => {
+      window.scrollTo(0, 0);
+    });
+    setTimeout(() => {
+      intevalSub.unsubscribe();
+    }, 3000);
     this.resizeObserver = new ResizeObserver(() => {
       this.updateDropdownSelection();
     });
@@ -118,6 +126,8 @@ export class ProductDetailComponent {
         this.productDetailService.productNames.set(productDetail.names);
         localStorage.removeItem(STORAGE_ITEM);
         this.installationCount = productDetail.installationCount;
+      window.scrollTo(0, window.pageYOffset)
+
       });
       this.productFeedbackService.initFeedbacks();
       this.productStarRatingService.fetchData();

From e4c5e84ae932984b40a088a80d07347de5b657ec Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Mon, 12 Aug 2024 09:46:57 +0700
Subject: [PATCH 04/11] refactor code

---
 .../product-detail/product-detail.component.ts   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index d00d64802..39ab9a737 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -105,12 +105,7 @@ export class ProductDetailComponent {
 
 
   constructor() {
-    const intevalSub = interval(500).subscribe(() => {
-      window.scrollTo(0, 0);
-    });
-    setTimeout(() => {
-      intevalSub.unsubscribe();
-    }, 3000);
+    this.scrollToTop();
     this.resizeObserver = new ResizeObserver(() => {
       this.updateDropdownSelection();
     });
@@ -140,6 +135,15 @@ export class ProductDetailComponent {
     this.updateDropdownSelection();
   }
 
+  scrollToTop() {
+    const intevalSub = interval(500).subscribe(() => {
+      window.scrollTo(0, 0);
+    });
+    setTimeout(() => {
+      intevalSub.unsubscribe();
+    }, 3000);
+  }
+
   getProductById(productId: string): Observable<ProductDetail> {
     const targetVersion =
       this.routingQueryParamService.getDesignerVersionFromCookie();

From 5b3849fd3655aea953c43c6223e3c28831ac3627 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Mon, 12 Aug 2024 09:55:45 +0700
Subject: [PATCH 05/11] remove unused code

---
 .../modules/product/product-detail/product-detail.component.ts  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index 39ab9a737..f40364d9d 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -121,8 +121,6 @@ export class ProductDetailComponent {
         this.productDetailService.productNames.set(productDetail.names);
         localStorage.removeItem(STORAGE_ITEM);
         this.installationCount = productDetail.installationCount;
-      window.scrollTo(0, window.pageYOffset)
-
       });
       this.productFeedbackService.initFeedbacks();
       this.productStarRatingService.fetchData();

From 66207b2aee8772f9fb3fe8f952b1de4dfab0b027 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Wed, 14 Aug 2024 12:01:41 +0700
Subject: [PATCH 06/11] Update scroll behaviour

---
 .../product-detail/product-detail.component.ts        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index f40364d9d..374ca9b4f 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -29,7 +29,7 @@ import { AuthService } from '../../../auth/auth.service';
 import { ProductStarRatingNumberComponent } from './product-star-rating-number/product-star-rating-number.component';
 import { ProductInstallationCountActionComponent } from './product-installation-count-action/product-installation-count-action.component';
 import { ProductTypeIconPipe } from '../../../shared/pipes/icon.pipe';
-import { interval, Observable, Subscription } from 'rxjs';
+import { interval, Observable } from 'rxjs';
 import { ProductStarRatingService } from './product-detail-feedback/product-star-rating-panel/product-star-rating.service';
 import { RoutingQueryParamService } from '../../../shared/services/routing.query.param.service';
 
@@ -92,7 +92,6 @@ export class ProductDetailComponent {
   showPopup!: boolean;
   isMobileMode = signal<boolean>(false);
   installationCount = 0;
-  intervalSub!: Subscription;
 
   @HostListener('window:popstate', ['$event'])
   onPopState() {
@@ -134,12 +133,12 @@ export class ProductDetailComponent {
   }
 
   scrollToTop() {
-    const intevalSub = interval(500).subscribe(() => {
-      window.scrollTo(0, 0);
+    const intervalSub = interval(500).subscribe(() => {
+      window.scrollTo({left: 0, top: 0, behavior: 'instant'});
     });
     setTimeout(() => {
-      intevalSub.unsubscribe();
-    }, 3000);
+      intervalSub.unsubscribe();
+    }, 1000);
   }
 
   getProductById(productId: string): Observable<ProductDetail> {

From c61fb9cd3bd55a3cb2fa71f252ee0b03502b6588 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Thu, 15 Aug 2024 13:54:35 +0700
Subject: [PATCH 07/11] Add setup chrome

---
 .github/workflows/ui-ci-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ui-ci-build.yml b/.github/workflows/ui-ci-build.yml
index d792f34a8..54b3f00bd 100644
--- a/.github/workflows/ui-ci-build.yml
+++ b/.github/workflows/ui-ci-build.yml
@@ -39,6 +39,9 @@ jobs:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
     steps:
+      - name: Setup chrome
+        uses: browser-actions/setup-chrome@v1
+
       - name: Execute Tests
         run: |
           cd ./marketplace-ui

From 244611eddfee8b40779c51e9b46f91eede62197d Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Thu, 15 Aug 2024 15:33:38 +0700
Subject: [PATCH 08/11] Fix sonar

---
 .../modules/product/product-detail/product-detail.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index 374ca9b4f..7024350df 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -42,6 +42,7 @@ export interface DetailTab {
 
 const STORAGE_ITEM = 'activeTab';
 const DEFAULT_ACTIVE_TAB = 'description';
+const SCROLL_INTERVAL = 500;
 @Component({
   selector: 'app-product-detail',
   standalone: true,
@@ -133,7 +134,7 @@ export class ProductDetailComponent {
   }
 
   scrollToTop() {
-    const intervalSub = interval(500).subscribe(() => {
+    const intervalSub = interval(SCROLL_INTERVAL).subscribe(() => {
       window.scrollTo({left: 0, top: 0, behavior: 'instant'});
     });
     setTimeout(() => {

From 7dcf3523afe15840bcbb3cce5c8c47553d07dc7d Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Thu, 15 Aug 2024 17:54:54 +0700
Subject: [PATCH 09/11] Disable scroll when navigate

---
 marketplace-ui/src/app/app.config.ts                 | 12 ++++++++++--
 .../product-detail/product-detail.component.ts       |  8 +-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/marketplace-ui/src/app/app.config.ts b/marketplace-ui/src/app/app.config.ts
index 5905267e0..d3d23dedb 100644
--- a/marketplace-ui/src/app/app.config.ts
+++ b/marketplace-ui/src/app/app.config.ts
@@ -1,6 +1,6 @@
 import { HttpClient, provideHttpClient, withFetch, withInterceptors } from '@angular/common/http';
 import { ApplicationConfig, importProvidersFrom, provideZoneChangeDetection } from '@angular/core';
-import { provideRouter } from '@angular/router';
+import { InMemoryScrollingFeature, InMemoryScrollingOptions, provideRouter, withInMemoryScrolling } from '@angular/router';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { routes } from './app.routes';
 import { MARKED_OPTIONS, MarkdownModule } from 'ngx-markdown';
@@ -8,10 +8,18 @@ import { markedOptionsFactory } from './core/configs/markdown.config';
 import { httpLoaderFactory } from './core/configs/translate.config';
 import { apiInterceptor } from './core/interceptors/api.interceptor';
 
+const scrollConfig: InMemoryScrollingOptions = {
+  scrollPositionRestoration: 'disabled',
+  anchorScrolling: 'disabled',
+};
+
+const inMemoryScrollingFeature: InMemoryScrollingFeature =
+  withInMemoryScrolling(scrollConfig);
+
 export const appConfig: ApplicationConfig = {
   providers: [
     provideZoneChangeDetection({ eventCoalescing: true }),
-    provideRouter(routes),
+    provideRouter(routes, inMemoryScrollingFeature),
     provideHttpClient(withFetch(), withInterceptors([apiInterceptor])),
     importProvidersFrom(
       TranslateModule.forRoot({
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index 7024350df..1b0f5f657 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -103,7 +103,6 @@ export class ProductDetailComponent {
     this.updateDropdownSelection();
   }
 
-
   constructor() {
     this.scrollToTop();
     this.resizeObserver = new ResizeObserver(() => {
@@ -134,12 +133,7 @@ export class ProductDetailComponent {
   }
 
   scrollToTop() {
-    const intervalSub = interval(SCROLL_INTERVAL).subscribe(() => {
-      window.scrollTo({left: 0, top: 0, behavior: 'instant'});
-    });
-    setTimeout(() => {
-      intervalSub.unsubscribe();
-    }, 1000);
+    window.scrollTo({ left: 0, top: 0, behavior: 'instant' });
   }
 
   getProductById(productId: string): Observable<ProductDetail> {

From e493cff1b9cf9c4aa426770fc0d5565fc6af3d47 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Fri, 16 Aug 2024 09:33:38 +0700
Subject: [PATCH 10/11] remove unused import

---
 .../modules/product/product-detail/product-detail.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index 1b0f5f657..9ba2e1a79 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -29,7 +29,7 @@ import { AuthService } from '../../../auth/auth.service';
 import { ProductStarRatingNumberComponent } from './product-star-rating-number/product-star-rating-number.component';
 import { ProductInstallationCountActionComponent } from './product-installation-count-action/product-installation-count-action.component';
 import { ProductTypeIconPipe } from '../../../shared/pipes/icon.pipe';
-import { interval, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ProductStarRatingService } from './product-detail-feedback/product-star-rating-panel/product-star-rating.service';
 import { RoutingQueryParamService } from '../../../shared/services/routing.query.param.service';
 

From 78879fb5ed873528058e6524c77529dde46e2ec9 Mon Sep 17 00:00:00 2001
From: tutn <tu.nguyenthanh@axonactive.com>
Date: Fri, 16 Aug 2024 10:07:04 +0700
Subject: [PATCH 11/11] remove unused

---
 .../modules/product/product-detail/product-detail.component.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index f942f5444..0802fb82d 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -29,7 +29,7 @@ import { AuthService } from '../../../auth/auth.service';
 import { ProductStarRatingNumberComponent } from './product-star-rating-number/product-star-rating-number.component';
 import { ProductInstallationCountActionComponent } from './product-installation-count-action/product-installation-count-action.component';
 import { ProductTypeIconPipe } from '../../../shared/pipes/icon.pipe';
-import { interval, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ProductStarRatingService } from './product-detail-feedback/product-star-rating-panel/product-star-rating.service';
 import { RoutingQueryParamService } from '../../../shared/services/routing.query.param.service';
 
@@ -42,7 +42,6 @@ export interface DetailTab {
 
 const STORAGE_ITEM = 'activeTab';
 const DEFAULT_ACTIVE_TAB = 'description';
-const SCROLL_INTERVAL = 500;
 @Component({
   selector: 'app-product-detail',
   standalone: true,