Merge pull request #8 from in2workspace/feature/search

Feature/search

Author: AlbaLopez552

cypress/e2e/dashboard.cy.ts

@@ -21,7 +21,7 @@ describe('/dashboard',{
         cy.getBySel('vServices').should('have.text', '1 verified services')
         cy.getBySel('rPublishers').should('exist')
         cy.getBySel('rPublishers').should('have.text', '1 registered providers')
-        cy.getBySel('nameServices').should('have.length', init_stat.services.length)
+        cy.getBySel('nameServices').should('have.length', init_stat.services?.length)
         cy.getBySel('nameOrgs').should('have.length', init_stat.organizations.length)
 
     })*/

src/app/offerings/gallery/gallery.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
-import { CommonModule } from '@angular/common';
 import {CardComponent} from "../../shared/card/card.component";
 import {components} from "../../models/product-catalog";
 type ProductOffering = components["schemas"]["ProductOffering"];
@@ -18,15 +17,14 @@ export class GalleryComponent implements OnInit {
   products: ProductOffering[]=[];
 
   constructor(
-    private api: ApiServiceService,
-    private cdr: ChangeDetectorRef) {
+    private readonly api: ApiServiceService,
+    private readonly cdr: ChangeDetectorRef) {
   }
 
   //Must be under environment.PRODUCT_LIMIT (i.e. 6 atm)
   gallery_limit=4;
 
   ngOnInit() {
-    console.log('API RESPONSE:')
     this.api.getProducts(0,undefined).then(data => {
       for(let i=0; i < this.gallery_limit && i < data.length; i++){
           let attachment: any[]= []
@@ -94,9 +92,6 @@ export class GalleryComponent implements OnInit {
           })
         }
     })
-
-    console.log('Productos...')
-    console.log(this.products)
   }
 
 }

src/app/pages/dashboard/dashboard.component.html

@@ -82,15 +82,7 @@ <h1 class="mb-4 text-left text-4xl font-extrabold tracking-tight md:text-5xl lg:
       </section>
     }    
 
-    <!--<app-how-it-works></app-how-it-works>-->
-    <!--<bae-off-featured></bae-off-featured>-->
     <bae-off-gallery></bae-off-gallery>
     <app-platform-benefits></app-platform-benefits>  
-    <!--<app-explore-dome></app-explore-dome>-->
-    <!--<app-faq></app-faq>-->
-  
-    <!-- @if(showContact){
-      <contact-us [ngClass]="showContact ? 'backdrop-blur-sm': ''" class="flex justify-center overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full shadow-2xl"></contact-us>
-    } -->
 
   </div>

src/app/pages/dashboard/dashboard.component.ts

@@ -68,27 +68,20 @@ export class DashboardComponent implements OnInit {
 
   startTagTransition() {
     setInterval(() => {
-      this.currentIndexServ = (this.currentIndexServ + 1) % this.services.length;
-      this.currentIndexPub = (this.currentIndexPub + 1) % this.publishers.length;
+      this.currentIndexServ = (this.currentIndexServ + 1) % this.services?.length;
+      this.currentIndexPub = (this.currentIndexPub + 1) % this.publishers?.length;
     }, this.delay);
   }
 
   async ngOnInit() {
     this.statsService.getStats().then(data=> {
-      this.services=data?.services;
-      this.publishers=data?.organizations;
+      this.services=data?.services ?? [];
+      this.publishers=data?.organizations ?? [];
       this.startTagTransition();
     })
     this.isFilterPanelShown = JSON.parse(this.localStorage.getItem('is_filter_panel_shown') as string);
-    //this.route.snapshot.paramMap.get('id');
-    console.log('--- route data')
-    console.log(this.route.queryParams)
-    console.log(this.route.snapshot.queryParamMap.get('token'))
     if(this.route.snapshot.queryParamMap.get('token') != null){    
       this.loginService.getLogin(this.route.snapshot.queryParamMap.get('token')).then(data => {
-        console.log('---- loginangular response ----')
-        console.log(data)
-        console.log(data.username)
         let info = {
           "id": data.id,
           "user": data.username,
@@ -107,25 +100,9 @@ export class DashboardComponent implements OnInit {
 
         this.localStorage.addLoginInfo(info);
         this.eventMessage.emitLogin(info);
-        console.log('----')
-        //this.refreshApi.stopInterval();
-        //this.refreshApi.startInterval(((data.expire - moment().unix())-4)*1000, data);
-        //this.refreshApi.startInterval(3000, data);
       })      
       this.router.navigate(['/dashboard'])
-    } else {
-      console.log('sin token')
-      //this.localStorage.clear()
-      let aux = this.localStorage.getObject('login_items') as LoginInfo;
-      if (JSON.stringify(aux) != '{}') {
-        console.log(aux)
-        console.log('moment')
-        console.log(aux['expire'])
-        console.log(moment().unix())
-        console.log(aux['expire'] - moment().unix())
-        console.log(aux['expire'] - moment().unix() <= 5)
-      }
-    }
+    } 
     this.api.getLaunchedCategories().then(data => {
       for(let i=0; i < data.length; i++){
         if(data[i].isRoot==true){
@@ -139,7 +116,6 @@ export class DashboardComponent implements OnInit {
     this.showContact = true;
 
     this.cdr.detectChanges();
-    console.log('----')
   }
   filterSearch(event: any) {
     if(this.searchField.value!='' && this.searchField.value != null){

src/app/pages/product-details/product-details.component.html

@@ -138,7 +138,7 @@ <h5 class="md:text-3xl lg:text-4xl font-semibold tracking-tight text-primary-100
                     </li>
                 }
             </ul>
-            @if(check_logged){
+            @if(check_logged && !IS_ISBE){
             <button type="button" (click)="openDrawer()" [disabled]="!PURCHASE_ENABLED" [ngClass]="!PURCHASE_ENABLED ? 'opacity-50' : 'hover:bg-primary-50'" class="hidden md:flex w-fit m-2 text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-800">
                 <svg class="w-3.5 h-3.5 me-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 21">
                 <path d="M15 12a1 1 0 0 0 .962-.726l2-7A1 1 0 0 0 17 3H3.77L3.175.745A1 1 0 0 0 2.208 0H1a1 1 0 0 0 0 2h.438l.6 2.255v.019l2 7 .746 2.986A3 3 0 1 0 9 17a2.966 2.966 0 0 0-.184-1h2.368c-.118.32-.18.659-.184 1a3 3 0 1 0 3-3H6.78l-.5-2H15Z"/>
@@ -147,7 +147,7 @@ <h5 class="md:text-3xl lg:text-4xl font-semibold tracking-tight text-primary-100
             </button>
             }
         </div>
-        @if(check_logged){
+        @if(check_logged && !IS_ISBE){
             <button type="button" (click)="openDrawer()" [disabled]="!PURCHASE_ENABLED" [ngClass]="!PURCHASE_ENABLED ? 'opacity-50' : 'hover:bg-primary-50'" class="flex md:hidden justify-end w-fit m-2 text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-800">
                 <svg class="w-3.5 h-3.5 me-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 21">
                 <path d="M15 12a1 1 0 0 0 .962-.726l2-7A1 1 0 0 0 17 3H3.77L3.175.745A1 1 0 0 0 2.208 0H1a1 1 0 0 0 0 2h.438l.6 2.255v.019l2 7 .746 2.986A3 3 0 1 0 9 17a2.966 2.966 0 0 0-.184-1h2.368c-.118.32-.18.659-.184 1a3 3 0 1 0 3-3H6.78l-.5-2H15Z"/>

src/app/pages/product-inventory/product-inventory.component.ts

@@ -23,8 +23,8 @@ export class ProductInventoryComponent implements OnInit, AfterViewInit {
   openProdId:any=undefined;
 
   constructor(
-    private cdr: ChangeDetectorRef,
-    private eventMessage: EventMessageService
+    private readonly cdr: ChangeDetectorRef,
+    private readonly eventMessage: EventMessageService
   ) {
     this.eventMessage.messages$.subscribe(ev => {
       if(ev.type === 'OpenServiceDetails') {

src/app/services/pagination.service.ts

@@ -27,10 +27,6 @@ export class PaginationService {
 
   async getItemsPaginated(page:number, pageSize:any, next:boolean, items:any[], nextItems:any[], options:any,
     handler: (...params: any[]) => Promise<any>): Promise<any> {
-
-      console.log('options')
-      console.log(options)
-
     try {
       let params: any[] = [page];
       if("keywords" in options){
@@ -68,8 +64,6 @@ export class PaginationService {
         page=0;
         params[0]=page;
 
-        console.log('------ Calling handler')
-        console.log(params)
         let data = await handler(...params)
         items=data;
         page=page+pageSize;
@@ -86,7 +80,7 @@ export class PaginationService {
       page=page+pageSize;
 
     } catch(err) {
-      console.log(err)
+      console.error(err)
     } finally {
       let page_check=true;
       if(nextItems.length>0){
@@ -246,7 +240,6 @@ export class PaginationService {
 
   async getProducts(page: number, keywords: any, filters?: Category[]): Promise<ProductOffering[]> {
     try {
-      console.log('-------------------------- getProducts ----------------------------');
       // Get data from API
       const productOfferings: ProductOffering[] = filters && filters.length > 0
         ? await this.api.getProductsByCategory(filters, page, keywords)
@@ -313,7 +306,6 @@ export class PaginationService {
 
   async getProductsByCatalog(page: number, keywords: any, filters?: Category[], id?: any): Promise<ProductOffering[]> {
     try {
-      console.log('-------------------------- getProductsByCatalog ----------------------------');
       // Get data from API
       const productOfferings: ProductOffering[] = filters && filters.length > 0
         ? await this.api.getProductsByCategoryAndCatalog(filters, id, page)
@@ -552,7 +544,6 @@ export class PaginationService {
     try {
       // Get Orders
       orders = await this.orderService.getProductOrders(seller, page, filters, selectedDate, role);
-      console.log('getOrders', orders);
       // Obtener todas las cuentas de facturación en paralelo
       const billingAccounts = await Promise.all(orders.map(order => this.accountService.getBillingAccountById(order.billingAccount.id)));
 
@@ -561,7 +552,6 @@ export class PaginationService {
         // Obtener detalles de los productos en paralelo
         const items = await Promise.all(order.productOrderItem.map(async (productOrderItem:any) => {
           try {
-            console.log('Soy un productOrderItem???????: ', productOrderItem);
             const offer = await this.api.getProductById(productOrderItem.productOffering.id);
             const spec = await this.api.getProductSpecification(offer.productSpecification.id);
 
@@ -613,7 +603,6 @@ export class PaginationService {
         };
       }));
 
-      console.log('Orders processed:', ordersWithDetails);
       return ordersWithDetails;
     } catch (error) {
       console.error('Error fetching orders:', error);
@@ -670,11 +659,8 @@ export class PaginationService {
 
   async getInventory(page: number, keywords: any, filters: Category[], seller: any): Promise<any[]> {
     try {
-      console.log('Fetching inventory...');
-
       // Obtener inventario desde el servicio
       const data = await this.inventoryService.getInventory(page, seller, filters, keywords);
-      console.log('Inventory received:', data);
 
       // Obtener ofertas del inventario
       return await this.getOffers(data);
@@ -686,14 +672,11 @@ export class PaginationService {
   }
 
   async getInvoices(page:number, filters:Category[], seller:any, selectedDate:any, role:any): Promise<any[]> {
-    console.log("---getInvoices---")
+
     let invoices = []
     try{
       invoices = await this.invoicesService.getInvoices(seller,page,filters,selectedDate,role)
     } finally {
-      console.log("params:", seller,page,filters,selectedDate,role)
-      console.log("---getInvoices result:---", invoices)
-      console.log(invoices)
       return invoices
     }
   }

src/app/services/shopping-cart-service.service.ts

@@ -29,8 +29,6 @@ export class ShoppingCartServiceService {
     return cart;
   }
   async addItemShoppingCart(item:any){
-    console.log('adding to cart')
-    console.log(item)
     //POST - El item va en el body de la petición
     let url = `${ShoppingCartServiceService.BASE_URL}${ShoppingCartServiceService.API_CART}/item/`;
 
@@ -44,8 +42,6 @@ export class ShoppingCartServiceService {
     let url = `${ShoppingCartServiceService.BASE_URL}${ShoppingCartServiceService.API_CART}/item/${id}`;
     await lastValueFrom(this.http.delete<any>(url));
     await this.refreshCart(); // Actualiza el carrito tras la operación
-
-    //return this.http.delete<any>(url);
   }
 
   async emptyShoppingCart(){

src/app/shared/card/card.component.html

@@ -74,7 +74,7 @@ <h5 class="text-xl font-semibold line-clamp-2 tracking-tight text-primary-100 da
           </svg>
           {{ 'CARD._details' | translate }}
         </button>
-        @if(check_logged){
+        @if(check_logged && !IS_ISBE){
           <button id="add-to-cart" type="button" [disabled]="!PURCHASE_ENABLED || productAlreadyInCart"
                   (click)="openDrawer()"
                   [ngClass]="!PURCHASE_ENABLED || productAlreadyInCart ? 'opacity-50' : 'hover:bg-primary-50'"
@@ -217,7 +217,7 @@ <h5 class="font-semibold tracking-tight text-lg text-primary-100 dark:text-prima
             </div>
             <hr class="h-px bg-gray-200 border-0 dark:bg-gray-700">
             <div class="flex">
-              @if(check_logged){
+              @if(check_logged && !IS_ISBE){
               <button (click)="openDrawer()" [disabled]="!PURCHASE_ENABLED || productAlreadyInCart" [ngClass]="!PURCHASE_ENABLED || productAlreadyInCart ? 'opacity-50' : 'hover:bg-primary-50'" type="button" class="m-4 w-fit flex items-center justify-start text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center me-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-800">
                 <svg class="w-3.5 h-3.5 me-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 21">
                 <path d="M15 12a1 1 0 0 0 .962-.726l2-7A1 1 0 0 0 17 3H3.77L3.175.745A1 1 0 0 0 2.208 0H1a1 1 0 0 0 0 2h.438l.6 2.255v.019l2 7 .746 2.986A3 3 0 1 0 9 17a2.966 2.966 0 0 0-.184-1h2.368c-.118.32-.18.659-.184 1a3 3 0 1 0 3-3H6.78l-.5-2H15Z"/>