Merge branch 'develop' into feature/MARP-1736-Add-loading-spinner-for…

…-Proceed-button-in-Security-Monitor-Page
axonivy-market · Dec 31, 2024 · 3192654 · 3192654
2 parents 5c19066 + 910bf0e
commit 3192654
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...roduct-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts b/...roduct-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts
@@ -93,10 +93,7 @@ export class ProductFeedbackService {
       .set('sort', sort);
     const requestURL = `${FEEDBACK_API_URL}/product/${productId}`;
     return this.http
-      .get<FeedbackApiResponse>(requestURL, {
-        params: requestParams,
-        context: new HttpContext().set(ForwardingError, true)
-      })
+      .get<FeedbackApiResponse>(requestURL, { params: requestParams })
       .pipe(
         tap(response => {
           if (page === 0) {
@@ -175,4 +172,4 @@ export class ProductFeedbackService {
     this.page.set(0);
     return this.findProductFeedbacksByCriteria();
   }
-}
+}
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
@@ -168,8 +168,7 @@ export class ProductDetailComponent {
       }).subscribe(res => {
         this.handleProductDetail(res.productDetail);
         this.productFeedbackService.handleFeedbackApiResponse(
-          res.productFeedBack
-        );
+          res.productFeedBack);
         this.updateDropdownSelection();
         this.checkMediaSize();
         this.route.queryParams.subscribe(params => {
@@ -181,8 +180,8 @@ export class ProductDetailComponent {
               .catch(() => this.removeQueryParam());
           }
         });
-        this.loadingService.hideLoading(LoadingComponentId.DETAIL_PAGE);
       });
+      this.loadingService.hideLoading(LoadingComponentId.DETAIL_PAGE);
     }
   }