Merge pull request #767 from IT-Academy-BCN/feature/176-filters-logic-integration

1/2 feature(starter): Filtering components logic integration #195

Author: ivilarop

CHANGELOG.md

@@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [ita-challenges-frontend-3.31.0-RELEASE] - 2026-02-19
+
+### Added
+- Functionality for new filtering components.
+### Removed
+- Visibility for old filtering component.
+
 ### [ita-challenges-frontend-3.30.0-RELEASE] - 2026-02-20
 ### Added
 - Restyled challenge detail page with card layout, repositioned breadcrumb outside header card, and moved difficulty indicator to stats row

conf/.env.CI.dev

@@ -1,2 +1,2 @@
 MICROSERVICE_DEPLOY=ita-challenges-frontend
-MICROSERVICE_VERSION=3.30.0-RELEASE
+MICROSERVICE_VERSION=3.31.0-RELEASE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ita-challenges-frontend",
-  "version": "3.30.0-RELEASE",
+  "version": "3.31.0-RELEASE",
    "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.dev.json",

src/app/modules/starter/components/challenge-list-filters/challenge-list-filters.component.html

@@ -1,5 +1,6 @@
 <div id="challenge-list-filters">
-    <div><app-language-filter></app-language-filter></div>
+    <div><app-language-filter
+        (languageSelected)="onLanguageFilterChange($event)"></app-language-filter></div>
     <div class="space-divider"></div>
     <app-sort-select
       [sortBy]="sortBy"

src/app/modules/starter/components/challenge-list-filters/challenge-list-filters.component.spec.ts

@@ -1,27 +1,87 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { ChallengeListFiltersComponent } from './challenge-list-filters.component'
+import { ChallengeListFiltersComponent } from "./challenge-list-filters.component";
+import { FilterChallenge } from "src/app/models/filter-challenge.model";
+import { SolutionStatus } from "src/app/models/user-solution-status.enum";
 
-describe('ChallengeListFiltersComponent', () => {
-  let component: ChallengeListFiltersComponent
-  let fixture: ComponentFixture<ChallengeListFiltersComponent>
+describe("ChallengeListFiltersComponent", () => {
+  let component: ChallengeListFiltersComponent;
+  let fixture: ComponentFixture<ChallengeListFiltersComponent>;
+  let AllFiltersAppliedSpy: jasmine.Spy;
+  let SortSelectedSpy: jasmine.Spy;
+  let OrderSelectedSpy: jasmine.Spy;
+  let initialFilters: FilterChallenge = {
+    languages: [],
+    levels: [],
+    progress: [],
+    tags: [],
+  };
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ChallengeListFiltersComponent]
-    }).compileComponents()
+      declarations: [ChallengeListFiltersComponent],
+    }).compileComponents();
 
-    fixture = TestBed.createComponent(ChallengeListFiltersComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
+    fixture = TestBed.createComponent(ChallengeListFiltersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy()
-  })
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
 
-  it('should render the filters container', () => {
-    const element: HTMLElement = fixture.nativeElement
-    expect(element.querySelector('#challenge-list-filters')).toBeTruthy()
-  })
-})
+  it("should render the filters container", () => {
+    const element: HTMLElement = fixture.nativeElement;
+    expect(element.querySelector("#challenge-list-filters")).toBeTruthy();
+  });
+  it("should have initial filters set correctly", () => {
+    component.initialFilters = {
+      languages: ["1234"],
+      levels: [],
+      progress: [],
+      tags: [],
+    };
+    expect(component.initialFilters).toEqual({
+      languages: ["1234"],
+      levels: [],
+      progress: [],
+      tags: [],
+    });
+  });
+
+  it("should emit allFiltersApplied with correct filters when onModalFiltersApplied is called", () => {
+    AllFiltersAppliedSpy = spyOn(component.allFiltersApplied, "emit");
+    const modalFilters = {
+      levels: ["Beginner"],
+      tags: ["Tag1"],
+      progress: [SolutionStatus.IN_PROGRESS],
+    };
+    component.onModalFiltersApplied(modalFilters);
+    expect(AllFiltersAppliedSpy).toHaveBeenCalledWith({
+      ...modalFilters,
+      languages: component.languageFilters,
+    });
+  });
+  it("should emit allFiltersApplied with correct filters when onLanguageFilterChange is called", () => {
+    AllFiltersAppliedSpy = spyOn(component.allFiltersApplied, "emit");
+    const languages = ["JavaScript", "Python"];
+    component.onLanguageFilterChange(languages);
+    expect(AllFiltersAppliedSpy).toHaveBeenCalledWith({
+      ...initialFilters,
+      languages: component.languageFilters,
+    });
+  });
+  it("should emit orderSelected with correct boolean value when changeOrder is called", () => {
+    OrderSelectedSpy = spyOn(component.orderSelected, "emit");
+    const isAscending = true;
+    component.changeOrder(isAscending);
+    expect(OrderSelectedSpy).toHaveBeenCalledWith(isAscending);
+  });
+  it("should emit sortSelected with correct sort value when changeSort is called", () => {
+    SortSelectedSpy = spyOn(component.sortSelected, "emit");
+    const sortValue = "difficulty";
+    component.changeSort(sortValue);
+    expect(SortSelectedSpy).toHaveBeenCalledWith(sortValue);
+  });
+});

src/app/modules/starter/components/challenge-list-filters/challenge-list-filters.component.ts

@@ -10,14 +10,20 @@ type ModalFilters = Pick<FilterChallenge, 'levels' | 'tags' | 'progress'>
 })
 export class ChallengeListFiltersComponent {
   @Input() initialFilters: FilterChallenge = { languages: [], levels: [], progress: [], tags: [] }
-  @Output() filtersApplied = new EventEmitter<ModalFilters>()
+  @Output() allFiltersApplied = new EventEmitter<FilterChallenge>()
   @Output() sortSelected = new EventEmitter<string>()
   @Output() orderSelected = new EventEmitter<boolean>()
   sortBy: string = 'popularity'
   isAscending: boolean = false
+  modalFilters: ModalFilters = { levels: [], tags: [], progress: [] } 
+  languageFilters: string[] = []
 
-  protected onModalFiltersApplied (filters: ModalFilters): void {
-    this.filtersApplied.emit(filters)
+  onModalFiltersApplied (filters: ModalFilters): void {
+    this.modalFilters = filters
+    this.allFiltersApplied.emit({
+      ...filters,
+      languages: this.languageFilters
+    })
   }
 
   changeSort (sort: string): void {
@@ -29,4 +35,12 @@ export class ChallengeListFiltersComponent {
     this.isAscending = isAscending
     this.orderSelected.emit(isAscending)
   }
+
+  onLanguageFilterChange (languages: string[]): void {
+    this.languageFilters = languages
+    this.allFiltersApplied.emit({
+      ...this.modalFilters,
+      languages
+    })
+  }
 }

src/app/modules/starter/components/starter/starter.component.html

@@ -1,48 +1,46 @@
 <div class="starter">
   <!-- OLD FILTERS COMPONENT -->
-  <header class="challenges-header">
+  <!-- <header class="challenges-header">
     <div class="d-flex justify-content-between align-items-center challenges-filter-header">
       <h2>{{ "modules.starter.main.section2.title" | translate }}</h2>
       <div class="d-flex gap-2 align-items-center">
-        <!-- MOBILE FILTER BUTTON -->
-        <!-- TODO: Decide how this button fits with the new filters implementations,
-        will the button be the same for the mobile and desktop versions? -->
+
         <button class="btn btn-outline-primary btnFiltrar d-xl-none" (click)="openModal()">
           <strong>Filtrar</strong>
         </button>
-        <!-- NEW CHALLENGE BUTTON -->
+
         <button [routerLink]="['/ita-challenge/challenges/new-challenge']" *ngIf="isAdmin" class="btn btn-sm btn-primary new-challenge-btn">
           {{ "components.mainMenu.section4.title" | translate }}
         </button>
       </div>
     </div>
     <fieldset id="filters-container">
-      <!-- SORT BY AND FILTERS SELECTOR -->
+
       <div id="filters-selector">
-        <!-- ORDER BY SELECTOR -->
-          <!-- SORT BY -->
+
     <app-sort-select
       [sortBy]="sortBy"
       [isAscending]="isAscending"
       (sortSelected)="changeSort($event)"
       (orderSelected)="changeOrder($event)">
     </app-sort-select>
-        <!-- FILTERS SELECTOR -->
+     
         <div id="filters-panel" class="filters-panel open">
-          <app-starter-filters (filtersSelected)="getChallengeFilters($event)"></app-starter-filters>
+          <app-starter-filters ></app-starter-filters>
         </div>
       </div>
     </fieldset>
-  </header>
+  </header> -->
 
 
   <!-- NEW FILTERS COMPONENT -->
   <header id="challenge-filters">
     <app-challenge-list-filters
+      [initialFilters]="filters"
+      (allFiltersApplied)="getChallengeFilters($event)"
       (sortSelected)="changeSort($event)"
       (orderSelected)="changeOrder($event)">
-      [initialFilters]="filters"
-      (filtersApplied)="onModalFiltersApplied($event)">
+    
     </app-challenge-list-filters>
   </header>
 

src/app/modules/starter/components/starter/starter.component.spec.ts

@@ -15,24 +15,7 @@ import { SolutionService } from 'src/app/services/solution.service';
 import { type UserSolution } from 'src/app/models/user-solution.interface';
 
 describe('StarterComponent', () => {
-  it('should render filters visible by default and without a toggle button', () => {
-    const fixture = TestBed.createComponent(StarterComponent);
-    fixture.detectChanges();
-    const button: HTMLButtonElement | null = fixture.nativeElement.querySelector('#filters-toggle');
-    const panel: HTMLElement | null = fixture.nativeElement.querySelector('#filters-panel');
-    expect(button).toBeNull();
-    expect(panel).toBeTruthy();
-    // Panel should be open by default
-    expect(panel?.classList.contains('open')).toBe(true);
-  });
 
-  it('should have the filters panel present in the DOM', () => {
-    const fixture = TestBed.createComponent(StarterComponent);
-    fixture.detectChanges();
-    const panel: HTMLElement | null = fixture.nativeElement.querySelector('#filters-panel');
-    expect(panel).toBeTruthy();
-    expect(panel?.classList.contains('open')).toBe(true);
-  });
   it('should re-fetch challenges when refresh$ emits', () => {
     const fixture = TestBed.createComponent(StarterComponent);
     const component = fixture.componentInstance;

src/app/modules/starter/components/starter/starter.component.ts

@@ -213,7 +213,8 @@ export class StarterComponent implements OnInit {
         this.solutionStatusMap = solutions.reduce<Record<string, SolutionStatus>>((statusMap, userSolution) => {
           statusMap[userSolution.uuid_challenge] = userSolution.status
           return statusMap
-        }, {})
+        }, {});
+        this.cd.detectChanges();
       },
       error: (err) => {
         console.error('Error fetching user solutions:', err)