From 05472d783d4e381e763706166066a65c5ebdeab1 Mon Sep 17 00:00:00 2001 From: Cesc Date: Tue, 16 Jul 2024 11:30:19 +0200 Subject: [PATCH 01/21] feat: progress filter hidden when user not logged --- CHANGELOG.md | 4 ++++ conf/.env.CI.dev | 3 ++- package.json | 2 +- .../filters-modal/filters-modal.component.html | 2 +- .../filters-modal/filters-modal.component.spec.ts | 12 +++++++----- .../modals/filters-modal/filters-modal.component.ts | 8 ++++++++ .../starter-filters/starter-filters.component.html | 2 +- .../starter-filters.component.spec.ts | 1 + .../starter-filters/starter-filters.component.ts | 5 +++++ 9 files changed, 30 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a55b596..679805ad 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.3-RELEASE] + +- Progress filter hidden is user is not logged (desktop and mobile) + ### [ita-challenges-frontend-3.0.3-RELEASE] - Ugraded to Angular 18 diff --git a/conf/.env.CI.dev b/conf/.env.CI.dev index 7350424d..6c7876fb 100755 --- a/conf/.env.CI.dev +++ b/conf/.env.CI.dev @@ -1,2 +1,3 @@ MICROSERVICE_DEPLOY=ita-challenges-frontend -MICROSERVICE_VERSION=3.0.3-RELEASE +MICROSERVICE_VERSION=3.1.3-RELEASE + diff --git a/package.json b/package.json index 0a3a3d40..b7866a4f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ita-challenges-frontend", - "version": "3.0.3-RELEASE", + "version": "3.1.3-RELEASE", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.dev.json", 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 5bef0ccc..1df94844 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.html +++ b/src/app/modules/modals/filters-modal/filters-modal.component.html @@ -48,7 +48,7 @@

-
+

Progreso

diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts b/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts index a7fb46b9..1fe5ca99 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts +++ b/src/app/modules/modals/filters-modal/filters-modal.component.spec.ts @@ -1,20 +1,22 @@ -import { type ComponentFixture, TestBed } from '@angular/core/testing' - +import { TestBed } from '@angular/core/testing' import { FiltersModalComponent } from './filters-modal.component' +import { AuthService } from 'src/app/services/auth.service' +import { HttpClientTestingModule } from '@angular/common/http/testing' describe('FiltersModalComponent', () => { let component: FiltersModalComponent - let fixture: ComponentFixture beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [FiltersModalComponent] + declarations: [FiltersModalComponent], + imports: [HttpClientTestingModule], + providers: [AuthService] }) .compileComponents() }) beforeEach(() => { - fixture = TestBed.createComponent(FiltersModalComponent) + const fixture = TestBed.createComponent(FiltersModalComponent) component = fixture.componentInstance fixture.detectChanges() }) diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.ts b/src/app/modules/modals/filters-modal/filters-modal.component.ts index 22de7a0f..eb31c9b4 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.ts +++ b/src/app/modules/modals/filters-modal/filters-modal.component.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, inject, type TemplateRef } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { AuthService } from 'src/app/services/auth.service' @Component({ selector: 'app-filters-modal', @@ -9,8 +10,15 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap' export class FiltersModalComponent { @ViewChild('modal') private readonly modalContent!: TemplateRef private readonly modalService = inject(NgbModal) + private readonly authService = inject(AuthService) + + public isUserLoggedIn?: boolean open (): void { this.modalService.open(this.modalContent, { size: 'lg' }) } + + constructor () { + this.isUserLoggedIn = this.authService.isUserLoggedIn() + } } diff --git a/src/app/modules/starter/components/starter-filters/starter-filters.component.html b/src/app/modules/starter/components/starter-filters/starter-filters.component.html index 4d5d2658..c508df68 100755 --- a/src/app/modules/starter/components/starter-filters/starter-filters.component.html +++ b/src/app/modules/starter/components/starter-filters/starter-filters.component.html @@ -33,7 +33,7 @@
-
+

{{'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 2026cb0e..e5ed55bb 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({ @@ -74,5 +78,6 @@ export class StarterFiltersComponent { } this.filtersSelected.emit(filters) }) + this.isUserLoggedIn = this.authService.isUserLoggedIn() } } From 604fcea5762105fcef14c0bf58c13602f8ddf092 Mon Sep 17 00:00:00 2001 From: Cesc Date: Wed, 24 Jul 2024 09:53:36 +0200 Subject: [PATCH 02/21] fixed library compatibility --- package-lock.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7f7dc57..b4d446b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ita-challenges-frontend", - "version": "3.0.3-RELEASE", + "version": "3.1.3-RELEASE", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ita-challenges-frontend", - "version": "3.0.3-RELEASE", + "version": "3.1.3-RELEASE", "dependencies": { "@angular/animations": "^18.0.2", "@angular/cdk": "^18.0.2", @@ -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" From bc4dab2578e3094f1f8f35ae6b3f0b5d13bc19e6 Mon Sep 17 00:00:00 2001 From: SilviaEzra <159856417+SilviaEzra@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:29:55 +0200 Subject: [PATCH 03/21] Progress Filter must be hidden if user is not logged #395 --- .../filters-modal.component.html | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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 1df94844..480d53eb 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.html +++ b/src/app/modules/modals/filters-modal/filters-modal.component.html @@ -48,23 +48,26 @@

-
+ @if (isUserLoggedIn) { +

Progreso

- - + +
- - + +
- - + +
-
+
+ } +
From 869886caa70880263c557094e4c059adf880f80f Mon Sep 17 00:00:00 2001 From: SilviaEzra <159856417+SilviaEzra@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:17:22 +0200 Subject: [PATCH 04/21] Resolve merge conflict --- CHANGELOG.md | 44 +++++++++- conf/.env.CI.dev | 2 +- package-lock.json | 4 +- package.json | 2 +- .../filters-modal.component.html | 4 +- .../filters-modal/filters-modal.component.ts | 86 ++++++++++++++++++- 6 files changed, 132 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20e47584..ba671662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,49 @@ 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.3-RELEASE] +### [ita-challenges-frontend-3.1.10-RELEASE] + +- Capture user solution + +### [ita-challenges-frontend-3.1.9-RELEASE] - 2024-10-08 (feature#300) + +- Refactoring: Creación de User Service + +### [ita-challenges-frontend-3.1.8-RELEASE] +- Several fixes in challenges screen + +### [ita-challenges-frontend-3.1.7-RELEASE] + +- Added scroll by overflow + + +### [ita-challenges-frontend-3.1.6-RELEASE] + +- Fixed filters at responsive mode. + +### [ita-challenges-frontend-3.1.5-RELEASE] + +- Reviewing of icons difficulty-off/on + +### [ita-challenges-frontend-3.1.4-RELEASE] + +- Reviewing of Challenge Screen & functionalities + +### [ita-challenges-frontend-3.1.3-RELEASE] - 2024-09-26 (feauture#405) + +- Refactoring: huge mocks must be externalized from tests. + +### [ita-challenges-frontend-3.1.2-RELEASE] - 2024-09-26 (feauture#408) + +- Tooltip is not translated. + +### [ita-challenges-frontend-3.1.0-RELEASE] + +- Added pipe to escape java characters to json. + +### [ita-challenges-frontend-3.0.6-RELEASE] + +- i18n of send-solution-modal - Progress filter hidden is user is not logged (desktop and mobile) diff --git a/conf/.env.CI.dev b/conf/.env.CI.dev index 6c7876fb..612bf324 100755 --- a/conf/.env.CI.dev +++ b/conf/.env.CI.dev @@ -1,3 +1,3 @@ MICROSERVICE_DEPLOY=ita-challenges-frontend -MICROSERVICE_VERSION=3.1.3-RELEASE +MICROSERVICE_VERSION=3.1.10-RELEASE diff --git a/package-lock.json b/package-lock.json index b4d446b5..71305310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ita-challenges-frontend", - "version": "3.1.3-RELEASE", + "version": "3.0.0-RELEASE", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ita-challenges-frontend", - "version": "3.1.3-RELEASE", + "version": "3.0.0-RELEASE", "dependencies": { "@angular/animations": "^18.0.2", "@angular/cdk": "^18.0.2", diff --git a/package.json b/package.json index b7866a4f..41429849 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ita-challenges-frontend", - "version": "3.1.3-RELEASE", + "version": "3.1.10-RELEASE", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.dev.json", 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 480d53eb..ab541542 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.html +++ b/src/app/modules/modals/filters-modal/filters-modal.component.html @@ -48,7 +48,7 @@

- @if (isUserLoggedIn) { + diff --git a/src/app/modules/modals/filters-modal/filters-modal.component.ts b/src/app/modules/modals/filters-modal/filters-modal.component.ts index eb31c9b4..9b571bbc 100755 --- a/src/app/modules/modals/filters-modal/filters-modal.component.ts +++ b/src/app/modules/modals/filters-modal/filters-modal.component.ts @@ -1,6 +1,10 @@ -import { Component, ViewChild, inject, type TemplateRef } from '@angular/core' +import { Component, Output, ViewChild, EventEmitter, inject, type TemplateRef } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { AuthService } from 'src/app/services/auth.service' +import { FormBuilder } from '@angular/forms' +import { type FilterChallenge } from 'src/app/models/filter-challenge.model' +import { ChallengeService } from 'src/app/services/challenge.service' +import { type Language } from 'src/app/models/language.model' @Component({ selector: 'app-filters-modal', @@ -8,17 +12,93 @@ import { AuthService } from 'src/app/services/auth.service' styleUrls: ['./filters-modal.component.scss'] }) export class FiltersModalComponent { + @Output() filtersSelected = new EventEmitter() @ViewChild('modal') private readonly modalContent!: TemplateRef private readonly modalService = inject(NgbModal) private readonly authService = inject(AuthService) public isUserLoggedIn?: boolean + private readonly formBuilder = inject(FormBuilder) + private readonly challengeService = inject(ChallengeService) + + public languages: Record = {} + + formGroup = this.formBuilder.group({ + languages: this.formBuilder.nonNullable.group({ + javascript: false, + java: false, + php: false, + python: false + }), + levels: this.formBuilder.nonNullable.group({ + easy: false, + medium: false, + hard: false + }), + progress: this.formBuilder.nonNullable.group({ + noStarted: false, + started: false, + finished: false + }) + }) + + applyFilters (): void { + this.challengeService.getAllLanguages().subscribe((res: any) => { + if (res.results !== undefined) { + this.languages = res.results.reduce((acc: Record, result: Language) => { + acc[result.language_name.toLowerCase()] = result.id_language + return acc + }, {}) + // Procesar filtros después de cargar los idiomas + this.processFilters() + } + }) + } + + private processFilters (): void { + const formValue = this.formGroup.value + const filters: FilterChallenge = { languages: [], levels: [], progress: [] } + + // Manejo de languages + if (formValue.languages !== null && formValue.languages !== undefined) { + Object.entries(formValue.languages).forEach(([key, val]) => { + if (val) { + const idLanguage = this.languages[key] + if (idLanguage !== '') { + filters.languages.push(idLanguage) + } + } + }) + } + + // Manejo de levels + if (formValue.levels !== null && formValue.levels !== undefined) { + Object.entries(formValue.levels).forEach(([key, val]) => { + if (val) { + filters.levels.push(key.toUpperCase()) + } + }) + } + + // Manejo de progress + if (formValue.progress !== null && formValue.progress !== undefined) { + Object.entries(formValue.progress).forEach(([key, val], i) => { + if (val) { + filters.progress.push(i + 1) + } + }) + } + + this.filtersSelected.emit(filters) + this.modalService.dismissAll() + } + open (): void { this.modalService.open(this.modalContent, { size: 'lg' }) } - constructor () { + /* constructor () { this.isUserLoggedIn = this.authService.isUserLoggedIn() - } + } */ } From aa76a3dbaeaec0913595c5aa5cc520baabd62d48 Mon Sep 17 00:00:00 2001 From: SilviaEzra <159856417+SilviaEzra@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:35:33 +0200 Subject: [PATCH 05/21] ok --- .../filters-modal/filters-modal.component.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 0b9c4df5..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,8 +48,12 @@

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