diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af34da9..9a941be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.1.13-RELEASE] + +* Hide progression filter if user is not logged in + ### [ita-challenges-frontend-3.1.10-RELEASE] - Capture user solution @@ -52,6 +56,7 @@ and this project adheres to - Optimized size and build process. + ### [ita-challenges-frontend-3.0.3-RELEASE] - Ugraded to Angular 18 diff --git a/GUIDELINES.md b/GUIDELINES.md index 4b2db443..08680712 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -303,7 +303,7 @@ All features developed are deployed on the develop server for testing when are a - Make sure your feature branch is up to date with the develop branch. - Make sure the name of your feature branch is right (feature/#X). - Follow semantic versioning (https://semver.org/), and update version number in package.json. -- Update version number (property MICROSERVICE_VERSION) at file .env.CI.dev as well. Make sure both versions are the same. There should be a white line at the end of the file. -- Make necesary annotations at file CHANGELOG.md +- Update version number (property MICROSERVICE_VERSION) at file **.env.CI.dev** and **package.json** as well. Make sure both versions are the same. There should be a white line at the end of the file. +- Make necesary annotations at file **CHANGELOG.md** - Push your changes to the remote repository. - Create a pull request from your feature branch to the develop branch. diff --git a/angular.json b/angular.json index 0b0605c9..e0ad1e9d 100755 --- a/angular.json +++ b/angular.json @@ -42,8 +42,6 @@ "node_modules/jquery/dist/jquery.min.js", "node_modules/@popperjs/core/dist/umd/popper.min.js", "node_modules/bootstrap/dist/js/bootstrap.min.js" - - ], "browser": "src/main.ts", "stylePreprocessorOptions": { @@ -178,4 +176,4 @@ "@schematics/angular" ] } -} \ No newline at end of file +} diff --git a/conf/.env.CI.dev b/conf/.env.CI.dev index 54487d93..43cb2b4c 100755 --- a/conf/.env.CI.dev +++ b/conf/.env.CI.dev @@ -1,2 +1,2 @@ MICROSERVICE_DEPLOY=ita-challenges-frontend -MICROSERVICE_VERSION=3.1.10-RELEASE +MICROSERVICE_VERSION=3.1.13-RELEASE diff --git a/package-lock.json b/package-lock.json index 7dae57d4..71305310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -64,7 +64,7 @@ "eslint-plugin-n": "^16.6.2", "eslint-plugin-promise": "^6.1.1", "jest": "^29.5.0", - "typescript": "^5.4.4" + "typescript": "^5.4.5" } }, "node_modules/@aduh95/viz.js": { @@ -21404,10 +21404,9 @@ } }, "node_modules/typescript": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz", - "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==", - "license": "Apache-2.0", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 835fede2..102f62c7 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ita-challenges-frontend", - "version": "3.1.10-RELEASE", + "version": "3.1.13-RELEASE", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.dev.json", diff --git a/src/app/models/challenge.model.ts b/src/app/models/challenge.model.ts index b2889f09..4ae06090 100755 --- a/src/app/models/challenge.model.ts +++ b/src/app/models/challenge.model.ts @@ -29,3 +29,17 @@ export class Challenge { }) } } + +export class ChallengeResponse { + count: number + limit: number + offset: number + results: Challenge[] + + constructor (data: any) { + this.count = data.count + this.limit = data.limit + this.offset = data.offset + this.results = data.results.map((item: any) => new Challenge(item)) + } +} diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.html b/src/app/modules/modals/filters-modal/filters-modal.component.html index 390dc31e..24d54778 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.html +++ b/src/app/modules/modals/filters-modal/filters-modal.component.html @@ -48,26 +48,31 @@

{{ "modules.starter.main.section1" | translate } + + -
-

{{'modules.starter.filters.progress' | translate}}

-
-
- - -
-
- - -
-
- - -
+ +
-
+

{{'modules.starter.filters.progress' | translate}}

diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts b/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts index 03738b58..17153239 100755 --- a/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts +++ b/src/app/modules/starter/components/starter-filters/starter-filters.component.spec.ts @@ -21,6 +21,7 @@ describe('StarterFiltersComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(StarterFiltersComponent) component = fixture.componentInstance + component.isUserLoggedIn = true fixture.detectChanges() }) diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.ts b/src/app/modules/starter/components/starter-filters/starter-filters.component.ts index e1a9f542..a85f4b62 100755 --- a/src/app/modules/starter/components/starter-filters/starter-filters.component.ts +++ b/src/app/modules/starter/components/starter-filters/starter-filters.component.ts @@ -4,6 +4,7 @@ import { FormBuilder } from '@angular/forms' import { takeUntilDestroyed } from '@angular/core/rxjs-interop' import { ChallengeService } from 'src/app/services/challenge.service' import { type Language } from 'src/app/models/language.model' +import { AuthService } from 'src/app/services/auth.service' @Component({ selector: 'app-starter-filters', @@ -20,6 +21,9 @@ export class StarterFiltersComponent { private readonly destroyRef = inject(DestroyRef) private readonly fb = inject(FormBuilder) private readonly challengeService = inject(ChallengeService) + private readonly authService = inject(AuthService) + + public isUserLoggedIn: boolean = false constructor () { this.filtersForm = this.fb.nonNullable.group({ @@ -75,5 +79,6 @@ export class StarterFiltersComponent { this.filtersSelected.emit(filters) }) + // this.isUserLoggedIn = this.authService.isUserLoggedIn() } } diff --git a/src/app/modules/starter/components/starter/starter.component.spec.ts b/src/app/modules/starter/components/starter/starter.component.spec.ts index 871d0658..d4768e34 100755 --- a/src/app/modules/starter/components/starter/starter.component.spec.ts +++ b/src/app/modules/starter/components/starter/starter.component.spec.ts @@ -33,7 +33,7 @@ describe('StarterComponent', () => { }) it('should call getAllChallenges when sortBy is not empty', (done) => { - const mockResponse = { challenge: 'challenge' } + const mockResponse = { results: [{ challenge: 'challenge' }] } component.sortBy = 'creation_date' spyOn(starterService, 'getAllChallenges').and.returnValue(of(mockResponse)) @@ -43,20 +43,20 @@ describe('StarterComponent', () => { }) it('should set listChallenges correctly when sortBy is empty', () => { - const mockResponse = { challenge: 'challenge' } + const mockResponse = { results: [{ challenge: 'challenge' }] } spyOn(starterService, 'getAllChallengesOffset').and.returnValue(of(mockResponse)) component.sortBy = '' component.getChallengesByPage(1) - expect(component.listChallenges).toBe(mockResponse) + expect(component.listChallenges).toBe(mockResponse.results) }) it('should set listChallenges correctly when sortBy is not empty', () => { - const mockResponse = [{ challenge: 'challenge' }] + const mockResponse = { results: [{ challenge: 'challenge' }] } spyOn(starterService, 'getAllChallenges').and.returnValue(of(mockResponse)) spyOn(starterService, 'orderBySortAscending').and.returnValue(of(mockResponse)) component.sortBy = 'creation_date' component.getChallengesByPage(1) - expect(component.listChallenges).toStrictEqual(mockResponse) + expect(component.listChallenges).toStrictEqual(mockResponse.results) }) // changeSort diff --git a/src/app/modules/starter/components/starter/starter.component.ts b/src/app/modules/starter/components/starter/starter.component.ts index 3dcc9a04..1219bf9e 100755 --- a/src/app/modules/starter/components/starter/starter.component.ts +++ b/src/app/modules/starter/components/starter/starter.component.ts @@ -59,12 +59,12 @@ export class StarterComponent implements OnInit { const challengesObservable = this.sortBy !== '' ? this.starterService.getAllChallenges() : this.starterService.getAllChallengesOffset(getChallengeOffset, this.pageSize) - this.challengesSubs$ = challengesObservable.subscribe(resp => { if (this.sortBy !== '') { - this.getAndSortChallenges(getChallengeOffset, resp) + this.getAndSortChallenges(getChallengeOffset, resp.results) } else { - this.listChallenges = resp + this.listChallenges = resp.results + console.log('Respuesta del servicio:', resp.results) this.totalPages = Math.ceil(22 / this.pageSize) // Cambiar 22 por el valor de challenge.count } }) @@ -97,7 +97,7 @@ export class StarterComponent implements OnInit { this.challengesSubs$ = challengesObservable.subscribe(resp => { if ((this.filters.languages.length > 0 && this.filters.languages.length < 4) || (this.filters.levels.length > 0 && this.filters.levels.length < 3) || (this.filters.progress.length > 0 && this.filters.progress.length < 3)) { - const respArray: Challenge[] = Array.isArray(resp) ? resp : [resp] + const respArray: Challenge[] = Array.isArray(resp.results) ? resp.results : [resp.results] this.starterService.getAllChallengesFiltered(this.filters, respArray) .subscribe((filteredResp: Challenge[]) => { if (this.sortBy !== '') { @@ -116,7 +116,7 @@ export class StarterComponent implements OnInit { } }) } else { - this.listChallenges = resp + this.listChallenges = resp.results this.totalPages = Math.ceil(22 / this.pageSize) // Cambiar 22 por el valor de challenge.count } }) diff --git a/src/app/services/starter.service.ts b/src/app/services/starter.service.ts index 63433b73..e5bcb043 100755 --- a/src/app/services/starter.service.ts +++ b/src/app/services/starter.service.ts @@ -3,30 +3,29 @@ import { Observable, map, of } from 'rxjs' import { environment } from '../../environments/environment' import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' import { type FilterChallenge } from '../models/filter-challenge.model' -import { type Challenge } from '../models/challenge.model' - +import { type Challenge, type ChallengeResponse } from '../models/challenge.model' @Injectable({ providedIn: 'root' }) export class StarterService { constructor (@Inject(HttpClient) private readonly http: HttpClient) {} - getAllChallenges (): Observable { + getAllChallenges (): Observable { const headers = new HttpHeaders({ 'Content-Type': 'application/json' }) - return this.http.get(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}`, { + return this.http.get(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}`, { headers }) } - getAllChallengesOffset (pageOffset: number, pageLimit: number): Observable { + getAllChallengesOffset (pageOffset: number, pageLimit: number): Observable { const params = new HttpParams().set('offset', pageOffset.toString()).set('limit', pageLimit.toString()) const headers = new HttpHeaders({ 'Content-Type': 'application/json' }) - return this.http.get(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}`, { + return this.http.get(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}`, { headers, params })