Compare commits
38 Commits
feature/ev
...
902f65d8d0
| Author | SHA1 | Date | |
|---|---|---|---|
| 902f65d8d0 | |||
| 9dcedc9382 | |||
| 565bc769ed | |||
| 4e06145f44 | |||
| 9bb4ff61f7 | |||
| 79a6edc3f3 | |||
| 5d5146d784 | |||
| 34d351afc5 | |||
| 9845a82f4a | |||
| f4e854843e | |||
| 752c5fceea | |||
| 974f947fc6 | |||
| fa0e9de886 | |||
| 656e41d189 | |||
| 63ae02df22 | |||
| 1d5c94b9bc | |||
| afaa761acc | |||
| d50bd40602 | |||
| aa51742627 | |||
| 21119ff303 | |||
| 44bcb9aeba | |||
| 67702ffdd7 | |||
| b04c33bbff | |||
| 5d1ed7efa2 | |||
| 37bbd65cfe | |||
| 862751fec8 | |||
| 251411d200 | |||
| 4f444fd757 | |||
| ca1cacc9ea | |||
| ea0bd4a956 | |||
| 8963bd5460 | |||
| a1d5ecb6fa | |||
| fb6ab2fca2 | |||
| 326f2d9bcd | |||
| 8268e58547 | |||
| 3e98d08d59 | |||
| 20c8b04638 | |||
| c662c27fc7 |
22
angular.json
22
angular.json
@@ -30,16 +30,11 @@
|
||||
"input": "public"
|
||||
}
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"styles": ["node_modules/leaflet/dist/leaflet.css", "src/styles.scss"],
|
||||
"server": "src/main.server.ts",
|
||||
"outputMode": "server",
|
||||
"security": {
|
||||
"allowedHosts": [
|
||||
"localhost",
|
||||
"127.0.0.1"
|
||||
]
|
||||
"allowedHosts": ["localhost", "127.0.0.1"]
|
||||
},
|
||||
"ssr": {
|
||||
"entry": "src/server.ts"
|
||||
@@ -70,6 +65,14 @@
|
||||
"optimization": false,
|
||||
"extractLicenses": false,
|
||||
"sourceMap": true
|
||||
},
|
||||
"homo": {
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.homo.ts"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "production"
|
||||
@@ -85,6 +88,9 @@
|
||||
},
|
||||
"local": {
|
||||
"buildTarget": "shopit-front:build:local"
|
||||
},
|
||||
"homo": {
|
||||
"buildTarget": "shopit-front:build:homo"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
@@ -95,4 +101,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
25
package-lock.json
generated
25
package-lock.json
generated
@@ -19,6 +19,7 @@
|
||||
"@fortawesome/fontawesome-free": "^7.2.0",
|
||||
"bootstrap": "^5.3.8",
|
||||
"express": "^5.1.0",
|
||||
"leaflet": "^1.9.4",
|
||||
"qrcode": "1.5.4",
|
||||
"rxjs": "~7.8.0",
|
||||
"tslib": "^2.3.0"
|
||||
@@ -28,6 +29,7 @@
|
||||
"@angular/cli": "^22.0.4",
|
||||
"@angular/compiler-cli": "^22.0.0",
|
||||
"@types/express": "^5.0.1",
|
||||
"@types/leaflet": "^1.9.21",
|
||||
"@types/node": "^20.17.19",
|
||||
"jsdom": "^28.0.0",
|
||||
"prettier": "^3.8.1",
|
||||
@@ -3816,6 +3818,13 @@
|
||||
"@types/send": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/geojson": {
|
||||
"version": "7946.0.16",
|
||||
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
|
||||
"integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/http-errors": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
|
||||
@@ -3823,6 +3832,16 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/leaflet": {
|
||||
"version": "1.9.21",
|
||||
"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.21.tgz",
|
||||
"integrity": "sha512-TbAd9DaPGSnzp6QvtYngntMZgcRk+igFELwR2N99XZn7RXUdKgsXMR+28bUO0rPsWp8MIu/f47luLIQuSLYv/w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/geojson": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "20.19.43",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.43.tgz",
|
||||
@@ -5936,6 +5955,12 @@
|
||||
],
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/leaflet": {
|
||||
"version": "1.9.4",
|
||||
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
|
||||
"integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==",
|
||||
"license": "BSD-2-Clause"
|
||||
},
|
||||
"node_modules/listr2": {
|
||||
"version": "10.2.1",
|
||||
"resolved": "https://registry.npmjs.org/listr2/-/listr2-10.2.1.tgz",
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
"@fortawesome/fontawesome-free": "^7.2.0",
|
||||
"bootstrap": "^5.3.8",
|
||||
"express": "^5.1.0",
|
||||
"leaflet": "^1.9.4",
|
||||
"qrcode": "1.5.4",
|
||||
"rxjs": "~7.8.0",
|
||||
"tslib": "^2.3.0"
|
||||
@@ -32,6 +33,7 @@
|
||||
"@angular/cli": "^22.0.4",
|
||||
"@angular/compiler-cli": "^22.0.0",
|
||||
"@types/express": "^5.0.1",
|
||||
"@types/leaflet": "^1.9.21",
|
||||
"@types/node": "^20.17.19",
|
||||
"jsdom": "^28.0.0",
|
||||
"prettier": "^3.8.1",
|
||||
|
||||
BIN
public/images/carousel-auriculares-amarillos.webp
Normal file
BIN
public/images/carousel-auriculares-amarillos.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
BIN
public/images/carousel-camara-violeta.webp
Normal file
BIN
public/images/carousel-camara-violeta.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
BIN
public/images/carousel-campera-azul.webp
Normal file
BIN
public/images/carousel-campera-azul.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
BIN
public/images/carousel-mochila-roja.webp
Normal file
BIN
public/images/carousel-mochila-roja.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
BIN
public/images/carousel-reloj-verde.webp
Normal file
BIN
public/images/carousel-reloj-verde.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
BIN
public/images/carousel-zapatillas-naranjas.webp
Normal file
BIN
public/images/carousel-zapatillas-naranjas.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
@@ -165,6 +165,55 @@ describe('app routes', () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it('loads the recover password page inside the simple layout', async () => {
|
||||
const { fixture, router } = await renderAppAt('/recuperar-contrasena');
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const recoverPasswordPage = compiled.querySelector('app-recover-password-page');
|
||||
|
||||
expect(router.url).toBe('/recuperar-contrasena');
|
||||
expect(compiled.querySelector('.simple-layout')).not.toBeNull();
|
||||
expect(recoverPasswordPage).not.toBeNull();
|
||||
expect(recoverPasswordPage?.textContent).toContain('Recuperar contraseña');
|
||||
expect(recoverPasswordPage?.querySelector('input')?.getAttribute('placeholder')).toBe('Email');
|
||||
expect(recoverPasswordPage?.textContent).toContain('Recuperar acceso');
|
||||
expect(recoverPasswordPage?.textContent).toContain('Volver');
|
||||
});
|
||||
|
||||
it('loads the recovery code page and shows the entered email', async () => {
|
||||
const { fixture, router } = await renderAppAt(
|
||||
'/recuperar-contrasena/codigo?email=ada%40example.com'
|
||||
);
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const codePage = compiled.querySelector('app-recover-password-code-page');
|
||||
|
||||
expect(router.url).toBe('/recuperar-contrasena/codigo?email=ada%40example.com');
|
||||
expect(compiled.querySelector('.simple-layout')).not.toBeNull();
|
||||
expect(codePage).not.toBeNull();
|
||||
expect(codePage?.textContent).toContain('ada@example.com');
|
||||
expect(codePage?.querySelectorAll('app-input')).toHaveLength(4);
|
||||
expect(codePage?.textContent).toContain('Validar');
|
||||
});
|
||||
|
||||
it('loads the reset password page with the shared password inputs', async () => {
|
||||
const { fixture, router } = await renderAppAt(
|
||||
'/recuperar-contrasena/restablecer?email=ada%40example.com&code=1234'
|
||||
);
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const resetPage = compiled.querySelector('app-reset-password-page');
|
||||
const placeholders = Array.from(resetPage?.querySelectorAll('input') ?? []).map((input) =>
|
||||
input.getAttribute('placeholder')
|
||||
);
|
||||
|
||||
expect(router.url).toBe(
|
||||
'/recuperar-contrasena/restablecer?email=ada%40example.com&code=1234'
|
||||
);
|
||||
expect(compiled.querySelector('.simple-layout')).not.toBeNull();
|
||||
expect(resetPage).not.toBeNull();
|
||||
expect(resetPage?.textContent).toContain('Restablecer contraseña');
|
||||
expect(placeholders).toEqual(['Nueva Contraseña', 'Repetir Nueva Contraseña']);
|
||||
expect(resetPage?.textContent).toContain('Guardar');
|
||||
});
|
||||
|
||||
it('redirects authenticated users away from /login', async () => {
|
||||
const { router } = await renderAppAt('/login', createTenantServiceStub(), createAuthServiceStub(true));
|
||||
|
||||
@@ -186,7 +235,7 @@ describe('app routes', () => {
|
||||
it('redirects unauthenticated users from /checkout to /login', async () => {
|
||||
const { router } = await renderAppAt('/checkout', createTenantServiceStub(), createAuthServiceStub(false));
|
||||
|
||||
expect(router.url).toBe('/login');
|
||||
expect(router.url).toBe('/login?returnUrl=%2Fcheckout');
|
||||
});
|
||||
|
||||
it('allows authenticated users to access /checkout', async () => {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { inject } from '@angular/core';
|
||||
import { CanActivateFn, Router } from '@angular/router';
|
||||
import { findMenu } from '../services/menu.utils';
|
||||
import { TenantService } from '../services/tenant.service';
|
||||
|
||||
export const hasMenuGuard = (menuCode: string): CanActivateFn => {
|
||||
@@ -13,7 +14,7 @@ export const hasMenuGuard = (menuCode: string): CanActivateFn => {
|
||||
return router.createUrlTree(['/']);
|
||||
}
|
||||
|
||||
const hasMenu = tenant.menues?.some(menu => menu.code === menuCode) ?? false;
|
||||
const hasMenu = findMenu(tenant.menues ?? [], menuCode) !== undefined;
|
||||
|
||||
if (hasMenu) {
|
||||
return true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<footer class="store-layout__footer mt-auto text-light">
|
||||
<div class="container-xl px-3 px-md-4 py-4 py-md-5">
|
||||
<div class="row g-4">
|
||||
<div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start">
|
||||
<div class="col-12">
|
||||
<div
|
||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3"
|
||||
data-testid="store-footer-brand-slot"
|
||||
@@ -15,13 +15,15 @@
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start">
|
||||
<div class="d-grid gap-2">
|
||||
<div class="d-flex align-items-center gap-2 text-light-emphasis">
|
||||
<div class="d-flex align-items-center gap-2 ">
|
||||
<i class="fa-solid fa-location-dot" aria-hidden="true"></i>
|
||||
<span>Av. San Lorenzo 1542, Rosario</span>
|
||||
</div>
|
||||
<div class="d-flex align-items-center gap-2 text-light-emphasis">
|
||||
<div class="d-flex align-items-center gap-2 ">
|
||||
<i class="fa-solid fa-phone" aria-hidden="true"></i>
|
||||
<span>54 9 (0341) 6658247</span>
|
||||
</div>
|
||||
@@ -31,24 +33,42 @@
|
||||
</div>
|
||||
|
||||
@for (section of footerSections; track section.heading) {
|
||||
<div class="col-12 col-md-6 col-xl-2 d-grid gap-3 align-content-start">
|
||||
<h2 class="store-layout__footer-heading">{{ section.heading }}</h2>
|
||||
<div class="col-12 col-md-6 col-xl-2 d-grid align-content-start">
|
||||
<div class="d-grid gap-2">
|
||||
@for (link of section.links; track link) {
|
||||
<span class="store-layout__muted-text">{{ link }}</span>
|
||||
@for (link of section.links; track link.label) {
|
||||
@if (link.routerLink) {
|
||||
<a
|
||||
class="store-layout__footer-link"
|
||||
[routerLink]="link.routerLink"
|
||||
>
|
||||
{{ link.label }}
|
||||
</a>
|
||||
} @else if (link.action === 'logout') {
|
||||
<button
|
||||
type="button"
|
||||
class="store-layout__footer-link store-layout__footer-action"
|
||||
(click)="logoutClick.emit()"
|
||||
>
|
||||
{{ link.label }}
|
||||
</button>
|
||||
} @else {
|
||||
<span class="store-layout__muted-text">{{ link.label }}</span>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="col-12 col-md-6 col-xl-3 d-grid gap-3 align-content-start">
|
||||
<h2 class="store-layout__footer-heading">Seguinos:</h2>
|
||||
<div class="col-12 col-md-6 col-xl-3 d-grid align-content-start">
|
||||
<div class="d-flex align-items-center gap-3">
|
||||
@for (social of socialLinks; track social.label) {
|
||||
<span class="fs-5 text-white">
|
||||
<i [class]="social.iconClass" aria-hidden="true"></i>
|
||||
<span class="visually-hidden">{{ social.label }}</span>
|
||||
</span>
|
||||
@for (social of socialMedia; track social.code) {
|
||||
<app-social-media
|
||||
class="text-white"
|
||||
[code]="social.code"
|
||||
[icon]="social.icon"
|
||||
[name]="social.name"
|
||||
[url]="social.url"
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
width: min(100%, 12rem);
|
||||
min-width: 10rem;
|
||||
}
|
||||
|
||||
@@ -18,6 +19,7 @@
|
||||
height: 100%;
|
||||
max-height: 2.75rem;
|
||||
object-fit: contain;
|
||||
object-position: left center;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo-skeleton {
|
||||
@@ -55,17 +57,30 @@
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.store-layout__footer-heading {
|
||||
margin: 0;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 500;
|
||||
color: #f8f8f8;
|
||||
}
|
||||
|
||||
.store-layout__muted-text {
|
||||
color: rgba(255, 255, 255, 0.72);
|
||||
}
|
||||
|
||||
.store-layout__footer-link {
|
||||
width: fit-content;
|
||||
color: rgba(255, 255, 255, 0.72);
|
||||
text-decoration: none;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: #ffffff;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
.store-layout__footer-action {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
font: inherit;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
@keyframes store-footer-logo-skeleton {
|
||||
from {
|
||||
background-position: 200% 0;
|
||||
|
||||
@@ -1,24 +1,29 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { Component, Input, output } from '@angular/core';
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { SocialMedia } from '../../../services/tenant.interface';
|
||||
import { SocialMediaComponent } from '../../../../shared/components/social-media/social-media.component';
|
||||
|
||||
export type StoreFooterLink = {
|
||||
label: string;
|
||||
routerLink?: string;
|
||||
action?: 'logout';
|
||||
};
|
||||
|
||||
export type StoreFooterSection = {
|
||||
heading: string;
|
||||
links: string[];
|
||||
};
|
||||
|
||||
export type StoreSocialLink = {
|
||||
label: string;
|
||||
iconClass: string;
|
||||
links: StoreFooterLink[];
|
||||
};
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-footer',
|
||||
imports: [],
|
||||
imports: [RouterLink, SocialMediaComponent],
|
||||
templateUrl: './store-footer.component.html',
|
||||
styleUrl: './store-footer.component.scss'
|
||||
styleUrl: './store-footer.component.scss',
|
||||
})
|
||||
export class StoreFooterComponent {
|
||||
@Input({ required: true }) currentYear = new Date().getFullYear();
|
||||
@Input({ required: true }) footerSections: StoreFooterSection[] = [];
|
||||
@Input({ required: true }) socialLinks: StoreSocialLink[] = [];
|
||||
@Input({ required: true }) socialMedia: SocialMedia[] = [];
|
||||
@Input() logoUrl: string | null = null;
|
||||
readonly logoutClick = output<void>();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<header class="store-layout__header">
|
||||
<div class="store-layout__header-main">
|
||||
<div class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3">
|
||||
<div
|
||||
class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3"
|
||||
>
|
||||
<a
|
||||
routerLink="/"
|
||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0 text-decoration-none"
|
||||
@@ -16,24 +18,57 @@
|
||||
}
|
||||
</a>
|
||||
|
||||
<div class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end">
|
||||
<div class="input-group store-layout__search" role="search">
|
||||
<label class="visually-hidden" for="store-search-input">Buscar productos</label>
|
||||
<input
|
||||
id="store-search-input"
|
||||
type="search"
|
||||
class="form-control store-layout__search-input border-end-0 rounded-start"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
class="btn store-layout__search-button border-start-0 rounded-end px-3"
|
||||
aria-label="Buscar"
|
||||
>
|
||||
<i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
|
||||
</button>
|
||||
<div
|
||||
class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end"
|
||||
>
|
||||
<div class="store-layout__search-wrapper">
|
||||
<div class="input-group store-layout__search" role="search">
|
||||
<label class="visually-hidden" for="store-search-input">Buscar productos</label>
|
||||
<input
|
||||
id="store-search-input"
|
||||
type="search"
|
||||
class="form-control store-layout__search-input border-end-0 rounded-start"
|
||||
placeholder="Buscar productos"
|
||||
autocomplete="off"
|
||||
[attr.aria-describedby]="showSearchError() ? 'store-search-error' : null"
|
||||
[attr.aria-invalid]="showSearchError()"
|
||||
[minlength]="minSearchLength"
|
||||
[formControl]="searchControl"
|
||||
(input)="clearSearchError()"
|
||||
(keydown.enter)="submitSearch($event)"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
class="btn store-layout__search-button border-start-0 rounded-end px-3"
|
||||
aria-label="Buscar"
|
||||
(click)="submitSearch()"
|
||||
>
|
||||
<i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@if (showSearchError()) {
|
||||
<p id="store-search-error" class="store-layout__search-error mb-0" role="alert">
|
||||
Ingresá al menos {{ minSearchLength }} caracteres para buscar.
|
||||
</p>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="d-flex align-items-center justify-content-end gap-1" aria-label="Acciones de usuario">
|
||||
@if (ticketsMenu(); as menu) {
|
||||
<app-button
|
||||
variant="primary"
|
||||
hostClass="flex-shrink-0"
|
||||
data-testid="store-header-tickets"
|
||||
(click)="ticketsClick.emit()"
|
||||
>
|
||||
{{ menu.label }}
|
||||
</app-button>
|
||||
}
|
||||
|
||||
<div
|
||||
class="d-flex align-items-center justify-content-end gap-1"
|
||||
aria-label="Acciones de usuario"
|
||||
>
|
||||
<app-cart-icon
|
||||
[quantity]="cartQuantity()"
|
||||
ariaLabel="Carrito de compras"
|
||||
@@ -54,6 +89,7 @@
|
||||
<app-user-dropdown
|
||||
id="store-user-dropdown"
|
||||
[user]="user()"
|
||||
[accountNavigationMenus]="accountNavigationMenus()"
|
||||
(logoutClick)="onLogoutClick()"
|
||||
/>
|
||||
}
|
||||
|
||||
@@ -41,11 +41,22 @@
|
||||
animation: store-header-logo-skeleton 1.2s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.store-layout__search {
|
||||
.store-layout__search-wrapper {
|
||||
width: min(100%, 260px);
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.store-layout__search {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.store-layout__search-error {
|
||||
margin-top: 0.25rem;
|
||||
font-size: 0.75rem;
|
||||
line-height: 1.2;
|
||||
color: var(--tenant-danger, #dc3545);
|
||||
}
|
||||
|
||||
.store-layout__search-input {
|
||||
color: #666666;
|
||||
border-color: #cccccc;
|
||||
|
||||
@@ -4,12 +4,22 @@ import { AuthUser } from '../../../services/auth/auth.interfaces';
|
||||
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
||||
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
||||
import { UserDropdownComponent } from './user-dropdown/user-dropdown.component';
|
||||
import { Menu } from '../../../services/tenant.interface';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
import { ReactiveFormsModule, FormControl } from '@angular/forms';
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-header',
|
||||
imports: [CartIconComponent, IconButtonComponent, RouterLink, UserDropdownComponent],
|
||||
imports: [
|
||||
ButtonComponent,
|
||||
CartIconComponent,
|
||||
IconButtonComponent,
|
||||
RouterLink,
|
||||
ReactiveFormsModule,
|
||||
UserDropdownComponent,
|
||||
],
|
||||
templateUrl: './store-header.component.html',
|
||||
styleUrl: './store-header.component.scss'
|
||||
styleUrl: './store-header.component.scss',
|
||||
})
|
||||
export class StoreHeaderComponent {
|
||||
private readonly elementRef = inject(ElementRef<HTMLElement>);
|
||||
@@ -18,11 +28,18 @@ export class StoreHeaderComponent {
|
||||
readonly cartQuantity = input<number>(0);
|
||||
readonly user = input<AuthUser | null>(null);
|
||||
readonly isAuthenticated = input<boolean>(false);
|
||||
readonly accountNavigationMenus = input<readonly Menu[]>([]);
|
||||
readonly ticketsMenu = input<Menu | null>(null);
|
||||
readonly cartClick = output<void>();
|
||||
readonly ticketsClick = output<void>();
|
||||
readonly loginClick = output<void>();
|
||||
readonly logoutClick = output<void>();
|
||||
readonly searchSubmit = output<string>();
|
||||
|
||||
protected readonly isUserDropdownOpen = signal(false);
|
||||
protected readonly minSearchLength = 3;
|
||||
protected readonly showSearchError = signal(false);
|
||||
protected readonly searchControl = new FormControl('', { nonNullable: true });
|
||||
|
||||
@HostListener('document:click', ['$event'])
|
||||
protected onDocumentClick(event: MouseEvent): void {
|
||||
@@ -59,4 +76,22 @@ export class StoreHeaderComponent {
|
||||
this.isUserDropdownOpen.set(false);
|
||||
this.logoutClick.emit();
|
||||
}
|
||||
|
||||
protected submitSearch(event?: Event): void {
|
||||
event?.preventDefault();
|
||||
|
||||
const term = this.searchControl.value.trim();
|
||||
|
||||
if (term.length < this.minSearchLength) {
|
||||
this.showSearchError.set(true);
|
||||
return;
|
||||
}
|
||||
|
||||
this.showSearchError.set(false);
|
||||
this.searchSubmit.emit(term);
|
||||
}
|
||||
|
||||
protected clearSearchError(): void {
|
||||
this.showSearchError.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,12 +5,16 @@
|
||||
|
||||
<div class="user-dropdown__divider"></div>
|
||||
|
||||
<a routerLink="/mi-cuenta/datos-personales" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-account">
|
||||
Mi cuenta
|
||||
</a>
|
||||
<a routerLink="/mi-cuenta/compras" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-purchases">
|
||||
Mis compras
|
||||
</a>
|
||||
@for (menu of accountNavigationMenus(); track menu.code) {
|
||||
<a
|
||||
[routerLink]="menu.route"
|
||||
class="user-dropdown__item"
|
||||
role="menuitem"
|
||||
[attr.data-testid]="'user-dropdown-' + menu.code"
|
||||
>
|
||||
{{ menu.label }}
|
||||
</a>
|
||||
}
|
||||
<button
|
||||
type="button"
|
||||
class="user-dropdown__item"
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
import { Component, computed, input, output } from '@angular/core';
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { AuthUser } from '../../../../services/auth/auth.interfaces';
|
||||
import { Menu } from '../../../../services/tenant.interface';
|
||||
|
||||
@Component({
|
||||
selector: 'app-user-dropdown',
|
||||
standalone: true,
|
||||
imports: [RouterLink],
|
||||
templateUrl: './user-dropdown.component.html',
|
||||
styleUrl: './user-dropdown.component.scss'
|
||||
styleUrl: './user-dropdown.component.scss',
|
||||
})
|
||||
export class UserDropdownComponent {
|
||||
readonly user = input<AuthUser | null>(null);
|
||||
readonly accountNavigationMenus = input<readonly Menu[]>([]);
|
||||
readonly logoutClick = output<void>();
|
||||
|
||||
protected readonly displayName = computed(() => this.user()?.nombre_apellido || 'Mi cuenta');
|
||||
|
||||
@@ -4,13 +4,20 @@
|
||||
[logoUrl]="tenant()?.header_logo ?? null"
|
||||
[user]="user()"
|
||||
[isAuthenticated]="isAuthenticated()"
|
||||
[accountNavigationMenus]="accountNavigationMenus()"
|
||||
[ticketsMenu]="ticketsMenu() ?? null"
|
||||
(cartClick)="isCartOpen.set(!isCartOpen())"
|
||||
(ticketsClick)="onTicketsClick()"
|
||||
(loginClick)="onLoginClick()"
|
||||
(logoutClick)="onLogoutClick()"
|
||||
(searchSubmit)="onSearch($event)"
|
||||
/>
|
||||
|
||||
@if (isCartOpen()) {
|
||||
<div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
|
||||
<div
|
||||
class="store-layout__cart-overlay"
|
||||
(click)="isCartOpen.set(false)"
|
||||
></div>
|
||||
<div class="store-layout__cart-dropdown card border-0 shadow-lg">
|
||||
<app-cart
|
||||
[showClose]="true"
|
||||
@@ -21,8 +28,20 @@
|
||||
[backgroundColor]="'#ffffff'"
|
||||
(closed)="isCartOpen.set(false)"
|
||||
>
|
||||
<app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)">Seguir comprando</app-button>
|
||||
<app-button variant="primary" class="flex-grow-1" (click)="onCheckoutClick()">Comprar</app-button>
|
||||
<app-button
|
||||
variant="secondary"
|
||||
class="flex-grow-1"
|
||||
(click)="isCartOpen.set(false)"
|
||||
>Seguir comprando</app-button
|
||||
>
|
||||
<app-button
|
||||
variant="primary"
|
||||
class="flex-grow-1"
|
||||
[disabled]="isCreatingPurchase()"
|
||||
(click)="onCheckoutClick()"
|
||||
>
|
||||
Comprar
|
||||
</app-button>
|
||||
</app-cart>
|
||||
</div>
|
||||
}
|
||||
@@ -37,8 +56,9 @@
|
||||
|
||||
<app-store-footer
|
||||
[currentYear]="currentYear"
|
||||
[footerSections]="footerSections"
|
||||
[socialLinks]="socialLinks"
|
||||
[footerSections]="footerSections()"
|
||||
[socialMedia]="tenant()?.social_media ?? []"
|
||||
[logoUrl]="tenant()?.footer_logo ?? null"
|
||||
(logoutClick)="onLogoutClick()"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { provideRouter, Router } from '@angular/router';
|
||||
|
||||
import { of } from 'rxjs';
|
||||
@@ -8,10 +9,13 @@ import { of } from 'rxjs';
|
||||
import { Tenant } from '../../services/tenant.interface';
|
||||
import { TenantService } from '../../services/tenant.service';
|
||||
import { CartService } from '../../services/cart/cart.service';
|
||||
import { Cart } from '../../services/cart/cart.interface';
|
||||
import { ToastService } from '../../services/toast.service';
|
||||
import { AuthService } from '../../services/auth/auth.service';
|
||||
import { AuthUser } from '../../services/auth/auth.interfaces';
|
||||
import { StoreLayoutComponent } from './store-layout.component';
|
||||
import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
|
||||
const tenant: Tenant = {
|
||||
id: 1,
|
||||
@@ -25,14 +29,116 @@ const tenant: Tenant = {
|
||||
header_bg_color: '#313131',
|
||||
footer_bg_color: '#313131',
|
||||
header_logo: 'https://example.com/header.png',
|
||||
footer_logo: 'https://example.com/footer.png'
|
||||
footer_logo: 'https://example.com/footer.png',
|
||||
menues: [
|
||||
{
|
||||
id: 4,
|
||||
code: 'account',
|
||||
label: 'Mi cuenta',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta',
|
||||
submenues: [
|
||||
{
|
||||
id: 5,
|
||||
code: 'account.profile',
|
||||
label: 'Datos personales',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/datos-personales',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
code: 'account.purchases',
|
||||
label: 'Mis compras',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/compras',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
code: 'account.tickets',
|
||||
label: 'Mis tickets',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/tickets',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
code: 'help',
|
||||
label: 'Ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'help.contact',
|
||||
label: 'Contacto',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'static',
|
||||
route: '/ayuda/contacto',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
code: 'help.faq',
|
||||
label: 'Preguntas frecuentes',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'static',
|
||||
route: '/ayuda/preguntas-frecuentes',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
social_media: [
|
||||
{
|
||||
code: 'instagram',
|
||||
icon: 'instagram',
|
||||
name: 'Instagram',
|
||||
url: 'https://instagram.com/test',
|
||||
},
|
||||
{
|
||||
code: 'whatsapp',
|
||||
icon: 'whatsapp',
|
||||
name: 'WhatsApp',
|
||||
url: 'https://wa.me/5493410000000',
|
||||
},
|
||||
{
|
||||
code: 'facebook',
|
||||
icon: 'facebook',
|
||||
name: 'Facebook',
|
||||
url: 'https://facebook.com/test',
|
||||
},
|
||||
{
|
||||
code: 'linkedin',
|
||||
icon: 'fa-brands fa-linkedin-in',
|
||||
name: 'LinkedIn',
|
||||
url: 'https://linkedin.com/company/test',
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
describe('StoreLayoutComponent', () => {
|
||||
let tenantState = signal<Tenant | null>(tenant);
|
||||
let cartState = signal<Cart | null>(null);
|
||||
let authUserState = signal<AuthUser | null>(null);
|
||||
let checkoutServiceStub: { startCheckout: ReturnType<typeof vi.fn> };
|
||||
|
||||
beforeEach(async () => {
|
||||
const tenantState = signal(tenant);
|
||||
const authUserState = signal<AuthUser | null>(null);
|
||||
tenantState = signal<Tenant | null>(tenant);
|
||||
cartState = signal<Cart | null>(null);
|
||||
authUserState = signal<AuthUser | null>(null);
|
||||
const isAuthenticatedState = signal(false);
|
||||
checkoutServiceStub = {
|
||||
startCheckout: vi.fn().mockResolvedValue({ id: 55 }),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [StoreLayoutComponent],
|
||||
@@ -44,17 +150,20 @@ describe('StoreLayoutComponent', () => {
|
||||
tenant: tenantState.asReadonly(),
|
||||
status: signal<'ready'>('ready').asReadonly(),
|
||||
getTenant: () => tenantState(),
|
||||
bootstrap: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
bootstrap: vi.fn().mockResolvedValue(undefined),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: CartService,
|
||||
useValue: {
|
||||
cart: signal(null).asReadonly(),
|
||||
cart: cartState.asReadonly(),
|
||||
loadCart: () => of({ id: 1, items: [], subtotal: '0' }),
|
||||
updateItemQuantity: vi.fn().mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } })),
|
||||
removeItem: vi.fn().mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } }))
|
||||
}
|
||||
updateItemQuantity: vi
|
||||
.fn()
|
||||
.mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } })),
|
||||
removeItem: vi.fn().mockReturnValue(of({ data: { id: 1, items: [], subtotal: '0' } })),
|
||||
clearCart: vi.fn(() => cartState.set(null)),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
@@ -63,18 +172,22 @@ describe('StoreLayoutComponent', () => {
|
||||
info: vi.fn(),
|
||||
danger: vi.fn(),
|
||||
success: vi.fn(),
|
||||
dismiss: vi.fn()
|
||||
}
|
||||
dismiss: vi.fn(),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: AuthService,
|
||||
useValue: {
|
||||
user: authUserState,
|
||||
isAuthenticated: isAuthenticatedState,
|
||||
logout: vi.fn().mockReturnValue(of(void 0))
|
||||
}
|
||||
}
|
||||
]
|
||||
logout: vi.fn().mockReturnValue(of(void 0)),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: CheckoutService,
|
||||
useValue: checkoutServiceStub,
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
@@ -99,10 +212,14 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(compiled.querySelector('[data-testid="store-header-brand-slot"]')).not.toBeNull();
|
||||
expect(compiled.querySelector('[data-testid="store-footer-brand-slot"]')).not.toBeNull();
|
||||
expect(
|
||||
compiled.querySelector(`app-store-header img.store-layout__brand-logo[src="${tenant.header_logo}"]`)
|
||||
compiled.querySelector(
|
||||
`app-store-header img.store-layout__brand-logo[src="${tenant.header_logo}"]`,
|
||||
),
|
||||
).not.toBeNull();
|
||||
expect(
|
||||
compiled.querySelector(`app-store-footer img.store-layout__brand-logo[src="${tenant.footer_logo}"]`)
|
||||
compiled.querySelector(
|
||||
`app-store-footer img.store-layout__brand-logo[src="${tenant.footer_logo}"]`,
|
||||
),
|
||||
).not.toBeNull();
|
||||
expect(compiled.querySelector('.fa-cart-shopping')).not.toBeNull();
|
||||
expect(compiled.querySelector('.fa-circle-user')).not.toBeNull();
|
||||
@@ -112,6 +229,127 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(compiled.querySelector('.fa-linkedin-in')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('navigates to search results when the search button is clicked', () => {
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
|
||||
const searchButton = header.query(By.css('.store-layout__search-button'));
|
||||
|
||||
(header.componentInstance as any).searchControl.setValue(' zapatillas ');
|
||||
searchButton.triggerEventHandler('click');
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/buscar'], {
|
||||
queryParams: { q: 'zapatillas', page: 1 },
|
||||
});
|
||||
});
|
||||
|
||||
it('prevents the native submit and searches when Enter is pressed', () => {
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
|
||||
const input = header.query(By.css('#store-search-input'));
|
||||
const keyboardEvent = {
|
||||
preventDefault: vi.fn(),
|
||||
};
|
||||
|
||||
(header.componentInstance as any).searchControl.setValue('remera');
|
||||
input.triggerEventHandler('keydown.enter', keyboardEvent);
|
||||
|
||||
expect(keyboardEvent.preventDefault).toHaveBeenCalled();
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/buscar'], {
|
||||
queryParams: { q: 'remera', page: 1 },
|
||||
});
|
||||
});
|
||||
|
||||
it('requires at least three characters to search', () => {
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
|
||||
const input = header.query(By.css('#store-search-input'));
|
||||
const searchButton = header.query(By.css('.store-layout__search-button'));
|
||||
|
||||
expect(input.nativeElement.getAttribute('minlength')).toBe('3');
|
||||
|
||||
(header.componentInstance as any).searchControl.setValue('ab');
|
||||
searchButton.triggerEventHandler('click');
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(router.navigate).not.toHaveBeenCalled();
|
||||
expect((fixture.nativeElement as HTMLElement).textContent).toContain(
|
||||
'Ingresá al menos 3 caracteres para buscar.',
|
||||
);
|
||||
expect(input.nativeElement.getAttribute('aria-invalid')).toBe('true');
|
||||
});
|
||||
|
||||
it('renders the primary tickets action when the tenant has the tickets menu', () => {
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
const configuredTicketsLabel = 'Entradas digitales';
|
||||
tenantState.set({
|
||||
...tenant,
|
||||
menues: tenant.menues?.map((menu) =>
|
||||
menu.code === 'account'
|
||||
? {
|
||||
...menu,
|
||||
submenues: menu.submenues.map((submenu) =>
|
||||
submenu.code === 'account.tickets'
|
||||
? { ...submenu, label: configuredTicketsLabel }
|
||||
: submenu,
|
||||
),
|
||||
}
|
||||
: menu,
|
||||
),
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const ticketsAction = (fixture.nativeElement as HTMLElement).querySelector<HTMLElement>(
|
||||
'app-button[data-testid="store-header-tickets"]',
|
||||
);
|
||||
const ticketsButton = ticketsAction?.querySelector('button');
|
||||
|
||||
expect(ticketsAction).not.toBeNull();
|
||||
expect(ticketsButton).not.toBeNull();
|
||||
expect(ticketsButton?.textContent?.trim()).toBe(configuredTicketsLabel);
|
||||
expect(ticketsButton?.classList).toContain('btn-primary');
|
||||
|
||||
ticketsButton?.click();
|
||||
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/mi-cuenta/tickets']);
|
||||
});
|
||||
|
||||
it('does not render the tickets action when the tenant lacks the tickets menu', () => {
|
||||
tenantState.set({
|
||||
...tenant,
|
||||
menues: tenant.menues?.map((menu) =>
|
||||
menu.code === 'account'
|
||||
? {
|
||||
...menu,
|
||||
submenues: menu.submenues.filter((submenu) => submenu.code !== 'account.tickets'),
|
||||
}
|
||||
: menu,
|
||||
),
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(
|
||||
(fixture.nativeElement as HTMLElement).querySelector('[data-testid="store-header-tickets"]'),
|
||||
).toBeNull();
|
||||
});
|
||||
|
||||
it('redirects to /login when user icon is clicked and user is not logged in', () => {
|
||||
const authService = TestBed.inject(AuthService);
|
||||
const router = TestBed.inject(Router);
|
||||
@@ -123,7 +361,9 @@ describe('StoreLayoutComponent', () => {
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||
const userButton = compiled.querySelector(
|
||||
'app-icon-button[variant="user"] button',
|
||||
) as HTMLButtonElement;
|
||||
expect(userButton).not.toBeNull();
|
||||
userButton.click();
|
||||
fixture.detectChanges();
|
||||
@@ -141,25 +381,33 @@ describe('StoreLayoutComponent', () => {
|
||||
(authService.user as any).set({
|
||||
id: 1,
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com'
|
||||
email: 'ada@example.com',
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||
const userButton = compiled.querySelector(
|
||||
'app-icon-button[variant="user"] button',
|
||||
) as HTMLButtonElement;
|
||||
expect(userButton).not.toBeNull();
|
||||
userButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(compiled.querySelector('app-user-dropdown')).not.toBeNull();
|
||||
expect(compiled.textContent).toContain('Ada Lovelace');
|
||||
expect(compiled.querySelector('[data-testid="user-dropdown-account"]')).not.toBeNull();
|
||||
expect(
|
||||
compiled.querySelector('[data-testid="user-dropdown-account.purchases"]'),
|
||||
).not.toBeNull();
|
||||
expect(compiled.querySelector('[data-testid="user-dropdown-account.tickets"]')).toBeNull();
|
||||
expect(router.navigate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('logs out from the authenticated user dropdown', () => {
|
||||
it('logs out from the authenticated user dropdown, clears the cart and returns home', () => {
|
||||
const authService = TestBed.inject(AuthService);
|
||||
const cartService = TestBed.inject(CartService);
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
|
||||
@@ -167,45 +415,196 @@ describe('StoreLayoutComponent', () => {
|
||||
(authService.user as any).set({
|
||||
id: 1,
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com'
|
||||
email: 'ada@example.com',
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const userButton = compiled.querySelector('app-icon-button[variant="user"] button') as HTMLButtonElement;
|
||||
const userButton = compiled.querySelector(
|
||||
'app-icon-button[variant="user"] button',
|
||||
) as HTMLButtonElement;
|
||||
userButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
const logoutButton = compiled.querySelector('[data-testid="user-dropdown-logout"]') as HTMLButtonElement;
|
||||
const logoutButton = compiled.querySelector(
|
||||
'[data-testid="user-dropdown-logout"]',
|
||||
) as HTMLButtonElement;
|
||||
expect(logoutButton).not.toBeNull();
|
||||
logoutButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(authService.logout).toHaveBeenCalled();
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/login']);
|
||||
expect(cartService.clearCart).toHaveBeenCalled();
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/']);
|
||||
});
|
||||
|
||||
it('redirects to /checkout when cart buy button is clicked', () => {
|
||||
it('provides account actions from the footer', () => {
|
||||
const authService = TestBed.inject(AuthService);
|
||||
const cartService = TestBed.inject(CartService);
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const footerLinks = Array.from(
|
||||
compiled.querySelectorAll<HTMLAnchorElement>('app-store-footer a.store-layout__footer-link'),
|
||||
);
|
||||
const profileLink = footerLinks.find((link) => link.textContent?.trim() === 'Mi cuenta');
|
||||
const purchasesLink = footerLinks.find((link) => link.textContent?.trim() === 'Mis compras');
|
||||
const ticketsLink = footerLinks.find((link) => link.textContent?.trim() === 'Mis tickets');
|
||||
const logoutButton = Array.from(
|
||||
compiled.querySelectorAll<HTMLButtonElement>('app-store-footer button'),
|
||||
).find((button) => button.textContent?.trim() === 'Cerrar sesion');
|
||||
|
||||
expect(profileLink?.getAttribute('href')).toBe('/mi-cuenta/datos-personales');
|
||||
expect(purchasesLink?.getAttribute('href')).toBe('/mi-cuenta/compras');
|
||||
expect(ticketsLink).toBeUndefined();
|
||||
expect(logoutButton).toBeDefined();
|
||||
|
||||
logoutButton!.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(authService.logout).toHaveBeenCalled();
|
||||
expect(cartService.clearCart).toHaveBeenCalled();
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/']);
|
||||
});
|
||||
|
||||
it('leaves checkout before logging out so the pending purchase can be cancelled', async () => {
|
||||
const authService = TestBed.inject(AuthService);
|
||||
const cartService = TestBed.inject(CartService);
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'url', 'get').mockReturnValue('/checkout?purchase=25');
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
await (fixture.componentInstance as any).onLogoutClick();
|
||||
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/']);
|
||||
expect(authService.logout).toHaveBeenCalled();
|
||||
expect(navigateSpy.mock.invocationCallOrder[0]).toBeLessThan(
|
||||
(authService.logout as any).mock.invocationCallOrder[0],
|
||||
);
|
||||
expect(cartService.clearCart).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('renders only the help submenus assigned to the tenant in the footer', () => {
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const footerLinks = Array.from(
|
||||
compiled.querySelectorAll<HTMLAnchorElement>('app-store-footer a.store-layout__footer-link'),
|
||||
);
|
||||
const helpLinks = footerLinks.filter((link) =>
|
||||
link.getAttribute('href')?.startsWith('/ayuda/'),
|
||||
);
|
||||
|
||||
expect(helpLinks.map((link) => link.textContent?.trim())).toEqual([
|
||||
'Contacto',
|
||||
'Preguntas frecuentes',
|
||||
]);
|
||||
expect(helpLinks.map((link) => link.getAttribute('href'))).toEqual([
|
||||
'/ayuda/contacto',
|
||||
'/ayuda/preguntas-frecuentes',
|
||||
]);
|
||||
expect(compiled.textContent).not.toContain('Medios de pago');
|
||||
});
|
||||
|
||||
it('creates a purchase and redirects to checkout when cart buy is clicked', async () => {
|
||||
const router = TestBed.inject(Router);
|
||||
vi.spyOn(router, 'navigate');
|
||||
cartState.set({
|
||||
id: 1,
|
||||
tenant_codigo: tenant.codigo,
|
||||
status: 'active',
|
||||
subtotal: '100.00',
|
||||
items: [
|
||||
{
|
||||
id: 1,
|
||||
cantidad: 1,
|
||||
precio_unitario: '100.00',
|
||||
catalog_item_id: 1,
|
||||
variant_id: null,
|
||||
product: {
|
||||
nombre: 'Producto',
|
||||
imagen: null,
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
authUserState.set({
|
||||
id: 7,
|
||||
nombre_apellido: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
(fixture.componentInstance as any).isCartOpen.set(true);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
const buyButton = Array.from(compiled.querySelectorAll('app-button button'))
|
||||
.find((button) => button.textContent?.trim() === 'Comprar') as HTMLButtonElement | undefined;
|
||||
const buyButton = Array.from(compiled.querySelectorAll('app-button button')).find(
|
||||
(button) => button.textContent?.trim() === 'Comprar',
|
||||
) as HTMLButtonElement | undefined;
|
||||
|
||||
expect(buyButton).toBeDefined();
|
||||
buyButton!.click();
|
||||
await Promise.resolve();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/checkout']);
|
||||
expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('test', {
|
||||
cart_id: 1,
|
||||
});
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/checkout'], {
|
||||
queryParams: { purchase: 55 },
|
||||
});
|
||||
expect((fixture.componentInstance as any).isCartOpen()).toBe(false);
|
||||
});
|
||||
|
||||
it('allows modifying quantities directly in the regular cart without a toggle', () => {
|
||||
cartState.set({
|
||||
id: 1,
|
||||
tenant_codigo: tenant.codigo,
|
||||
status: 'active',
|
||||
subtotal: '100.00',
|
||||
items: [
|
||||
{
|
||||
id: 1,
|
||||
cantidad: 1,
|
||||
precio_unitario: '100.00',
|
||||
catalog_item_id: 1,
|
||||
variant_id: null,
|
||||
product: {
|
||||
nombre: 'Producto',
|
||||
imagen: null,
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
(fixture.componentInstance as any).isCartOpen.set(true);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const cartItem = fixture.debugElement.query(By.css('app-cart-item'));
|
||||
const buyButton = Array.from(
|
||||
element.querySelectorAll<HTMLButtonElement>('app-button button'),
|
||||
).find((button) => button.textContent?.trim() === 'Comprar');
|
||||
|
||||
expect(element.querySelector('.cart-edit-btn')).toBeNull();
|
||||
expect(cartItem.componentInstance.quantityDisabled()).toBe(false);
|
||||
expect(buyButton).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,16 +2,15 @@ import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
||||
import { Router, RouterOutlet } from '@angular/router';
|
||||
import { TenantService } from '../../services/tenant.service';
|
||||
import { CartService } from '../../services/cart/cart.service';
|
||||
import {
|
||||
StoreFooterComponent,
|
||||
StoreFooterSection,
|
||||
StoreSocialLink,
|
||||
} from './store-footer/store-footer.component';
|
||||
import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-footer.component';
|
||||
import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
|
||||
import { ButtonComponent } from '../../../shared/components/button/button.component';
|
||||
import { CartItem } from '../../services/cart/cart.interface';
|
||||
import { AuthService } from '../../services/auth/auth.service';
|
||||
import { findMenu } from '../../services/menu.utils';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
import { ToastService } from '../../services/toast.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-layout',
|
||||
@@ -29,9 +28,12 @@ export class StoreLayoutComponent implements OnInit {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly router = inject(Router);
|
||||
|
||||
protected readonly isCartOpen = signal(false);
|
||||
protected readonly isCreatingPurchase = signal(false);
|
||||
|
||||
protected readonly cartSubtotal = computed(() => {
|
||||
const cart = this.cartService.cart();
|
||||
@@ -82,6 +84,24 @@ export class StoreLayoutComponent implements OnInit {
|
||||
protected readonly tenant = this.tenantService.tenant;
|
||||
protected readonly user = this.authService.user;
|
||||
protected readonly isAuthenticated = this.authService.isAuthenticated;
|
||||
protected readonly ticketsMenu = computed(() =>
|
||||
findMenu(this.tenant()?.menues ?? [], 'account.tickets'),
|
||||
);
|
||||
protected readonly accountNavigationMenus = computed(() => {
|
||||
const accountMenu = findMenu(this.tenant()?.menues ?? [], 'account');
|
||||
|
||||
if (!accountMenu) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const profile = accountMenu.submenues.find((menu) => menu.code === 'account.profile');
|
||||
const purchases = accountMenu.submenues.find((menu) => menu.code === 'account.purchases');
|
||||
|
||||
return [
|
||||
...(profile ? [{ ...accountMenu, route: profile.route }] : []),
|
||||
...(purchases ? [purchases] : []),
|
||||
];
|
||||
});
|
||||
|
||||
protected readonly cartQuantity = computed(() => {
|
||||
const cart = this.cartService.cart();
|
||||
@@ -99,45 +119,106 @@ export class StoreLayoutComponent implements OnInit {
|
||||
void this.router.navigate(['/login']);
|
||||
}
|
||||
|
||||
protected onLogoutClick(): void {
|
||||
protected onSearch(term: string): void {
|
||||
void this.router.navigate(['/buscar'], {
|
||||
queryParams: { q: term, page: 1 },
|
||||
});
|
||||
}
|
||||
|
||||
protected onTicketsClick(): void {
|
||||
const route = this.ticketsMenu()?.route;
|
||||
|
||||
if (route) {
|
||||
void this.router.navigate([route]);
|
||||
}
|
||||
}
|
||||
|
||||
protected async onLogoutClick(): Promise<void> {
|
||||
const isLeavingCheckout = this.router.url.startsWith('/checkout');
|
||||
|
||||
// Checkout must be left while the authenticated session is still valid so
|
||||
// its CanDeactivate guard can cancel the pending purchase.
|
||||
if (isLeavingCheckout) {
|
||||
const navigationSucceeded = await this.router.navigate(['/']);
|
||||
|
||||
if (!navigationSucceeded) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.authService.logout().subscribe({
|
||||
next: () => void this.router.navigate(['/login']),
|
||||
next: () => {
|
||||
this.cartService.clearCart();
|
||||
this.isCartOpen.set(false);
|
||||
|
||||
if (!isLeavingCheckout) {
|
||||
void this.router.navigate(['/']);
|
||||
}
|
||||
},
|
||||
error: (err) => console.error('Error logging out', err),
|
||||
});
|
||||
}
|
||||
|
||||
protected onCheckoutClick(): void {
|
||||
this.isCartOpen.set(false);
|
||||
void this.router.navigate(['/checkout']);
|
||||
protected async onCheckoutClick(): Promise<void> {
|
||||
if (this.isCreatingPurchase()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const cart = this.cartService.cart();
|
||||
const tenant = this.tenantService.tenant();
|
||||
const user = this.authService.user();
|
||||
|
||||
if (!user) {
|
||||
this.isCartOpen.set(false);
|
||||
void this.router.navigate(['/login'], { queryParams: { returnUrl: '/' } });
|
||||
return;
|
||||
}
|
||||
|
||||
if (!cart?.id || !tenant) {
|
||||
this.toastService.danger('No hay un carrito activo para iniciar la compra.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.isCreatingPurchase.set(true);
|
||||
try {
|
||||
const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
|
||||
cart_id: cart.id,
|
||||
});
|
||||
|
||||
this.cartService.clearCart();
|
||||
this.isCartOpen.set(false);
|
||||
await this.router.navigate(['/checkout'], {
|
||||
queryParams: { purchase: purchase.id },
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to create cart purchase:', error);
|
||||
this.toastService.danger('No se pudo iniciar la compra.');
|
||||
} finally {
|
||||
this.isCreatingPurchase.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
protected readonly footerSections: StoreFooterSection[] = [
|
||||
{
|
||||
heading: 'Cuenta',
|
||||
links: ['Mi cuenta', 'Mis compras', 'Cerrar sesion'],
|
||||
},
|
||||
{
|
||||
heading: 'Ayuda',
|
||||
links: ['Contacto', 'Ayuda', 'Preguntas frecuentes'],
|
||||
},
|
||||
];
|
||||
protected readonly footerSections = computed<StoreFooterSection[]>(() => {
|
||||
const helpSubmenues = findMenu(this.tenant()?.menues ?? [], 'help')?.submenues ?? [];
|
||||
|
||||
protected readonly socialLinks: StoreSocialLink[] = [
|
||||
{
|
||||
label: 'Instagram',
|
||||
iconClass: 'fa-brands fa-instagram',
|
||||
},
|
||||
{
|
||||
label: 'WhatsApp',
|
||||
iconClass: 'fa-brands fa-whatsapp',
|
||||
},
|
||||
{
|
||||
label: 'Facebook',
|
||||
iconClass: 'fa-brands fa-facebook',
|
||||
},
|
||||
{
|
||||
label: 'LinkedIn',
|
||||
iconClass: 'fa-brands fa-linkedin-in',
|
||||
},
|
||||
];
|
||||
return [
|
||||
{
|
||||
heading: 'Cuenta',
|
||||
links: [
|
||||
...this.accountNavigationMenus().map((menu) => ({
|
||||
label: menu.label,
|
||||
routerLink: menu.route,
|
||||
})),
|
||||
{ label: 'Cerrar sesion', action: 'logout' },
|
||||
],
|
||||
},
|
||||
{
|
||||
heading: 'Ayuda',
|
||||
links: helpSubmenues.map((menu) => ({
|
||||
label: menu.label,
|
||||
routerLink: menu.route,
|
||||
})),
|
||||
},
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -23,10 +23,14 @@ describe('auth guards', () => {
|
||||
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub() }]
|
||||
});
|
||||
|
||||
const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
|
||||
const result = TestBed.runInInjectionContext(() =>
|
||||
authGuard(null as never, { url: '/checkout?mode=direct' } as never),
|
||||
);
|
||||
|
||||
expect(result instanceof UrlTree).toBe(true);
|
||||
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe('/login');
|
||||
expect(TestBed.inject(Router).serializeUrl(result as UrlTree)).toBe(
|
||||
'/login?returnUrl=%2Fcheckout%3Fmode%3Ddirect',
|
||||
);
|
||||
});
|
||||
|
||||
it('allows authenticated users through authGuard', () => {
|
||||
@@ -34,7 +38,9 @@ describe('auth guards', () => {
|
||||
providers: [provideRouter([]), { provide: AuthService, useValue: createAuthServiceStub(true) }]
|
||||
});
|
||||
|
||||
const result = TestBed.runInInjectionContext(() => authGuard(null as never, null as never));
|
||||
const result = TestBed.runInInjectionContext(() =>
|
||||
authGuard(null as never, { url: '/checkout' } as never),
|
||||
);
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
@@ -3,11 +3,15 @@ import { CanActivateFn, Router } from '@angular/router';
|
||||
|
||||
import { AuthService } from './auth.service';
|
||||
|
||||
export const authGuard: CanActivateFn = () => {
|
||||
export const authGuard: CanActivateFn = (_route, state) => {
|
||||
const authService = inject(AuthService);
|
||||
const router = inject(Router);
|
||||
|
||||
return authService.isAuthenticated() ? true : router.createUrlTree(['/login']);
|
||||
return authService.isAuthenticated()
|
||||
? true
|
||||
: router.createUrlTree(['/login'], {
|
||||
queryParams: { returnUrl: state.url },
|
||||
});
|
||||
};
|
||||
|
||||
export const guestOnlyGuard: CanActivateFn = () => {
|
||||
|
||||
@@ -37,3 +37,25 @@ export interface RegisterResponse {
|
||||
message: string;
|
||||
data: AuthUser;
|
||||
}
|
||||
|
||||
export interface ResetPasswordAttemptResponse {
|
||||
message: string;
|
||||
status: 'pending';
|
||||
}
|
||||
|
||||
export interface ValidateResetPasswordAttemptResponse {
|
||||
message: string;
|
||||
status: 'validated';
|
||||
}
|
||||
|
||||
export interface ResetPasswordPayload {
|
||||
email: string;
|
||||
codigo: string;
|
||||
password: string;
|
||||
password_confirmation: string;
|
||||
}
|
||||
|
||||
export interface ResetPasswordResponse {
|
||||
message: string;
|
||||
status: 'used';
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
|
||||
import { environment } from '../../../../environments/environment';
|
||||
import { AuthService } from './auth.service';
|
||||
import { CookieService } from '../cookie/cookie.service';
|
||||
import { TenantService } from '../tenant.service';
|
||||
|
||||
describe('AuthService', () => {
|
||||
let cookieStore: Record<string, string> = {};
|
||||
@@ -18,8 +19,12 @@ describe('AuthService', () => {
|
||||
function createCookieServiceStub() {
|
||||
return {
|
||||
get: (name: string) => cookieStore[name] || null,
|
||||
set: (name: string, value: string) => { cookieStore[name] = value; },
|
||||
delete: (name: string) => { delete cookieStore[name]; }
|
||||
set: (name: string, value: string) => {
|
||||
cookieStore[name] = value;
|
||||
},
|
||||
delete: (name: string) => {
|
||||
delete cookieStore[name];
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,6 +35,10 @@ describe('AuthService', () => {
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||
},
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
@@ -43,6 +52,12 @@ describe('AuthService', () => {
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}login`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body).toEqual({
|
||||
email: 'ada@example.com',
|
||||
password: 'secret123',
|
||||
tenant_codigo: 'tenant-test'
|
||||
});
|
||||
expect(request.request.withCredentials).toBe(true);
|
||||
request.flush({
|
||||
message: 'Sesion iniciada correctamente.',
|
||||
token: 'plain-text-token',
|
||||
@@ -95,7 +110,48 @@ describe('AuthService', () => {
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('propagates a 401 from /me without clearing the session', async () => {
|
||||
it('sends tenant and credentials when completing Google login', () => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
provideHttpClient(),
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||
},
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
|
||||
const service = TestBed.inject(AuthService);
|
||||
const httpController = TestBed.inject(HttpTestingController);
|
||||
|
||||
service.completeGoogleLogin('oauth-code').subscribe();
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}auth/google/exchange`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body).toEqual({
|
||||
oauth_code: 'oauth-code',
|
||||
tenant_codigo: 'tenant-test'
|
||||
});
|
||||
expect(request.request.withCredentials).toBe(true);
|
||||
request.flush({
|
||||
message: 'Sesion iniciada correctamente.',
|
||||
token: 'google-token',
|
||||
token_type: 'Bearer',
|
||||
user: {
|
||||
id: 1,
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com'
|
||||
}
|
||||
});
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('clears an expired session when /me returns 401', async () => {
|
||||
cookieStore['shopit.auth.token'] = 'expired-token';
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
@@ -116,11 +172,11 @@ describe('AuthService', () => {
|
||||
|
||||
request.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' });
|
||||
|
||||
await expect(bootstrapPromise).rejects.toMatchObject({ status: 401 });
|
||||
await expect(bootstrapPromise).resolves.toBeUndefined();
|
||||
expect(service.user()).toBeNull();
|
||||
expect(service.token()).toBe('expired-token');
|
||||
expect(service.isAuthenticated()).toBe(true);
|
||||
expect(cookieStore['shopit.auth.token']).toBe('expired-token');
|
||||
expect(service.token()).toBeNull();
|
||||
expect(service.isAuthenticated()).toBe(false);
|
||||
expect(cookieStore['shopit.auth.token']).toBeUndefined();
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
@@ -132,6 +188,10 @@ describe('AuthService', () => {
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||
},
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
@@ -152,6 +212,7 @@ describe('AuthService', () => {
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}register`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body.tenant_codigo).toBe('tenant-test');
|
||||
request.flush({
|
||||
message: 'Usuario registrado correctamente.',
|
||||
data: {
|
||||
@@ -168,6 +229,121 @@ describe('AuthService', () => {
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('requests a password reset and exposes the final HTTP status', () => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
provideHttpClient(),
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||
},
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
|
||||
const service = TestBed.inject(AuthService);
|
||||
const httpController = TestBed.inject(HttpTestingController);
|
||||
|
||||
service.requestPasswordReset('ada@example.com').subscribe((response) => {
|
||||
expect(response.status).toBe(202);
|
||||
expect(response.body?.status).toBe('pending');
|
||||
});
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}password/reset-attempts`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body).toEqual({
|
||||
email: 'ada@example.com',
|
||||
tenant_codigo: 'tenant-test'
|
||||
});
|
||||
request.flush(
|
||||
{
|
||||
message: 'Si el email está registrado, recibirás un código.',
|
||||
status: 'pending'
|
||||
},
|
||||
{ status: 202, statusText: 'Accepted' }
|
||||
);
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('validates a password reset code and exposes its final status', () => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
provideHttpClient(),
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
|
||||
const service = TestBed.inject(AuthService);
|
||||
const httpController = TestBed.inject(HttpTestingController);
|
||||
|
||||
service.validatePasswordResetCode('ada@example.com', '0123').subscribe((response) => {
|
||||
expect(response.status).toBe(200);
|
||||
expect(response.body?.status).toBe('validated');
|
||||
});
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}password/reset-attempts/validate`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body).toEqual({
|
||||
email: 'ada@example.com',
|
||||
codigo: '0123'
|
||||
});
|
||||
request.flush(
|
||||
{
|
||||
message: 'Código validado correctamente.',
|
||||
status: 'validated'
|
||||
},
|
||||
{ status: 200, statusText: 'OK' }
|
||||
);
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('resets the password and exposes the consumed attempt status', () => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
provideHttpClient(),
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
|
||||
const service = TestBed.inject(AuthService);
|
||||
const httpController = TestBed.inject(HttpTestingController);
|
||||
const payload = {
|
||||
email: 'ada@example.com',
|
||||
codigo: '0123',
|
||||
password: 'NewSecret!456',
|
||||
password_confirmation: 'NewSecret!456'
|
||||
};
|
||||
|
||||
service.resetPassword(payload).subscribe((response) => {
|
||||
expect(response.status).toBe(200);
|
||||
expect(response.body?.status).toBe('used');
|
||||
});
|
||||
|
||||
const request = httpController.expectOne(`${environment.url}password/reset`);
|
||||
expect(request.request.method).toBe('POST');
|
||||
expect(request.request.body).toEqual(payload);
|
||||
request.flush(
|
||||
{
|
||||
message: 'Contraseña modificada correctamente.',
|
||||
status: 'used'
|
||||
},
|
||||
{ status: 200, statusText: 'OK' }
|
||||
);
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('propagates logout errors without clearing the local session', () => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
@@ -175,6 +351,10 @@ describe('AuthService', () => {
|
||||
provideHttpClientTesting(),
|
||||
AuthService,
|
||||
{ provide: CookieService, useValue: createCookieServiceStub() },
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { getTenant: () => ({ codigo: 'tenant-test' }) }
|
||||
},
|
||||
TransferState
|
||||
]
|
||||
});
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { DOCUMENT } from '@angular/common';
|
||||
import { HttpClient, HttpErrorResponse, HttpResponse } from '@angular/common/http';
|
||||
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
|
||||
import { computed, inject, Injectable, PLATFORM_ID, signal, TransferState, makeStateKey } from '@angular/core';
|
||||
import { firstValueFrom, map, Observable, of, tap } from 'rxjs';
|
||||
@@ -10,9 +11,14 @@ import {
|
||||
LoginResponse,
|
||||
RegisterPayload,
|
||||
RegisterResponse,
|
||||
UpdateProfilePayload
|
||||
ResetPasswordPayload,
|
||||
ResetPasswordAttemptResponse,
|
||||
ResetPasswordResponse,
|
||||
UpdateProfilePayload,
|
||||
ValidateResetPasswordAttemptResponse
|
||||
} from './auth.interfaces';
|
||||
import { CookieService } from '../cookie/cookie.service';
|
||||
import { TenantService } from '../tenant.service';
|
||||
|
||||
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
|
||||
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
||||
@@ -22,9 +28,11 @@ const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
||||
})
|
||||
export class AuthService {
|
||||
private readonly http = inject(HttpClient);
|
||||
private readonly document = inject(DOCUMENT);
|
||||
private readonly platformId = inject(PLATFORM_ID);
|
||||
private readonly cookieService = inject(CookieService);
|
||||
private readonly transferState = inject(TransferState);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
private readonly userState = signal<AuthUser | null>(null);
|
||||
private readonly tokenState = signal<string | null>(null);
|
||||
@@ -34,20 +42,96 @@ export class AuthService {
|
||||
readonly isAuthenticated = computed(() => this.tokenState() !== null);
|
||||
|
||||
login(payload: LoginPayload): Observable<AuthUser> {
|
||||
return this.http.post<LoginResponse>(`${environment.url}login`, payload).pipe(
|
||||
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||
map((response) => response.user)
|
||||
);
|
||||
const tenant = this.tenantService.getTenant();
|
||||
if (!tenant) {
|
||||
throw new Error('No se pudo resolver el tenant activo.');
|
||||
}
|
||||
|
||||
return this.http
|
||||
.post<LoginResponse>(
|
||||
`${environment.url}login`,
|
||||
{ ...payload, tenant_codigo: tenant.codigo },
|
||||
{ withCredentials: true }
|
||||
)
|
||||
.pipe(
|
||||
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||
map((response) => response.user)
|
||||
);
|
||||
}
|
||||
|
||||
register(payload: RegisterPayload): Observable<RegisterResponse> {
|
||||
return this.http.post<RegisterResponse>(`${environment.url}register`, payload);
|
||||
const tenantCode = this.tenantService.getTenant()?.codigo;
|
||||
|
||||
return this.http.post<RegisterResponse>(`${environment.url}register`, {
|
||||
...payload,
|
||||
...(tenantCode ? { tenant_codigo: tenantCode } : {})
|
||||
});
|
||||
}
|
||||
|
||||
requestPasswordReset(email: string): Observable<HttpResponse<ResetPasswordAttemptResponse>> {
|
||||
const tenantCode = this.tenantService.getTenant()?.codigo;
|
||||
|
||||
return this.http.post<ResetPasswordAttemptResponse>(
|
||||
`${environment.url}password/reset-attempts`,
|
||||
{
|
||||
email,
|
||||
...(tenantCode ? { tenant_codigo: tenantCode } : {})
|
||||
},
|
||||
{ observe: 'response' }
|
||||
);
|
||||
}
|
||||
|
||||
validatePasswordResetCode(
|
||||
email: string,
|
||||
codigo: string
|
||||
): Observable<HttpResponse<ValidateResetPasswordAttemptResponse>> {
|
||||
return this.http.post<ValidateResetPasswordAttemptResponse>(
|
||||
`${environment.url}password/reset-attempts/validate`,
|
||||
{ email, codigo },
|
||||
{ observe: 'response' }
|
||||
);
|
||||
}
|
||||
|
||||
resetPassword(payload: ResetPasswordPayload): Observable<HttpResponse<ResetPasswordResponse>> {
|
||||
return this.http.post<ResetPasswordResponse>(`${environment.url}password/reset`, payload, {
|
||||
observe: 'response'
|
||||
});
|
||||
}
|
||||
|
||||
loginWithGoogle(): void {
|
||||
const tenant = this.tenantService.getTenant();
|
||||
if (!tenant) {
|
||||
throw new Error('No se pudo resolver el tenant activo.');
|
||||
}
|
||||
|
||||
const apiUrl = new URL(environment.url);
|
||||
const authorizationUrl = new URL('/auth/google/redirect', apiUrl.origin);
|
||||
authorizationUrl.searchParams.set('tenant', tenant.codigo);
|
||||
authorizationUrl.searchParams.set('return_url', this.document.location.origin);
|
||||
|
||||
this.document.location.assign(authorizationUrl.toString());
|
||||
}
|
||||
|
||||
completeGoogleLogin(oauthCode: string): Observable<AuthUser> {
|
||||
const tenant = this.tenantService.getTenant();
|
||||
if (!tenant) {
|
||||
throw new Error('No se pudo resolver el tenant activo.');
|
||||
}
|
||||
|
||||
return this.http
|
||||
.post<LoginResponse>(
|
||||
`${environment.url}auth/google/exchange`,
|
||||
{ oauth_code: oauthCode, tenant_codigo: tenant.codigo },
|
||||
{ withCredentials: true }
|
||||
)
|
||||
.pipe(
|
||||
tap((response) => this.applyAuthenticatedState(response.token, response.user)),
|
||||
map((response) => response.user)
|
||||
);
|
||||
}
|
||||
|
||||
updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
|
||||
return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(
|
||||
tap((user) => this.userState.set(user))
|
||||
);
|
||||
return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(tap((user) => this.userState.set(user)));
|
||||
}
|
||||
|
||||
logout(): Observable<void> {
|
||||
@@ -56,9 +140,7 @@ export class AuthService {
|
||||
return of(void 0);
|
||||
}
|
||||
|
||||
return this.http.post<void>(`${environment.url}logout`, {}).pipe(
|
||||
tap(() => this.clearSession())
|
||||
);
|
||||
return this.http.post<void>(`${environment.url}logout`, {}).pipe(tap(() => this.clearSession()));
|
||||
}
|
||||
|
||||
async bootstrap(): Promise<void> {
|
||||
@@ -75,16 +157,29 @@ export class AuthService {
|
||||
return;
|
||||
}
|
||||
|
||||
const user = await firstValueFrom(this.loadCurrentUser());
|
||||
if (isPlatformServer(this.platformId)) {
|
||||
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);
|
||||
try {
|
||||
const user = await firstValueFrom(this.loadCurrentUser());
|
||||
|
||||
if (isPlatformServer(this.platformId)) {
|
||||
this.transferState.set(AUTH_USER_SSR_STATE_KEY, user);
|
||||
}
|
||||
} catch (error) {
|
||||
// An expired token is an expected state, including while rendering on the
|
||||
// server. Do not let it reject the application initializer: Angular's SSR
|
||||
// pipeline can otherwise attempt to serialize HttpErrorResponse internals
|
||||
// as HTTP headers.
|
||||
if (error instanceof HttpErrorResponse && error.status === 401) {
|
||||
this.clearSession();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
loadCurrentUser(): Observable<AuthUser> {
|
||||
return this.http.get<AuthUser>(`${environment.url}me`).pipe(
|
||||
tap((user) => this.userState.set(user))
|
||||
);
|
||||
return this.http.get<AuthUser>(`${environment.url}me`).pipe(tap((user) => this.userState.set(user)));
|
||||
}
|
||||
|
||||
hydrateSession(): void {
|
||||
|
||||
@@ -65,6 +65,7 @@ export interface CatalogItemDetail {
|
||||
}
|
||||
|
||||
export type CatalogProductLayout = 'row' | 'column_with_image' | 'column_with_cart';
|
||||
export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
|
||||
|
||||
export interface CatalogFeaturedItemVariant {
|
||||
id: number;
|
||||
@@ -82,10 +83,14 @@ export interface CatalogFeaturedItem {
|
||||
variants?: CatalogFeaturedItemVariant[];
|
||||
}
|
||||
|
||||
export type CatalogFeaturedItems =
|
||||
ApiPaginatedResponse<CatalogFeaturedItem[]> | CatalogFeaturedItem[];
|
||||
|
||||
export interface CatalogFeaturedGroup {
|
||||
id: number;
|
||||
title: string;
|
||||
layout: CatalogProductLayout;
|
||||
group_layout: CatalogGroupLayout;
|
||||
group_order: number;
|
||||
items: ApiPaginatedResponse<CatalogFeaturedItem[]>;
|
||||
items: CatalogFeaturedItems;
|
||||
}
|
||||
|
||||
@@ -9,12 +9,17 @@ import { TenantService } from '../tenant.service';
|
||||
import {
|
||||
CatalogFeaturedGroup,
|
||||
CatalogFeaturedItem,
|
||||
CatalogFeaturedItems,
|
||||
CatalogItemDetail,
|
||||
Product,
|
||||
} from './catalog.interface';
|
||||
|
||||
type HttpParamValue = string | number | boolean | readonly (string | number | boolean)[];
|
||||
|
||||
export interface CatalogSearchQueryParams extends ApiPaginationQueryParams {
|
||||
q: string;
|
||||
}
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
@@ -36,11 +41,20 @@ export class CatalogService {
|
||||
return this.http.get<CatalogFeaturedGroup[]>(`${this.tenantApiUrl}/catalog`);
|
||||
}
|
||||
|
||||
searchCatalog(
|
||||
params: CatalogSearchQueryParams,
|
||||
): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
|
||||
return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
|
||||
`${this.tenantApiUrl}/catalog-items`,
|
||||
{ params: this.buildHttpParams(params) },
|
||||
);
|
||||
}
|
||||
|
||||
getFeaturedGroupItems(
|
||||
featuredGroupId: number,
|
||||
params?: ApiPaginationQueryParams,
|
||||
): Observable<ApiPaginatedResponse<CatalogFeaturedItem[]>> {
|
||||
return this.http.get<ApiPaginatedResponse<CatalogFeaturedItem[]>>(
|
||||
): Observable<CatalogFeaturedItems> {
|
||||
return this.http.get<CatalogFeaturedItems>(
|
||||
`${this.tenantApiUrl}/catalog/featured-groups/${featuredGroupId}/items`,
|
||||
{ params: this.buildHttpParams(params) },
|
||||
);
|
||||
|
||||
@@ -4,14 +4,25 @@ import { firstValueFrom } from 'rxjs';
|
||||
|
||||
import { environment } from '../../../environments/environment';
|
||||
|
||||
export interface CreatePurchasePayload {
|
||||
cart_id: number;
|
||||
export interface UpdatePurchaseCustomerPayload {
|
||||
dni: string;
|
||||
telefono: string;
|
||||
nombre_apellido: string;
|
||||
email: string;
|
||||
}
|
||||
|
||||
export type StartCheckoutPayload =
|
||||
| {
|
||||
cart_id: number;
|
||||
}
|
||||
| {
|
||||
direct_item: {
|
||||
catalog_item_id: number;
|
||||
variant_id: number | null;
|
||||
cantidad: number;
|
||||
};
|
||||
};
|
||||
|
||||
export interface PurchaseStatusResponse {
|
||||
status: string | null;
|
||||
}
|
||||
@@ -62,17 +73,23 @@ export interface PurchaseDetailResponse extends PurchaseStatusResponse {
|
||||
}
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class CheckoutService {
|
||||
private readonly http = inject(HttpClient);
|
||||
|
||||
async createPurchase(tenantCode: string, payload: CreatePurchasePayload): Promise<{ id: number }> {
|
||||
async startCheckout(
|
||||
tenantCode: string,
|
||||
payload: StartCheckoutPayload,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: { id: number }; id?: number }>(`${environment.url}tenants/${tenantCode}/compras`, payload)
|
||||
this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/start-checkout`,
|
||||
payload,
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<{ id: number }>(response);
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
|
||||
if (!purchase?.id) {
|
||||
throw new Error('Error al crear la compra.');
|
||||
@@ -81,13 +98,21 @@ export class CheckoutService {
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async generatePaymentIntent(tenantCode: string, purchaseId: number, method: 'qr' | 'transfer' | 'telepagos', payerDni?: string): Promise<any> {
|
||||
async generatePaymentIntent(
|
||||
tenantCode: string,
|
||||
purchaseId: number,
|
||||
method: 'qr' | 'transfer' | 'telepagos',
|
||||
payerDni?: string,
|
||||
): Promise<any> {
|
||||
const payload: any = { method };
|
||||
if (payerDni) {
|
||||
payload.transfer_payer_dni = payerDni;
|
||||
}
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, payload)
|
||||
this.http.post<any>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`,
|
||||
payload,
|
||||
),
|
||||
);
|
||||
if (!response) {
|
||||
throw new Error('Error al generar la intención de pago.');
|
||||
@@ -95,9 +120,72 @@ export class CheckoutService {
|
||||
return response;
|
||||
}
|
||||
|
||||
async updateCustomerData(
|
||||
tenantCode: string,
|
||||
purchaseId: number,
|
||||
payload: UpdatePurchaseCustomerPayload,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/customer-data`,
|
||||
payload,
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
if (!purchase) {
|
||||
throw new Error('Error al actualizar los datos de la compra.');
|
||||
}
|
||||
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async updateItemQuantity(
|
||||
tenantCode: string,
|
||||
purchaseId: number,
|
||||
itemId: number,
|
||||
quantity: number,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.patch<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/items/${itemId}`,
|
||||
{ quantity },
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
if (!purchase) {
|
||||
throw new Error('Error al actualizar la cantidad del producto.');
|
||||
}
|
||||
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async prepareItemEditing(
|
||||
tenantCode: string,
|
||||
purchaseId: number,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/edit-items`,
|
||||
{},
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
if (!purchase) {
|
||||
throw new Error('Error al preparar la compra para editarla.');
|
||||
}
|
||||
|
||||
return purchase;
|
||||
}
|
||||
|
||||
async completePurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`, {})
|
||||
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/complete`,
|
||||
{},
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||
@@ -107,27 +195,49 @@ export class CheckoutService {
|
||||
}
|
||||
|
||||
return {
|
||||
status: purchase.status ?? null
|
||||
status: purchase.status ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
async getPurchases(tenantCode: string, status?: string): Promise<{ data: PurchaseSummaryResponse[] }> {
|
||||
async cancelPurchase(tenantCode: string, purchaseId: number): Promise<PurchaseStatusResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.post<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/cancel`,
|
||||
{},
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseStatusResponse>(response);
|
||||
if (!purchase) {
|
||||
throw new Error('Error al cancelar la compra.');
|
||||
}
|
||||
|
||||
return { status: purchase.status ?? null };
|
||||
}
|
||||
|
||||
async getPurchases(
|
||||
tenantCode: string,
|
||||
status?: string,
|
||||
): Promise<{ data: PurchaseSummaryResponse[] }> {
|
||||
let url = `${environment.url}tenants/${tenantCode}/compras`;
|
||||
if (status) {
|
||||
url += `?status=${status}`;
|
||||
}
|
||||
const response = await firstValueFrom(
|
||||
this.http.get<{ data: PurchaseSummaryResponse[] }>(url)
|
||||
);
|
||||
const response = await firstValueFrom(this.http.get<{ data: PurchaseSummaryResponse[] }>(url));
|
||||
if (!response) {
|
||||
throw new Error('Error al obtener las compras.');
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
async getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseDetailResponse> {
|
||||
async getPurchase(
|
||||
tenantCode: string,
|
||||
purchaseId: string | number,
|
||||
): Promise<PurchaseDetailResponse> {
|
||||
const response = await firstValueFrom(
|
||||
this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`)
|
||||
this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(
|
||||
`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`,
|
||||
),
|
||||
);
|
||||
|
||||
const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
|
||||
|
||||
17
src/app/core/services/menu.utils.ts
Normal file
17
src/app/core/services/menu.utils.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { Menu } from './tenant.interface';
|
||||
|
||||
export function findMenu(menues: readonly Menu[], menuCode: string): Menu | undefined {
|
||||
for (const menu of menues) {
|
||||
if (menu.code === menuCode) {
|
||||
return menu;
|
||||
}
|
||||
|
||||
const submenu = findMenu(menu.submenues ?? [], menuCode);
|
||||
|
||||
if (submenu) {
|
||||
return submenu;
|
||||
}
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
@@ -26,7 +26,19 @@ export interface EventConfig {
|
||||
export interface Menu {
|
||||
id: number;
|
||||
code: string;
|
||||
label: string;
|
||||
parent_menu_code: string | null;
|
||||
content_type: 'static' | 'dynamic';
|
||||
route: string;
|
||||
static_content?: unknown;
|
||||
submenues: Menu[];
|
||||
}
|
||||
|
||||
export interface SocialMedia {
|
||||
code: string;
|
||||
icon: string;
|
||||
name: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
export interface Tenant {
|
||||
@@ -46,8 +58,12 @@ export interface Tenant {
|
||||
selected_bank_account?: BankAccount | null;
|
||||
hero_config?: HeroConfig | null;
|
||||
event_config?: EventConfig | null;
|
||||
search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
|
||||
search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
|
||||
search_items_per_page?: number;
|
||||
main_carousel_images?: string[];
|
||||
social_media?: SocialMedia[];
|
||||
menues?: Menu[];
|
||||
}
|
||||
|
||||
export type TenantBootstrapResponse = ApiResponse<Tenant>;
|
||||
|
||||
|
||||
@@ -395,6 +395,44 @@
|
||||
|
||||
<hr class="section-divider" />
|
||||
|
||||
<div class="accordion-showcase">
|
||||
<h2>Accordion</h2>
|
||||
<p class="text-muted mb-4">
|
||||
Accordion reutilizable basado en las clases globales de Bootstrap. Por defecto mantiene un
|
||||
solo item abierto.
|
||||
</p>
|
||||
|
||||
<app-accordion>
|
||||
<app-accordion-item title="¿Cómo realizo una compra?" [open]="true">
|
||||
Elegí el producto, seleccioná sus variantes y agregalo al carrito. Desde allí podés
|
||||
revisar el pedido y continuar al checkout.
|
||||
</app-accordion-item>
|
||||
|
||||
<app-accordion-item title="¿Qué medios de pago están disponibles?">
|
||||
Los medios de pago dependen de la configuración de cada tienda y se muestran durante el
|
||||
checkout.
|
||||
</app-accordion-item>
|
||||
|
||||
<app-accordion-item title="Item deshabilitado" [disabled]="true">
|
||||
Este contenido no puede abrirse.
|
||||
</app-accordion-item>
|
||||
</app-accordion>
|
||||
|
||||
<h3 class="h5 mt-5 mb-3">Variante múltiple y flush</h3>
|
||||
|
||||
<app-accordion [allowMultiple]="true" [flush]="true">
|
||||
<app-accordion-item title="Envíos">
|
||||
La tienda informa los métodos y costos de envío disponibles para cada pedido.
|
||||
</app-accordion-item>
|
||||
|
||||
<app-accordion-item title="Cambios y devoluciones">
|
||||
Las condiciones de cambio y devolución son definidas por cada comercio.
|
||||
</app-accordion-item>
|
||||
</app-accordion>
|
||||
</div>
|
||||
|
||||
<hr class="section-divider" />
|
||||
|
||||
<div class="cart-showcase">
|
||||
<div class="cart-showcase__header">
|
||||
<div>
|
||||
@@ -574,6 +612,59 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="component-demo card shadow-sm mt-4" data-testid="main-carousel">
|
||||
<div class="card-body">
|
||||
<span class="eyebrow">Reusable Component</span>
|
||||
<h2 class="mb-3">Main Carousel</h2>
|
||||
|
||||
<p class="text-muted mb-4">
|
||||
Carrusel panorámico compuesto únicamente por imágenes, con autoslide e indicadores.
|
||||
</p>
|
||||
|
||||
<app-main-carousel
|
||||
[images]="mainCarouselImages"
|
||||
[imageAlts]="mainCarouselImageAlts"
|
||||
[autoSlideInterval]="4000"
|
||||
ariaLabel="Promociones de la tienda"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="component-demo card shadow-sm mt-4" data-testid="products-carousel">
|
||||
<div class="card-body">
|
||||
<span class="eyebrow">Reusable Component</span>
|
||||
<h2 class="mb-3">Carousel de productos</h2>
|
||||
|
||||
<p class="text-muted mb-4">
|
||||
El carousel controla únicamente el desplazamiento. Cada ítem se define externamente con un
|
||||
template y en este ejemplo renderiza productos con imágenes mockeadas.
|
||||
</p>
|
||||
|
||||
<ng-template #productCarouselItem let-product let-index="index">
|
||||
<div class="carousel-product" [attr.data-carousel-index]="index">
|
||||
<span class="carousel-product__mock-id">ITEM {{ product.id }}</span>
|
||||
<app-product-column-with-image
|
||||
[imageUrl]="product.imageUrl"
|
||||
[title]="product.title"
|
||||
[originalPrice]="product.originalPrice"
|
||||
[discount]="product.discount"
|
||||
[transferPrice]="product.transferPrice"
|
||||
(buy)="onProductBuy(product.title)"
|
||||
/>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<app-carousel
|
||||
[items]="carouselProducts"
|
||||
[itemTemplate]="productCarouselItem"
|
||||
[trackBy]="trackCarouselProduct"
|
||||
[gap]="16"
|
||||
[circular]="true"
|
||||
ariaLabel="Productos con imágenes de prueba"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="component-demo card shadow-sm mt-4">
|
||||
<div class="card-body">
|
||||
<span class="eyebrow">Reusable Component</span>
|
||||
@@ -601,6 +692,23 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="component-demo card shadow-sm mt-4" data-testid="location-map-demo">
|
||||
<div class="card-body">
|
||||
<span class="eyebrow">Reusable Component</span>
|
||||
<h2 class="mb-2">Mapa de ubicaciones</h2>
|
||||
<p class="text-muted mb-4">
|
||||
Prueba de Leaflet con múltiples puntos, encuadre automático y acceso a indicaciones.
|
||||
</p>
|
||||
|
||||
<app-location-map
|
||||
[locations]="mapLocations"
|
||||
[markerColor]="tenant()?.primary_color ?? '#24a9e0'"
|
||||
mapStyle="minimal-light"
|
||||
ariaLabel="Mapa de puntos de atención en Rosario"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="component-demo card shadow-sm mt-4">
|
||||
<div class="card-body">
|
||||
<span class="eyebrow">Reusable Component</span>
|
||||
|
||||
@@ -19,6 +19,32 @@
|
||||
width: min(100%, 64rem);
|
||||
}
|
||||
|
||||
.carousel-product {
|
||||
position: relative;
|
||||
width: clamp(15rem, 30vw, 18rem);
|
||||
height: 100%;
|
||||
|
||||
&__mock-id {
|
||||
position: absolute;
|
||||
top: 0.75rem;
|
||||
left: 0.75rem;
|
||||
z-index: 2;
|
||||
padding: 0.35rem 0.55rem;
|
||||
color: #fff;
|
||||
font-size: 0.7rem;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
letter-spacing: 0.08em;
|
||||
background: rgb(20 20 20 / 82%);
|
||||
border-radius: 999px;
|
||||
}
|
||||
|
||||
app-product-column-with-image {
|
||||
display: block;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.eyebrow {
|
||||
display: inline-block;
|
||||
margin-bottom: 0.75rem;
|
||||
@@ -155,7 +181,6 @@ h1 {
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
|
||||
.file-field {
|
||||
display: grid;
|
||||
gap: 0.75rem;
|
||||
@@ -168,6 +193,10 @@ h1 {
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.carousel-product {
|
||||
width: min(18rem, calc(100vw - 5rem));
|
||||
}
|
||||
|
||||
.input-grid {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
@@ -206,11 +235,15 @@ h1 {
|
||||
padding: 1rem;
|
||||
overflow: hidden;
|
||||
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
transition:
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
|
||||
&:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05), 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
box-shadow:
|
||||
inset 0 2px 4px rgba(0, 0, 0, 0.05),
|
||||
0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,7 +284,9 @@ h1 {
|
||||
border: 1px solid #dee2e6;
|
||||
overflow: hidden;
|
||||
background-color: #ffffff;
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
transition:
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
|
||||
&:hover {
|
||||
transform: translateY(-3px);
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||
import {
|
||||
BrowserTestingModule,
|
||||
platformBrowserTesting
|
||||
} from '@angular/platform-browser/testing';
|
||||
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||
import { of } from 'rxjs';
|
||||
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
@@ -25,7 +22,7 @@ const tenant: Tenant = {
|
||||
header_bg_color: '#313131',
|
||||
footer_bg_color: '#313131',
|
||||
header_logo: 'https://example.com/header.png',
|
||||
footer_logo: 'https://example.com/footer.png'
|
||||
footer_logo: 'https://example.com/footer.png',
|
||||
};
|
||||
|
||||
function createTenantServiceStub(currentTenant: Tenant | null) {
|
||||
@@ -36,7 +33,7 @@ function createTenantServiceStub(currentTenant: Tenant | null) {
|
||||
tenant: tenantState.asReadonly(),
|
||||
status: statusState.asReadonly(),
|
||||
getTenant: () => tenantState(),
|
||||
bootstrap: vi.fn().mockResolvedValue(undefined)
|
||||
bootstrap: vi.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,7 +41,7 @@ function createToastServiceStub() {
|
||||
return {
|
||||
success: vi.fn(),
|
||||
danger: vi.fn(),
|
||||
info: vi.fn()
|
||||
info: vi.fn(),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -52,17 +49,14 @@ function createModalServiceStub() {
|
||||
return {
|
||||
open: vi.fn(),
|
||||
openConfirm: vi.fn().mockReturnValue(of(true)),
|
||||
openConfirmDelete: vi.fn().mockReturnValue(of(false))
|
||||
openConfirmDelete: vi.fn().mockReturnValue(of(false)),
|
||||
};
|
||||
}
|
||||
|
||||
describe('ReutilizablesTestPageComponent', () => {
|
||||
beforeAll(() => {
|
||||
try {
|
||||
getTestBed().initTestEnvironment(
|
||||
BrowserTestingModule,
|
||||
platformBrowserTesting()
|
||||
);
|
||||
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||
} catch {
|
||||
// Test environment may already be initialized by another setup entrypoint.
|
||||
}
|
||||
@@ -79,17 +73,17 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant)
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub()
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: modalServiceStub
|
||||
}
|
||||
]
|
||||
useValue: modalServiceStub,
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
@@ -101,12 +95,12 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
expect(sectionTitle?.textContent).toContain('Configuracion Tenant');
|
||||
|
||||
const headerImg = element.querySelector(
|
||||
'.tenant-logo-card img[alt="Header Logo"]'
|
||||
'.tenant-logo-card img[alt="Header Logo"]',
|
||||
) as HTMLImageElement;
|
||||
expect(headerImg?.src).toBe(tenant.header_logo);
|
||||
|
||||
const footerImg = element.querySelector(
|
||||
'.tenant-logo-card img[alt="Footer Logo"]'
|
||||
'.tenant-logo-card img[alt="Footer Logo"]',
|
||||
) as HTMLImageElement;
|
||||
expect(footerImg?.src).toBe(tenant.footer_logo);
|
||||
|
||||
@@ -123,17 +117,17 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant)
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub()
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: modalServiceStub
|
||||
}
|
||||
]
|
||||
useValue: modalServiceStub,
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
@@ -142,9 +136,117 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(element.querySelector('app-paginator')).not.toBeNull();
|
||||
expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe(
|
||||
'1/8',
|
||||
);
|
||||
});
|
||||
|
||||
it('renders the reusable map demo with all configured locations', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ReutilizablesTestPageComponent],
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: createModalServiceStub(),
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const mapDemo = fixture.nativeElement.querySelector(
|
||||
'[data-testid="location-map-demo"]',
|
||||
) as HTMLElement;
|
||||
const accessibleLocations = mapDemo.querySelectorAll('app-location-map .visually-hidden li');
|
||||
|
||||
expect(mapDemo.querySelector('app-location-map')).not.toBeNull();
|
||||
expect(accessibleLocations).toHaveLength(3);
|
||||
expect(mapDemo.textContent).toContain('Gigante de Arroyito');
|
||||
|
||||
fixture.destroy();
|
||||
});
|
||||
|
||||
it('renders the carousel demo with mocked product images', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ReutilizablesTestPageComponent],
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: createModalServiceStub(),
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const carouselDemo = element.querySelector('[data-testid="products-carousel"]');
|
||||
const carouselItems = carouselDemo?.querySelectorAll('[data-carousel-index]');
|
||||
const productImages = carouselDemo?.querySelectorAll('app-product-column-with-image img');
|
||||
|
||||
expect(carouselDemo?.querySelector('app-carousel')).not.toBeNull();
|
||||
expect(carouselItems).toHaveLength(6);
|
||||
expect(productImages).toHaveLength(6);
|
||||
expect(productImages?.[0].getAttribute('src')).toContain('/images/carousel-mochila-roja.webp');
|
||||
expect(productImages?.[1].getAttribute('src')).toContain(
|
||||
'/images/carousel-auriculares-amarillos.webp',
|
||||
);
|
||||
expect(
|
||||
element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()
|
||||
).toBe('1/8');
|
||||
new Set(Array.from(productImages ?? [], (image) => image.getAttribute('src'))).size,
|
||||
).toBe(6);
|
||||
});
|
||||
|
||||
it('renders the main carousel demo with remote images', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ReutilizablesTestPageComponent],
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: createModalServiceStub(),
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const carouselDemo = element.querySelector('[data-testid="main-carousel"]');
|
||||
const images = carouselDemo?.querySelectorAll('.main-carousel__image');
|
||||
const indicators = carouselDemo?.querySelectorAll('.main-carousel__indicator');
|
||||
|
||||
expect(carouselDemo?.querySelector('app-main-carousel')).not.toBeNull();
|
||||
expect(images).toHaveLength(3);
|
||||
expect(indicators).toHaveLength(3);
|
||||
expect(images?.[0].getAttribute('src')).toContain('images.unsplash.com');
|
||||
|
||||
fixture.destroy();
|
||||
});
|
||||
|
||||
it('renders the modal showcase and opens the confirm demos from the buttons', async () => {
|
||||
@@ -154,36 +256,34 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant)
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub()
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: modalServiceStub
|
||||
}
|
||||
]
|
||||
useValue: modalServiceStub,
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const buttons = Array.from(
|
||||
element.querySelectorAll('.button-group app-button button')
|
||||
);
|
||||
const buttons = Array.from(element.querySelectorAll('.button-group app-button button'));
|
||||
const confirmButton = buttons.find((button) =>
|
||||
button.textContent?.includes('Abrir confirm modal')
|
||||
button.textContent?.includes('Abrir confirm modal'),
|
||||
) as HTMLButtonElement;
|
||||
const deleteButton = buttons.find((button) =>
|
||||
button.textContent?.includes('Abrir confirm delete')
|
||||
button.textContent?.includes('Abrir confirm delete'),
|
||||
) as HTMLButtonElement;
|
||||
|
||||
expect(
|
||||
element.querySelector('[data-testid="modal-last-result"]')?.textContent
|
||||
).toContain('Todavia no se abrio ningun modal.');
|
||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||
'Todavia no se abrio ningun modal.',
|
||||
);
|
||||
|
||||
confirmButton.click();
|
||||
fixture.detectChanges();
|
||||
@@ -193,17 +293,17 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
expect(modalServiceStub.openConfirm).toHaveBeenCalledWith({
|
||||
title: 'Confirmar accion',
|
||||
content: 'Caso base para verificar apertura, cierre y devolucion de resultado.',
|
||||
confirmLabel: 'Confirmar'
|
||||
confirmLabel: 'Confirmar',
|
||||
});
|
||||
expect(modalServiceStub.openConfirmDelete).toHaveBeenCalledWith({
|
||||
title: 'Eliminar producto',
|
||||
content:
|
||||
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
||||
confirmLabel: 'Eliminar'
|
||||
confirmLabel: 'Eliminar',
|
||||
});
|
||||
expect(
|
||||
element.querySelector('[data-testid="modal-last-result"]')?.textContent
|
||||
).toContain('Resultado: false');
|
||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||
'Resultado: false',
|
||||
);
|
||||
});
|
||||
|
||||
it('updates the visible result when the confirm modal resolves to true', async () => {
|
||||
@@ -213,17 +313,17 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(tenant)
|
||||
useValue: createTenantServiceStub(tenant),
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: createToastServiceStub()
|
||||
useValue: createToastServiceStub(),
|
||||
},
|
||||
{
|
||||
provide: ModalService,
|
||||
useValue: modalServiceStub
|
||||
}
|
||||
]
|
||||
useValue: modalServiceStub,
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ReutilizablesTestPageComponent);
|
||||
@@ -231,16 +331,14 @@ describe('ReutilizablesTestPageComponent', () => {
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const confirmButton = Array.from(
|
||||
element.querySelectorAll('.button-group app-button button')
|
||||
).find((button) =>
|
||||
button.textContent?.includes('Abrir confirm modal')
|
||||
) as HTMLButtonElement;
|
||||
element.querySelectorAll('.button-group app-button button'),
|
||||
).find((button) => button.textContent?.includes('Abrir confirm modal')) as HTMLButtonElement;
|
||||
|
||||
confirmButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(
|
||||
element.querySelector('[data-testid="modal-last-result"]')?.textContent
|
||||
).toContain('Resultado: true');
|
||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||
'Resultado: true',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -14,6 +14,23 @@ import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
||||
import { CarouselComponent } from '../../../../shared/components/carousel/carousel.component';
|
||||
import { MainCarouselComponent } from '../../../../shared/components/main-carousel/main-carousel.component';
|
||||
import { AccordionComponent } from '../../../../shared/components/accordion/accordion.component';
|
||||
import { AccordionItemComponent } from '../../../../shared/components/accordion/accordion-item.component';
|
||||
import {
|
||||
LocationMapComponent,
|
||||
MapLocation,
|
||||
} from '../../../../shared/components/location-map/location-map.component';
|
||||
|
||||
interface CarouselProductMock {
|
||||
id: number;
|
||||
title: string;
|
||||
originalPrice: number;
|
||||
discount: number | null;
|
||||
transferPrice: number;
|
||||
imageUrl: string;
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-reutilizables-test-page',
|
||||
@@ -30,6 +47,11 @@ import { StepComponent } from '../../../../shared/components/stepper/step.compon
|
||||
CartIconComponent,
|
||||
StepperComponent,
|
||||
StepComponent,
|
||||
CarouselComponent,
|
||||
MainCarouselComponent,
|
||||
AccordionComponent,
|
||||
AccordionItemComponent,
|
||||
LocationMapComponent,
|
||||
],
|
||||
templateUrl: './reutilizables-test-page.component.html',
|
||||
styleUrl: './reutilizables-test-page.component.scss',
|
||||
@@ -62,6 +84,39 @@ export class ReutilizablesTestPageComponent {
|
||||
protected lastModalResult = 'Todavia no se abrio ningun modal.';
|
||||
protected readonly paginatorTotalPages = 8;
|
||||
protected readonly cartBackgroundColor = '#ffffff';
|
||||
protected readonly mapLocations: readonly MapLocation[] = [
|
||||
{
|
||||
id: 'gigante-de-arroyito',
|
||||
label: 'Gigante de Arroyito',
|
||||
address: 'Av. Génova 640, Rosario',
|
||||
latitude: -32.913997,
|
||||
longitude: -60.674567,
|
||||
},
|
||||
{
|
||||
id: 'punto-centro',
|
||||
label: 'Punto Centro',
|
||||
address: 'Centro, Rosario',
|
||||
latitude: -32.94682,
|
||||
longitude: -60.63932,
|
||||
},
|
||||
{
|
||||
id: 'punto-sur',
|
||||
label: 'Punto Sur',
|
||||
address: 'Zona sur, Rosario',
|
||||
latitude: -32.97151,
|
||||
longitude: -60.65064,
|
||||
},
|
||||
];
|
||||
protected readonly mainCarouselImages = [
|
||||
'https://images.unsplash.com/photo-1441986300917-64674bd600d8?auto=format&fit=crop&w=1600&q=80',
|
||||
'https://images.unsplash.com/photo-1529139574466-a303027c1d8b?auto=format&fit=crop&w=1600&q=80',
|
||||
'https://images.unsplash.com/photo-1483985988355-763728e1935b?auto=format&fit=crop&w=1600&q=80',
|
||||
];
|
||||
protected readonly mainCarouselImageAlts = [
|
||||
'Interior de una tienda de indumentaria',
|
||||
'Colección de moda en exteriores',
|
||||
'Percheros con prendas de distintos colores',
|
||||
];
|
||||
|
||||
protected readonly testProducts = [
|
||||
{
|
||||
@@ -87,6 +142,62 @@ export class ReutilizablesTestPageComponent {
|
||||
},
|
||||
];
|
||||
|
||||
protected readonly carouselProducts: CarouselProductMock[] = [
|
||||
{
|
||||
id: 1,
|
||||
title: '01 · Mochila roja',
|
||||
originalPrice: 85000,
|
||||
discount: 20,
|
||||
transferPrice: 68000,
|
||||
imageUrl: '/images/carousel-mochila-roja.webp',
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
title: '02 · Auriculares amarillos',
|
||||
originalPrice: 120000,
|
||||
discount: 15,
|
||||
transferPrice: 102000,
|
||||
imageUrl: '/images/carousel-auriculares-amarillos.webp',
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
title: '03 · Reloj verde',
|
||||
originalPrice: 96000,
|
||||
discount: 10,
|
||||
transferPrice: 86400,
|
||||
imageUrl: '/images/carousel-reloj-verde.webp',
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
title: '04 · Cámara violeta',
|
||||
originalPrice: 135000,
|
||||
discount: null,
|
||||
transferPrice: 128000,
|
||||
imageUrl: '/images/carousel-camara-violeta.webp',
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
title: '05 · Zapatillas naranjas',
|
||||
originalPrice: 110000,
|
||||
discount: 25,
|
||||
transferPrice: 82500,
|
||||
imageUrl: '/images/carousel-zapatillas-naranjas.webp',
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
title: '06 · Campera azul',
|
||||
originalPrice: 142000,
|
||||
discount: 12,
|
||||
transferPrice: 121000,
|
||||
imageUrl: '/images/carousel-campera-azul.webp',
|
||||
},
|
||||
];
|
||||
|
||||
protected readonly trackCarouselProduct = (
|
||||
_index: number,
|
||||
product: CarouselProductMock,
|
||||
): number => product.id;
|
||||
|
||||
protected readonly testRowProduct = {
|
||||
title: 'ENTRADA GENERAL',
|
||||
description:
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<div class="sidebar-container">
|
||||
<h2 class="sidebar-title">MI CUENTA</h2>
|
||||
<h2 class="sidebar-title">{{ menu()?.label }}</h2>
|
||||
<div class="divider"></div>
|
||||
<nav class="sidebar-nav">
|
||||
<a routerLink="/mi-cuenta/datos-personales" routerLinkActive="active" class="nav-link"
|
||||
>Datos Personales</a
|
||||
>
|
||||
<a routerLink="/mi-cuenta/compras" routerLinkActive="active" class="nav-link">Mis compras</a>
|
||||
<a routerLink="/mi-cuenta/tickets" routerLinkActive="active" class="nav-link">Mis tickets</a>
|
||||
<nav class="sidebar-nav" aria-label="Secciones de mi cuenta">
|
||||
@for (menu of submenues(); track menu.code) {
|
||||
<a [routerLink]="menu.route" routerLinkActive="active" class="nav-link">
|
||||
{{ menu.label }}
|
||||
</a>
|
||||
}
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
font-weight: bold;
|
||||
color: #1a1a1a;
|
||||
margin-bottom: 12px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.divider {
|
||||
height: 1px;
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { AccountSidebar } from './account-sidebar';
|
||||
|
||||
describe('AccountSidebar', () => {
|
||||
it('renders only the account submenus configured for the tenant', async () => {
|
||||
const tenant = signal<Tenant>({
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#000000',
|
||||
secondary_color: '#000000',
|
||||
danger_color: '#000000',
|
||||
success_color: '#000000',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'account',
|
||||
label: 'Mi cuenta',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'account.profile',
|
||||
label: 'Datos personales',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/datos-personales',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
code: 'account.purchases',
|
||||
label: 'Mis compras',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/compras',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [AccountSidebar],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(AccountSidebar);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const links = Array.from(element.querySelectorAll<HTMLAnchorElement>('.nav-link'));
|
||||
|
||||
expect(element.querySelector('.sidebar-title')?.textContent?.trim()).toBe('Mi cuenta');
|
||||
expect(links.map((link) => link.textContent?.trim())).toEqual([
|
||||
'Datos personales',
|
||||
'Mis compras',
|
||||
]);
|
||||
expect(links.map((link) => link.getAttribute('href'))).toEqual([
|
||||
'/mi-cuenta/datos-personales',
|
||||
'/mi-cuenta/compras',
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -1,6 +1,9 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-account-sidebar',
|
||||
standalone: true,
|
||||
@@ -8,4 +11,11 @@ import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
templateUrl: './account-sidebar.html',
|
||||
styleUrl: './account-sidebar.scss',
|
||||
})
|
||||
export class AccountSidebar {}
|
||||
export class AccountSidebar {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly menu = computed(() =>
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], 'account'),
|
||||
);
|
||||
protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
|
||||
}
|
||||
|
||||
@@ -2,28 +2,29 @@
|
||||
<h1 class="tickets-page__title">MIS TICKETS</h1>
|
||||
|
||||
<div class="tickets-list" aria-busy="{{ isLoading() }}">
|
||||
<header class="tickets-list__header">
|
||||
<label class="tickets-list__select-all">
|
||||
<input
|
||||
type="checkbox"
|
||||
[checked]="allSelected()"
|
||||
[disabled]="activeTickets().length === 0"
|
||||
(change)="toggleAll($any($event.target).checked)"
|
||||
/>
|
||||
<span>TICKETS ACTIVOS</span>
|
||||
</label>
|
||||
@if (activeTickets().length) {
|
||||
<header class="tickets-list__header">
|
||||
<label class="tickets-list__select-all">
|
||||
<input
|
||||
type="checkbox"
|
||||
[checked]="allSelected()"
|
||||
(change)="toggleAll($any($event.target).checked)"
|
||||
/>
|
||||
<span>TICKETS ACTIVOS</span>
|
||||
</label>
|
||||
|
||||
<div class="tickets-list__bulk-actions">
|
||||
<span class="tickets-list__bulk-action">
|
||||
<app-icon-button variant="download" ariaLabel="Descargar tickets seleccionados" />
|
||||
<small>Descargar</small>
|
||||
</span>
|
||||
<span class="tickets-list__bulk-action">
|
||||
<app-icon-button variant="share" ariaLabel="Compartir tickets seleccionados" />
|
||||
<small>Compartir</small>
|
||||
</span>
|
||||
</div>
|
||||
</header>
|
||||
<div class="tickets-list__bulk-actions">
|
||||
<span class="tickets-list__bulk-action">
|
||||
<app-icon-button variant="download" ariaLabel="Descargar tickets seleccionados" />
|
||||
<small>Descargar</small>
|
||||
</span>
|
||||
<span class="tickets-list__bulk-action">
|
||||
<app-icon-button variant="share" ariaLabel="Compartir tickets seleccionados" />
|
||||
<small>Compartir</small>
|
||||
</span>
|
||||
</div>
|
||||
</header>
|
||||
}
|
||||
|
||||
@if (isLoading()) {
|
||||
@for (item of [1, 2, 3, 4]; track item) {
|
||||
|
||||
@@ -26,6 +26,33 @@ const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
|
||||
});
|
||||
|
||||
describe('TicketsPage', () => {
|
||||
it('hides the active tickets header when there are no available tickets', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [TicketsPage],
|
||||
providers: [{ provide: ToastService, useValue: { danger: vi.fn() } }],
|
||||
})
|
||||
.overrideComponent(TicketsPage, {
|
||||
set: {
|
||||
providers: [
|
||||
{ provide: TicketService, useValue: { getTickets: () => Promise.resolve([]) } },
|
||||
],
|
||||
},
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(TicketsPage);
|
||||
fixture.detectChanges();
|
||||
await fixture.whenStable();
|
||||
fixture.detectChanges();
|
||||
|
||||
const page = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(page.querySelector('.tickets-list__select-all')).toBeNull();
|
||||
expect(page.querySelector('.tickets-list__bulk-actions')).toBeNull();
|
||||
expect(page.textContent).not.toContain('TICKETS ACTIVOS');
|
||||
expect(page.textContent).toContain('Aún no tenés tickets disponibles.');
|
||||
});
|
||||
|
||||
it('separates expired and used tickets into the disabled inactive list', async () => {
|
||||
const tickets = [
|
||||
ticket({ id: 1 }),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="account-layout">
|
||||
<div class="sidebar-layout">
|
||||
<app-account-sidebar class="account-sidebar"></app-account-sidebar>
|
||||
<div class="account-content">
|
||||
<router-outlet></router-outlet>
|
||||
@@ -1,4 +1,4 @@
|
||||
.account-layout {
|
||||
.sidebar-layout {
|
||||
display: flex;
|
||||
margin: 0 auto;
|
||||
gap: 100px;
|
||||
@@ -3,10 +3,10 @@ import { RouterOutlet } from '@angular/router';
|
||||
import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
|
||||
|
||||
@Component({
|
||||
selector: 'app-account-layout',
|
||||
selector: 'app-sidebar-layout',
|
||||
standalone: true,
|
||||
imports: [RouterOutlet, AccountSidebar],
|
||||
templateUrl: './account-layout.html',
|
||||
styleUrl: './account-layout.scss',
|
||||
templateUrl: './sidebar-layout.html',
|
||||
styleUrl: './sidebar-layout.scss',
|
||||
})
|
||||
export class AccountLayout {}
|
||||
export class SidebarLayout {}
|
||||
@@ -1,7 +1,11 @@
|
||||
|
||||
<div class="checkout-page">
|
||||
<div class="checkout-page__stepper-col ">
|
||||
<app-stepper #stepper>
|
||||
<div class="checkout-page">
|
||||
<div
|
||||
class="checkout-page__stepper-col"
|
||||
[class.checkout-page__stepper-col--editing]="isEditingItems()"
|
||||
[attr.aria-hidden]="isEditingItems()"
|
||||
[attr.inert]="isEditingItems() ? '' : null"
|
||||
>
|
||||
<app-stepper #stepper>
|
||||
<app-step label="Datos" [isValid]="isStep1Valid()">
|
||||
<app-checkout-data-step
|
||||
[form]="form"
|
||||
@@ -30,16 +34,32 @@
|
||||
(retryQrPolling)="retryQrPolling()"
|
||||
/>
|
||||
</app-step>
|
||||
</app-stepper>
|
||||
</div>
|
||||
|
||||
<div class="checkout-page__cart-col">
|
||||
<app-cart
|
||||
[items]="mappedCartItems()"
|
||||
[subtotal]="cartSubtotal()"
|
||||
[discount]="cartDiscount()"
|
||||
[total]="cartTotal()"
|
||||
backgroundColor="transparent"
|
||||
/>
|
||||
</div>
|
||||
</app-stepper>
|
||||
</div>
|
||||
|
||||
@if (isEditingItems()) {
|
||||
<div class="checkout-page__editing-notice" role="status">
|
||||
<p>Terminá de modificar las cantidades para continuar con el pago.</p>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="checkout-page__cart-col">
|
||||
<app-cart
|
||||
title="COMPRA"
|
||||
[items]="mappedCartItems()"
|
||||
[subtotal]="cartSubtotal()"
|
||||
[discount]="cartDiscount()"
|
||||
[total]="cartTotal()"
|
||||
[allowEditing]="
|
||||
createdPurchase()?.status === 'created' || createdPurchase()?.status === 'pending_payment'
|
||||
"
|
||||
[allowRemove]="false"
|
||||
[persistQuantityChanges]="false"
|
||||
[editing]="isEditingItems()"
|
||||
[editingDisabled]="isUpdatingItem() || isPreparingItemEdit()"
|
||||
backgroundColor="transparent"
|
||||
(editingChange)="onEditingItemsChange($event)"
|
||||
(itemQuantityChange)="onPurchaseItemQuantityChange($event)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,27 @@
|
||||
min-width: 0;
|
||||
border-radius: 4px;
|
||||
min-height: 420px;
|
||||
|
||||
&--editing {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
&__editing-notice {
|
||||
display: grid;
|
||||
min-height: 420px;
|
||||
place-items: center;
|
||||
padding: 2rem;
|
||||
border-radius: 4px;
|
||||
background: #f5f5f5;
|
||||
color: #666666;
|
||||
text-align: center;
|
||||
|
||||
p {
|
||||
max-width: 360px;
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
&__cart-col {
|
||||
|
||||
@@ -1,18 +1,24 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { getTestBed, TestBed } from '@angular/core/testing';
|
||||
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||
import { Router } from '@angular/router';
|
||||
import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
|
||||
import { of } from 'rxjs';
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { CheckoutPageComponent } from './checkout-page.component';
|
||||
|
||||
describe('CheckoutPageComponent payment validation', () => {
|
||||
let checkoutServiceStub: {
|
||||
startCheckout: ReturnType<typeof vi.fn>;
|
||||
updateCustomerData: ReturnType<typeof vi.fn>;
|
||||
updateItemQuantity: ReturnType<typeof vi.fn>;
|
||||
prepareItemEditing: ReturnType<typeof vi.fn>;
|
||||
cancelPurchase: ReturnType<typeof vi.fn>;
|
||||
generatePaymentIntent: ReturnType<typeof vi.fn>;
|
||||
getPurchase: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
@@ -23,6 +29,8 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
clearCart: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
let routerStub: { navigate: ReturnType<typeof vi.fn> };
|
||||
let routeQueryParamMap: ReturnType<typeof convertToParamMap>;
|
||||
let authUserState: ReturnType<typeof signal>;
|
||||
|
||||
beforeAll(() => {
|
||||
try {
|
||||
@@ -36,6 +44,16 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
checkoutServiceStub = {
|
||||
startCheckout: vi.fn().mockResolvedValue({
|
||||
id: 25,
|
||||
items: [],
|
||||
subtotal: '0.00',
|
||||
total: '0.00',
|
||||
}),
|
||||
updateCustomerData: vi.fn(),
|
||||
updateItemQuantity: vi.fn(),
|
||||
prepareItemEditing: vi.fn(),
|
||||
cancelPurchase: vi.fn().mockResolvedValue({ status: 'cancelled' }),
|
||||
generatePaymentIntent: vi.fn().mockResolvedValue({
|
||||
qr_data: { qr_code: 'qr-value' },
|
||||
}),
|
||||
@@ -63,14 +81,27 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
});
|
||||
});
|
||||
routerStub = { navigate: vi.fn() };
|
||||
routeQueryParamMap = convertToParamMap({});
|
||||
authUserState = signal(null);
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [CheckoutPageComponent],
|
||||
providers: [
|
||||
{ provide: CheckoutService, useValue: checkoutServiceStub },
|
||||
{ provide: CatalogService, useValue: { getCatalogItem: vi.fn() } },
|
||||
{ provide: CartService, useValue: cartServiceStub },
|
||||
{ provide: TenantService, useValue: { tenant: signal({ codigo: 'tenant-test' }) } },
|
||||
{ provide: AuthService, useValue: { user: signal(null) } },
|
||||
{ provide: AuthService, useValue: { user: authUserState } },
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
get queryParamMap() {
|
||||
return routeQueryParamMap;
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{ provide: Router, useValue: routerStub },
|
||||
],
|
||||
})
|
||||
@@ -87,6 +118,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
const fixture = TestBed.createComponent(CheckoutPageComponent);
|
||||
fixture.detectChanges();
|
||||
fixture.componentInstance['createdPurchaseId'].set(25);
|
||||
routerStub.navigate.mockClear();
|
||||
return { fixture, component: fixture.componentInstance as any };
|
||||
}
|
||||
|
||||
@@ -105,7 +137,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledTimes(2);
|
||||
expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
|
||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
@@ -181,7 +213,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
|
||||
await component.onComplete();
|
||||
|
||||
expect(cartServiceStub.clearCart).toHaveBeenCalledOnce();
|
||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25]);
|
||||
});
|
||||
|
||||
@@ -197,4 +229,175 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('loads purchase items but prefills customer data from the user', async () => {
|
||||
const purchase = {
|
||||
id: 25,
|
||||
cart_id: null,
|
||||
nombre_apellido: 'Datos de la compra',
|
||||
email: 'compra@example.com',
|
||||
dni: '11111111',
|
||||
telefono: '1111111111',
|
||||
items: [
|
||||
{
|
||||
id: 91,
|
||||
quantity: 2,
|
||||
unit_price: '1250.50',
|
||||
line_total: '2501.00',
|
||||
source_catalog_item_id: 8,
|
||||
source_variant_id: 21,
|
||||
item_details: {
|
||||
nombre: 'Remera',
|
||||
descripcion: null,
|
||||
slug: 'remera',
|
||||
imagen: 'https://example.com/remera.jpg',
|
||||
attributes: [{ name: 'Color', value: 'Negro' }],
|
||||
},
|
||||
},
|
||||
],
|
||||
subtotal: '2501.00',
|
||||
total: '2501.00',
|
||||
};
|
||||
routeQueryParamMap = convertToParamMap({ purchase: 25 });
|
||||
checkoutServiceStub.getPurchase.mockResolvedValue(purchase);
|
||||
authUserState.set({
|
||||
id: 7,
|
||||
nombre_apellido: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
});
|
||||
const { component } = createComponent();
|
||||
await Promise.resolve();
|
||||
|
||||
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
|
||||
expect(component.mappedCartItems()).toEqual([
|
||||
{
|
||||
cartItemId: 91,
|
||||
imageUrl: 'https://example.com/remera.jpg',
|
||||
product: 'Remera',
|
||||
originalPrice: null,
|
||||
discountedPrice: 1250.5,
|
||||
discountPercentage: null,
|
||||
attributes: [{ label: 'Color', value: 'Negro' }],
|
||||
quantity: 2,
|
||||
},
|
||||
]);
|
||||
expect(component.cartSubtotal()).toBe(2501);
|
||||
expect(component.cartTotal()).toBe(2501);
|
||||
expect(component.form.getRawValue()).toEqual({
|
||||
nombre: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
});
|
||||
});
|
||||
|
||||
it('updates a purchase item while editing and refreshes checkout totals', async () => {
|
||||
const updatedPurchase = {
|
||||
id: 25,
|
||||
items: [],
|
||||
subtotal: '300.00',
|
||||
total: '300.00',
|
||||
};
|
||||
checkoutServiceStub.updateItemQuantity.mockResolvedValue(updatedPurchase);
|
||||
const { component } = createComponent();
|
||||
component.isEditingItems.set(true);
|
||||
|
||||
await component.onPurchaseItemQuantityChange({
|
||||
item: {
|
||||
cartItemId: 91,
|
||||
imageUrl: null,
|
||||
product: 'Remera',
|
||||
originalPrice: null,
|
||||
discountedPrice: 100,
|
||||
discountPercentage: null,
|
||||
attributes: [],
|
||||
quantity: 2,
|
||||
},
|
||||
quantity: 3,
|
||||
});
|
||||
|
||||
expect(checkoutServiceStub.updateItemQuantity).toHaveBeenCalledWith(
|
||||
'tenant-test',
|
||||
25,
|
||||
91,
|
||||
3,
|
||||
);
|
||||
expect(component.createdPurchase()).toBe(updatedPurchase);
|
||||
expect(component.isUpdatingItem()).toBe(false);
|
||||
});
|
||||
|
||||
it('keeps the payment step selected while editing and regenerates payment afterward', async () => {
|
||||
const editablePurchase = {
|
||||
id: 25,
|
||||
status: 'created',
|
||||
items: [],
|
||||
subtotal: '100.00',
|
||||
total: '100.00',
|
||||
};
|
||||
checkoutServiceStub.prepareItemEditing.mockResolvedValue(editablePurchase);
|
||||
const { component } = createComponent();
|
||||
component.stepper = { currentStepIndex: signal(1) };
|
||||
const selectPaymentMethod = vi
|
||||
.spyOn(component, 'selectPaymentMethod')
|
||||
.mockResolvedValue(undefined);
|
||||
|
||||
await component.onEditingItemsChange(true);
|
||||
|
||||
expect(checkoutServiceStub.prepareItemEditing).toHaveBeenCalledWith('tenant-test', 25);
|
||||
expect(component.isEditingItems()).toBe(true);
|
||||
expect(component.createdPurchase()).toBe(editablePurchase);
|
||||
|
||||
await component.onEditingItemsChange(false);
|
||||
|
||||
expect(component.stepper.currentStepIndex()).toBe(1);
|
||||
expect(selectPaymentMethod).toHaveBeenCalledWith('qr');
|
||||
expect(component.isEditingItems()).toBe(false);
|
||||
});
|
||||
|
||||
it('updates customer data on the existing purchase before payment', async () => {
|
||||
const updatedPurchase = {
|
||||
id: 25,
|
||||
cart_id: 10,
|
||||
items: [],
|
||||
subtotal: '100.00',
|
||||
total: '100.00',
|
||||
};
|
||||
checkoutServiceStub.updateCustomerData.mockResolvedValue(updatedPurchase);
|
||||
const { component } = createComponent();
|
||||
component.form.setValue({
|
||||
nombre: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
});
|
||||
component.stepper = { next: vi.fn() };
|
||||
|
||||
await component.onStep1Continue();
|
||||
|
||||
expect(checkoutServiceStub.startCheckout).not.toHaveBeenCalled();
|
||||
expect(checkoutServiceStub.updateCustomerData).toHaveBeenCalledWith('tenant-test', 25, {
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
email: 'juan@example.com',
|
||||
nombre_apellido: 'Juan Perez',
|
||||
});
|
||||
expect(component.createdPurchase()).toEqual({
|
||||
...updatedPurchase,
|
||||
status: 'pending_payment',
|
||||
});
|
||||
expect(component.stepper.next).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it('cancels the pending purchase before allowing navigation away', async () => {
|
||||
const { component } = createComponent();
|
||||
|
||||
await expect(component.canDeactivate()).resolves.toBe(true);
|
||||
|
||||
expect(checkoutServiceStub.cancelPurchase).toHaveBeenCalledWith('tenant-test', 25);
|
||||
expect(cartServiceStub.loadCart).toHaveBeenCalled();
|
||||
expect(cartServiceStub.clearCart).not.toHaveBeenCalled();
|
||||
expect(component.createdPurchaseId()).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,24 +2,25 @@ import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
computed,
|
||||
effect,
|
||||
inject,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
signal,
|
||||
untracked,
|
||||
ViewChild,
|
||||
} from '@angular/core';
|
||||
import { FormBuilder, Validators } from '@angular/forms';
|
||||
import { Router } from '@angular/router';
|
||||
import { startWith } from 'rxjs';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { firstValueFrom, startWith } from 'rxjs';
|
||||
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { CheckoutService, CreatePurchasePayload } from '../../../../core/services/checkout.service';
|
||||
import {
|
||||
CheckoutService,
|
||||
PurchaseDetailItemResponse,
|
||||
PurchaseDetailResponse,
|
||||
} from '../../../../core/services/checkout.service';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { BankAccount } from '../../../../core/services/tenant.interface';
|
||||
import { CartItem } from '../../../../core/services/cart/cart.interface';
|
||||
import { CartComponent, CartItemMock } from '../../../../shared/components/cart/cart.component';
|
||||
import { StepComponent } from '../../../../shared/components/stepper/step.component';
|
||||
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
|
||||
@@ -51,11 +52,12 @@ import {
|
||||
})
|
||||
export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly router = inject(Router);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly qrPollingIntervalMs = 5_000;
|
||||
private readonly qrPollingMaxAttempts = 60;
|
||||
|
||||
@@ -74,19 +76,23 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
telefono: ['', [Validators.required]],
|
||||
});
|
||||
|
||||
protected readonly createdPurchase = signal<PurchaseDetailResponse | null>(null);
|
||||
|
||||
protected readonly cartSubtotal = computed(() => {
|
||||
const cart = this.cartService.cart();
|
||||
return cart ? parseFloat(cart.subtotal) : 0;
|
||||
const purchase = this.createdPurchase();
|
||||
return purchase ? parseFloat(purchase.subtotal) : 0;
|
||||
});
|
||||
|
||||
protected readonly cartDiscount = computed(() => 0);
|
||||
|
||||
protected readonly cartTotal = computed(() => this.cartSubtotal() - this.cartDiscount());
|
||||
protected readonly cartTotal = computed(() => {
|
||||
const purchase = this.createdPurchase();
|
||||
return purchase ? parseFloat(purchase.total) : this.cartSubtotal() - this.cartDiscount();
|
||||
});
|
||||
|
||||
protected readonly mappedCartItems = computed<CartItemMock[]>(() => {
|
||||
const cart = this.cartService.cart();
|
||||
if (!cart || !cart.items) return [];
|
||||
return cart.items.map((item) => this.mapCartItemToMock(item));
|
||||
const purchase = this.createdPurchase();
|
||||
return purchase ? purchase.items.map((item) => this.mapPurchaseItemToMock(item)) : [];
|
||||
});
|
||||
|
||||
protected readonly isStep1Valid = signal(this.form.valid);
|
||||
@@ -100,32 +106,19 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly transferAccount = signal<TransferAccount | null>(null);
|
||||
protected readonly transferDni = signal<string>('');
|
||||
|
||||
protected readonly isCreatingPurchase = signal(false);
|
||||
protected readonly isUpdatingPurchase = signal(false);
|
||||
protected readonly isEditingItems = signal(false);
|
||||
protected readonly isUpdatingItem = signal(false);
|
||||
protected readonly isPreparingItemEdit = signal(false);
|
||||
protected readonly createdPurchaseId = signal<number | null>(null);
|
||||
protected readonly isGeneratingIntent = signal(false);
|
||||
protected readonly isPaymentLoading = computed(
|
||||
() => this.isGeneratingIntent() || this.cartService.isUpdating(),
|
||||
);
|
||||
protected readonly isPaymentLoading = computed(() => this.isGeneratingIntent());
|
||||
protected readonly qrData = signal<string | null>(null);
|
||||
protected readonly qrPaymentStatus = signal<QrPaymentStatus>('idle');
|
||||
protected readonly isCheckingQrPayment = signal(false);
|
||||
protected readonly transferValidationStatus = signal<TransferValidationStatus>('idle');
|
||||
|
||||
constructor() {
|
||||
effect(() => {
|
||||
// We only want to trigger the intent generation when the cart changes.
|
||||
// So we track the cart, but untrack the other signals to prevent duplicate calls.
|
||||
const cart = this.cartService.cart();
|
||||
|
||||
untracked(() => {
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
if (cart && purchaseId && !this.navigationStarted) {
|
||||
// Trigger payment intent generation when cart changes and we are on the payment step
|
||||
void this.selectPaymentMethod(this.selectedPaymentMethod());
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
this.form.statusChanges
|
||||
.pipe(startWith(this.form.status))
|
||||
.subscribe(() => this.isStep1Valid.set(this.form.valid));
|
||||
@@ -144,68 +137,126 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.cartService.loadCart().subscribe();
|
||||
const purchaseId = Number(this.route.snapshot.queryParamMap.get('purchase'));
|
||||
if (!Number.isInteger(purchaseId) || purchaseId <= 0) {
|
||||
void this.router.navigate(['/']);
|
||||
return;
|
||||
}
|
||||
|
||||
void this.loadPurchase(purchaseId);
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.stopQrPolling();
|
||||
}
|
||||
|
||||
private mapCartItemToMock(item: CartItem): CartItemMock {
|
||||
const fullName = item.product?.nombre ?? '';
|
||||
let product = fullName;
|
||||
let attributes: { label: string; value: string }[] = [];
|
||||
|
||||
const match = fullName.match(/^(.*?)\s*\((.*?)\)$/);
|
||||
if (match) {
|
||||
product = match[1];
|
||||
const attributesString = match[2];
|
||||
attributes = attributesString.split(',').map((attr) => {
|
||||
const parts = attr.split(':');
|
||||
if (parts.length === 2) {
|
||||
return { label: parts[0].trim(), value: parts[1].trim() };
|
||||
}
|
||||
return { label: '', value: attr.trim() };
|
||||
});
|
||||
}
|
||||
|
||||
private mapPurchaseItemToMock(item: PurchaseDetailItemResponse): CartItemMock {
|
||||
return {
|
||||
cartItemId: item.id,
|
||||
imageUrl: item.product?.imagen ?? null,
|
||||
product,
|
||||
imageUrl: item.item_details.imagen,
|
||||
product: item.item_details.nombre,
|
||||
originalPrice: null,
|
||||
discountedPrice: parseFloat(item.precio_unitario),
|
||||
discountedPrice: parseFloat(item.unit_price),
|
||||
discountPercentage: null,
|
||||
attributes,
|
||||
quantity: item.cantidad,
|
||||
attributes: item.item_details.attributes.map((attribute) => ({
|
||||
label: attribute.name,
|
||||
value: attribute.value === null ? '' : String(attribute.value),
|
||||
})),
|
||||
quantity: item.quantity,
|
||||
};
|
||||
}
|
||||
|
||||
protected async onStep1Continue(): Promise<void> {
|
||||
if (this.form.invalid) return;
|
||||
protected async onEditingItemsChange(editing: boolean): Promise<void> {
|
||||
if (this.isUpdatingItem() || this.isPreparingItemEdit()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const tenant = this.tenantService.tenant();
|
||||
if (!tenant) return;
|
||||
if (!editing) {
|
||||
this.isEditingItems.set(false);
|
||||
|
||||
this.isCreatingPurchase.set(true);
|
||||
|
||||
try {
|
||||
const cart = this.cartService.cart();
|
||||
if (!cart?.id) {
|
||||
throw new Error('No hay un carrito activo para finalizar la compra.');
|
||||
if (this.stepper?.currentStepIndex() === 1) {
|
||||
void this.selectPaymentMethod(this.selectedPaymentMethod());
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
this.isEditingItems.set(true);
|
||||
this.stopQrPolling();
|
||||
this.qrData.set(null);
|
||||
this.qrPaymentStatus.set('idle');
|
||||
this.transferAccount.set(null);
|
||||
this.transferValidationStatus.set('idle');
|
||||
|
||||
const tenant = this.tenantService.tenant();
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
|
||||
if (!tenant || !purchaseId) {
|
||||
this.isEditingItems.set(false);
|
||||
return;
|
||||
}
|
||||
|
||||
this.isPreparingItemEdit.set(true);
|
||||
try {
|
||||
const purchase = await this.checkoutService.prepareItemEditing(
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
);
|
||||
this.createdPurchase.set(purchase);
|
||||
} catch (error) {
|
||||
console.error('Failed to prepare purchase item editing:', error);
|
||||
this.isEditingItems.set(false);
|
||||
} finally {
|
||||
this.isPreparingItemEdit.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
protected async onPurchaseItemQuantityChange(event: {
|
||||
item: CartItemMock;
|
||||
quantity: number;
|
||||
}): Promise<void> {
|
||||
const tenant = this.tenantService.tenant();
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
const itemId = event.item.cartItemId;
|
||||
|
||||
if (!tenant || !purchaseId || !itemId || this.isUpdatingItem() || !this.isEditingItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.isUpdatingItem.set(true);
|
||||
try {
|
||||
const purchase = await this.checkoutService.updateItemQuantity(
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
itemId,
|
||||
event.quantity,
|
||||
);
|
||||
this.createdPurchase.set(purchase);
|
||||
} catch (error) {
|
||||
console.error('Failed to update purchase item quantity:', error);
|
||||
} finally {
|
||||
this.isUpdatingItem.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
protected async onStep1Continue(): Promise<void> {
|
||||
if (this.form.invalid || this.isUpdatingPurchase() || this.isEditingItems()) return;
|
||||
|
||||
const tenant = this.tenantService.tenant();
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
if (!tenant || !purchaseId) return;
|
||||
|
||||
this.isUpdatingPurchase.set(true);
|
||||
|
||||
try {
|
||||
const formValue = this.form.getRawValue();
|
||||
const payload: CreatePurchasePayload = {
|
||||
cart_id: cart.id,
|
||||
const purchase = await this.checkoutService.updateCustomerData(tenant.codigo, purchaseId, {
|
||||
dni: formValue.dni,
|
||||
telefono: formValue.telefono,
|
||||
email: formValue.email,
|
||||
nombre_apellido: formValue.nombre,
|
||||
};
|
||||
|
||||
const response = await this.checkoutService.createPurchase(tenant.codigo, payload);
|
||||
this.createdPurchaseId.set(response.id);
|
||||
});
|
||||
this.createdPurchase.set(purchase);
|
||||
|
||||
this.stepper.next();
|
||||
|
||||
@@ -215,17 +266,50 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
console.error('Failed to create purchase:', error);
|
||||
// Here we could show an alert or toast
|
||||
} finally {
|
||||
this.isCreatingPurchase.set(false);
|
||||
this.isUpdatingPurchase.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
protected onCancel(): void {
|
||||
protected async onCancel(): Promise<void> {
|
||||
if (await this.canDeactivate()) {
|
||||
void this.router.navigate(['/']);
|
||||
}
|
||||
}
|
||||
|
||||
public async canDeactivate(): Promise<boolean> {
|
||||
this.stopQrPolling();
|
||||
void this.router.navigate(['/']);
|
||||
|
||||
if (this.navigationStarted) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
const tenant = this.tenantService.tenant();
|
||||
|
||||
if (!purchaseId || !tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
await this.checkoutService.cancelPurchase(tenant.codigo, purchaseId);
|
||||
this.createdPurchaseId.set(null);
|
||||
this.createdPurchase.set(null);
|
||||
|
||||
try {
|
||||
await firstValueFrom(this.cartService.loadCart());
|
||||
} catch (error) {
|
||||
console.error('Failed to restore cart after cancelling checkout:', error);
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('Failed to cancel purchase:', error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected async selectPaymentMethod(method: PaymentMethod): Promise<void> {
|
||||
if (this.navigationStarted) {
|
||||
if (this.navigationStarted || this.isEditingItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -266,6 +350,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
this.qrData.set(response.qr_data.qr_code);
|
||||
this.markPurchasePendingPayment();
|
||||
this.startQrPolling();
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -276,6 +361,10 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
protected async generateTransferIntent(dni: string): Promise<void> {
|
||||
if (this.isEditingItems()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const purchaseId = this.createdPurchaseId();
|
||||
const tenant = this.tenantService.tenant();
|
||||
|
||||
@@ -291,10 +380,11 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
'transfer',
|
||||
dni
|
||||
dni,
|
||||
);
|
||||
|
||||
if (response.transfer_data) {
|
||||
this.markPurchasePendingPayment();
|
||||
this.transferAccount.set({
|
||||
titular: response.transfer_data.titular,
|
||||
entidad: response.transfer_data.entidad,
|
||||
@@ -334,6 +424,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
!purchaseId ||
|
||||
!tenant ||
|
||||
this.navigationStarted ||
|
||||
this.isEditingItems() ||
|
||||
this.transferValidationStatus() === 'checking'
|
||||
) {
|
||||
return;
|
||||
@@ -448,11 +539,22 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
}
|
||||
|
||||
private handleConfirmedPayment(purchaseId: number): void {
|
||||
this.navigateToPurchaseStatus(purchaseId, true);
|
||||
private markPurchasePendingPayment(): void {
|
||||
this.createdPurchase.update((purchase) =>
|
||||
purchase
|
||||
? {
|
||||
...purchase,
|
||||
status: 'pending_payment',
|
||||
}
|
||||
: purchase,
|
||||
);
|
||||
}
|
||||
|
||||
private navigateToPurchaseStatus(purchaseId: number, clearCart = false): void {
|
||||
private handleConfirmedPayment(purchaseId: number): void {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
}
|
||||
|
||||
private navigateToPurchaseStatus(purchaseId: number): void {
|
||||
if (this.navigationStarted) {
|
||||
return;
|
||||
}
|
||||
@@ -460,10 +562,23 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.navigationStarted = true;
|
||||
this.stopQrPolling();
|
||||
|
||||
if (clearCart) {
|
||||
this.cartService.clearCart();
|
||||
}
|
||||
|
||||
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||
}
|
||||
|
||||
private async loadPurchase(purchaseId: number): Promise<void> {
|
||||
const tenant = this.tenantService.tenant();
|
||||
if (!tenant) {
|
||||
void this.router.navigate(['/']);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||
this.createdPurchaseId.set(purchase.id);
|
||||
this.createdPurchase.set(purchase);
|
||||
} catch (error) {
|
||||
console.error('Failed to load purchase:', error);
|
||||
void this.router.navigate(['/']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
import { CanDeactivateFn } from '@angular/router';
|
||||
|
||||
interface PendingCheckoutComponent {
|
||||
canDeactivate(): Promise<boolean>;
|
||||
}
|
||||
|
||||
export const checkoutPendingPurchaseGuard: CanDeactivateFn<PendingCheckoutComponent> = (component) =>
|
||||
component.canDeactivate();
|
||||
@@ -0,0 +1,16 @@
|
||||
<aside class="help-sidebar">
|
||||
<h1 class="help-sidebar__title">{{ menu()?.label }}</h1>
|
||||
<div class="help-sidebar__divider"></div>
|
||||
|
||||
<nav class="help-sidebar__nav" aria-label="Secciones de ayuda">
|
||||
@for (menu of submenues(); track menu.code) {
|
||||
<a
|
||||
class="help-sidebar__link"
|
||||
[routerLink]="menu.route"
|
||||
routerLinkActive="help-sidebar__link--active"
|
||||
>
|
||||
{{ menu.label }}
|
||||
</a>
|
||||
}
|
||||
</nav>
|
||||
</aside>
|
||||
@@ -0,0 +1,57 @@
|
||||
.help-sidebar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.help-sidebar__title {
|
||||
margin: 0 0 0.75rem;
|
||||
color: #1a1a1a;
|
||||
font-size: 1rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.25;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.help-sidebar__divider {
|
||||
height: 1px;
|
||||
margin-bottom: 1.25rem;
|
||||
background: #dedede;
|
||||
}
|
||||
|
||||
.help-sidebar__nav {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.help-sidebar__link {
|
||||
color: #888888;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
line-height: 1.35;
|
||||
text-decoration: none;
|
||||
transition: color 150ms ease;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: #5a5a5a;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
border-radius: 2px;
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
}
|
||||
|
||||
.help-sidebar__link--active {
|
||||
color: var(--color-primary);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.help-sidebar__nav {
|
||||
flex-flow: row wrap;
|
||||
gap: 0.75rem 1.25rem;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { HelpSidebar } from './help-sidebar';
|
||||
|
||||
describe('HelpSidebar', () => {
|
||||
it('renders the parent and submenu labels supplied by the tenant', async () => {
|
||||
const tenant = signal<Tenant>({
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#000000',
|
||||
secondary_color: '#000000',
|
||||
danger_color: '#000000',
|
||||
success_color: '#000000',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'help',
|
||||
label: 'Centro de ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'help.faq',
|
||||
label: 'Consultas habituales',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda/preguntas-frecuentes',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [HelpSidebar],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(HelpSidebar);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(element.querySelector('.help-sidebar__title')?.textContent?.trim()).toBe(
|
||||
'Centro de ayuda',
|
||||
);
|
||||
expect(element.querySelector('.help-sidebar__link')?.textContent?.trim()).toBe(
|
||||
'Consultas habituales',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,20 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-help-sidebar',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './help-sidebar.html',
|
||||
styleUrl: './help-sidebar.scss',
|
||||
})
|
||||
export class HelpSidebar {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly menu = computed(() =>
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], 'help'),
|
||||
);
|
||||
protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
<section class="contact-page" aria-labelledby="contact-page-title">
|
||||
<div class="contact-page__details">
|
||||
<h2 id="contact-page-title" class="contact-page__title">CONTACTO</h2>
|
||||
|
||||
@if (contact().whatsappUrl && contact().whatsappLabel) {
|
||||
<a
|
||||
class="contact-page__contact-link"
|
||||
[href]="contact().whatsappUrl"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
<i class="fa-brands fa-whatsapp" aria-hidden="true"></i>
|
||||
<span>{{ contact().whatsappLabel }}</span>
|
||||
</a>
|
||||
}
|
||||
|
||||
@if (contact().phone; as phone) {
|
||||
<a class="contact-page__contact-link" [href]="phoneUrl(phone)">
|
||||
<i class="fa-solid fa-phone" aria-hidden="true"></i>
|
||||
<span>{{ phone }}</span>
|
||||
</a>
|
||||
}
|
||||
|
||||
@for (location of contact().locations; track location.id) {
|
||||
<article class="contact-page__location">
|
||||
<h3 class="contact-page__location-title">
|
||||
<i class="fa-solid fa-location-dot" aria-hidden="true"></i>
|
||||
<span>{{ location.label }}</span>
|
||||
</h3>
|
||||
|
||||
<ul class="contact-page__addresses">
|
||||
@for (address of location.addresses; track address.id) {
|
||||
<li>{{ address.address }}</li>
|
||||
}
|
||||
</ul>
|
||||
</article>
|
||||
}
|
||||
|
||||
@if (!contact().whatsappUrl && !contact().phone && contact().locations.length === 0) {
|
||||
<p class="contact-page__empty">No hay datos de contacto disponibles.</p>
|
||||
}
|
||||
</div>
|
||||
|
||||
@if (contact().mapLocations.length > 0) {
|
||||
<app-location-map
|
||||
class="contact-page__map"
|
||||
[locations]="contact().mapLocations"
|
||||
[markerColor]="markerColor()"
|
||||
mapStyle="minimal-light"
|
||||
ariaLabel="Mapa de sucursales y puntos de atención"
|
||||
/>
|
||||
}
|
||||
</section>
|
||||
@@ -0,0 +1,129 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.contact-page {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(13rem, 0.72fr) minmax(20rem, 1.45fr);
|
||||
align-items: start;
|
||||
gap: clamp(2rem, 5vw, 4.75rem);
|
||||
width: 100%;
|
||||
color: #666666;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.contact-page__details {
|
||||
display: flex;
|
||||
min-width: 0;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.contact-page__title {
|
||||
margin: 0 0 1.25rem;
|
||||
color: inherit;
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.contact-page__contact-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.65rem;
|
||||
margin-bottom: 1rem;
|
||||
color: inherit;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.35;
|
||||
text-decoration: none;
|
||||
transition: color 150ms ease;
|
||||
|
||||
i {
|
||||
width: 0.9rem;
|
||||
color: inherit;
|
||||
font-size: 0.875rem;
|
||||
text-align: center;
|
||||
transition: color 150ms ease;
|
||||
}
|
||||
|
||||
&:hover,
|
||||
&:focus-visible,
|
||||
&:active {
|
||||
color: var(--color-primary);
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
border-radius: 2px;
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.contact-page__location {
|
||||
margin-top: 0.15rem;
|
||||
|
||||
& + & {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.contact-page__location-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.65rem;
|
||||
margin: 0 0 0.3rem;
|
||||
color: inherit;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.35;
|
||||
|
||||
i {
|
||||
width: 0.9rem;
|
||||
font-size: 0.875rem;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.contact-page__addresses {
|
||||
display: grid;
|
||||
gap: 0.15rem;
|
||||
margin: 0;
|
||||
padding-left: 2.3rem;
|
||||
color: inherit;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.contact-page__empty {
|
||||
margin: 0;
|
||||
color: inherit;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.contact-page__map {
|
||||
display: block;
|
||||
min-width: 0;
|
||||
|
||||
&::ng-deep .location-map {
|
||||
min-height: clamp(15rem, 26vw, 20rem);
|
||||
border-radius: 0.25rem;
|
||||
filter: saturate(0.72) contrast(0.96);
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 991.98px) {
|
||||
.contact-page {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 2rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 575.98px) {
|
||||
.contact-page__map::ng-deep .location-map {
|
||||
min-height: 16rem;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ContactPage } from './contact-page';
|
||||
|
||||
const tenant: Tenant = {
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#3366ff',
|
||||
secondary_color: '#a0a0a0',
|
||||
danger_color: '#ff8888',
|
||||
success_color: '#198754',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#202020',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'help',
|
||||
label: 'Ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'help.contact',
|
||||
label: 'Contacto',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'static',
|
||||
route: '/ayuda/contacto',
|
||||
static_content: {
|
||||
whatsapp: {
|
||||
whatsapp_url: 'https://wa.me/543412602222',
|
||||
whatsapp_label: 'Chatea con nosotros',
|
||||
},
|
||||
phone: '+54 9 (0341) 6658247',
|
||||
locations: {
|
||||
rosario: {
|
||||
label: 'Rosario',
|
||||
addresses: [
|
||||
{
|
||||
label: 'Gigante de Arroyito',
|
||||
address: 'Av. Génova 640, Rosario',
|
||||
coordinates: [-32.913997, -60.674567],
|
||||
},
|
||||
{
|
||||
label: 'Telepagos',
|
||||
address: 'Rioja 1150, piso 12, dpto. 3, Rosario',
|
||||
coordinates: [-32.94682, -60.63932],
|
||||
},
|
||||
],
|
||||
},
|
||||
santa_fe: {
|
||||
label: 'Santa Fe',
|
||||
addresses: [
|
||||
{
|
||||
label: 'San Martín 2450',
|
||||
address: 'San Martín 2450, Santa Fe',
|
||||
coordinates: [-31.63333, -60.7],
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
describe('ContactPage', () => {
|
||||
let fixture: ComponentFixture<ContactPage>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ContactPage],
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: {
|
||||
tenant: signal<Tenant | null>(tenant).asReadonly(),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ContactPage);
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('renders the contact content configured for the tenant', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const whatsapp = element.querySelector<HTMLAnchorElement>(
|
||||
'a[href="https://wa.me/543412602222"]',
|
||||
);
|
||||
const phone = element.querySelector<HTMLAnchorElement>('a[href="tel:+54903416658247"]');
|
||||
|
||||
expect(element.textContent).toContain('CONTACTO');
|
||||
expect(whatsapp?.textContent).toContain('Chatea con nosotros');
|
||||
expect(phone?.textContent).toContain('+54 9 (0341) 6658247');
|
||||
expect(element.textContent).toContain('Rosario');
|
||||
expect(element.textContent).toContain('Gigante de Arroyito');
|
||||
expect(element.textContent).toContain('Telepagos');
|
||||
expect(element.querySelector('.contact-page__addresses')?.textContent).toContain(
|
||||
'Av. Génova 640, Rosario',
|
||||
);
|
||||
expect(element.querySelector('.contact-page__addresses')?.textContent).toContain(
|
||||
'Rioja 1150, piso 12, dpto. 3, Rosario',
|
||||
);
|
||||
expect(element.textContent).not.toContain('Santa Fe');
|
||||
expect(element.textContent).not.toContain('San Martín 2450');
|
||||
});
|
||||
|
||||
it('passes the tenant map coordinates to the reusable map component', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const map = element.querySelector('app-location-map');
|
||||
const accessibleLocations = element.querySelectorAll('app-location-map .visually-hidden li');
|
||||
const directionsLinks = element.querySelectorAll(
|
||||
'app-location-map .visually-hidden a[target="_blank"]',
|
||||
);
|
||||
|
||||
expect(map).not.toBeNull();
|
||||
expect(map?.getAttribute('mapstyle')).toBe('minimal-light');
|
||||
expect(accessibleLocations).toHaveLength(2);
|
||||
expect(map?.textContent).toContain('Gigante de Arroyito');
|
||||
expect(map?.textContent).toContain('Telepagos');
|
||||
expect(map?.textContent).toContain('Av. Génova 640, Rosario');
|
||||
expect(map?.textContent).toContain('Rioja 1150, piso 12, dpto. 3, Rosario');
|
||||
expect(directionsLinks).toHaveLength(2);
|
||||
expect(map?.textContent).not.toContain('San Martín 2450');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,148 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import {
|
||||
LocationMapComponent,
|
||||
MapLocation,
|
||||
} from '../../../../../../shared/components/location-map/location-map.component';
|
||||
|
||||
type ContactLocation = {
|
||||
id: string;
|
||||
label: string;
|
||||
addresses: ContactAddress[];
|
||||
};
|
||||
|
||||
type ContactAddress = {
|
||||
id: string;
|
||||
label: string;
|
||||
address: string;
|
||||
coordinates: [number, number];
|
||||
};
|
||||
|
||||
type ContactContent = {
|
||||
whatsappUrl: string | null;
|
||||
whatsappLabel: string | null;
|
||||
phone: string | null;
|
||||
locations: ContactLocation[];
|
||||
mapLocations: MapLocation[];
|
||||
};
|
||||
|
||||
@Component({
|
||||
selector: 'app-contact-page',
|
||||
imports: [LocationMapComponent],
|
||||
templateUrl: './contact-page.html',
|
||||
styleUrl: './contact-page.scss',
|
||||
})
|
||||
export class ContactPage {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly markerColor = computed(
|
||||
() => this.tenantService.tenant()?.primary_color ?? '#6376f3',
|
||||
);
|
||||
|
||||
protected readonly contact = computed(() =>
|
||||
this.parseContactContent(
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], 'help.contact')?.static_content,
|
||||
),
|
||||
);
|
||||
|
||||
protected phoneUrl(phone: string): string {
|
||||
const normalizedPhone = phone.replace(/[^\d+]/g, '');
|
||||
return `tel:${normalizedPhone}`;
|
||||
}
|
||||
|
||||
private parseContactContent(value: unknown): ContactContent {
|
||||
const empty: ContactContent = {
|
||||
whatsappUrl: null,
|
||||
whatsappLabel: null,
|
||||
phone: null,
|
||||
locations: [],
|
||||
mapLocations: [],
|
||||
};
|
||||
|
||||
if (!this.isRecord(value)) {
|
||||
return empty;
|
||||
}
|
||||
|
||||
const whatsapp = this.isRecord(value['whatsapp']) ? value['whatsapp'] : null;
|
||||
const locations = this.parseLocations(value['locations']).slice(0, 1);
|
||||
|
||||
return {
|
||||
whatsappUrl: whatsapp ? this.stringValue(whatsapp['whatsapp_url']) : null,
|
||||
whatsappLabel: whatsapp ? this.stringValue(whatsapp['whatsapp_label']) : null,
|
||||
phone: this.stringValue(value['phone']),
|
||||
locations,
|
||||
mapLocations: locations.flatMap((location) =>
|
||||
location.addresses.map(
|
||||
(address): MapLocation => ({
|
||||
id: address.id,
|
||||
label: address.label,
|
||||
latitude: address.coordinates[0],
|
||||
longitude: address.coordinates[1],
|
||||
address: address.address,
|
||||
}),
|
||||
),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
private parseLocations(value: unknown): ContactLocation[] {
|
||||
return this.recordEntries(value).flatMap(([id, item]): ContactLocation[] => {
|
||||
if (!this.isRecord(item)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const label = this.stringValue(item['label']);
|
||||
const addresses: ContactAddress[] = Array.isArray(item['addresses'])
|
||||
? item['addresses'].flatMap((address, index): ContactAddress[] => {
|
||||
if (!this.isRecord(address)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const addressLabel = this.stringValue(address['label']);
|
||||
const addressText = this.stringValue(address['address']);
|
||||
const coordinates = address['coordinates'];
|
||||
|
||||
if (
|
||||
!addressLabel ||
|
||||
!addressText ||
|
||||
!Array.isArray(coordinates) ||
|
||||
coordinates.length !== 2 ||
|
||||
typeof coordinates[0] !== 'number' ||
|
||||
typeof coordinates[1] !== 'number'
|
||||
) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return [
|
||||
{
|
||||
id: `${id}-${index}`,
|
||||
label: addressLabel,
|
||||
address: addressText,
|
||||
coordinates: [coordinates[0], coordinates[1]],
|
||||
},
|
||||
];
|
||||
})
|
||||
: [];
|
||||
|
||||
return label && addresses.length > 0 ? [{ id, label, addresses }] : [];
|
||||
});
|
||||
}
|
||||
|
||||
private recordEntries(value: unknown): [string, unknown][] {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((item, index) => [String(index), item]);
|
||||
}
|
||||
|
||||
return this.isRecord(value) ? Object.entries(value) : [];
|
||||
}
|
||||
|
||||
private stringValue(value: unknown): string | null {
|
||||
return typeof value === 'string' && value.trim() ? value.trim() : null;
|
||||
}
|
||||
|
||||
private isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<section class="faq-page" aria-labelledby="faq-page-title">
|
||||
<h2 id="faq-page-title" class="faq-page__title">PREGUNTAS FRECUENTES</h2>
|
||||
|
||||
@if (faqs().length > 0) {
|
||||
<app-accordion [flush]="true">
|
||||
@for (faq of faqs(); track $index; let last = $last) {
|
||||
<app-accordion-item
|
||||
[title]="faq.question"
|
||||
[headingLevel]="3"
|
||||
[open]="last"
|
||||
>
|
||||
<p>{{ faq.answer }}</p>
|
||||
</app-accordion-item>
|
||||
}
|
||||
</app-accordion>
|
||||
} @else {
|
||||
<p class="faq-page__empty">No hay preguntas frecuentes disponibles.</p>
|
||||
}
|
||||
</section>
|
||||
@@ -0,0 +1,28 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.faq-page {
|
||||
width: 100%;
|
||||
max-width: 760px;
|
||||
}
|
||||
|
||||
.faq-page__title {
|
||||
margin: 0 0 0.5rem;
|
||||
color: #a0a0a0;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.faq-page p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.faq-page__empty {
|
||||
padding: 1rem 0;
|
||||
border-bottom: 1px solid #dedede;
|
||||
color: #888888;
|
||||
font-size: 0.8125rem;
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { FaqPage } from './faq-page';
|
||||
|
||||
const tenant: Tenant = {
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#6376f3',
|
||||
secondary_color: '#a0a0a0',
|
||||
danger_color: '#ff8888',
|
||||
success_color: '#198754',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#202020',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'help',
|
||||
label: 'Ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'help.faq',
|
||||
label: 'Preguntas frecuentes',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'static',
|
||||
route: '/ayuda/preguntas-frecuentes',
|
||||
static_content: [
|
||||
{
|
||||
pregunta: '¿Hay algún límite de compra?',
|
||||
respuesta: 'No hay un límite general de compra.',
|
||||
},
|
||||
{
|
||||
pregunta: '¿Cuáles son los medios de pago disponibles?',
|
||||
respuesta: 'Podés seleccionarlos al finalizar tu compra.',
|
||||
},
|
||||
],
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
describe('FaqPage', () => {
|
||||
let fixture: ComponentFixture<FaqPage>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [FaqPage],
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: {
|
||||
tenant: signal<Tenant | null>(tenant).asReadonly(),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(FaqPage);
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('renders the tenant FAQ content using the reusable accordion', () => {
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const buttons = element.querySelectorAll<HTMLButtonElement>('.accordion-button');
|
||||
|
||||
expect(element.textContent).toContain('PREGUNTAS FRECUENTES');
|
||||
expect(buttons).toHaveLength(2);
|
||||
expect(buttons[0].textContent).toContain('¿Hay algún límite de compra?');
|
||||
expect(buttons[1].getAttribute('aria-expanded')).toBe('true');
|
||||
expect(element.textContent).toContain('Podés seleccionarlos al finalizar tu compra.');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,47 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { AccordionItemComponent } from '../../../../../../shared/components/accordion/accordion-item.component';
|
||||
import { AccordionComponent } from '../../../../../../shared/components/accordion/accordion.component';
|
||||
|
||||
type Faq = {
|
||||
question: string;
|
||||
answer: string;
|
||||
};
|
||||
|
||||
@Component({
|
||||
selector: 'app-faq-page',
|
||||
imports: [AccordionComponent, AccordionItemComponent],
|
||||
templateUrl: './faq-page.html',
|
||||
styleUrl: './faq-page.scss',
|
||||
})
|
||||
export class FaqPage {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly faqs = computed(() => {
|
||||
const staticContent = findMenu(
|
||||
this.tenantService.tenant()?.menues ?? [],
|
||||
'help.faq',
|
||||
)?.static_content;
|
||||
|
||||
if (!Array.isArray(staticContent)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return staticContent.flatMap((item): Faq[] => {
|
||||
if (
|
||||
typeof item !== 'object' ||
|
||||
item === null ||
|
||||
!('pregunta' in item) ||
|
||||
!('respuesta' in item) ||
|
||||
typeof item.pregunta !== 'string' ||
|
||||
typeof item.respuesta !== 'string'
|
||||
) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return [{ question: item.pregunta, answer: item.respuesta }];
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-pending-help-page',
|
||||
template: '',
|
||||
})
|
||||
export class PendingHelpPage {}
|
||||
@@ -0,0 +1,7 @@
|
||||
<div class="help-layout">
|
||||
<app-help-sidebar class="help-layout__sidebar" />
|
||||
|
||||
<div class="help-layout__content">
|
||||
<router-outlet />
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,25 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.help-layout {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
|
||||
gap: clamp(3rem, 8vw, 6.25rem);
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.help-layout__sidebar {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.help-layout__content {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.help-layout {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 2rem;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
|
||||
import { HelpSidebar } from '../components/help-sidebar/help-sidebar';
|
||||
|
||||
@Component({
|
||||
selector: 'app-help-sidebar-layout',
|
||||
imports: [RouterOutlet, HelpSidebar],
|
||||
templateUrl: './help-sidebar-layout.html',
|
||||
styleUrl: './help-sidebar-layout.scss',
|
||||
})
|
||||
export class HelpSidebarLayout {}
|
||||
@@ -40,7 +40,11 @@
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
}
|
||||
<div class="text-end">
|
||||
<button type="button" class="login-page__forgot-password btn btn-link p-0 border-0 text-decoration-none">
|
||||
<button
|
||||
type="button"
|
||||
class="login-page__forgot-password btn btn-link p-0 border-0 text-decoration-none"
|
||||
(click)="goToRecoverPassword()"
|
||||
>
|
||||
Olvide mi contraseña
|
||||
</button>
|
||||
</div>
|
||||
@@ -56,7 +60,7 @@
|
||||
>
|
||||
{{ isSubmitting() ? 'Ingresando...' : 'Ingresar' }}
|
||||
</app-button>
|
||||
|
||||
|
||||
<app-button
|
||||
type="button"
|
||||
variant="borderless"
|
||||
@@ -81,7 +85,8 @@
|
||||
variant="neutral-outline"
|
||||
hostClass="w-100 d-block"
|
||||
buttonClass="w-100 d-inline-flex align-items-center justify-content-center gap-2 py-2 fw-semibold"
|
||||
[disabled]="true"
|
||||
[disabled]="isSubmitting()"
|
||||
(click)="loginWithGoogle()"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { DOCUMENT } from '@angular/common';
|
||||
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
||||
import { DOCUMENT, isPlatformBrowser } from '@angular/common';
|
||||
import { ChangeDetectionStrategy, Component, inject, PLATFORM_ID, signal } from '@angular/core';
|
||||
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||
import { Router } from '@angular/router';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
@@ -9,6 +9,7 @@ import { InputComponent } from '../../../../shared/components/input/input.compon
|
||||
|
||||
const PASSWORD_MIN_LENGTH = 8;
|
||||
const EMAIL_MAX_LENGTH = 255;
|
||||
const POST_LOGIN_RETURN_URL_KEY = 'shopit.auth.return-url';
|
||||
|
||||
@Component({
|
||||
selector: 'app-login-page',
|
||||
@@ -20,8 +21,10 @@ const EMAIL_MAX_LENGTH = 255;
|
||||
export class LoginPageComponent {
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly document = inject(DOCUMENT);
|
||||
private readonly platformId = inject(PLATFORM_ID);
|
||||
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
@@ -35,10 +38,26 @@ export class LoginPageComponent {
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
|
||||
ngOnInit(): void {
|
||||
if (!isPlatformBrowser(this.platformId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const oauthCode = this.route.snapshot.queryParamMap.get('oauth_code');
|
||||
|
||||
if (oauthCode) {
|
||||
this.completeGoogleLogin(oauthCode);
|
||||
}
|
||||
}
|
||||
|
||||
goToRegister(): void {
|
||||
void this.router.navigate(['/register']);
|
||||
}
|
||||
|
||||
goToRecoverPassword(): void {
|
||||
void this.router.navigate(['/recuperar-contrasena']);
|
||||
}
|
||||
|
||||
onSubmit(): void {
|
||||
this.submittedState.set(true);
|
||||
this.serverErrorState.set(null);
|
||||
@@ -62,6 +81,20 @@ export class LoginPageComponent {
|
||||
});
|
||||
}
|
||||
|
||||
loginWithGoogle(): void {
|
||||
this.serverErrorState.set(null);
|
||||
|
||||
try {
|
||||
const returnUrl = this.route.snapshot.queryParamMap.get('returnUrl');
|
||||
if (returnUrl?.startsWith('/') && !returnUrl.startsWith('//')) {
|
||||
this.document.defaultView?.sessionStorage.setItem(POST_LOGIN_RETURN_URL_KEY, returnUrl);
|
||||
}
|
||||
this.authService.loginWithGoogle();
|
||||
} catch (error: unknown) {
|
||||
this.serverErrorState.set(this.resolveErrorMessage(error));
|
||||
}
|
||||
}
|
||||
|
||||
protected updateEmail(value: string | number): void {
|
||||
this.form.controls.email.setValue(String(value));
|
||||
}
|
||||
@@ -103,8 +136,32 @@ export class LoginPageComponent {
|
||||
}
|
||||
|
||||
protected redirectToHome(): void {
|
||||
const homeUrl = this.router.serializeUrl(this.router.createUrlTree(['/']));
|
||||
this.document.location.assign(homeUrl);
|
||||
const requestedUrl =
|
||||
this.route.snapshot.queryParamMap.get('returnUrl') ??
|
||||
this.document.defaultView?.sessionStorage.getItem(POST_LOGIN_RETURN_URL_KEY);
|
||||
const destination =
|
||||
requestedUrl?.startsWith('/') && !requestedUrl.startsWith('//')
|
||||
? requestedUrl
|
||||
: this.router.serializeUrl(this.router.createUrlTree(['/']));
|
||||
|
||||
this.document.defaultView?.sessionStorage.removeItem(POST_LOGIN_RETURN_URL_KEY);
|
||||
this.document.location.assign(destination);
|
||||
}
|
||||
|
||||
private completeGoogleLogin(oauthCode: string): void {
|
||||
this.isSubmittingState.set(true);
|
||||
this.serverErrorState.set(null);
|
||||
|
||||
this.authService.completeGoogleLogin(oauthCode).subscribe({
|
||||
next: () => {
|
||||
this.isSubmittingState.set(false);
|
||||
this.redirectToHome();
|
||||
},
|
||||
error: (error: unknown) => {
|
||||
this.isSubmittingState.set(false);
|
||||
this.serverErrorState.set(this.resolveErrorMessage(error));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private resolveErrorMessage(error: unknown): string {
|
||||
|
||||
@@ -73,9 +73,12 @@
|
||||
<app-button
|
||||
class="product-detail__cta"
|
||||
type="button"
|
||||
[disabled]="!selectedVariantAvailable() || variantLoading()"
|
||||
[disabled]="
|
||||
!selectedVariantAvailable() || variantLoading() || creatingDirectPurchase()
|
||||
"
|
||||
(click)="buyNow()"
|
||||
>
|
||||
@if (variantLoading()) {
|
||||
@if (variantLoading() || creatingDirectPurchase()) {
|
||||
<div class="spinner-border spinner-border-sm" role="status"></div>
|
||||
} @else {
|
||||
Comprar
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { TestBed, getTestBed } from '@angular/core/testing';
|
||||
import { signal } from '@angular/core';
|
||||
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { By } from '@angular/platform-browser';
|
||||
@@ -10,6 +11,9 @@ import { CatalogService } from '../../../../core/services/catalog/catalog.servic
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ProductDetailPageComponent } from './product-detail-page.component';
|
||||
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import {
|
||||
PRODUCT_DETAIL_ERROR_MESSAGE,
|
||||
ProductDetailResolvedData,
|
||||
@@ -41,6 +45,7 @@ describe('ProductDetailPageComponent', () => {
|
||||
let routerStub: any;
|
||||
let cartServiceStub: any;
|
||||
let toastServiceStub: any;
|
||||
let checkoutServiceStub: any;
|
||||
|
||||
beforeAll(() => {
|
||||
try {
|
||||
@@ -72,6 +77,9 @@ describe('ProductDetailPageComponent', () => {
|
||||
danger: vi.fn(),
|
||||
info: vi.fn(),
|
||||
};
|
||||
checkoutServiceStub = {
|
||||
startCheckout: vi.fn().mockResolvedValue({ id: 44 }),
|
||||
};
|
||||
});
|
||||
|
||||
async function configureTestingModule() {
|
||||
@@ -100,6 +108,26 @@ describe('ProductDetailPageComponent', () => {
|
||||
provide: ToastService,
|
||||
useValue: toastServiceStub,
|
||||
},
|
||||
{
|
||||
provide: CheckoutService,
|
||||
useValue: checkoutServiceStub,
|
||||
},
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: signal({ codigo: 'tenant-test' }) },
|
||||
},
|
||||
{
|
||||
provide: AuthService,
|
||||
useValue: {
|
||||
user: signal({
|
||||
id: 7,
|
||||
nombre_apellido: 'Juan Perez',
|
||||
email: 'juan@example.com',
|
||||
dni: '12345678',
|
||||
telefono: '3415555555',
|
||||
}),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
}
|
||||
@@ -364,7 +392,7 @@ describe('ProductDetailPageComponent', () => {
|
||||
expect(toggleButton.textContent?.trim()).toBe('Mostrar menos');
|
||||
});
|
||||
|
||||
it('renders purchase actions without side effects', async () => {
|
||||
it('renders purchase actions and starts a direct checkout', async () => {
|
||||
await configureTestingModule();
|
||||
const fixture = TestBed.createComponent(ProductDetailPageComponent);
|
||||
fixture.detectChanges();
|
||||
@@ -380,8 +408,18 @@ describe('ProductDetailPageComponent', () => {
|
||||
|
||||
buttons[0].click();
|
||||
buttons[1].click();
|
||||
await Promise.resolve();
|
||||
|
||||
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||
expect(checkoutServiceStub.startCheckout).toHaveBeenCalledWith('tenant-test', {
|
||||
direct_item: {
|
||||
catalog_item_id: 1,
|
||||
variant_id: null,
|
||||
cantidad: 1,
|
||||
},
|
||||
});
|
||||
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout'], {
|
||||
queryParams: { purchase: 44 },
|
||||
});
|
||||
});
|
||||
|
||||
it('calls CartService.addItem when variant is selected and Add to Cart is clicked', async () => {
|
||||
|
||||
@@ -28,6 +28,9 @@ import { ButtonComponent } from '../../../../shared/components/button/button.com
|
||||
import { ProductAttributeSelectorComponent } from '../../components/product-attribute-selector/product-attribute-selector.component';
|
||||
import { QuantitySelectorComponent } from '../../../../shared/components/quantity-selector/quantity-selector.component';
|
||||
import { ProductDetailResolvedData } from './product-detail-page.resolver';
|
||||
import { CheckoutService } from '../../../../core/services/checkout.service';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-product-detail-page',
|
||||
@@ -50,6 +53,9 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
private readonly catalogService = inject(CatalogService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly checkoutService = inject(CheckoutService);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly attributeSelector = viewChild(ProductAttributeSelectorComponent);
|
||||
private readonly carouselHost = viewChild<ElementRef<HTMLElement>>('carouselHost');
|
||||
private readonly descriptionBody = viewChild<ElementRef<HTMLElement>>('descriptionBody');
|
||||
@@ -77,6 +83,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly loading = signal(false);
|
||||
protected readonly variantLoading = signal(false);
|
||||
protected readonly addingToCart = signal(false);
|
||||
protected readonly creatingDirectPurchase = signal(false);
|
||||
protected readonly error = signal<string | null>(null);
|
||||
protected readonly selectedVariant = signal<CatalogItemVariant | null>(null);
|
||||
protected readonly quantity = signal(1);
|
||||
@@ -253,6 +260,55 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
|
||||
protected async buyNow(): Promise<void> {
|
||||
const currentProduct = this.product();
|
||||
const variant = this.selectedVariant();
|
||||
|
||||
if (this.creatingDirectPurchase()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!currentProduct || !this.selectedVariantAvailable()) {
|
||||
this.toastService.danger('Por favor, selecciona una variante.');
|
||||
return;
|
||||
}
|
||||
|
||||
const tenant = this.tenantService.tenant();
|
||||
const user = this.authService.user();
|
||||
|
||||
if (!user) {
|
||||
void this.router.navigate(['/login'], {
|
||||
queryParams: { returnUrl: `/producto/${currentProduct.id}` },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!tenant) {
|
||||
this.toastService.danger('No se pudo identificar la tienda.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.creatingDirectPurchase.set(true);
|
||||
try {
|
||||
const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
|
||||
direct_item: {
|
||||
catalog_item_id: currentProduct.id,
|
||||
variant_id: variant?.id ?? null,
|
||||
cantidad: this.quantity(),
|
||||
},
|
||||
});
|
||||
|
||||
await this.router.navigate(['/checkout'], {
|
||||
queryParams: { purchase: purchase.id },
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to create direct purchase:', error);
|
||||
this.toastService.danger('No se pudo iniciar la compra directa.');
|
||||
} finally {
|
||||
this.creatingDirectPurchase.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
private isVariantAvailable(variant: CatalogItemVariant, product: CatalogItemDetail): boolean {
|
||||
return product.inventory_policy === 'unlimited' || (variant.stock_tecnico ?? 0) > 0;
|
||||
}
|
||||
|
||||
@@ -57,6 +57,20 @@
|
||||
Actualizar estado
|
||||
</app-button>
|
||||
</div>
|
||||
} @else if (status() === 'expired') {
|
||||
<div class="status-content__section status-content__section--primary">
|
||||
<div class="status-content__icon status-content__icon--warning">
|
||||
<i class="fa-solid fa-clock"></i>
|
||||
</div>
|
||||
<h2 class="status-content__title">LA COMPRA VENCIÓ</h2>
|
||||
<p class="status-content__subtitle">El plazo de pago terminó y liberamos el stock reservado.</p>
|
||||
</div>
|
||||
|
||||
<hr class="status-content__divider" />
|
||||
|
||||
<div class="status-content__section status-content__section--secondary">
|
||||
<p class="status-content__message">Podés volver a la tienda e iniciar una nueva compra.</p>
|
||||
</div>
|
||||
} @else if (status() === 'rejected') {
|
||||
<div class="status-content__section status-content__section--primary">
|
||||
<div class="status-content__icon status-content__icon--error">
|
||||
|
||||
@@ -5,7 +5,7 @@ import { CheckoutService, PurchaseStatusResponse } from '../../../../core/servic
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
|
||||
type PurchaseStatusView = 'approved' | 'pending' | 'rejected' | 'error';
|
||||
type PurchaseStatusView = 'approved' | 'pending' | 'rejected' | 'expired' | 'error';
|
||||
|
||||
@Component({
|
||||
selector: 'app-purchase-status-page',
|
||||
@@ -93,6 +93,10 @@ export class PurchaseStatusPageComponent implements OnInit, OnDestroy {
|
||||
return 'rejected';
|
||||
}
|
||||
|
||||
if (purchase.status === 'expired') {
|
||||
return 'expired';
|
||||
}
|
||||
|
||||
return 'pending';
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
<header class="recover-password-code-page__header text-center mb-4">
|
||||
<h1 id="recover-password-code-title" class="auth-title mb-4">Ingresá el código</h1>
|
||||
<p class="recover-password-code-page__description mb-0">
|
||||
Te enviamos un código a <strong>{{ email }}</strong>
|
||||
</p>
|
||||
<p class="recover-password-code-page__description fst-italic mb-0">
|
||||
Recordá revisar en Correo no deseado.
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<form
|
||||
class="recover-password-code-page__form d-grid gap-4"
|
||||
novalidate
|
||||
aria-labelledby="recover-password-code-title"
|
||||
[formGroup]="form"
|
||||
(ngSubmit)="onSubmit()"
|
||||
>
|
||||
<div>
|
||||
<fieldset class="border-0 p-0 m-0">
|
||||
<legend class="visually-hidden">Código de recuperación de cuatro dígitos</legend>
|
||||
<div class="recover-password-code-page__inputs d-flex justify-content-center gap-2">
|
||||
<app-input
|
||||
id="recover-password-code-digit-1"
|
||||
type="text"
|
||||
[maxlength]="1"
|
||||
[value]="form.controls.digit1.value"
|
||||
[invalid]="isCodeInvalid()"
|
||||
(valueChange)="updateDigit('digit1', $event)"
|
||||
(pasteEvent)="pasteCode($event)"
|
||||
/>
|
||||
<app-input
|
||||
id="recover-password-code-digit-2"
|
||||
type="text"
|
||||
[maxlength]="1"
|
||||
[value]="form.controls.digit2.value"
|
||||
[invalid]="isCodeInvalid()"
|
||||
(valueChange)="updateDigit('digit2', $event)"
|
||||
(pasteEvent)="pasteCode($event)"
|
||||
/>
|
||||
<app-input
|
||||
id="recover-password-code-digit-3"
|
||||
type="text"
|
||||
[maxlength]="1"
|
||||
[value]="form.controls.digit3.value"
|
||||
[invalid]="isCodeInvalid()"
|
||||
(valueChange)="updateDigit('digit3', $event)"
|
||||
(pasteEvent)="pasteCode($event)"
|
||||
/>
|
||||
<app-input
|
||||
id="recover-password-code-digit-4"
|
||||
type="text"
|
||||
[maxlength]="1"
|
||||
[value]="form.controls.digit4.value"
|
||||
[invalid]="isCodeInvalid()"
|
||||
(valueChange)="updateDigit('digit4', $event)"
|
||||
(pasteEvent)="pasteCode($event)"
|
||||
/>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
@if (isCodeInvalid()) {
|
||||
<small class="text-danger d-block text-center mt-2">
|
||||
Ingresá los cuatro dígitos del código.
|
||||
</small>
|
||||
}
|
||||
|
||||
@if (serverError(); as errorMessage) {
|
||||
<small class="text-danger d-block text-center mt-2" role="alert">
|
||||
{{ errorMessage }}
|
||||
</small>
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
<app-button
|
||||
type="button"
|
||||
variant="borderless"
|
||||
buttonClass="recover-password-code-page__resend-action px-3 py-2"
|
||||
[disabled]="isResending()"
|
||||
(click)="resendCode()"
|
||||
>
|
||||
{{ isResending() ? 'Reenviando...' : 'Reenviar Código' }}
|
||||
</app-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-2 text-center">
|
||||
<app-button
|
||||
type="submit"
|
||||
hostClass="w-100 d-block"
|
||||
buttonClass="w-100"
|
||||
[disabled]="isSubmitting()"
|
||||
>
|
||||
{{ isSubmitting() ? 'Validando...' : 'Validar' }}
|
||||
</app-button>
|
||||
|
||||
<app-button
|
||||
type="button"
|
||||
variant="borderless"
|
||||
hostClass="w-100 d-block text-center"
|
||||
buttonClass="recover-password-code-page__back-action px-3 py-2"
|
||||
(click)="goBack()"
|
||||
>
|
||||
Volver
|
||||
</app-button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -0,0 +1,65 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.recover-password-code-page__description {
|
||||
color: #a0a0a0;
|
||||
font-size: 12px;
|
||||
font-weight: 325;
|
||||
}
|
||||
|
||||
.recover-password-code-page__form {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.recover-password-code-page__inputs app-input {
|
||||
width: 52px;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__inputs .form-control {
|
||||
min-height: 52px;
|
||||
padding: 0.5rem;
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__resend-action {
|
||||
min-height: 36px;
|
||||
color: #a0a0a0 !important;
|
||||
font-size: 12px !important;
|
||||
font-weight: 400 !important;
|
||||
transition:
|
||||
color 0.15s ease,
|
||||
transform 0.1s ease;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__resend-action:hover,
|
||||
:host ::ng-deep .recover-password-code-page__resend-action:focus-visible {
|
||||
color: #8a8a8a !important;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__resend-action:hover {
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__resend-action:active {
|
||||
color: #666666 !important;
|
||||
transform: translateY(1px);
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__back-action {
|
||||
min-height: 40px;
|
||||
transition:
|
||||
color 0.15s ease,
|
||||
transform 0.1s ease;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__back-action:hover,
|
||||
:host ::ng-deep .recover-password-code-page__back-action:focus-visible {
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__back-action:active {
|
||||
opacity: 0.75;
|
||||
transform: translateY(1px);
|
||||
}
|
||||
@@ -0,0 +1,313 @@
|
||||
import { HttpResponse } from '@angular/common/http';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { ActivatedRoute, convertToParamMap, provideRouter, Router } from '@angular/router';
|
||||
import { of, throwError } from 'rxjs';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { RecoverPasswordCodePageComponent } from './recover-password-code-page.component';
|
||||
|
||||
describe('RecoverPasswordCodePageComponent', () => {
|
||||
let validatePasswordResetCode: ReturnType<typeof vi.fn>;
|
||||
let requestPasswordReset: ReturnType<typeof vi.fn>;
|
||||
let showDangerToast: ReturnType<typeof vi.fn>;
|
||||
let showSuccessToast: ReturnType<typeof vi.fn>;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => undefined);
|
||||
validatePasswordResetCode = vi.fn(() => of(new HttpResponse({
|
||||
body: {
|
||||
message: 'Código validado correctamente.',
|
||||
status: 'validated' as const,
|
||||
},
|
||||
status: 200,
|
||||
})));
|
||||
requestPasswordReset = vi.fn(() => of(new HttpResponse({
|
||||
body: {
|
||||
message: 'Solicitud aceptada.',
|
||||
status: 'pending' as const,
|
||||
},
|
||||
status: 202,
|
||||
})));
|
||||
showDangerToast = vi.fn();
|
||||
showSuccessToast = vi.fn();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
function authProviders() {
|
||||
return [
|
||||
{
|
||||
provide: AuthService,
|
||||
useValue: { requestPasswordReset, validatePasswordResetCode },
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: { danger: showDangerToast, success: showSuccessToast },
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
it('shows the email received from the recovery flow', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(fixture.nativeElement.textContent).toContain('ada@example.com');
|
||||
});
|
||||
|
||||
it('moves focus to the next input after entering a digit', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
fixture.detectChanges();
|
||||
const inputs = fixture.nativeElement.querySelectorAll('input');
|
||||
|
||||
inputs[0].focus();
|
||||
component.updateDigit('digit1', '1');
|
||||
|
||||
expect(document.activeElement).toBe(inputs[1]);
|
||||
});
|
||||
|
||||
it('distributes a pasted four-digit code across all inputs', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
fixture.detectChanges();
|
||||
const inputs = fixture.nativeElement.querySelectorAll('input');
|
||||
const pasteEvent = new Event('paste', {
|
||||
bubbles: true,
|
||||
cancelable: true,
|
||||
});
|
||||
Object.defineProperty(pasteEvent, 'clipboardData', {
|
||||
value: {
|
||||
getData: () => '01 23',
|
||||
},
|
||||
});
|
||||
|
||||
inputs[0].dispatchEvent(pasteEvent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(pasteEvent.defaultPrevented).toBe(true);
|
||||
expect(component.form.getRawValue()).toEqual({
|
||||
digit1: '0',
|
||||
digit2: '1',
|
||||
digit3: '2',
|
||||
digit4: '3',
|
||||
});
|
||||
expect(component.form.valid).toBe(true);
|
||||
expect(document.activeElement).toBe(inputs[3]);
|
||||
});
|
||||
|
||||
it('accepts only a complete four-digit code and navigates back preserving the email', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.updateDigit('digit1', '1');
|
||||
component.updateDigit('digit2', 'a2');
|
||||
component.updateDigit('digit3', '3');
|
||||
component.updateDigit('digit4', '4');
|
||||
|
||||
expect(component.form.getRawValue()).toEqual({
|
||||
digit1: '1',
|
||||
digit2: '2',
|
||||
digit3: '3',
|
||||
digit4: '4',
|
||||
});
|
||||
expect(component.form.valid).toBe(true);
|
||||
|
||||
component.goBack();
|
||||
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/recuperar-contrasena'], {
|
||||
queryParams: { email: 'ada@example.com' },
|
||||
});
|
||||
});
|
||||
|
||||
it('continues to the reset password page with the email and code', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.setValue({
|
||||
digit1: '1',
|
||||
digit2: '2',
|
||||
digit3: '3',
|
||||
digit4: '4',
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
expect(validatePasswordResetCode).toHaveBeenCalledWith('ada@example.com', '1234');
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/recuperar-contrasena/restablecer'], {
|
||||
queryParams: {
|
||||
email: 'ada@example.com',
|
||||
code: '1234',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it('shows the validation error and stays on the code page', async () => {
|
||||
validatePasswordResetCode.mockReturnValue(throwError(() => ({
|
||||
error: {
|
||||
errors: {
|
||||
codigo: ['El código ingresado es inválido.'],
|
||||
},
|
||||
},
|
||||
})));
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.setValue({
|
||||
digit1: '9',
|
||||
digit2: '9',
|
||||
digit3: '9',
|
||||
digit4: '9',
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
expect(navigateSpy).not.toHaveBeenCalled();
|
||||
expect(component.serverError()).toBe('El código ingresado es inválido.');
|
||||
expect(showDangerToast).toHaveBeenCalledWith('El código ingresado es inválido.');
|
||||
});
|
||||
|
||||
it('requests a new code and clears the previous digits', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordCodePageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
...authProviders(),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({ email: 'ada@example.com' }),
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordCodePageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
fixture.detectChanges();
|
||||
component.form.setValue({
|
||||
digit1: '1',
|
||||
digit2: '2',
|
||||
digit3: '3',
|
||||
digit4: '4',
|
||||
});
|
||||
|
||||
component.resendCode();
|
||||
|
||||
expect(requestPasswordReset).toHaveBeenCalledWith('ada@example.com');
|
||||
expect(component.form.getRawValue()).toEqual({
|
||||
digit1: '',
|
||||
digit2: '',
|
||||
digit3: '',
|
||||
digit4: '',
|
||||
});
|
||||
expect(showSuccessToast).toHaveBeenCalledWith('Código reenviado correctamente.');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,191 @@
|
||||
import { ChangeDetectionStrategy, Component, inject, signal, viewChildren } from '@angular/core';
|
||||
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||
|
||||
type CodeControlName = 'digit1' | 'digit2' | 'digit3' | 'digit4';
|
||||
const CODE_CONTROL_NAMES: CodeControlName[] = ['digit1', 'digit2', 'digit3', 'digit4'];
|
||||
|
||||
@Component({
|
||||
selector: 'app-recover-password-code-page',
|
||||
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||
templateUrl: './recover-password-code-page.component.html',
|
||||
styleUrl: './recover-password-code-page.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class RecoverPasswordCodePageComponent {
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly isSubmittingState = signal(false);
|
||||
private readonly isResendingState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
private readonly digitInputs = viewChildren(InputComponent);
|
||||
|
||||
protected readonly email = this.route.snapshot.queryParamMap.get('email') ?? '';
|
||||
protected readonly form = this.formBuilder.nonNullable.group({
|
||||
digit1: ['', [Validators.required, Validators.pattern(/^\d$/)]],
|
||||
digit2: ['', [Validators.required, Validators.pattern(/^\d$/)]],
|
||||
digit3: ['', [Validators.required, Validators.pattern(/^\d$/)]],
|
||||
digit4: ['', [Validators.required, Validators.pattern(/^\d$/)]],
|
||||
});
|
||||
protected readonly submitted = this.submittedState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
protected readonly isResending = this.isResendingState.asReadonly();
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
|
||||
protected updateDigit(controlName: CodeControlName, value: string | number): void {
|
||||
const digit = String(value).replace(/\D/g, '').slice(-1);
|
||||
this.form.controls[controlName].setValue(digit);
|
||||
|
||||
const currentIndex = CODE_CONTROL_NAMES.indexOf(controlName);
|
||||
if (digit && currentIndex < CODE_CONTROL_NAMES.length - 1) {
|
||||
this.digitInputs()[currentIndex + 1]?.focus();
|
||||
}
|
||||
}
|
||||
|
||||
protected pasteCode(event: ClipboardEvent): void {
|
||||
event.preventDefault();
|
||||
|
||||
const pastedText = event.clipboardData?.getData('text') ?? '';
|
||||
const digits = pastedText.replace(/\D/g, '');
|
||||
|
||||
if (digits.length !== CODE_CONTROL_NAMES.length) {
|
||||
console.warn('Password reset code paste was rejected because it did not contain four digits.', {
|
||||
digitCount: digits.length,
|
||||
});
|
||||
this.showServerError('Pegá un código de cuatro dígitos.');
|
||||
return;
|
||||
}
|
||||
|
||||
CODE_CONTROL_NAMES.forEach((controlName, index) => {
|
||||
this.form.controls[controlName].setValue(digits[index]);
|
||||
});
|
||||
|
||||
this.submittedState.set(false);
|
||||
this.serverErrorState.set(null);
|
||||
this.digitInputs()[CODE_CONTROL_NAMES.length - 1]?.focus();
|
||||
}
|
||||
|
||||
protected isCodeInvalid(): boolean {
|
||||
return this.form.invalid && this.submitted();
|
||||
}
|
||||
|
||||
protected onSubmit(): void {
|
||||
this.submittedState.set(true);
|
||||
this.serverErrorState.set(null);
|
||||
|
||||
if (this.form.invalid || this.isSubmitting()) {
|
||||
this.form.markAllAsTouched();
|
||||
return;
|
||||
}
|
||||
|
||||
const code = Object.values(this.form.getRawValue()).join('');
|
||||
|
||||
if (!this.email) {
|
||||
console.warn('Password reset code validation cannot start without an email.');
|
||||
this.showServerError('No se pudo identificar la solicitud de recuperación.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.isSubmittingState.set(true);
|
||||
|
||||
this.authService.validatePasswordResetCode(this.email, code).subscribe({
|
||||
next: (response) => {
|
||||
this.isSubmittingState.set(false);
|
||||
|
||||
if (response.status !== 200 || response.body?.status !== 'validated') {
|
||||
console.warn('Password reset code validation returned an unexpected status.', {
|
||||
httpStatus: response.status,
|
||||
attemptStatus: response.body?.status ?? null,
|
||||
});
|
||||
this.showServerError('No se pudo validar el código. Intenta nuevamente.');
|
||||
return;
|
||||
}
|
||||
|
||||
void this.router.navigate(['/recuperar-contrasena/restablecer'], {
|
||||
queryParams: {
|
||||
email: this.email,
|
||||
code,
|
||||
},
|
||||
});
|
||||
},
|
||||
error: (error: unknown) => {
|
||||
this.isSubmittingState.set(false);
|
||||
console.error('Password reset code validation request failed.', error);
|
||||
this.showServerError(this.resolveErrorMessage(error));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
protected resendCode(): void {
|
||||
if (!this.email || this.isResending()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.serverErrorState.set(null);
|
||||
this.isResendingState.set(true);
|
||||
|
||||
this.authService.requestPasswordReset(this.email).subscribe({
|
||||
next: (response) => {
|
||||
this.isResendingState.set(false);
|
||||
|
||||
if (response.status !== 202 || response.body?.status !== 'pending') {
|
||||
console.warn('Password reset code resend returned an unexpected status.', {
|
||||
httpStatus: response.status,
|
||||
attemptStatus: response.body?.status ?? null,
|
||||
});
|
||||
this.showServerError('No se pudo reenviar el código. Intenta nuevamente.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.submittedState.set(false);
|
||||
this.form.reset();
|
||||
this.digitInputs()[0]?.focus();
|
||||
this.toastService.success('Código reenviado correctamente.');
|
||||
},
|
||||
error: (error: unknown) => {
|
||||
this.isResendingState.set(false);
|
||||
console.error('Password reset code resend request failed.', error);
|
||||
this.showServerError(this.resolveErrorMessage(error));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
protected goBack(): void {
|
||||
void this.router.navigate(['/recuperar-contrasena'], {
|
||||
queryParams: this.email ? { email: this.email } : undefined,
|
||||
});
|
||||
}
|
||||
|
||||
private showServerError(message: string): void {
|
||||
this.serverErrorState.set(message);
|
||||
this.toastService.danger(message);
|
||||
}
|
||||
|
||||
private resolveErrorMessage(error: unknown): string {
|
||||
const errorPayload =
|
||||
typeof error === 'object' && error !== null && 'error' in error
|
||||
? (error as { error?: { errors?: Record<string, string[]>; message?: string } }).error
|
||||
: undefined;
|
||||
const codeMessages = errorPayload?.errors?.['codigo'];
|
||||
const codeError = Array.isArray(codeMessages) ? codeMessages[0] : null;
|
||||
|
||||
if (typeof codeError === 'string' && codeError.trim()) {
|
||||
return codeError;
|
||||
}
|
||||
|
||||
if (typeof errorPayload?.message === 'string' && errorPayload.message.trim()) {
|
||||
return errorPayload.message;
|
||||
}
|
||||
|
||||
return 'No se pudo validar el código. Intenta nuevamente.';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
<header class="recover-password-page__header text-center mb-4">
|
||||
<h1 id="recover-password-title" class="auth-title mb-3">Recuperar contraseña</h1>
|
||||
<p class="recover-password-page__description mb-0">
|
||||
Ingresá tu Email para restablecer tu Contraseña.
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<form
|
||||
class="recover-password-page__form d-grid gap-3"
|
||||
novalidate
|
||||
aria-labelledby="recover-password-title"
|
||||
[formGroup]="form"
|
||||
(ngSubmit)="onSubmit()"
|
||||
>
|
||||
<div class="d-grid gap-1">
|
||||
<label class="visually-hidden" for="recover-password-email">Email</label>
|
||||
<app-input
|
||||
id="recover-password-email"
|
||||
type="email"
|
||||
placeholder="Email"
|
||||
[value]="form.controls.email.value"
|
||||
[invalid]="showEmailError()"
|
||||
(valueChange)="updateEmail($event)"
|
||||
/>
|
||||
@if (getEmailError(); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
}
|
||||
@if (serverError(); as errorMessage) {
|
||||
<small class="text-danger" role="alert">{{ errorMessage }}</small>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-2 text-center">
|
||||
<app-button
|
||||
type="submit"
|
||||
hostClass="w-100 d-block"
|
||||
buttonClass="w-100"
|
||||
[disabled]="isSubmitting()"
|
||||
>
|
||||
{{ isSubmitting() ? 'Enviando...' : 'Recuperar acceso' }}
|
||||
</app-button>
|
||||
|
||||
<app-button
|
||||
type="button"
|
||||
variant="borderless"
|
||||
hostClass="w-100 d-block text-center"
|
||||
buttonClass="recover-password-page__back-action px-3 py-2"
|
||||
(click)="goToLogin()"
|
||||
>
|
||||
Volver
|
||||
</app-button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -0,0 +1,17 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.recover-password-page__description {
|
||||
color: #a0a0a0;
|
||||
font-size: 12px;
|
||||
font-weight: 325;
|
||||
}
|
||||
|
||||
.recover-password-page__form {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.recover-password-page__back-action {
|
||||
min-height: 40px;
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
import { HttpResponse } from '@angular/common/http';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter, Router } from '@angular/router';
|
||||
import { of, throwError } from 'rxjs';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { RecoverPasswordPageComponent } from './recover-password-page.component';
|
||||
|
||||
describe('RecoverPasswordPageComponent', () => {
|
||||
let requestPasswordReset: ReturnType<typeof vi.fn>;
|
||||
let showDangerToast: ReturnType<typeof vi.fn>;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => undefined);
|
||||
requestPasswordReset = vi.fn(() => of(new HttpResponse({
|
||||
body: {
|
||||
message: 'Solicitud aceptada.',
|
||||
status: 'pending' as const
|
||||
},
|
||||
status: 202
|
||||
})));
|
||||
showDangerToast = vi.fn();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
function authProviders() {
|
||||
return [
|
||||
{ provide: AuthService, useValue: { requestPasswordReset } },
|
||||
{ provide: ToastService, useValue: { danger: showDangerToast } }
|
||||
];
|
||||
}
|
||||
|
||||
it('validates the email before submitting', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordPageComponent],
|
||||
providers: [provideRouter([]), ...authProviders()],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
|
||||
component.form.controls.email.setValue('invalid-email');
|
||||
component.onSubmit();
|
||||
|
||||
expect(component.form.invalid).toBe(true);
|
||||
expect(component.getEmailError()).toBe('Ingresa un email válido.');
|
||||
});
|
||||
|
||||
it('navigates back to login', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordPageComponent],
|
||||
providers: [provideRouter([]), ...authProviders()],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.goToLogin();
|
||||
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/login']);
|
||||
});
|
||||
|
||||
it('continues to the code page with the entered email', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordPageComponent],
|
||||
providers: [provideRouter([]), ...authProviders()],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.controls.email.setValue('ada@example.com');
|
||||
component.onSubmit();
|
||||
|
||||
expect(requestPasswordReset).toHaveBeenCalledWith('ada@example.com');
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/recuperar-contrasena/codigo'], {
|
||||
queryParams: { email: 'ada@example.com' },
|
||||
});
|
||||
});
|
||||
|
||||
it('stays on the page when the endpoint does not finish as pending', async () => {
|
||||
requestPasswordReset.mockReturnValue(of(new HttpResponse({
|
||||
body: null,
|
||||
status: 200
|
||||
})));
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordPageComponent],
|
||||
providers: [provideRouter([]), ...authProviders()],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.controls.email.setValue('ada@example.com');
|
||||
component.onSubmit();
|
||||
|
||||
expect(navigateSpy).not.toHaveBeenCalled();
|
||||
expect(component.serverError()).toBe(
|
||||
'No se pudo iniciar la recuperación. Intenta nuevamente.',
|
||||
);
|
||||
expect(showDangerToast).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('shows the API error and does not navigate when the request fails', async () => {
|
||||
requestPasswordReset.mockReturnValue(throwError(() => ({
|
||||
error: { message: 'Servicio temporalmente no disponible.' }
|
||||
})));
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [RecoverPasswordPageComponent],
|
||||
providers: [provideRouter([]), ...authProviders()],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(RecoverPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.controls.email.setValue('ada@example.com');
|
||||
component.onSubmit();
|
||||
|
||||
expect(navigateSpy).not.toHaveBeenCalled();
|
||||
expect(component.serverError()).toBe('Servicio temporalmente no disponible.');
|
||||
expect(showDangerToast).toHaveBeenCalledWith('Servicio temporalmente no disponible.');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,135 @@
|
||||
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
||||
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||
|
||||
const EMAIL_MAX_LENGTH = 255;
|
||||
|
||||
@Component({
|
||||
selector: 'app-recover-password-page',
|
||||
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||
templateUrl: './recover-password-page.component.html',
|
||||
styleUrl: './recover-password-page.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class RecoverPasswordPageComponent {
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly isSubmittingState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
|
||||
protected readonly form = this.formBuilder.nonNullable.group({
|
||||
email: [
|
||||
this.route.snapshot.queryParamMap.get('email') ?? '',
|
||||
[Validators.required, Validators.email, Validators.maxLength(EMAIL_MAX_LENGTH)],
|
||||
],
|
||||
});
|
||||
protected readonly submitted = this.submittedState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
|
||||
protected updateEmail(value: string | number): void {
|
||||
this.form.controls.email.setValue(String(value));
|
||||
}
|
||||
|
||||
protected showEmailError(): boolean {
|
||||
const email = this.form.controls.email;
|
||||
|
||||
return email.invalid && (email.touched || this.submitted());
|
||||
}
|
||||
|
||||
protected getEmailError(): string | null {
|
||||
const email = this.form.controls.email;
|
||||
|
||||
if (!this.showEmailError()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (email.hasError('required')) {
|
||||
return 'Este campo es obligatorio.';
|
||||
}
|
||||
|
||||
if (email.hasError('maxlength')) {
|
||||
return `No puede superar los ${EMAIL_MAX_LENGTH} caracteres.`;
|
||||
}
|
||||
|
||||
if (email.hasError('email')) {
|
||||
return 'Ingresa un email válido.';
|
||||
}
|
||||
|
||||
return 'El valor ingresado no es válido.';
|
||||
}
|
||||
|
||||
protected onSubmit(): void {
|
||||
this.submittedState.set(true);
|
||||
this.serverErrorState.set(null);
|
||||
|
||||
if (this.form.invalid || this.isSubmitting()) {
|
||||
this.form.markAllAsTouched();
|
||||
return;
|
||||
}
|
||||
|
||||
const email = this.form.controls.email.value;
|
||||
this.isSubmittingState.set(true);
|
||||
|
||||
this.authService.requestPasswordReset(email).subscribe({
|
||||
next: (response) => {
|
||||
this.isSubmittingState.set(false);
|
||||
|
||||
if (response.status !== 202 || response.body?.status !== 'pending') {
|
||||
console.warn('Password reset attempt returned an unexpected status.', {
|
||||
httpStatus: response.status,
|
||||
attemptStatus: response.body?.status ?? null,
|
||||
});
|
||||
this.showServerError('No se pudo iniciar la recuperación. Intenta nuevamente.');
|
||||
return;
|
||||
}
|
||||
|
||||
void this.router.navigate(['/recuperar-contrasena/codigo'], {
|
||||
queryParams: { email },
|
||||
});
|
||||
},
|
||||
error: (error: unknown) => {
|
||||
this.isSubmittingState.set(false);
|
||||
console.error('Password reset attempt request failed.', error);
|
||||
this.showServerError(this.resolveErrorMessage(error));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
protected goToLogin(): void {
|
||||
void this.router.navigate(['/login']);
|
||||
}
|
||||
|
||||
private showServerError(message: string): void {
|
||||
this.serverErrorState.set(message);
|
||||
this.toastService.danger(message);
|
||||
}
|
||||
|
||||
private resolveErrorMessage(error: unknown): string {
|
||||
const errorPayload =
|
||||
typeof error === 'object' && error !== null && 'error' in error
|
||||
? (error as { error?: { errors?: Record<string, string[]>; message?: string } }).error
|
||||
: undefined;
|
||||
const emailMessages = errorPayload?.errors?.['email'];
|
||||
const emailError = Array.isArray(emailMessages) ? emailMessages[0] : null;
|
||||
|
||||
if (typeof emailError === 'string' && emailError.trim()) {
|
||||
return emailError;
|
||||
}
|
||||
|
||||
if (typeof errorPayload?.message === 'string' && errorPayload.message.trim()) {
|
||||
return errorPayload.message;
|
||||
}
|
||||
|
||||
return 'No se pudo iniciar la recuperación. Intenta nuevamente.';
|
||||
}
|
||||
}
|
||||
@@ -50,8 +50,8 @@ describe('RegisterPageComponent', () => {
|
||||
component.form.setValue({
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com',
|
||||
password: 'secret123',
|
||||
password_confirmation: 'secret123'
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123'
|
||||
});
|
||||
|
||||
component.onSubmit();
|
||||
@@ -59,8 +59,8 @@ describe('RegisterPageComponent', () => {
|
||||
expect(authService.register).toHaveBeenCalledWith({
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com',
|
||||
password: 'secret123',
|
||||
password_confirmation: 'secret123'
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123'
|
||||
});
|
||||
expect(modalService.openSimple).toHaveBeenCalledWith({
|
||||
content: 'Tu cuenta fue creada correctamente',
|
||||
@@ -178,8 +178,8 @@ describe('RegisterPageComponent', () => {
|
||||
component.form.setValue({
|
||||
nombre_apellido: 'Ada Lovelace',
|
||||
email: 'ada@example.com',
|
||||
password: 'secret123',
|
||||
password_confirmation: 'secret123'
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123'
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
<header class="reset-password-page__header text-center mb-4">
|
||||
<h1 id="reset-password-title" class="auth-title">Restablecer contraseña</h1>
|
||||
</header>
|
||||
|
||||
<form
|
||||
class="reset-password-page__form d-grid gap-3"
|
||||
novalidate
|
||||
aria-labelledby="reset-password-title"
|
||||
[formGroup]="form"
|
||||
(ngSubmit)="onSubmit()"
|
||||
>
|
||||
<div class="d-grid gap-1">
|
||||
<label class="visually-hidden" for="reset-password-new">Nueva Contraseña</label>
|
||||
<app-input
|
||||
id="reset-password-new"
|
||||
type="password"
|
||||
placeholder="Nueva Contraseña"
|
||||
[value]="form.controls.password.value"
|
||||
[invalid]="showControlError('password')"
|
||||
(valueChange)="updatePassword('password', $event)"
|
||||
/>
|
||||
@if (getControlError('password'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-1">
|
||||
<label class="visually-hidden" for="reset-password-confirmation">
|
||||
Repetir Nueva Contraseña
|
||||
</label>
|
||||
<app-input
|
||||
id="reset-password-confirmation"
|
||||
type="password"
|
||||
placeholder="Repetir Nueva Contraseña"
|
||||
[value]="form.controls.password_confirmation.value"
|
||||
[invalid]="showControlError('password_confirmation')"
|
||||
(valueChange)="updatePassword('password_confirmation', $event)"
|
||||
/>
|
||||
@if (getControlError('password_confirmation'); as errorMessage) {
|
||||
<small class="text-danger">{{ errorMessage }}</small>
|
||||
}
|
||||
</div>
|
||||
|
||||
@if (serverError(); as errorMessage) {
|
||||
<small class="text-danger" role="alert">{{ errorMessage }}</small>
|
||||
}
|
||||
|
||||
<app-button
|
||||
type="submit"
|
||||
hostClass="w-100 d-block"
|
||||
buttonClass="w-100"
|
||||
[disabled]="isSubmitting()"
|
||||
>
|
||||
{{ isSubmitting() ? 'Guardando...' : 'Guardar' }}
|
||||
</app-button>
|
||||
</form>
|
||||
@@ -0,0 +1,7 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.reset-password-page__form {
|
||||
width: 100%;
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
import { HttpResponse } from '@angular/common/http';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { ActivatedRoute, convertToParamMap, provideRouter, Router } from '@angular/router';
|
||||
import { of, throwError } from 'rxjs';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ModalService } from '../../../../core/services/modal.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ResetPasswordPageComponent } from './reset-password-page.component';
|
||||
|
||||
describe('ResetPasswordPageComponent', () => {
|
||||
let resetPassword: ReturnType<typeof vi.fn>;
|
||||
let showDangerToast: ReturnType<typeof vi.fn>;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => undefined);
|
||||
resetPassword = vi.fn(() => of(new HttpResponse({
|
||||
body: {
|
||||
message: 'Contraseña modificada correctamente.',
|
||||
status: 'used' as const,
|
||||
},
|
||||
status: 200,
|
||||
})));
|
||||
showDangerToast = vi.fn();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
function resetProviders(modalService: { openSimple: ReturnType<typeof vi.fn> }) {
|
||||
return [
|
||||
provideRouter([]),
|
||||
{ provide: AuthService, useValue: { resetPassword } },
|
||||
{ provide: ModalService, useValue: modalService },
|
||||
{ provide: ToastService, useValue: { danger: showDangerToast } },
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
queryParamMap: convertToParamMap({
|
||||
email: 'ada@example.com',
|
||||
code: '1234',
|
||||
}),
|
||||
},
|
||||
},
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
it('rejects passwords that do not match', async () => {
|
||||
const modalService = {
|
||||
openSimple: vi.fn(),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ResetPasswordPageComponent],
|
||||
providers: resetProviders(modalService),
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ResetPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
|
||||
component.form.setValue({
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Different!123',
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
expect(component.form.hasError('passwordMismatch')).toBe(true);
|
||||
expect(component.getControlError('password_confirmation')).toBe(
|
||||
'Las contraseñas no coinciden.',
|
||||
);
|
||||
expect(modalService.openSimple).not.toHaveBeenCalled();
|
||||
expect(resetPassword).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('shows the success modal and returns to login for matching passwords', async () => {
|
||||
const modalService = {
|
||||
openSimple: vi.fn().mockReturnValue(of(undefined)),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ResetPasswordPageComponent],
|
||||
providers: resetProviders(modalService),
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ResetPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
const router = TestBed.inject(Router);
|
||||
const navigateSpy = vi.spyOn(router, 'navigate').mockResolvedValue(true);
|
||||
|
||||
component.form.setValue({
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123',
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
expect(component.form.valid).toBe(true);
|
||||
expect(component.getControlError('password_confirmation')).toBeNull();
|
||||
expect(resetPassword).toHaveBeenCalledWith({
|
||||
email: 'ada@example.com',
|
||||
codigo: '1234',
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123',
|
||||
});
|
||||
expect(modalService.openSimple).toHaveBeenCalledWith({
|
||||
content: 'Contraseña modificada correctamente',
|
||||
buttonLabel: 'Cerrar',
|
||||
});
|
||||
expect(navigateSpy).toHaveBeenCalledWith(['/login']);
|
||||
});
|
||||
|
||||
it('shows the API error without opening the success modal', async () => {
|
||||
resetPassword.mockReturnValue(throwError(() => ({
|
||||
error: {
|
||||
errors: {
|
||||
codigo: ['La solicitud de recuperación es inválida o ya fue utilizada.'],
|
||||
},
|
||||
},
|
||||
})));
|
||||
const modalService = {
|
||||
openSimple: vi.fn(),
|
||||
};
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ResetPasswordPageComponent],
|
||||
providers: resetProviders(modalService),
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(ResetPasswordPageComponent);
|
||||
const component = fixture.componentInstance as any;
|
||||
|
||||
component.form.setValue({
|
||||
password: 'Secret!123',
|
||||
password_confirmation: 'Secret!123',
|
||||
});
|
||||
component.onSubmit();
|
||||
|
||||
expect(modalService.openSimple).not.toHaveBeenCalled();
|
||||
expect(component.serverError()).toBe(
|
||||
'La solicitud de recuperación es inválida o ya fue utilizada.',
|
||||
);
|
||||
expect(showDangerToast).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,193 @@
|
||||
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
||||
import {
|
||||
AbstractControl,
|
||||
FormBuilder,
|
||||
ReactiveFormsModule,
|
||||
ValidationErrors,
|
||||
ValidatorFn,
|
||||
Validators,
|
||||
} from '@angular/forms';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||
import { ModalService } from '../../../../core/services/modal.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||
|
||||
const PASSWORD_MIN_LENGTH = 8;
|
||||
|
||||
const passwordsMatchValidator: ValidatorFn = (
|
||||
control: AbstractControl,
|
||||
): ValidationErrors | null => {
|
||||
const password = control.get('password')?.value;
|
||||
const passwordConfirmation = control.get('password_confirmation')?.value;
|
||||
|
||||
if (!password || !passwordConfirmation) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return password === passwordConfirmation ? null : { passwordMismatch: true };
|
||||
};
|
||||
|
||||
type PasswordControlName = 'password' | 'password_confirmation';
|
||||
|
||||
@Component({
|
||||
selector: 'app-reset-password-page',
|
||||
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||
templateUrl: './reset-password-page.component.html',
|
||||
styleUrl: './reset-password-page.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class ResetPasswordPageComponent {
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly authService = inject(AuthService);
|
||||
private readonly modalService = inject(ModalService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
private readonly submittedState = signal(false);
|
||||
private readonly isSubmittingState = signal(false);
|
||||
private readonly serverErrorState = signal<string | null>(null);
|
||||
|
||||
private readonly email = this.route.snapshot.queryParamMap.get('email') ?? '';
|
||||
private readonly code = this.route.snapshot.queryParamMap.get('code') ?? '';
|
||||
|
||||
protected readonly form = this.formBuilder.nonNullable.group(
|
||||
{
|
||||
password: [
|
||||
'',
|
||||
[
|
||||
Validators.required,
|
||||
Validators.minLength(PASSWORD_MIN_LENGTH),
|
||||
Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[\W_]).+$/),
|
||||
],
|
||||
],
|
||||
password_confirmation: ['', [Validators.required]],
|
||||
},
|
||||
{
|
||||
validators: [passwordsMatchValidator],
|
||||
},
|
||||
);
|
||||
protected readonly submitted = this.submittedState.asReadonly();
|
||||
protected readonly isSubmitting = this.isSubmittingState.asReadonly();
|
||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||
|
||||
protected updatePassword(controlName: PasswordControlName, value: string | number): void {
|
||||
this.form.controls[controlName].setValue(String(value));
|
||||
}
|
||||
|
||||
protected showControlError(controlName: PasswordControlName): boolean {
|
||||
const control = this.form.controls[controlName];
|
||||
const hasPasswordMismatch =
|
||||
controlName === 'password_confirmation' &&
|
||||
this.form.hasError('passwordMismatch') &&
|
||||
(control.touched || this.submitted());
|
||||
|
||||
return (control.invalid && (control.touched || this.submitted())) || hasPasswordMismatch;
|
||||
}
|
||||
|
||||
protected getControlError(controlName: PasswordControlName): string | null {
|
||||
const control = this.form.controls[controlName];
|
||||
|
||||
if (!this.showControlError(controlName)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (control.hasError('required')) {
|
||||
return 'Este campo es obligatorio.';
|
||||
}
|
||||
|
||||
if (control.hasError('minlength')) {
|
||||
return `Debe tener al menos ${PASSWORD_MIN_LENGTH} caracteres.`;
|
||||
}
|
||||
|
||||
if (controlName === 'password' && control.hasError('pattern')) {
|
||||
return 'Debe contener mayúscula, minúscula y un carácter especial.';
|
||||
}
|
||||
|
||||
if (controlName === 'password_confirmation' && this.form.hasError('passwordMismatch')) {
|
||||
return 'Las contraseñas no coinciden.';
|
||||
}
|
||||
|
||||
return 'El valor ingresado no es válido.';
|
||||
}
|
||||
|
||||
protected onSubmit(): void {
|
||||
this.submittedState.set(true);
|
||||
this.serverErrorState.set(null);
|
||||
|
||||
if (this.form.invalid || this.isSubmitting()) {
|
||||
this.form.markAllAsTouched();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.email || !/^\d{4}$/.test(this.code)) {
|
||||
console.warn('Password reset cannot start without a validated recovery request.');
|
||||
this.showServerError('La solicitud de recuperación es inválida.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.isSubmittingState.set(true);
|
||||
|
||||
this.authService.resetPassword({
|
||||
email: this.email,
|
||||
codigo: this.code,
|
||||
...this.form.getRawValue(),
|
||||
}).subscribe({
|
||||
next: (response) => {
|
||||
this.isSubmittingState.set(false);
|
||||
|
||||
if (response.status !== 200 || response.body?.status !== 'used') {
|
||||
console.warn('Password reset returned an unexpected status.', {
|
||||
httpStatus: response.status,
|
||||
attemptStatus: response.body?.status ?? null,
|
||||
});
|
||||
this.showServerError('No se pudo modificar la contraseña. Intenta nuevamente.');
|
||||
return;
|
||||
}
|
||||
|
||||
this.modalService
|
||||
.openSimple({
|
||||
content: 'Contraseña modificada correctamente',
|
||||
buttonLabel: 'Cerrar',
|
||||
})
|
||||
.subscribe(() => {
|
||||
void this.router.navigate(['/login']);
|
||||
});
|
||||
},
|
||||
error: (error: unknown) => {
|
||||
this.isSubmittingState.set(false);
|
||||
console.error('Password reset request failed.', error);
|
||||
this.showServerError(this.resolveErrorMessage(error));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private showServerError(message: string): void {
|
||||
this.serverErrorState.set(message);
|
||||
this.toastService.danger(message);
|
||||
}
|
||||
|
||||
private resolveErrorMessage(error: unknown): string {
|
||||
const errorPayload =
|
||||
typeof error === 'object' && error !== null && 'error' in error
|
||||
? (error as { error?: { errors?: Record<string, string[]>; message?: string } }).error
|
||||
: undefined;
|
||||
const errors = errorPayload?.errors;
|
||||
|
||||
for (const field of ['codigo', 'password'] as const) {
|
||||
const messages = errors?.[field];
|
||||
|
||||
if (Array.isArray(messages) && typeof messages[0] === 'string' && messages[0].trim()) {
|
||||
return messages[0];
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof errorPayload?.message === 'string' && errorPayload.message.trim()) {
|
||||
return errorPayload.message;
|
||||
}
|
||||
|
||||
return 'No se pudo modificar la contraseña. Intenta nuevamente.';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
<section class="search-results" aria-labelledby="search-results-title">
|
||||
<header class="search-results__header mb-4">
|
||||
<h1 id="search-results-title" class="h3 mb-2">Resultados de búsqueda</h1>
|
||||
@if (query()) {
|
||||
<p class="text-body-secondary mb-0">
|
||||
Resultados para <strong>“{{ query() }}”</strong>
|
||||
</p>
|
||||
}
|
||||
</header>
|
||||
|
||||
@if (error()) {
|
||||
<p class="alert text-center mb-0 search-results__alert-error">{{ error() }}</p>
|
||||
} @else if (loading()) {
|
||||
<p class="alert alert-light border text-center mb-0">Buscando productos...</p>
|
||||
} @else if (results(); as searchResults) {
|
||||
@if (!searchResults.data.length) {
|
||||
<p class="alert alert-light border text-center mb-0">
|
||||
No encontramos productos para “{{ query() }}”.
|
||||
</p>
|
||||
} @else {
|
||||
<app-product-list
|
||||
[layout]="productLayout()"
|
||||
[groupLayout]="groupLayout()"
|
||||
[items]="displayItems()"
|
||||
(buy)="onBuyProduct($event)"
|
||||
(addToCart)="onAddToCart($event)"
|
||||
(pageChange)="onPageChange($event)"
|
||||
/>
|
||||
|
||||
@if (hasHiddenResults()) {
|
||||
<p class="text-body-secondary text-center mt-3 mb-0">
|
||||
Se muestran {{ searchResults.data.length }} de {{ searchResults.meta.total }} resultados.
|
||||
</p>
|
||||
}
|
||||
}
|
||||
}
|
||||
</section>
|
||||
@@ -0,0 +1,3 @@
|
||||
.search-results__alert-error {
|
||||
color: var(--tenant-danger-color, var(--bs-danger));
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { ActivatedRoute, convertToParamMap, provideRouter } from '@angular/router';
|
||||
import { of } from 'rxjs';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
|
||||
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component';
|
||||
import { SearchPageComponent } from './search-page.component';
|
||||
|
||||
describe('SearchPageComponent', () => {
|
||||
const searchCatalog = vi.fn();
|
||||
const tenant = signal({
|
||||
search_product_layout: 'row',
|
||||
search_group_layout: 'simple_vertical',
|
||||
search_items_per_page: 8,
|
||||
} as Tenant);
|
||||
|
||||
beforeEach(async () => {
|
||||
searchCatalog.mockReset();
|
||||
searchCatalog.mockReturnValue(
|
||||
of({
|
||||
data: [
|
||||
{
|
||||
id: 1,
|
||||
nombre: 'Running',
|
||||
descripcion: 'Zapatillas',
|
||||
precio: '100.00',
|
||||
variants: [],
|
||||
},
|
||||
],
|
||||
links: {
|
||||
first: '/catalog-items?page=1',
|
||||
last: '/catalog-items?page=2',
|
||||
prev: null,
|
||||
next: '/catalog-items?page=2',
|
||||
},
|
||||
meta: {
|
||||
current_page: 1,
|
||||
from: 1,
|
||||
last_page: 2,
|
||||
links: [],
|
||||
path: '/catalog-items',
|
||||
per_page: 8,
|
||||
to: 1,
|
||||
total: 10,
|
||||
},
|
||||
}),
|
||||
);
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [SearchPageComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
queryParamMap: of(convertToParamMap({ q: 'running', page: '1' })),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: CatalogService,
|
||||
useValue: { searchCatalog },
|
||||
},
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
{
|
||||
provide: CartService,
|
||||
useValue: { addItem: vi.fn() },
|
||||
},
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: {
|
||||
success: vi.fn(),
|
||||
danger: vi.fn(),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
it('searches from the URL and applies the tenant presentation configuration', () => {
|
||||
const fixture = TestBed.createComponent(SearchPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(searchCatalog).toHaveBeenCalledWith({
|
||||
q: 'running',
|
||||
page: 1,
|
||||
});
|
||||
|
||||
const productList = fixture.debugElement.query(By.directive(ProductListComponent))
|
||||
.componentInstance as ProductListComponent;
|
||||
|
||||
expect(productList.layout()).toBe('row');
|
||||
expect(productList.groupLayout()).toBe('simple_vertical');
|
||||
expect(Array.isArray(productList.items())).toBe(true);
|
||||
expect((fixture.nativeElement as HTMLElement).textContent).toContain(
|
||||
'Se muestran 1 de 10 resultados.',
|
||||
);
|
||||
});
|
||||
|
||||
it('does not search when the query has fewer than three characters', () => {
|
||||
TestBed.overrideProvider(ActivatedRoute, {
|
||||
useValue: {
|
||||
queryParamMap: of(convertToParamMap({ q: 'ab', page: '1' })),
|
||||
},
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(SearchPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(searchCatalog).not.toHaveBeenCalled();
|
||||
expect((fixture.nativeElement as HTMLElement).textContent).toContain(
|
||||
'Ingresá al menos 3 caracteres para buscar.',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,155 @@
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
DestroyRef,
|
||||
computed,
|
||||
inject,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { catchError, distinctUntilChanged, map, of, switchMap, tap } from 'rxjs';
|
||||
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
|
||||
import { CartService } from '../../../../core/services/cart/cart.service';
|
||||
import {
|
||||
CatalogFeaturedItem,
|
||||
CatalogFeaturedItems,
|
||||
CatalogGroupLayout,
|
||||
CatalogProductLayout,
|
||||
} from '../../../../core/services/catalog/catalog.interface';
|
||||
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
|
||||
import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import {
|
||||
ProductListCartEvent,
|
||||
ProductListComponent,
|
||||
ProductListItem,
|
||||
} from '../../../../shared/components/product-list/product-list.component';
|
||||
|
||||
interface SearchRouteState {
|
||||
query: string;
|
||||
page: number;
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-search-page',
|
||||
imports: [ProductListComponent],
|
||||
templateUrl: './search-page.component.html',
|
||||
styleUrl: './search-page.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class SearchPageComponent {
|
||||
private readonly minSearchLength = 3;
|
||||
private readonly cartService = inject(CartService);
|
||||
private readonly catalogService = inject(CatalogService);
|
||||
private readonly destroyRef = inject(DestroyRef);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly router = inject(Router);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
private readonly toastService = inject(ToastService);
|
||||
|
||||
protected readonly query = signal('');
|
||||
protected readonly results = signal<ApiPaginatedResponse<CatalogFeaturedItem[]> | null>(null);
|
||||
protected readonly loading = signal(false);
|
||||
protected readonly error = signal<string | null>(null);
|
||||
|
||||
protected readonly productLayout = computed<CatalogProductLayout>(
|
||||
() => this.tenantService.tenant()?.search_product_layout ?? 'column_with_image',
|
||||
);
|
||||
protected readonly groupLayout = computed<CatalogGroupLayout>(
|
||||
() => this.tenantService.tenant()?.search_group_layout ?? 'paginated',
|
||||
);
|
||||
protected readonly displayItems = computed<CatalogFeaturedItems>(() => {
|
||||
const results = this.results();
|
||||
|
||||
if (!results) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return this.groupLayout() === 'paginated' ? results : results.data;
|
||||
});
|
||||
protected readonly hasHiddenResults = computed(() => {
|
||||
const results = this.results();
|
||||
|
||||
return (
|
||||
results !== null &&
|
||||
this.groupLayout() !== 'paginated' &&
|
||||
results.meta.total > results.data.length
|
||||
);
|
||||
});
|
||||
|
||||
constructor() {
|
||||
this.route.queryParamMap
|
||||
.pipe(
|
||||
map(
|
||||
(params): SearchRouteState => ({
|
||||
query: params.get('q')?.trim() ?? '',
|
||||
page: this.parsePage(params.get('page')),
|
||||
}),
|
||||
),
|
||||
distinctUntilChanged(
|
||||
(previous, current) => previous.query === current.query && previous.page === current.page,
|
||||
),
|
||||
tap(({ query }) => {
|
||||
this.query.set(query);
|
||||
this.results.set(null);
|
||||
this.error.set(
|
||||
query.length >= this.minSearchLength
|
||||
? null
|
||||
: `Ingresá al menos ${this.minSearchLength} caracteres para buscar.`,
|
||||
);
|
||||
this.loading.set(query.length >= this.minSearchLength);
|
||||
}),
|
||||
switchMap(({ query, page }) => {
|
||||
if (query.length < this.minSearchLength) {
|
||||
return of(null);
|
||||
}
|
||||
|
||||
return this.catalogService.searchCatalog({ q: query, page }).pipe(
|
||||
catchError(() => {
|
||||
this.error.set('No pudimos realizar la búsqueda en este momento.');
|
||||
|
||||
return of(null);
|
||||
}),
|
||||
);
|
||||
}),
|
||||
takeUntilDestroyed(this.destroyRef),
|
||||
)
|
||||
.subscribe((results) => {
|
||||
this.results.set(results);
|
||||
this.loading.set(false);
|
||||
});
|
||||
}
|
||||
|
||||
protected onPageChange(page: number): void {
|
||||
void this.router.navigate([], {
|
||||
relativeTo: this.route,
|
||||
queryParams: { page },
|
||||
queryParamsHandling: 'merge',
|
||||
});
|
||||
}
|
||||
|
||||
protected onBuyProduct(product: ProductListItem): void {
|
||||
void this.router.navigate(['/producto', product.id]);
|
||||
}
|
||||
|
||||
protected onAddToCart(event: ProductListCartEvent): void {
|
||||
this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({
|
||||
next: (response) => {
|
||||
this.toastService.success(response.message || 'Producto agregado al carrito');
|
||||
},
|
||||
error: (error: HttpErrorResponse) => {
|
||||
const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
|
||||
this.toastService.danger(message);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private parsePage(value: string | null): number {
|
||||
const page = Number(value ?? 1);
|
||||
|
||||
return Number.isInteger(page) && page > 0 ? page : 1;
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,14 @@
|
||||
@if (tenant()?.main_carousel_images; as mainCarouselImages) {
|
||||
@if (mainCarouselImages.length) {
|
||||
<app-main-carousel
|
||||
class="store-home__main-carousel"
|
||||
[images]="mainCarouselImages"
|
||||
ariaLabel="Imágenes destacadas de la tienda"
|
||||
(firstImageReady)="mainCarouselReady.set(true)"
|
||||
/>
|
||||
}
|
||||
}
|
||||
|
||||
@if (tenant()?.hero_config || tenant()?.event_config) {
|
||||
<app-hero-banner
|
||||
[heroConfig]="tenant()?.hero_config"
|
||||
@@ -18,8 +29,10 @@
|
||||
<app-store-section [title]="group.title">
|
||||
<app-product-list
|
||||
[layout]="group.layout"
|
||||
[groupLayout]="group.group_layout"
|
||||
[items]="group.items"
|
||||
[loading]="isGroupLoading(group.id)"
|
||||
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
|
||||
(buy)="onBuyProduct($event)"
|
||||
(addToCart)="onAddToCart($event)"
|
||||
(pageChange)="onPageChange(group.id, $event)"
|
||||
|
||||
@@ -2,6 +2,10 @@
|
||||
display: block;
|
||||
}
|
||||
|
||||
.store-home__main-carousel {
|
||||
margin-bottom: clamp(2rem, 4vw, 3rem);
|
||||
}
|
||||
|
||||
app-hero-banner + app-store-section,
|
||||
app-store-section + app-store-section {
|
||||
margin-top: clamp(3rem, 6vw, 5rem);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
@@ -11,6 +12,8 @@ import {
|
||||
CatalogFeaturedItem,
|
||||
} from '../../../../core/services/catalog/catalog.interface';
|
||||
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
|
||||
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../core/services/toast.service';
|
||||
import { ProductListComponent } from '../../../../shared/components/product-list/product-list.component';
|
||||
import { StoreHomePageComponent } from './store-home-page.component';
|
||||
@@ -56,6 +59,7 @@ function createCatalog(
|
||||
id: 7,
|
||||
title: 'Destacados',
|
||||
layout: 'column_with_image',
|
||||
group_layout: 'paginated',
|
||||
group_order: 0,
|
||||
items: createItemsPage(items, currentPage, lastPage),
|
||||
},
|
||||
@@ -84,6 +88,33 @@ const pageOneItems: CatalogFeaturedItem[] = [
|
||||
},
|
||||
];
|
||||
|
||||
function createTenant(mainCarouselImages?: string[]): Tenant {
|
||||
return {
|
||||
id: 1,
|
||||
codigo: 'acme',
|
||||
nombre: 'Acme',
|
||||
dominio: 'acme.com',
|
||||
primary_color: '#6376f3',
|
||||
secondary_color: '#a0a0a0',
|
||||
danger_color: '#dc3545',
|
||||
success_color: '#198754',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '/header.png',
|
||||
footer_logo: '/footer.png',
|
||||
main_carousel_images: mainCarouselImages,
|
||||
};
|
||||
}
|
||||
|
||||
function createTenantServiceStub(tenant: Tenant | null) {
|
||||
const tenantState = signal(tenant);
|
||||
|
||||
return {
|
||||
tenant: tenantState.asReadonly(),
|
||||
getTenant: () => tenantState(),
|
||||
};
|
||||
}
|
||||
|
||||
describe('StoreHomePageComponent', () => {
|
||||
beforeEach(() => vi.restoreAllMocks());
|
||||
|
||||
@@ -114,6 +145,71 @@ describe('StoreHomePageComponent', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('renders the tenant main carousel images at the beginning of the home page', async () => {
|
||||
const mainCarouselImages = [
|
||||
'https://example.com/carousel-1.webp',
|
||||
'https://example.com/carousel-2.webp',
|
||||
];
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [StoreHomePageComponent],
|
||||
providers: [
|
||||
provideActivatedRoute({ response: createCatalog(), error: null }),
|
||||
{
|
||||
provide: CatalogService,
|
||||
useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
|
||||
},
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(createTenant(mainCarouselImages)),
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(StoreHomePageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const carousel = element.querySelector('app-main-carousel');
|
||||
const images = carousel?.querySelectorAll('.main-carousel__image');
|
||||
|
||||
expect(element.firstElementChild).toBe(carousel);
|
||||
expect(images).toHaveLength(2);
|
||||
expect(images?.[0].getAttribute('src')).toBe(mainCarouselImages[0]);
|
||||
expect(images?.[1].getAttribute('src')).toBeNull();
|
||||
expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(0);
|
||||
|
||||
images?.[0].dispatchEvent(new Event('load'));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(images?.[1].getAttribute('src')).toBe(mainCarouselImages[1]);
|
||||
expect(element.querySelectorAll('app-product-column-with-image img')).toHaveLength(1);
|
||||
|
||||
fixture.destroy();
|
||||
});
|
||||
|
||||
it('does not render the main carousel when the tenant has no images', async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [StoreHomePageComponent],
|
||||
providers: [
|
||||
provideActivatedRoute({ response: createCatalog(), error: null }),
|
||||
{
|
||||
provide: CatalogService,
|
||||
useValue: { getCatalog: vi.fn(), getFeaturedGroupItems: vi.fn() },
|
||||
},
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: createTenantServiceStub(createTenant([])),
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(StoreHomePageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect((fixture.nativeElement as HTMLElement).querySelector('app-main-carousel')).toBeNull();
|
||||
});
|
||||
|
||||
it('requests another page for the selected featured group', async () => {
|
||||
const pageTwoItems = [{ id: 3, nombre: 'Mouse Gamer', precio: '15999.00', image: null }];
|
||||
const catalogServiceStub = {
|
||||
|
||||
@@ -3,6 +3,7 @@ import {
|
||||
Component,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
computed,
|
||||
inject,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
@@ -21,6 +22,7 @@ import {
|
||||
ProductListItem,
|
||||
} from '../../../../shared/components/product-list/product-list.component';
|
||||
import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
|
||||
import { MainCarouselComponent } from '../../../../shared/components/main-carousel/main-carousel.component';
|
||||
import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component';
|
||||
import {
|
||||
STORE_HOME_PRODUCTS_ERROR_MESSAGE,
|
||||
@@ -29,7 +31,12 @@ import {
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-home-page',
|
||||
imports: [StoreSectionComponent, ProductListComponent, HeroBannerComponent],
|
||||
imports: [
|
||||
StoreSectionComponent,
|
||||
ProductListComponent,
|
||||
HeroBannerComponent,
|
||||
MainCarouselComponent,
|
||||
],
|
||||
templateUrl: './store-home-page.component.html',
|
||||
styleUrl: './store-home-page.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
@@ -47,14 +54,17 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
protected readonly loading = signal(false);
|
||||
protected readonly loadingGroupIds = signal<ReadonlySet<number>>(new Set());
|
||||
protected readonly error = signal<string | null>(null);
|
||||
protected readonly mainCarouselReady = signal(false);
|
||||
protected readonly hasMainCarouselImages = computed(
|
||||
() => (this.tenant()?.main_carousel_images?.length ?? 0) > 0,
|
||||
);
|
||||
|
||||
private catalogRequestSubscription: Subscription | null = null;
|
||||
private readonly groupRequestSubscriptions = new Map<number, Subscription>();
|
||||
|
||||
ngOnInit(): void {
|
||||
const resolvedData = this.route.snapshot.data['catalogData'] as
|
||||
| StoreHomeCatalogResolvedData
|
||||
| undefined;
|
||||
StoreHomeCatalogResolvedData | undefined;
|
||||
|
||||
if (resolvedData) {
|
||||
this.applyResolvedData(resolvedData);
|
||||
@@ -78,6 +88,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
|
||||
if (
|
||||
!group ||
|
||||
Array.isArray(group.items) ||
|
||||
page < 1 ||
|
||||
page === group.items.meta.current_page ||
|
||||
this.isGroupLoading(groupId)
|
||||
@@ -112,18 +123,15 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
protected onAddToCart(event: ProductListCartEvent): void {
|
||||
this.cartService
|
||||
.addItem(event.product.id, event.variant ?? null, event.quantity)
|
||||
.subscribe({
|
||||
next: (response) => {
|
||||
this.toastService.success(response.message || 'Producto agregado al carrito');
|
||||
},
|
||||
error: (error: HttpErrorResponse) => {
|
||||
const message =
|
||||
error.error?.message || 'No se pudo agregar el producto al carrito.';
|
||||
this.toastService.danger(message);
|
||||
},
|
||||
});
|
||||
this.cartService.addItem(event.product.id, event.variant ?? null, event.quantity).subscribe({
|
||||
next: (response) => {
|
||||
this.toastService.success(response.message || 'Producto agregado al carrito');
|
||||
},
|
||||
error: (error: HttpErrorResponse) => {
|
||||
const message = error.error?.message || 'No se pudo agregar el producto al carrito.';
|
||||
this.toastService.danger(message);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private loadCatalog(): void {
|
||||
|
||||
@@ -6,9 +6,13 @@ import { authGuard, guestOnlyGuard } from '../../core/services/auth/auth.guards'
|
||||
import { LoginPageComponent } from './pages/login-page/login-page.component';
|
||||
import { hasMenuGuard } from '../../core/guards/menu.guard';
|
||||
import { productDetailResolver } from './pages/product-detail-page/product-detail-page.resolver';
|
||||
import { RecoverPasswordCodePageComponent } from './pages/recover-password-code-page/recover-password-code-page.component';
|
||||
import { RecoverPasswordPageComponent } from './pages/recover-password-page/recover-password-page.component';
|
||||
import { ResetPasswordPageComponent } from './pages/reset-password-page/reset-password-page.component';
|
||||
import { RegisterPageComponent } from './pages/register-page/register-page.component';
|
||||
import { StoreHomePageComponent } from './pages/store-home-page/store-home-page.component';
|
||||
import { storeHomeCatalogResolver } from './pages/store-home-page/store-home-page.resolver';
|
||||
import { checkoutPendingPurchaseGuard } from './pages/checkout-page/checkout-page.guard';
|
||||
|
||||
export const routes: Routes = [
|
||||
{
|
||||
@@ -45,6 +49,30 @@ export const routes: Routes = [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: 'recuperar-contrasena',
|
||||
canActivate: [guestOnlyGuard],
|
||||
component: SimpleLayoutComponent,
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
component: RecoverPasswordPageComponent,
|
||||
},
|
||||
{
|
||||
path: 'codigo',
|
||||
component: RecoverPasswordCodePageComponent,
|
||||
},
|
||||
{
|
||||
path: 'restablecer',
|
||||
component: ResetPasswordPageComponent,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: 'buscar',
|
||||
loadComponent: () =>
|
||||
import('./pages/search-page/search-page.component').then((m) => m.SearchPageComponent),
|
||||
},
|
||||
{
|
||||
path: 'producto/:id',
|
||||
canActivate: [hasMenuGuard('product.detail')],
|
||||
@@ -59,6 +87,7 @@ export const routes: Routes = [
|
||||
{
|
||||
path: 'checkout',
|
||||
canActivate: [authGuard, hasMenuGuard('checkout')],
|
||||
canDeactivate: [checkoutPendingPurchaseGuard],
|
||||
loadComponent: () =>
|
||||
import('./pages/checkout-page/checkout-page.component').then(
|
||||
(m) => m.CheckoutPageComponent,
|
||||
@@ -78,14 +107,50 @@ export const routes: Routes = [
|
||||
],
|
||||
},
|
||||
{
|
||||
path: 'mi-cuenta',
|
||||
canActivate: [authGuard],
|
||||
path: 'ayuda',
|
||||
canActivate: [hasMenuGuard('help')],
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/account-layout/account-layout').then((m) => m.AccountLayout),
|
||||
import('./pages/help-page/sidebar-layout/help-sidebar-layout').then(
|
||||
(m) => m.HelpSidebarLayout,
|
||||
),
|
||||
children: [
|
||||
{
|
||||
path: 'preguntas-frecuentes',
|
||||
canActivate: [hasMenuGuard('help.faq')],
|
||||
loadComponent: () =>
|
||||
import('./pages/help-page/pages/faq-page/faq-page').then((m) => m.FaqPage),
|
||||
},
|
||||
{
|
||||
path: 'contacto',
|
||||
canActivate: [hasMenuGuard('help.contact')],
|
||||
loadComponent: () =>
|
||||
import('./pages/help-page/pages/contact-page/contact-page').then(
|
||||
(m) => m.ContactPage,
|
||||
),
|
||||
},
|
||||
{
|
||||
path: '',
|
||||
redirectTo: 'preguntas-frecuentes',
|
||||
pathMatch: 'full',
|
||||
},
|
||||
{
|
||||
path: '**',
|
||||
loadComponent: () =>
|
||||
import('./pages/help-page/pages/pending-help-page/pending-help-page').then(
|
||||
(m) => m.PendingHelpPage,
|
||||
),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: 'mi-cuenta',
|
||||
canActivate: [authGuard, hasMenuGuard('account')],
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/sidebar-layout/sidebar-layout').then((m) => m.SidebarLayout),
|
||||
children: [
|
||||
{
|
||||
path: 'datos-personales',
|
||||
canActivate: [hasMenuGuard('profile')],
|
||||
canActivate: [hasMenuGuard('account.profile')],
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/pages/profile-page/profile-page').then(
|
||||
(m) => m.ProfilePage,
|
||||
@@ -93,7 +158,7 @@ export const routes: Routes = [
|
||||
},
|
||||
{
|
||||
path: 'compras',
|
||||
canActivate: [hasMenuGuard('purchases')],
|
||||
canActivate: [hasMenuGuard('account.purchases')],
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/pages/purchases-page/purchases-page').then(
|
||||
(m) => m.PurchasesPage,
|
||||
@@ -108,7 +173,7 @@ export const routes: Routes = [
|
||||
},
|
||||
{
|
||||
path: 'tickets',
|
||||
canActivate: [hasMenuGuard('tickets')],
|
||||
canActivate: [hasMenuGuard('account.tickets')],
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/pages/tickets-page/tickets-page').then(
|
||||
(m) => m.TicketsPage,
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<div
|
||||
class="accordion-header"
|
||||
role="heading"
|
||||
[attr.aria-level]="normalizedHeadingLevel()"
|
||||
>
|
||||
<button
|
||||
class="accordion-button"
|
||||
[class.collapsed]="!open()"
|
||||
type="button"
|
||||
[id]="triggerId()"
|
||||
[disabled]="disabled()"
|
||||
[attr.aria-expanded]="open()"
|
||||
[attr.aria-controls]="panelId()"
|
||||
(click)="toggle()"
|
||||
>
|
||||
{{ title() }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="accordion-collapse collapse"
|
||||
[class.show]="open()"
|
||||
[id]="panelId()"
|
||||
role="region"
|
||||
[attr.aria-labelledby]="triggerId()"
|
||||
>
|
||||
<div class="accordion-body">
|
||||
<ng-content />
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,55 @@
|
||||
:host {
|
||||
display: block;
|
||||
border: 0;
|
||||
border-radius: 0 !important;
|
||||
background: transparent;
|
||||
--bs-accordion-btn-padding-x: 0;
|
||||
--bs-accordion-btn-padding-y: 1rem;
|
||||
--bs-accordion-btn-color: #666666;
|
||||
--bs-accordion-btn-bg: transparent;
|
||||
--bs-accordion-active-color: #666666;
|
||||
--bs-accordion-active-bg: transparent;
|
||||
--bs-accordion-btn-focus-border-color: transparent;
|
||||
--bs-accordion-btn-focus-box-shadow: none;
|
||||
--bs-accordion-btn-active-icon: var(--bs-accordion-btn-icon);
|
||||
}
|
||||
|
||||
:host:not(:first-child) {
|
||||
border-top: 1px solid var(--bs-accordion-border-color);
|
||||
}
|
||||
|
||||
.accordion-button {
|
||||
border-radius: 0 !important;
|
||||
color: #666666;
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
line-height: 1.35;
|
||||
|
||||
&:not(.collapsed) {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
|
||||
&::after,
|
||||
&:not(.collapsed)::after {
|
||||
filter: none;
|
||||
opacity: 0.45;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid #666666;
|
||||
outline-offset: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
.accordion-body {
|
||||
padding: 0 0 1rem;
|
||||
color: #666666;
|
||||
font-size: 10px;
|
||||
font-weight: 400;
|
||||
line-height: 1.5;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
computed,
|
||||
forwardRef,
|
||||
inject,
|
||||
input,
|
||||
model,
|
||||
} from '@angular/core';
|
||||
|
||||
import { AccordionComponent } from './accordion.component';
|
||||
|
||||
let nextAccordionItemId = 0;
|
||||
|
||||
@Component({
|
||||
selector: 'app-accordion-item',
|
||||
imports: [],
|
||||
templateUrl: './accordion-item.component.html',
|
||||
styleUrl: './accordion-item.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
host: {
|
||||
class: 'accordion-item',
|
||||
},
|
||||
})
|
||||
export class AccordionItemComponent {
|
||||
private readonly accordion = inject(forwardRef(() => AccordionComponent));
|
||||
private readonly generatedId = `app-accordion-item-${nextAccordionItemId++}`;
|
||||
|
||||
readonly title = input.required<string>();
|
||||
readonly id = input<string | null>(null);
|
||||
readonly disabled = input(false);
|
||||
readonly headingLevel = input(2);
|
||||
readonly open = model(false);
|
||||
|
||||
protected readonly itemId = computed(() => this.id()?.trim() || this.generatedId);
|
||||
protected readonly triggerId = computed(() => `${this.itemId()}-trigger`);
|
||||
protected readonly panelId = computed(() => `${this.itemId()}-panel`);
|
||||
protected readonly normalizedHeadingLevel = computed(() =>
|
||||
Math.min(6, Math.max(1, Math.trunc(this.headingLevel()))),
|
||||
);
|
||||
|
||||
protected toggle(): void {
|
||||
this.accordion.toggle(this);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
<div class="accordion" [class.accordion-flush]="flush()">
|
||||
<ng-content />
|
||||
</div>
|
||||
12
src/app/shared/components/accordion/accordion.component.scss
Normal file
12
src/app/shared/components/accordion/accordion.component.scss
Normal file
@@ -0,0 +1,12 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.accordion {
|
||||
--bs-accordion-border-color: #dedede;
|
||||
--bs-accordion-border-radius: 0;
|
||||
--bs-accordion-inner-border-radius: 0;
|
||||
--bs-accordion-bg: transparent;
|
||||
border-bottom: 1px solid var(--bs-accordion-border-color);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user