Merge branch 'develop' into feature#472

CHANGELOG.md

@@ -4,6 +4,17 @@ 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.27-RELEASE] (2024-11-14) (feature#479)
+
+- Angular Bootstrap updated from 16.0.0 to 17.0.1
+
+### [ita-challenges-frontend-3.1.26-RELEASE] (2024-11-14) (feature#475)
+
+- Refactoring: Fixed wrong names of config vars
+
+### [ita-challenges-frontend-3.1.25-RELEASE] (2024-11-14) (feature#475)
+
+- Fixed breadcrumb translation
 
 ### [ita-challenges-frontend-3.1.24-RELEASE] (2024-11-14) (feature#449)
 

conf/.env.CI.dev

@@ -1,2 +1,2 @@
 MICROSERVICE_DEPLOY=ita-challenges-frontend
-MICROSERVICE_VERSION=3.1.24-RELEASE
+MICROSERVICE_VERSION=3.1.27-RELEASE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ita-challenges-frontend",
-  "version": "3.1.24-RELEASE",
+  "version": "3.1.27-RELEASE",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.dev.json",
@@ -37,7 +37,7 @@
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.14.1",
     "@compodoc/compodoc": "^1.1.23",
-    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
     "@popperjs/core": "^2.11.6",

src/app/modules/challenge/components/challenge-header/challenge-header.component.html

@@ -2,8 +2,8 @@
   <div class="row">
     <div class="col-12 col-md-9">
       <p class="breadcrumbs">
-        <a routerLink="/ita-challenge/challenges" id="retos-link">Retos</a> > 
-        <span id="color">Detalle</span>
+        <a routerLink="/ita-challenge/challenges">{{ "modules.starter.main.section2.title" | translate }}</a> &gt;
+        <span id="color">{{ "modules.challenge.header.section" | translate }}</span>
       </p>
       <div class="d-flex align-items-start">
         <div class="difficulty">

src/app/services/resources.service.spec.ts

@@ -35,7 +35,7 @@ describe('ResourcesService', () => {
       done()
     })
 
-    const req = httpClientMock.expectOne(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_SSO_RESOURCES))
+    const req = httpClientMock.expectOne(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_ITA_WIKI_RESOURCES))
     expect(req.request.method).toEqual('GET')
 
     req.flush(responseMock)
@@ -53,7 +53,7 @@ describe('ResourcesService', () => {
       }
     })
 
-    const req = httpClientMock.expectOne(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_SSO_RESOURCES))
+    const req = httpClientMock.expectOne(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_ITA_WIKI_RESOURCES))
     expect(req.request.method).toEqual('GET')
 
     req.flush(errorMessage, { status, statusText: 'Internal Server Error' })

src/app/services/resources.service.ts

@@ -15,8 +15,7 @@ export class ResourcesService {
 
   constructor (@Inject(HttpClient) private readonly http: HttpClient) { }
   getResources (): Observable<ResourceResponse> {
-    // todo: need change the env api request.
-    return this.http.get<ResourceResponse>(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_SSO_RESOURCES),
+    return this.http.get<ResourceResponse>(environment.BACKEND_ITA_WIKI_BASE_URL.concat(environment.BACKEND_ITA_WIKI_RESOURCES),
       {
         headers: {
           'Content-Type': 'application/json'

src/environments/environment.prod.ts

@@ -7,15 +7,16 @@ export const environment = {
   BACKEND_ITA_CHALLENGE_SOLUTION: '/challenge/solution',
   BACKEND_ITA_CHALLENGE_USER_SOLUTION: '/user/solution',
   BACKEND_ITA_SSO_BASE_URL: 'https://dev.sso.itawiki.eurecatacademy.org/api/v1',
-  BACKEND_ITA_WIKI_BASE_URL: 'https://dev.api.itadirectory.eurecatacademy.org/api/v1',
+  BACKEND_ITA_WIKI_BASE_URL: 'https://dev.itawiki.eurecatacademy.org/api/v1',
+  BACKEND_ITA_WIKI_RESOURCES: '/resources',
+  BACKEND_ITA_WIKI_CATEGORIES: '/categories',
   BACKEND_ALL_CHALLENGES_URL: '/challenge/challenges',
   BACKEND_ALL_LANGUAGE_URL: '/challenge/language',
   BACKEND_SSO_ITINERARIES: '/itineraries',
   BACKEND_SSO_LOGIN_URL: '/auth/login',
   BACKEND_SSO_POST_USER: '/users/me',
   BACKEND_SSO_PATCH_USER: '/users',
   BACKEND_SSO_REGISTER_URL: '/auth/register',
-  BACKEND_SSO_RESOURCES: '/resources',
   BACKEND_SSO_VALIDATE_TOKEN_URL: '/tokens/validate',
   ADMIN_USER: '../assets/dummy/admin-user.json',
   USER_SOLUTION: '../assets/dummy/user-solution.json',

src/environments/environment.ts

@@ -1,23 +1,22 @@
-import packageInfo from '../../package.json'
+import { version } from '../../package.json'
 
 export const environment = {
   production: false,
-  appVersion: packageInfo.version,
+  appVersion: version,
   BACKEND_ITA_CHALLENGE_BASE_URL: '/itachallenge/api/v1',
   BACKEND_ITA_CHALLENGE_SOLUTION: '/challenge/solution',
   BACKEND_ITA_CHALLENGE_USER_SOLUTION: '/user/solution',
   BACKEND_ITA_SSO_BASE_URL: 'https://dev.sso.itawiki.eurecatacademy.org/api/v1',
-  // BACKEND_ITA_WIKI_BASE_URL: 'https://dev.api.itadirectory.eurecatacademy.org/api/v1',
   BACKEND_ITA_WIKI_BASE_URL: 'https://dev.itawiki.eurecatacademy.org/api/v1',
+  BACKEND_ITA_WIKI_RESOURCES: '/resources',
+  BACKEND_ITA_WIKI_CATEGORIES: '/categories',
   BACKEND_ALL_CHALLENGES_URL: '/challenge/challenges',
   BACKEND_ALL_LANGUAGE_URL: '/challenge/language',
   BACKEND_SSO_ITINERARIES: '/itineraries',
   BACKEND_SSO_LOGIN_URL: '/auth/login',
   BACKEND_SSO_POST_USER: '/users/me',
   BACKEND_SSO_PATCH_USER: '/users',
   BACKEND_SSO_REGISTER_URL: '/auth/register',
-  BACKEND_SSO_CATEGORIES_URL: '/categories',
-  BACKEND_SSO_RESOURCES: '/resources',
   BACKEND_SSO_VALIDATE_TOKEN_URL: '/tokens/validate',
   ADMIN_USER: '../assets/dummy/admin-user.json',
   USER_SOLUTION: '../assets/dummy/user-solution.mock.json',