Compare commits
36 Commits
homo_exper
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| f859eba8a8 | |||
| 8ba34c6c7a | |||
| d7c015e71e | |||
| d8d608c435 | |||
| 985316d3b4 | |||
| d601cc1984 | |||
| 70d47ac310 | |||
| 5d1d7086c7 | |||
| 9a6ec3d1f2 | |||
| 38ba5f4195 | |||
| 4bd74d95cb | |||
| 6f87aae939 | |||
| 71ef09b413 | |||
| 1d54cb1c48 | |||
| 7d52e11bca | |||
| ebae063a0f | |||
| f0c1e74c1b | |||
| 709859e731 | |||
| e95a7612c2 | |||
| 8bc0e165c7 | |||
| 158b28ec1a | |||
| 8c22485d49 | |||
| 2462f25f2f | |||
| 63b01f366a | |||
| ddd0b1b56d | |||
| 2cad0c39b4 | |||
| 3089873232 | |||
| 3fa0235163 | |||
| 0910d90363 | |||
| f3d446d012 | |||
| 71c462aaba | |||
| 481eb30795 | |||
| afebc7f639 | |||
| 1ec48f7e21 | |||
| c387a01d62 | |||
| 520397baa5 |
@@ -12,7 +12,7 @@ import {
|
|||||||
UrlSerializer,
|
UrlSerializer,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
|
|
||||||
import { BehaviorSubject, of } from 'rxjs';
|
import { BehaviorSubject, of, throwError } from 'rxjs';
|
||||||
|
|
||||||
import { Tenant } from '../../services/tenant.interface';
|
import { Tenant } from '../../services/tenant.interface';
|
||||||
import { TenantService } from '../../services/tenant.service';
|
import { TenantService } from '../../services/tenant.service';
|
||||||
@@ -211,7 +211,7 @@ describe('StoreLayoutComponent', () => {
|
|||||||
useValue: {
|
useValue: {
|
||||||
user: authUserState,
|
user: authUserState,
|
||||||
isAuthenticated: isAuthenticatedState,
|
isAuthenticated: isAuthenticatedState,
|
||||||
logout: vi.fn().mockReturnValue(of(void 0)),
|
logout: vi.fn().mockReturnValue(of({ message: 'Sesión cerrada correctamente.' })),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -574,6 +574,24 @@ describe('StoreLayoutComponent', () => {
|
|||||||
expect(authService.logout).toHaveBeenCalled();
|
expect(authService.logout).toHaveBeenCalled();
|
||||||
expect(cartService.clearCart).toHaveBeenCalled();
|
expect(cartService.clearCart).toHaveBeenCalled();
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/']);
|
expect(router.navigate).toHaveBeenCalledWith(['/']);
|
||||||
|
expect(TestBed.inject(ToastService).info).toHaveBeenCalledWith(
|
||||||
|
'Sesión cerrada correctamente.',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a danger toast when logout fails', async () => {
|
||||||
|
const authService = TestBed.inject(AuthService);
|
||||||
|
const message = 'La sesión no pudo cerrarse en el servidor.';
|
||||||
|
(authService.logout as any).mockReturnValue(
|
||||||
|
throwError(() => ({ error: { message } })),
|
||||||
|
);
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
await (fixture.componentInstance as any).onLogoutClick();
|
||||||
|
|
||||||
|
expect(TestBed.inject(ToastService).danger).toHaveBeenCalledWith(message);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('provides account actions from the footer', () => {
|
it('provides account actions from the footer', () => {
|
||||||
|
|||||||
@@ -236,23 +236,39 @@ export class StoreLayoutComponent implements OnInit {
|
|||||||
const navigationSucceeded = await this.router.navigate(['/']);
|
const navigationSucceeded = await this.router.navigate(['/']);
|
||||||
|
|
||||||
if (!navigationSucceeded) {
|
if (!navigationSucceeded) {
|
||||||
|
this.toastService.danger('No se pudo cerrar la sesión. Intentá nuevamente.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.authService.logout().subscribe({
|
this.authService.logout().subscribe({
|
||||||
next: () => {
|
next: ({ message }) => {
|
||||||
this.cartService.clearCart();
|
this.cartService.clearCart();
|
||||||
this.isCartOpen.set(false);
|
this.isCartOpen.set(false);
|
||||||
|
this.toastService.info(message || 'Sesión cerrada correctamente.');
|
||||||
|
|
||||||
if (!isLeavingCheckout) {
|
if (!isLeavingCheckout) {
|
||||||
void this.router.navigate(['/']);
|
void this.router.navigate(['/']);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: (err) => console.error('Error logging out', err),
|
error: (error: unknown) => {
|
||||||
|
this.toastService.danger(this.resolveLogoutErrorMessage(error));
|
||||||
|
console.error('Error logging out', error);
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private resolveLogoutErrorMessage(error: unknown): string {
|
||||||
|
const payload =
|
||||||
|
typeof error === 'object' && error !== null && 'error' in error
|
||||||
|
? (error as { error?: { message?: unknown } }).error
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
return typeof payload?.message === 'string' && payload.message.trim()
|
||||||
|
? payload.message
|
||||||
|
: 'No se pudo cerrar la sesión. Intentá nuevamente.';
|
||||||
|
}
|
||||||
|
|
||||||
protected async onCheckoutClick(): Promise<void> {
|
protected async onCheckoutClick(): Promise<void> {
|
||||||
if (this.isCreatingPurchase()) {
|
if (this.isCreatingPurchase()) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -33,6 +33,10 @@ export interface LoginResponse {
|
|||||||
user: AuthUser;
|
user: AuthUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface LogoutResponse {
|
||||||
|
message: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface RegisterResponse {
|
export interface RegisterResponse {
|
||||||
message: string;
|
message: string;
|
||||||
data: AuthUser;
|
data: AuthUser;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
AuthUser,
|
AuthUser,
|
||||||
LoginPayload,
|
LoginPayload,
|
||||||
LoginResponse,
|
LoginResponse,
|
||||||
|
LogoutResponse,
|
||||||
RegisterPayload,
|
RegisterPayload,
|
||||||
RegisterResponse,
|
RegisterResponse,
|
||||||
ResetPasswordPayload,
|
ResetPasswordPayload,
|
||||||
@@ -155,14 +156,14 @@ export class AuthService extends BaseApiService {
|
|||||||
.pipe(tap((user) => this.userState.set(user)));
|
.pipe(tap((user) => this.userState.set(user)));
|
||||||
}
|
}
|
||||||
|
|
||||||
logout(): Observable<void> {
|
logout(): Observable<LogoutResponse> {
|
||||||
if (!this.tokenState()) {
|
if (!this.tokenState()) {
|
||||||
this.clearSession();
|
this.clearSession();
|
||||||
return of(void 0);
|
return of({ message: 'Sesión cerrada correctamente.' });
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.http
|
return this.http
|
||||||
.post<void>(`${environment.url}logout`, {})
|
.post<LogoutResponse>(`${environment.url}logout`, {})
|
||||||
.pipe(tap(() => this.clearSession()));
|
.pipe(tap(() => this.clearSession()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ export interface CatalogItemVariant {
|
|||||||
maximum_use_date?: string | null;
|
maximum_use_date?: string | null;
|
||||||
effective_minimum_use_date?: string | null;
|
effective_minimum_use_date?: string | null;
|
||||||
effective_maximum_use_date?: string | null;
|
effective_maximum_use_date?: string | null;
|
||||||
values: Record<string, string | string[]>;
|
values: Record<string, CatalogVariantValue>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SelectedCatalogItemVariant extends CatalogItemVariant {
|
export interface SelectedCatalogItemVariant extends CatalogItemVariant {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { firstValueFrom } from 'rxjs';
|
|||||||
|
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
|
import { ImageModalComponent } from '../../shared/components/image-modal/image-modal.component';
|
||||||
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
import { MODAL_DATA, ModalRef, ModalService } from './modal.service';
|
import { MODAL_DATA, ModalRef, ModalService } from './modal.service';
|
||||||
@@ -258,6 +259,36 @@ describe('ModalService', () => {
|
|||||||
showCloseButton: true,
|
showCloseButton: true,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('opens the image viewer fullscreen with normalized zoom limits', () => {
|
||||||
|
service.openImage({
|
||||||
|
title: 'Producto',
|
||||||
|
src: '/images/producto.webp',
|
||||||
|
alt: 'Producto visto de frente',
|
||||||
|
initialZoom: 8,
|
||||||
|
minZoom: 0,
|
||||||
|
maxZoom: 3,
|
||||||
|
});
|
||||||
|
|
||||||
|
const activeModal = service.activeModal();
|
||||||
|
|
||||||
|
expect(activeModal?.component).toBe(ImageModalComponent);
|
||||||
|
expect(activeModal?.config).toEqual({
|
||||||
|
title: 'Producto',
|
||||||
|
size: 'full',
|
||||||
|
presentation: 'fullscreen-media',
|
||||||
|
data: {
|
||||||
|
src: '/images/producto.webp',
|
||||||
|
alt: 'Producto visto de frente',
|
||||||
|
initialZoom: 3,
|
||||||
|
minZoom: 0.1,
|
||||||
|
maxZoom: 3,
|
||||||
|
},
|
||||||
|
closeOnBackdrop: true,
|
||||||
|
closeOnEscape: true,
|
||||||
|
showCloseButton: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|||||||
@@ -2,16 +2,19 @@ import { InjectionToken, Injectable, Type, signal } from '@angular/core';
|
|||||||
import { Observable, Subject, map } from 'rxjs';
|
import { Observable, Subject, map } from 'rxjs';
|
||||||
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
import { ConfirmDeleteModalComponent } from '../../shared/components/confirm-delete-modal/confirm-delete-modal.component';
|
||||||
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
import { ConfirmModalComponent } from '../../shared/components/confirm-modal/confirm-modal.component';
|
||||||
|
import { ImageModalComponent } from '../../shared/components/image-modal/image-modal.component';
|
||||||
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
import { QrModalComponent } from '../../shared/components/qr-modal/qr-modal.component';
|
||||||
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
import { SimpleModalComponent } from '../../shared/components/simple-modal/simple-modal.component';
|
||||||
|
|
||||||
export type ModalSize = 'qr' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
export type ModalSize = 'qr' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
|
||||||
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced';
|
export type ModalDismissReason = 'backdrop' | 'escape' | 'programmatic' | 'replaced' | 'swipe';
|
||||||
|
export type ModalPresentation = 'dialog' | 'fullscreen-media';
|
||||||
|
|
||||||
export interface ModalConfig<TData = unknown> {
|
export interface ModalConfig<TData = unknown> {
|
||||||
title?: string;
|
title?: string;
|
||||||
data?: TData;
|
data?: TData;
|
||||||
size?: ModalSize;
|
size?: ModalSize;
|
||||||
|
presentation?: ModalPresentation;
|
||||||
closeOnBackdrop?: boolean;
|
closeOnBackdrop?: boolean;
|
||||||
closeOnEscape?: boolean;
|
closeOnEscape?: boolean;
|
||||||
showCloseButton?: boolean;
|
showCloseButton?: boolean;
|
||||||
@@ -62,6 +65,25 @@ export interface QrModalConfig extends Omit<ModalConfig<QrModalData>, 'data' | '
|
|||||||
ticket: string;
|
ticket: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ImageModalData {
|
||||||
|
src: string;
|
||||||
|
alt: string;
|
||||||
|
initialZoom: number;
|
||||||
|
minZoom: number;
|
||||||
|
maxZoom: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ImageModalConfig extends Omit<
|
||||||
|
ModalConfig<ImageModalData>,
|
||||||
|
'data' | 'presentation' | 'size'
|
||||||
|
> {
|
||||||
|
src: string;
|
||||||
|
alt: string;
|
||||||
|
initialZoom?: number;
|
||||||
|
minZoom?: number;
|
||||||
|
maxZoom?: number;
|
||||||
|
}
|
||||||
|
|
||||||
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
export interface ActiveModalState<TResult = unknown, TData = unknown> {
|
||||||
component: Type<unknown>;
|
component: Type<unknown>;
|
||||||
config: NormalizedModalConfig<TData>;
|
config: NormalizedModalConfig<TData>;
|
||||||
@@ -195,6 +217,33 @@ export class ModalService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
openImage(config: ImageModalConfig): Observable<void> {
|
||||||
|
return this.openImageRef(config).afterClosed$.pipe(map(() => undefined));
|
||||||
|
}
|
||||||
|
|
||||||
|
openImageRef(config: ImageModalConfig): ModalRef<void> {
|
||||||
|
const { src, alt, initialZoom = 1, minZoom = 1, maxZoom = 4, ...modalConfig } = config;
|
||||||
|
const normalizedMinZoom = Math.max(0.1, minZoom);
|
||||||
|
const normalizedMaxZoom = Math.max(normalizedMinZoom, maxZoom);
|
||||||
|
const normalizedInitialZoom = Math.min(
|
||||||
|
normalizedMaxZoom,
|
||||||
|
Math.max(normalizedMinZoom, initialZoom),
|
||||||
|
);
|
||||||
|
|
||||||
|
return this.open(ImageModalComponent, {
|
||||||
|
...modalConfig,
|
||||||
|
size: 'full',
|
||||||
|
presentation: 'fullscreen-media',
|
||||||
|
data: {
|
||||||
|
src,
|
||||||
|
alt,
|
||||||
|
initialZoom: normalizedInitialZoom,
|
||||||
|
minZoom: normalizedMinZoom,
|
||||||
|
maxZoom: normalizedMaxZoom,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
private close<TResult>(ref: ModalRef<TResult>, result?: TResult): void {
|
||||||
if (this.activeModalState()?.ref !== ref) {
|
if (this.activeModalState()?.ref !== ref) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ export interface Tenant {
|
|||||||
dominio: string;
|
dominio: string;
|
||||||
base_path?: string;
|
base_path?: string;
|
||||||
site_title?: string | null;
|
site_title?: string | null;
|
||||||
|
asset_url?: string | null;
|
||||||
address?: string | null;
|
address?: string | null;
|
||||||
phone?: string | null;
|
phone?: string | null;
|
||||||
favicon?: string | null;
|
favicon?: string | null;
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const tenant: Tenant = {
|
|||||||
codigo: 'test',
|
codigo: 'test',
|
||||||
nombre: 'Test Tenant',
|
nombre: 'Test Tenant',
|
||||||
dominio: 'localhost',
|
dominio: 'localhost',
|
||||||
|
asset_url: 'https://s3.example.com/assets',
|
||||||
primary_color: '#6376F3',
|
primary_color: '#6376F3',
|
||||||
secondary_color: '#A0A0A0',
|
secondary_color: '#A0A0A0',
|
||||||
danger_color: '#FF8888',
|
danger_color: '#FF8888',
|
||||||
@@ -44,6 +45,7 @@ const tenantResponse: TenantBootstrapResponse = {
|
|||||||
|
|
||||||
describe('TenantService', () => {
|
describe('TenantService', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
document.head.querySelectorAll('link[rel="preconnect"]').forEach((link) => link.remove());
|
||||||
try {
|
try {
|
||||||
window.history.replaceState({}, '', 'http://localhost:4200/');
|
window.history.replaceState({}, '', 'http://localhost:4200/');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -72,6 +74,9 @@ describe('TenantService', () => {
|
|||||||
expect(service.status()).toBe('ready');
|
expect(service.status()).toBe('ready');
|
||||||
expect(service.tenant()).toEqual(tenant);
|
expect(service.tenant()).toEqual(tenant);
|
||||||
expect(service.getTenant()).toEqual(tenant);
|
expect(service.getTenant()).toEqual(tenant);
|
||||||
|
expect(
|
||||||
|
document.head.querySelector('link[rel="preconnect"][href="https://s3.example.com/"]'),
|
||||||
|
).not.toBeNull();
|
||||||
|
|
||||||
httpController.verify();
|
httpController.verify();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
|
import { DOCUMENT, isPlatformBrowser, isPlatformServer } from '@angular/common';
|
||||||
import { HttpErrorResponse } from '@angular/common/http';
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
import {
|
import {
|
||||||
inject,
|
inject,
|
||||||
@@ -26,6 +26,7 @@ import {
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class TenantService extends BaseApiService {
|
export class TenantService extends BaseApiService {
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
private readonly platformId = inject(PLATFORM_ID);
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
private readonly request = inject(REQUEST, { optional: true });
|
private readonly request = inject(REQUEST, { optional: true });
|
||||||
private readonly responseInit = inject(RESPONSE_INIT, { optional: true });
|
private readonly responseInit = inject(RESPONSE_INIT, { optional: true });
|
||||||
@@ -182,10 +183,40 @@ export class TenantService extends BaseApiService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private setReady(tenant: Tenant): void {
|
private setReady(tenant: Tenant): void {
|
||||||
|
this.ensureAssetPreconnect(tenant.asset_url);
|
||||||
this.tenantState.set(tenant);
|
this.tenantState.set(tenant);
|
||||||
this.statusState.set('ready');
|
this.statusState.set('ready');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ensureAssetPreconnect(assetUrl: string | null | undefined): void {
|
||||||
|
if (!assetUrl) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let origin: string;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = new URL(assetUrl);
|
||||||
|
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
origin = url.origin;
|
||||||
|
} catch {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingPreconnects =
|
||||||
|
this.document.head.querySelectorAll<HTMLLinkElement>('link[rel="preconnect"]');
|
||||||
|
if ([...existingPreconnects].some((link) => link.href === `${origin}/`)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const link = this.document.createElement('link');
|
||||||
|
link.rel = 'preconnect';
|
||||||
|
link.href = origin;
|
||||||
|
this.document.head.append(link);
|
||||||
|
}
|
||||||
|
|
||||||
private setNotFound(): void {
|
private setNotFound(): void {
|
||||||
this.tenantState.set(null);
|
this.tenantState.set(null);
|
||||||
this.statusState.set('not-found');
|
this.statusState.set('not-found');
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { DOCUMENT } from '@angular/common';
|
||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { vi } from 'vitest';
|
import { vi } from 'vitest';
|
||||||
import { ToastService } from './toast.service';
|
import { ToastService } from './toast.service';
|
||||||
@@ -6,14 +7,16 @@ describe('ToastService', () => {
|
|||||||
let service: ToastService;
|
let service: ToastService;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
vi.useFakeTimers();
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
providers: [ToastService]
|
providers: [ToastService]
|
||||||
});
|
});
|
||||||
|
TestBed.inject(DOCUMENT).defaultView?.sessionStorage.removeItem('shopit.pending-toast');
|
||||||
service = TestBed.inject(ToastService);
|
service = TestBed.inject(ToastService);
|
||||||
vi.useFakeTimers();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
TestBed.inject(DOCUMENT).defaultView?.sessionStorage.removeItem('shopit.pending-toast');
|
||||||
vi.useRealTimers();
|
vi.useRealTimers();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -98,4 +101,23 @@ describe('ToastService', () => {
|
|||||||
|
|
||||||
expect(service.toasts().length).toBe(1);
|
expect(service.toasts().length).toBe(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should restore a toast queued for after a full page reload', () => {
|
||||||
|
service.showAfterReload('Sesión iniciada correctamente.', 'success', 0);
|
||||||
|
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
TestBed.configureTestingModule({ providers: [ToastService] });
|
||||||
|
service = TestBed.inject(ToastService);
|
||||||
|
|
||||||
|
expect(service.toasts()).toEqual([
|
||||||
|
expect.objectContaining({
|
||||||
|
message: 'Sesión iniciada correctamente.',
|
||||||
|
type: 'success',
|
||||||
|
duration: 0,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(
|
||||||
|
TestBed.inject(DOCUMENT).defaultView?.sessionStorage.getItem('shopit.pending-toast'),
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
import { Injectable, signal } from '@angular/core';
|
import { DOCUMENT, isPlatformBrowser } from '@angular/common';
|
||||||
|
import { inject, Injectable, PLATFORM_ID, signal } from '@angular/core';
|
||||||
|
|
||||||
|
const PENDING_TOAST_STORAGE_KEY = 'shopit.pending-toast';
|
||||||
|
|
||||||
export interface Toast {
|
export interface Toast {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -11,9 +14,15 @@ export interface Toast {
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class ToastService {
|
export class ToastService {
|
||||||
|
private readonly document = inject(DOCUMENT);
|
||||||
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
private readonly toastsSignal = signal<Toast[]>([]);
|
private readonly toastsSignal = signal<Toast[]>([]);
|
||||||
readonly toasts = this.toastsSignal.asReadonly();
|
readonly toasts = this.toastsSignal.asReadonly();
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.restorePendingToast();
|
||||||
|
}
|
||||||
|
|
||||||
show(message: string, type: 'success' | 'danger' | 'info' = 'info', duration = 3000): string {
|
show(message: string, type: 'success' | 'danger' | 'info' = 'info', duration = 3000): string {
|
||||||
const id = Math.random().toString(36).substring(2, 9);
|
const id = Math.random().toString(36).substring(2, 9);
|
||||||
const newToast: Toast = { id, message, type, duration };
|
const newToast: Toast = { id, message, type, duration };
|
||||||
@@ -41,7 +50,50 @@ export class ToastService {
|
|||||||
return this.show(message, 'success', duration);
|
return this.show(message, 'success', duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
showAfterReload(
|
||||||
|
message: string,
|
||||||
|
type: Toast['type'] = 'info',
|
||||||
|
duration = 3000,
|
||||||
|
): void {
|
||||||
|
if (!isPlatformBrowser(this.platformId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.document.defaultView?.sessionStorage.setItem(
|
||||||
|
PENDING_TOAST_STORAGE_KEY,
|
||||||
|
JSON.stringify({ message, type, duration }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
dismiss(id: string): void {
|
dismiss(id: string): void {
|
||||||
this.toastsSignal.update((toasts) => toasts.filter((t) => t.id !== id));
|
this.toastsSignal.update((toasts) => toasts.filter((t) => t.id !== id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private restorePendingToast(): void {
|
||||||
|
if (!isPlatformBrowser(this.platformId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const storage = this.document.defaultView?.sessionStorage;
|
||||||
|
const pendingToast = storage?.getItem(PENDING_TOAST_STORAGE_KEY);
|
||||||
|
|
||||||
|
if (!pendingToast) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
storage?.removeItem(PENDING_TOAST_STORAGE_KEY);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(pendingToast) as Partial<Toast>;
|
||||||
|
|
||||||
|
if (
|
||||||
|
typeof parsed.message === 'string' &&
|
||||||
|
(parsed.type === 'success' || parsed.type === 'danger' || parsed.type === 'info')
|
||||||
|
) {
|
||||||
|
this.show(parsed.message, parsed.type, parsed.duration);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Ignore malformed session data left by an older or interrupted client.
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,9 @@
|
|||||||
Abrir modal ancho
|
Abrir modal ancho
|
||||||
</app-button>
|
</app-button>
|
||||||
<app-button (click)="openSimpleModal()"> Abrir simple modal </app-button>
|
<app-button (click)="openSimpleModal()"> Abrir simple modal </app-button>
|
||||||
|
<app-button variant="secondary" (click)="openImageModal()">
|
||||||
|
Abrir visor de imagen
|
||||||
|
</app-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-showcase__result" data-testid="modal-last-result">
|
<div class="modal-showcase__result" data-testid="modal-last-result">
|
||||||
{{ lastModalResult }}
|
{{ lastModalResult }}
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ function createModalServiceStub() {
|
|||||||
open: vi.fn(),
|
open: vi.fn(),
|
||||||
openConfirm: vi.fn().mockReturnValue(of(true)),
|
openConfirm: vi.fn().mockReturnValue(of(true)),
|
||||||
openConfirmDelete: vi.fn().mockReturnValue(of(false)),
|
openConfirmDelete: vi.fn().mockReturnValue(of(false)),
|
||||||
|
openImage: vi.fn().mockReturnValue(of(undefined)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,6 +282,9 @@ describe('ReutilizablesTestPageComponent', () => {
|
|||||||
const deleteButton = buttons.find((button) =>
|
const deleteButton = buttons.find((button) =>
|
||||||
button.textContent?.includes('Abrir confirm delete'),
|
button.textContent?.includes('Abrir confirm delete'),
|
||||||
) as HTMLButtonElement;
|
) as HTMLButtonElement;
|
||||||
|
const imageButton = buttons.find((button) =>
|
||||||
|
button.textContent?.includes('Abrir visor de imagen'),
|
||||||
|
) as HTMLButtonElement;
|
||||||
|
|
||||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||||
'Todavia no se abrio ningun modal.',
|
'Todavia no se abrio ningun modal.',
|
||||||
@@ -290,6 +294,8 @@ describe('ReutilizablesTestPageComponent', () => {
|
|||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
deleteButton.click();
|
deleteButton.click();
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
imageButton.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
expect(modalServiceStub.openConfirm).toHaveBeenCalledWith({
|
expect(modalServiceStub.openConfirm).toHaveBeenCalledWith({
|
||||||
title: 'Confirmar accion',
|
title: 'Confirmar accion',
|
||||||
@@ -302,6 +308,11 @@ describe('ReutilizablesTestPageComponent', () => {
|
|||||||
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
'Esta accion eliminara el producto del catalogo. Podras volver a crearlo manualmente.',
|
||||||
confirmLabel: 'Eliminar',
|
confirmLabel: 'Eliminar',
|
||||||
});
|
});
|
||||||
|
expect(modalServiceStub.openImage).toHaveBeenCalledWith({
|
||||||
|
title: 'Mochila urbana roja',
|
||||||
|
src: '/images/carousel-mochila-roja.webp',
|
||||||
|
alt: 'Mochila urbana roja vista de frente',
|
||||||
|
});
|
||||||
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
expect(element.querySelector('[data-testid="modal-last-result"]')?.textContent).toContain(
|
||||||
'Resultado: false',
|
'Resultado: false',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -493,6 +493,14 @@ export class ReutilizablesTestPageComponent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected openImageModal(): void {
|
||||||
|
this.modalService.openImage({
|
||||||
|
title: 'Mochila urbana roja',
|
||||||
|
src: '/images/carousel-mochila-roja.webp',
|
||||||
|
alt: 'Mochila urbana roja vista de frente',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private openConfirmModal(config: Parameters<ModalService['openConfirm']>[0]): void {
|
private openConfirmModal(config: Parameters<ModalService['openConfirm']>[0]): void {
|
||||||
this.modalService.openConfirm(config).subscribe((confirmed) => {
|
this.modalService.openConfirm(config).subscribe((confirmed) => {
|
||||||
this.lastModalResult = `Resultado: ${confirmed}`;
|
this.lastModalResult = `Resultado: ${confirmed}`;
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { beforeEach, describe, expect, it } from 'vitest';
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
import { ProductAttribute } from '../../../../core/services/catalog/catalog.interface';
|
import {
|
||||||
|
CatalogItemVariant,
|
||||||
|
ProductAttribute,
|
||||||
|
} from '../../../../core/services/catalog/catalog.interface';
|
||||||
import { ProductAttributeSelectorComponent } from './product-attribute-selector.component';
|
import { ProductAttributeSelectorComponent } from './product-attribute-selector.component';
|
||||||
|
|
||||||
describe('ProductAttributeSelectorComponent', () => {
|
describe('ProductAttributeSelectorComponent', () => {
|
||||||
@@ -24,6 +27,63 @@ describe('ProductAttributeSelectorComponent', () => {
|
|||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it.each([{ size: { value: 'S', label: 'Small' } }, { size: [{ value: 'S', label: 'Small' }] }])(
|
||||||
|
'initializes and matches structured variant values: %j',
|
||||||
|
(values) => {
|
||||||
|
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||||
|
const variant: CatalogItemVariant = { id: 1, maximum_addable_quantity: null, values };
|
||||||
|
const emittedIds: Array<number | null> = [];
|
||||||
|
fixture.componentInstance.variantChange.subscribe((selected) =>
|
||||||
|
emittedIds.push(selected?.id ?? null),
|
||||||
|
);
|
||||||
|
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
||||||
|
fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
|
||||||
|
fixture.componentRef.setInput('variants', [variant]);
|
||||||
|
fixture.componentRef.setInput('selectedVariant', variant);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const button = fixture.nativeElement.querySelector(
|
||||||
|
'.attribute-selector__text-option',
|
||||||
|
) as HTMLButtonElement;
|
||||||
|
expect(button.getAttribute('aria-pressed')).toBe('true');
|
||||||
|
expect(button.disabled).toBe(false);
|
||||||
|
expect(emittedIds.at(-1)).toBe(1);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it.each([0, 2, null])(
|
||||||
|
'uses maximum quantity %s for alternatives to a preselected option',
|
||||||
|
(maximum) => {
|
||||||
|
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||||
|
const variants: CatalogItemVariant[] = [
|
||||||
|
{ id: 1, maximum_addable_quantity: 3, values: { size: { value: 'S', label: 'Small' } } },
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
maximum_addable_quantity: maximum,
|
||||||
|
values: { size: { value: 'M', label: 'Medium' } },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
const emittedIds: Array<number | null> = [];
|
||||||
|
fixture.componentInstance.variantChange.subscribe((variant) =>
|
||||||
|
emittedIds.push(variant?.id ?? null),
|
||||||
|
);
|
||||||
|
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
||||||
|
fixture.componentRef.setInput('inventoryPolicy', maximum === null ? 'unlimited' : 'tracked');
|
||||||
|
fixture.componentRef.setInput('variants', variants);
|
||||||
|
fixture.componentRef.setInput('selectedVariant', variants[0]);
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const buttons = fixture.nativeElement.querySelectorAll(
|
||||||
|
'.attribute-selector__text-option',
|
||||||
|
) as NodeListOf<HTMLButtonElement>;
|
||||||
|
expect(buttons[1].disabled).toBe(maximum === 0);
|
||||||
|
buttons[1].click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(emittedIds.at(-1)).toBe(maximum === 0 ? 1 : 2);
|
||||||
|
expect(buttons[0].disabled).toBe(false);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
it('keeps an unlimited option available when maximum quantity is null', () => {
|
it('keeps an unlimited option available when maximum quantity is null', () => {
|
||||||
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||||
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
fixture.componentRef.setInput('attributes', [sizeAttribute]);
|
||||||
@@ -94,7 +154,16 @@ describe('ProductAttributeSelectorComponent', () => {
|
|||||||
fixture.componentRef.setInput('variants', [
|
fixture.componentRef.setInput('variants', [
|
||||||
{ id: 1, maximum_addable_quantity: null, values: { event_date: '1' } },
|
{ id: 1, maximum_addable_quantity: null, values: { event_date: '1' } },
|
||||||
{ id: 2, maximum_addable_quantity: null, values: { event_date: '2' } },
|
{ id: 2, maximum_addable_quantity: null, values: { event_date: '2' } },
|
||||||
{ id: 3, maximum_addable_quantity: null, values: { event_date: ['1', '2'] } },
|
{
|
||||||
|
id: 3,
|
||||||
|
maximum_addable_quantity: null,
|
||||||
|
values: {
|
||||||
|
event_date: [
|
||||||
|
{ value: '1', label: '09/10/2026' },
|
||||||
|
{ value: '2', label: '10/10/2026' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
|||||||
@@ -51,22 +51,15 @@ export class ProductAttributeSelectorComponent {
|
|||||||
const optionNormalized = this.normalizeText(option.value || option.label);
|
const optionNormalized = this.normalizeText(option.value || option.label);
|
||||||
const selectedForAttribute = selections[attribute.codigo] ?? [];
|
const selectedForAttribute = selections[attribute.codigo] ?? [];
|
||||||
|
|
||||||
if (
|
|
||||||
!attribute.allow_multi_select &&
|
|
||||||
selectedForAttribute.length >= 1 &&
|
|
||||||
!selectedForAttribute.includes(option.id)
|
|
||||||
) {
|
|
||||||
availability[attribute.codigo][option.id] = false;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const isAvailable = variants.some((variant) => {
|
const isAvailable = variants.some((variant) => {
|
||||||
if (!this.isVariantAvailable(variant)) return false;
|
if (!this.isVariantAvailable(variant)) return false;
|
||||||
|
|
||||||
const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
|
const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
|
||||||
const desiredOptionIds = selectedForAttribute.includes(option.id)
|
const desiredOptionIds = !attribute.allow_multi_select
|
||||||
? selectedForAttribute
|
? [option.id]
|
||||||
: [...selectedForAttribute, option.id];
|
: selectedForAttribute.includes(option.id)
|
||||||
|
? selectedForAttribute
|
||||||
|
: [...selectedForAttribute, option.id];
|
||||||
const desiredValues = desiredOptionIds
|
const desiredValues = desiredOptionIds
|
||||||
.map((id) => attribute.options.find((candidate) => candidate.id === id))
|
.map((id) => attribute.options.find((candidate) => candidate.id === id))
|
||||||
.filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
|
.filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
|
||||||
@@ -202,7 +195,7 @@ export class ProductAttributeSelectorComponent {
|
|||||||
|
|
||||||
private getVariantAttributeValues(
|
private getVariantAttributeValues(
|
||||||
attribute: ProductAttribute,
|
attribute: ProductAttribute,
|
||||||
variantAttributes: Record<string, string | string[]>,
|
variantAttributes: CatalogItemVariant['values'],
|
||||||
): string[] {
|
): string[] {
|
||||||
const normalizedCodigo = this.normalizeText(attribute.codigo);
|
const normalizedCodigo = this.normalizeText(attribute.codigo);
|
||||||
const normalizedNombre = this.normalizeText(attribute.nombre);
|
const normalizedNombre = this.normalizeText(attribute.nombre);
|
||||||
@@ -211,7 +204,9 @@ export class ProductAttributeSelectorComponent {
|
|||||||
const normalizedKey = this.normalizeText(key);
|
const normalizedKey = this.normalizeText(key);
|
||||||
|
|
||||||
if (normalizedKey === normalizedCodigo || normalizedKey === normalizedNombre) {
|
if (normalizedKey === normalizedCodigo || normalizedKey === normalizedNombre) {
|
||||||
return (Array.isArray(value) ? value : [value]).map((item) => this.normalizeText(item));
|
return (Array.isArray(value) ? value : [value]).map((item) =>
|
||||||
|
this.normalizeText(typeof item === 'string' ? item : item.value || item.label),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
<!-- Thumbnails Row -->
|
<!-- Thumbnails Row -->
|
||||||
@if (images().length > 1) {
|
@if (images().length > 1) {
|
||||||
<div class="product-carousel__thumbnails">
|
<div class="product-carousel__thumbnails">
|
||||||
@for (image of images(); track image; let idx = $index) {
|
@for (image of images(); track $index; let idx = $index) {
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light"
|
class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light"
|
||||||
|
|||||||
@@ -159,6 +159,64 @@ describe('CheckoutPageComponent payment validation', () => {
|
|||||||
expect(component.checkoutRemainingTime()).toBe('10:00');
|
expect(component.checkoutRemainingTime()).toBe('10:00');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('checks the purchase when the countdown expires and redirects to the expired status', async () => {
|
||||||
|
const countdown = TestBed.inject(CheckoutCountdownService);
|
||||||
|
checkoutServiceStub.getPurchase.mockResolvedValue({ status: 'expired' });
|
||||||
|
const { fixture, component } = createComponent();
|
||||||
|
component.createdPurchase.set({
|
||||||
|
id: 25,
|
||||||
|
status: 'created',
|
||||||
|
expires_at: new Date(Date.now() + 1_000).toISOString(),
|
||||||
|
expires_in_seconds: 1,
|
||||||
|
server_time: new Date().toISOString(),
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
total: '0.00',
|
||||||
|
});
|
||||||
|
countdown.synchronize(component.createdPurchase());
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
await vi.advanceTimersByTimeAsync(1_000);
|
||||||
|
fixture.detectChanges();
|
||||||
|
await Promise.resolve();
|
||||||
|
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledOnce();
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledWith('tenant-test', 25);
|
||||||
|
expect(routerStub.navigate).toHaveBeenCalledWith(['/checkout/status', 25], {
|
||||||
|
queryParams: { status: 'expired' },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('checks the purchase only once when the expired countdown remains at zero', async () => {
|
||||||
|
const countdown = TestBed.inject(CheckoutCountdownService);
|
||||||
|
checkoutServiceStub.getPurchase.mockResolvedValue({
|
||||||
|
status: 'pending_payment',
|
||||||
|
expires_at: new Date(Date.now() - 1_000).toISOString(),
|
||||||
|
expires_in_seconds: 0,
|
||||||
|
server_time: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
const { fixture, component } = createComponent();
|
||||||
|
component.createdPurchase.set({
|
||||||
|
id: 25,
|
||||||
|
status: 'pending_payment',
|
||||||
|
expires_at: new Date(Date.now() - 1_000).toISOString(),
|
||||||
|
expires_in_seconds: 0,
|
||||||
|
server_time: new Date().toISOString(),
|
||||||
|
items: [],
|
||||||
|
subtotal: '0.00',
|
||||||
|
total: '0.00',
|
||||||
|
});
|
||||||
|
countdown.synchronize(component.createdPurchase());
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
await Promise.resolve();
|
||||||
|
fixture.detectChanges();
|
||||||
|
await vi.advanceTimersByTimeAsync(5_000);
|
||||||
|
|
||||||
|
expect(checkoutServiceStub.getPurchase).toHaveBeenCalledOnce();
|
||||||
|
expect(routerStub.navigate).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it('polls QR after five seconds and navigates only when payment is paid', async () => {
|
it('polls QR after five seconds and navigates only when payment is paid', async () => {
|
||||||
checkoutServiceStub.getPurchase
|
checkoutServiceStub.getPurchase
|
||||||
.mockResolvedValueOnce({ status: 'pending_payment' })
|
.mockResolvedValueOnce({ status: 'pending_payment' })
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {
|
|||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
Component,
|
Component,
|
||||||
computed,
|
computed,
|
||||||
|
effect,
|
||||||
inject,
|
inject,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnInit,
|
OnInit,
|
||||||
@@ -86,6 +87,7 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
private paymentMethodRequestId = 0;
|
private paymentMethodRequestId = 0;
|
||||||
private navigationStarted = false;
|
private navigationStarted = false;
|
||||||
private cancelPurchasePromise: Promise<boolean> | null = null;
|
private cancelPurchasePromise: Promise<boolean> | null = null;
|
||||||
|
private expirationCheckPurchaseId: number | null = null;
|
||||||
|
|
||||||
@ViewChild(StepperComponent) stepper!: StepperComponent;
|
@ViewChild(StepperComponent) stepper!: StepperComponent;
|
||||||
|
|
||||||
@@ -176,6 +178,28 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
);
|
);
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
|
effect(() => {
|
||||||
|
const remainingSeconds = this.checkoutCountdownService.remainingSeconds();
|
||||||
|
const purchaseId = this.createdPurchaseId() ?? this.createdPurchase()?.id ?? null;
|
||||||
|
|
||||||
|
if (remainingSeconds !== null && remainingSeconds > 0) {
|
||||||
|
this.expirationCheckPurchaseId = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
remainingSeconds !== 0 ||
|
||||||
|
purchaseId === null ||
|
||||||
|
this.navigationStarted ||
|
||||||
|
this.expirationCheckPurchaseId === purchaseId
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.expirationCheckPurchaseId = purchaseId;
|
||||||
|
void this.checkPurchaseAfterCountdownExpiration(purchaseId);
|
||||||
|
});
|
||||||
|
|
||||||
this.form.statusChanges
|
this.form.statusChanges
|
||||||
.pipe(startWith(this.form.status))
|
.pipe(startWith(this.form.status))
|
||||||
.subscribe(() => this.isStep1Valid.set(this.form.valid));
|
.subscribe(() => this.isStep1Valid.set(this.form.valid));
|
||||||
@@ -719,6 +743,35 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
|||||||
void this.router.navigate(['/checkout/status', purchaseId]);
|
void this.router.navigate(['/checkout/status', purchaseId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async checkPurchaseAfterCountdownExpiration(purchaseId: number): Promise<void> {
|
||||||
|
const tenant = this.tenantService.tenant();
|
||||||
|
|
||||||
|
if (!tenant || this.navigationStarted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const purchase = await this.checkoutService
|
||||||
|
.withCustomLoading()
|
||||||
|
.getPurchase(tenant.codigo, purchaseId);
|
||||||
|
|
||||||
|
if (this.navigationStarted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (purchase.status === 'expired') {
|
||||||
|
this.navigateToExpiredPurchaseStatus();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.checkoutCountdownService.synchronize(purchase);
|
||||||
|
} catch (error) {
|
||||||
|
if (this.isPurchaseExpiredError(error)) {
|
||||||
|
this.navigateToExpiredPurchaseStatus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async loadPurchase(purchaseId: number): Promise<void> {
|
private async loadPurchase(purchaseId: number): Promise<void> {
|
||||||
const tenant = this.tenantService.tenant();
|
const tenant = this.tenantService.tenant();
|
||||||
if (!tenant) {
|
if (!tenant) {
|
||||||
|
|||||||
@@ -3,11 +3,21 @@ import { provideRouter, Router } from '@angular/router';
|
|||||||
import { of, throwError } from 'rxjs';
|
import { of, throwError } from 'rxjs';
|
||||||
|
|
||||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
import { LoginPageComponent } from './login-page.component';
|
import { LoginPageComponent } from './login-page.component';
|
||||||
|
|
||||||
describe('LoginPageComponent', () => {
|
describe('LoginPageComponent', () => {
|
||||||
|
let toastService: {
|
||||||
|
danger: ReturnType<typeof vi.fn>;
|
||||||
|
showAfterReload: ReturnType<typeof vi.fn>;
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
TestBed.resetTestingModule();
|
TestBed.resetTestingModule();
|
||||||
|
toastService = {
|
||||||
|
danger: vi.fn(),
|
||||||
|
showAfterReload: vi.fn(),
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
it('submits credentials and redirects to home with a full page reload on success', async () => {
|
it('submits credentials and redirects to home with a full page reload on success', async () => {
|
||||||
@@ -16,14 +26,18 @@ describe('LoginPageComponent', () => {
|
|||||||
of({
|
of({
|
||||||
id: 1,
|
id: 1,
|
||||||
nombre_apellido: 'Ada Lovelace',
|
nombre_apellido: 'Ada Lovelace',
|
||||||
email: 'ada@example.com'
|
email: 'ada@example.com',
|
||||||
})
|
}),
|
||||||
)
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [LoginPageComponent],
|
imports: [LoginPageComponent],
|
||||||
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ToastService, useValue: toastService },
|
||||||
|
],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(LoginPageComponent);
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
@@ -34,17 +48,56 @@ describe('LoginPageComponent', () => {
|
|||||||
|
|
||||||
component.form.setValue({
|
component.form.setValue({
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'secret123'
|
password: 'secret123',
|
||||||
});
|
});
|
||||||
|
|
||||||
component.onSubmit();
|
component.onSubmit();
|
||||||
|
|
||||||
expect(authService.login).toHaveBeenCalledWith({
|
expect(authService.login).toHaveBeenCalledWith({
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'secret123'
|
password: 'secret123',
|
||||||
});
|
});
|
||||||
expect(redirectSpy).toHaveBeenCalled();
|
expect(redirectSpy).toHaveBeenCalled();
|
||||||
expect(navigateSpy).not.toHaveBeenCalled();
|
expect(navigateSpy).not.toHaveBeenCalled();
|
||||||
|
expect(toastService.showAfterReload).toHaveBeenCalledWith(
|
||||||
|
'Sesión iniciada correctamente.',
|
||||||
|
'success',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('serializes a stored return URL before reloading so tenant base paths are restored', async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [LoginPageComponent],
|
||||||
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: {} },
|
||||||
|
{ provide: ToastService, useValue: toastService },
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
|
const component = fixture.componentInstance as any;
|
||||||
|
const router = TestBed.inject(Router);
|
||||||
|
const assign = vi.fn();
|
||||||
|
const parsedUrl = router.parseUrl('/');
|
||||||
|
|
||||||
|
component.document = {
|
||||||
|
defaultView: {
|
||||||
|
sessionStorage: {
|
||||||
|
getItem: vi.fn().mockReturnValue('/'),
|
||||||
|
removeItem: vi.fn(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
location: { assign },
|
||||||
|
};
|
||||||
|
const parseUrlSpy = vi.spyOn(router, 'parseUrl').mockReturnValue(parsedUrl);
|
||||||
|
const serializeUrlSpy = vi.spyOn(router, 'serializeUrl').mockReturnValue('/sonder');
|
||||||
|
|
||||||
|
component.redirectToHome();
|
||||||
|
|
||||||
|
expect(parseUrlSpy).toHaveBeenCalledWith('/');
|
||||||
|
expect(serializeUrlSpy).toHaveBeenCalledWith(parsedUrl);
|
||||||
|
expect(assign).toHaveBeenCalledWith('/sonder');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('surfaces backend login errors', async () => {
|
it('surfaces backend login errors', async () => {
|
||||||
@@ -53,16 +106,20 @@ describe('LoginPageComponent', () => {
|
|||||||
throwError(() => ({
|
throwError(() => ({
|
||||||
error: {
|
error: {
|
||||||
errors: {
|
errors: {
|
||||||
email: ['Las credenciales son invalidas.']
|
email: ['Las credenciales son invalidas.'],
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}))
|
})),
|
||||||
)
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [LoginPageComponent],
|
imports: [LoginPageComponent],
|
||||||
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ToastService, useValue: toastService },
|
||||||
|
],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(LoginPageComponent);
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
@@ -70,22 +127,27 @@ describe('LoginPageComponent', () => {
|
|||||||
|
|
||||||
component.form.setValue({
|
component.form.setValue({
|
||||||
email: 'ada@example.com',
|
email: 'ada@example.com',
|
||||||
password: 'wrong-password'
|
password: 'wrong-password',
|
||||||
});
|
});
|
||||||
|
|
||||||
component.onSubmit();
|
component.onSubmit();
|
||||||
|
|
||||||
expect(component.serverError()).toBe('Las credenciales son invalidas.');
|
expect(component.serverError()).toBe('Las credenciales son invalidas.');
|
||||||
|
expect(toastService.danger).toHaveBeenCalledWith('Las credenciales son invalidas.');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('validates email length and password minimum length before submit', async () => {
|
it('validates email length and password minimum length before submit', async () => {
|
||||||
const authService = {
|
const authService = {
|
||||||
login: vi.fn()
|
login: vi.fn(),
|
||||||
};
|
};
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [LoginPageComponent],
|
imports: [LoginPageComponent],
|
||||||
providers: [provideRouter([]), { provide: AuthService, useValue: authService }]
|
providers: [
|
||||||
|
provideRouter([]),
|
||||||
|
{ provide: AuthService, useValue: authService },
|
||||||
|
{ provide: ToastService, useValue: toastService },
|
||||||
|
],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(LoginPageComponent);
|
const fixture = TestBed.createComponent(LoginPageComponent);
|
||||||
@@ -93,12 +155,15 @@ describe('LoginPageComponent', () => {
|
|||||||
|
|
||||||
component.form.setValue({
|
component.form.setValue({
|
||||||
email: `${'a'.repeat(250)}@example.com`,
|
email: `${'a'.repeat(250)}@example.com`,
|
||||||
password: '1234567'
|
password: '1234567',
|
||||||
});
|
});
|
||||||
component.onSubmit();
|
component.onSubmit();
|
||||||
|
|
||||||
expect(authService.login).not.toHaveBeenCalled();
|
expect(authService.login).not.toHaveBeenCalled();
|
||||||
expect(component.getControlError('email')).toBe('No puede superar los 255 caracteres.');
|
expect(component.getControlError('email')).toBe('No puede superar los 255 caracteres.');
|
||||||
expect(component.getControlError('password')).toBe('Debe tener al menos 8 caracteres.');
|
expect(component.getControlError('password')).toBe('Debe tener al menos 8 caracteres.');
|
||||||
|
expect(toastService.danger).toHaveBeenCalledWith(
|
||||||
|
'Revisá los datos ingresados para iniciar sesión.',
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
|||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
|
||||||
import { AuthService } from '../../../../core/services/auth/auth.service';
|
import { AuthService } from '../../../../core/services/auth/auth.service';
|
||||||
|
import { ToastService } from '../../../../core/services/toast.service';
|
||||||
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
import { ButtonComponent } from '../../../../shared/components/button/button.component';
|
||||||
import { InputComponent } from '../../../../shared/components/input/input.component';
|
import { InputComponent } from '../../../../shared/components/input/input.component';
|
||||||
|
|
||||||
@@ -16,13 +17,14 @@ const POST_LOGIN_RETURN_URL_KEY = 'shopit.auth.return-url';
|
|||||||
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
|
||||||
templateUrl: './login-page.component.html',
|
templateUrl: './login-page.component.html',
|
||||||
styleUrl: './login-page.component.scss',
|
styleUrl: './login-page.component.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class LoginPageComponent {
|
export class LoginPageComponent {
|
||||||
private readonly formBuilder = inject(FormBuilder);
|
private readonly formBuilder = inject(FormBuilder);
|
||||||
private readonly router = inject(Router);
|
private readonly router = inject(Router);
|
||||||
private readonly route = inject(ActivatedRoute);
|
private readonly route = inject(ActivatedRoute);
|
||||||
private readonly authService = inject(AuthService);
|
private readonly authService = inject(AuthService);
|
||||||
|
private readonly toastService = inject(ToastService);
|
||||||
private readonly document = inject(DOCUMENT);
|
private readonly document = inject(DOCUMENT);
|
||||||
private readonly platformId = inject(PLATFORM_ID);
|
private readonly platformId = inject(PLATFORM_ID);
|
||||||
|
|
||||||
@@ -32,7 +34,7 @@ export class LoginPageComponent {
|
|||||||
|
|
||||||
protected readonly form = this.formBuilder.nonNullable.group({
|
protected readonly form = this.formBuilder.nonNullable.group({
|
||||||
email: ['', [Validators.required, Validators.email, Validators.maxLength(EMAIL_MAX_LENGTH)]],
|
email: ['', [Validators.required, Validators.email, Validators.maxLength(EMAIL_MAX_LENGTH)]],
|
||||||
password: ['', [Validators.required, Validators.minLength(PASSWORD_MIN_LENGTH)]]
|
password: ['', [Validators.required, Validators.minLength(PASSWORD_MIN_LENGTH)]],
|
||||||
});
|
});
|
||||||
protected readonly submitted = this.submittedState.asReadonly();
|
protected readonly submitted = this.submittedState.asReadonly();
|
||||||
protected readonly serverError = this.serverErrorState.asReadonly();
|
protected readonly serverError = this.serverErrorState.asReadonly();
|
||||||
@@ -64,6 +66,7 @@ export class LoginPageComponent {
|
|||||||
|
|
||||||
if (this.form.invalid) {
|
if (this.form.invalid) {
|
||||||
this.form.markAllAsTouched();
|
this.form.markAllAsTouched();
|
||||||
|
this.toastService.danger('Revisá los datos ingresados para iniciar sesión.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,12 +75,13 @@ export class LoginPageComponent {
|
|||||||
this.authService.login(this.form.getRawValue()).subscribe({
|
this.authService.login(this.form.getRawValue()).subscribe({
|
||||||
next: () => {
|
next: () => {
|
||||||
this.isSubmittingState.set(false);
|
this.isSubmittingState.set(false);
|
||||||
|
this.toastService.showAfterReload('Sesión iniciada correctamente.', 'success');
|
||||||
this.redirectToHome();
|
this.redirectToHome();
|
||||||
},
|
},
|
||||||
error: (error: unknown) => {
|
error: (error: unknown) => {
|
||||||
this.isSubmittingState.set(false);
|
this.isSubmittingState.set(false);
|
||||||
this.serverErrorState.set(this.resolveErrorMessage(error));
|
this.showLoginError(error);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,7 +95,7 @@ export class LoginPageComponent {
|
|||||||
}
|
}
|
||||||
this.authService.loginWithGoogle();
|
this.authService.loginWithGoogle();
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
this.serverErrorState.set(this.resolveErrorMessage(error));
|
this.showLoginError(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,10 +143,9 @@ export class LoginPageComponent {
|
|||||||
const requestedUrl =
|
const requestedUrl =
|
||||||
this.route.snapshot.queryParamMap.get('returnUrl') ??
|
this.route.snapshot.queryParamMap.get('returnUrl') ??
|
||||||
this.document.defaultView?.sessionStorage.getItem(POST_LOGIN_RETURN_URL_KEY);
|
this.document.defaultView?.sessionStorage.getItem(POST_LOGIN_RETURN_URL_KEY);
|
||||||
const destination =
|
const internalDestination =
|
||||||
requestedUrl?.startsWith('/') && !requestedUrl.startsWith('//')
|
requestedUrl?.startsWith('/') && !requestedUrl.startsWith('//') ? requestedUrl : '/';
|
||||||
? requestedUrl
|
const destination = this.router.serializeUrl(this.router.parseUrl(internalDestination));
|
||||||
: this.router.serializeUrl(this.router.createUrlTree(['/']));
|
|
||||||
|
|
||||||
this.document.defaultView?.sessionStorage.removeItem(POST_LOGIN_RETURN_URL_KEY);
|
this.document.defaultView?.sessionStorage.removeItem(POST_LOGIN_RETURN_URL_KEY);
|
||||||
this.document.location.assign(destination);
|
this.document.location.assign(destination);
|
||||||
@@ -155,15 +158,22 @@ export class LoginPageComponent {
|
|||||||
this.authService.completeGoogleLogin(oauthCode).subscribe({
|
this.authService.completeGoogleLogin(oauthCode).subscribe({
|
||||||
next: () => {
|
next: () => {
|
||||||
this.isSubmittingState.set(false);
|
this.isSubmittingState.set(false);
|
||||||
|
this.toastService.showAfterReload('Sesión iniciada correctamente.', 'success');
|
||||||
this.redirectToHome();
|
this.redirectToHome();
|
||||||
},
|
},
|
||||||
error: (error: unknown) => {
|
error: (error: unknown) => {
|
||||||
this.isSubmittingState.set(false);
|
this.isSubmittingState.set(false);
|
||||||
this.serverErrorState.set(this.resolveErrorMessage(error));
|
this.showLoginError(error);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private showLoginError(error: unknown): void {
|
||||||
|
const message = this.resolveErrorMessage(error);
|
||||||
|
this.serverErrorState.set(message);
|
||||||
|
this.toastService.danger(message);
|
||||||
|
}
|
||||||
|
|
||||||
private resolveErrorMessage(error: unknown): string {
|
private resolveErrorMessage(error: unknown): string {
|
||||||
const errorPayload =
|
const errorPayload =
|
||||||
typeof error === 'object' && error !== null && 'error' in error
|
typeof error === 'object' && error !== null && 'error' in error
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
No hay productos disponibles en este momento.
|
No hay productos disponibles en este momento.
|
||||||
</p>
|
</p>
|
||||||
} @else {
|
} @else {
|
||||||
@for (group of catalog(); track group.id) {
|
@for (group of catalog(); track group.id; let first = $first) {
|
||||||
<app-store-section [attr.id]="group.code" [title]="group.title">
|
<app-store-section [attr.id]="group.code" [title]="group.title">
|
||||||
<app-product-list
|
<app-product-list
|
||||||
[layout]="group.layout"
|
[layout]="group.layout"
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
[items]="group.items"
|
[items]="group.items"
|
||||||
[loading]="isGroupLoading(group.id)"
|
[loading]="isGroupLoading(group.id)"
|
||||||
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
|
[loadImages]="!hasMainCarouselImages() || mainCarouselReady()"
|
||||||
|
[prioritizeFirstImage]="first && !hasMainCarouselImages()"
|
||||||
[unavailableVariantIds]="unavailableVariantIds()"
|
[unavailableVariantIds]="unavailableVariantIds()"
|
||||||
[savingProductIds]="savingProductIds()"
|
[savingProductIds]="savingProductIds()"
|
||||||
(buy)="onBuyProduct($event)"
|
(buy)="onBuyProduct($event)"
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
<div class="hero-banner-container">
|
<div class="hero-banner-container">
|
||||||
<div class="hero-banner position-relative rounded">
|
<div
|
||||||
|
class="hero-banner position-relative rounded"
|
||||||
|
[class.hero-banner--with-media]="desktopImageUrl"
|
||||||
|
>
|
||||||
@if (desktopImageUrl) {
|
@if (desktopImageUrl) {
|
||||||
<picture class="hero-media" aria-hidden="true">
|
<picture class="hero-media" aria-hidden="true">
|
||||||
@if (mobileImageUrl) {
|
@if (mobileImageUrl) {
|
||||||
|
|||||||
@@ -7,23 +7,23 @@
|
|||||||
min-height: 400px;
|
min-height: 400px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
||||||
|
&--with-media {
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-media {
|
.hero-media {
|
||||||
position: absolute;
|
position: relative;
|
||||||
inset: 0;
|
|
||||||
display: block;
|
display: block;
|
||||||
|
width: 100%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background-position: center;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-size: cover;
|
|
||||||
border-radius: inherit;
|
border-radius: inherit;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: auto;
|
||||||
object-fit: cover;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
@@ -52,6 +52,11 @@
|
|||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hero-banner--with-media .hero-content {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
}
|
||||||
|
|
||||||
::ng-deep .hero-title,
|
::ng-deep .hero-title,
|
||||||
.hero-title {
|
.hero-title {
|
||||||
color: #666666;
|
color: #666666;
|
||||||
@@ -179,24 +184,29 @@
|
|||||||
inset: auto;
|
inset: auto;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: clamp(8.75rem, 44vw, 211px);
|
overflow: visible;
|
||||||
background-position: center center;
|
|
||||||
background-size: 140% auto;
|
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-media::after {
|
.hero-media::after {
|
||||||
top: auto;
|
top: auto;
|
||||||
height: 48%;
|
bottom: -2px;
|
||||||
|
height: calc(48% + 2px);
|
||||||
background: linear-gradient(
|
background: linear-gradient(
|
||||||
to bottom,
|
to bottom,
|
||||||
rgba(245, 245, 245, 0) 0%,
|
rgba(245, 245, 245, 0) 0%,
|
||||||
rgba(245, 245, 245, 0.78) 55%,
|
rgba(245, 245, 245, 0.78) 55%,
|
||||||
|
#f5f5f5 96%,
|
||||||
#f5f5f5 100%
|
#f5f5f5 100%
|
||||||
);
|
);
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hero-banner--with-media .hero-content {
|
||||||
|
position: relative;
|
||||||
|
inset: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.hero-content {
|
.hero-content {
|
||||||
justify-content: center !important;
|
justify-content: center !important;
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
|
|||||||
@@ -22,6 +22,21 @@ describe('HeroBannerComponent', () => {
|
|||||||
expect(element.querySelector('img')?.getAttribute('src')).toBe(
|
expect(element.querySelector('img')?.getAttribute('src')).toBe(
|
||||||
'https://example.com/desktop.jpg',
|
'https://example.com/desktop.jpg',
|
||||||
);
|
);
|
||||||
|
expect(element.querySelector('.hero-banner')?.classList).toContain(
|
||||||
|
'hero-banner--with-media',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the fallback banner sizing when there is no image', async () => {
|
||||||
|
await TestBed.configureTestingModule({ imports: [HeroBannerComponent] }).compileComponents();
|
||||||
|
|
||||||
|
const fixture = TestBed.createComponent(HeroBannerComponent);
|
||||||
|
fixture.componentRef.setInput('heroConfig', { title_html: 'Banner sin imagen' });
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const banner = (fixture.nativeElement as HTMLElement).querySelector('.hero-banner');
|
||||||
|
|
||||||
|
expect(banner?.classList).not.toContain('hero-banner--with-media');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('expands and collapses the event schedules', async () => {
|
it('expands and collapses the event schedules', async () => {
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<div
|
||||||
|
class="image-modal"
|
||||||
|
[class.image-modal--gesturing]="gestureActive()"
|
||||||
|
[class.image-modal--settling]="swipeSettling()"
|
||||||
|
[style.transform]="swipeTransform()"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
#viewport
|
||||||
|
class="image-modal__viewport"
|
||||||
|
[class.image-modal__viewport--zoomed]="zoom() > data.minZoom"
|
||||||
|
(wheel)="onWheel($event)"
|
||||||
|
(dblclick)="onDoubleClick($event)"
|
||||||
|
(pointerdown)="onPointerDown($event)"
|
||||||
|
(pointermove)="onPointerMove($event)"
|
||||||
|
(pointerup)="onPointerUp($event)"
|
||||||
|
(pointercancel)="onPointerUp($event)"
|
||||||
|
>
|
||||||
|
@if (!imageFailed()) {
|
||||||
|
<img
|
||||||
|
#image
|
||||||
|
class="image-modal__image"
|
||||||
|
[src]="data.src"
|
||||||
|
[alt]="data.alt"
|
||||||
|
[style.transform]="transform()"
|
||||||
|
decoding="async"
|
||||||
|
draggable="false"
|
||||||
|
(load)="onImageLoad()"
|
||||||
|
(error)="imageFailed.set(true)"
|
||||||
|
/>
|
||||||
|
} @else {
|
||||||
|
<p class="image-modal__error" role="alert">No se pudo cargar la imagen.</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="image-modal__controls" aria-label="Controles de zoom">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="image-modal__control"
|
||||||
|
aria-label="Alejar"
|
||||||
|
[disabled]="zoom() <= data.minZoom"
|
||||||
|
(click)="zoomOut()"
|
||||||
|
>
|
||||||
|
−
|
||||||
|
</button>
|
||||||
|
<button type="button" class="image-modal__zoom" aria-label="Restablecer zoom" (click)="reset()">
|
||||||
|
{{ zoomLabel() }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="image-modal__control"
|
||||||
|
aria-label="Acercar"
|
||||||
|
[disabled]="zoom() >= data.maxZoom"
|
||||||
|
(click)="zoomIn()"
|
||||||
|
>
|
||||||
|
+
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
146
src/app/shared/components/image-modal/image-modal.component.scss
Normal file
146
src/app/shared/components/image-modal/image-modal.component.scss
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
:host {
|
||||||
|
display: flex;
|
||||||
|
min-height: 0;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 0;
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
background: black;
|
||||||
|
transform-origin: center top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal--settling {
|
||||||
|
transition: transform 180ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal--gesturing {
|
||||||
|
will-change: transform;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__viewport {
|
||||||
|
display: flex;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 0;
|
||||||
|
flex: 1;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
overflow: hidden;
|
||||||
|
cursor: zoom-in;
|
||||||
|
touch-action: none;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__viewport--zoomed {
|
||||||
|
cursor: grab;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__viewport--zoomed:active {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__image {
|
||||||
|
display: block;
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
object-fit: contain;
|
||||||
|
transform-origin: center;
|
||||||
|
transition: transform 120ms ease-out;
|
||||||
|
-webkit-user-drag: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal--gesturing .image-modal__image {
|
||||||
|
transition: none;
|
||||||
|
will-change: transform;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__viewport:active .image-modal__image {
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__error {
|
||||||
|
margin: 1rem;
|
||||||
|
color: #ffffff;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__controls {
|
||||||
|
position: absolute;
|
||||||
|
right: 50%;
|
||||||
|
bottom: max(1.25rem, env(safe-area-inset-bottom));
|
||||||
|
z-index: 1;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
overflow: hidden;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.25);
|
||||||
|
border-radius: 2rem;
|
||||||
|
background: rgba(20, 20, 20, 0.78);
|
||||||
|
box-shadow: 0 0.25rem 1rem rgba(0, 0, 0, 0.3);
|
||||||
|
transform: translateX(50%);
|
||||||
|
backdrop-filter: blur(0.5rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__control,
|
||||||
|
.image-modal__zoom {
|
||||||
|
display: inline-flex;
|
||||||
|
height: 2.75rem;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border: 0;
|
||||||
|
color: #ffffff;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__control {
|
||||||
|
width: 2.75rem;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__zoom {
|
||||||
|
min-width: 4rem;
|
||||||
|
padding: 0 0.5rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__control:hover:not(:disabled),
|
||||||
|
.image-modal__zoom:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__control:focus-visible,
|
||||||
|
.image-modal__zoom:focus-visible {
|
||||||
|
outline: 2px solid #ffffff;
|
||||||
|
outline-offset: -3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.image-modal__control:disabled {
|
||||||
|
opacity: 0.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 576px) {
|
||||||
|
.image-modal__controls {
|
||||||
|
bottom: max(1rem, env(safe-area-inset-bottom));
|
||||||
|
background: rgba(20, 20, 20, 0.94);
|
||||||
|
backdrop-filter: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (pointer: coarse) {
|
||||||
|
.image-modal__controls {
|
||||||
|
background: rgba(20, 20, 20, 0.94);
|
||||||
|
backdrop-filter: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.image-modal__image {
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
import '@angular/compiler';
|
||||||
|
import { ComponentFixture, TestBed, getTestBed } from '@angular/core/testing';
|
||||||
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
||||||
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { ImageModalData, MODAL_DATA, ModalRef } from '../../../core/services/modal.service';
|
||||||
|
import { ImageModalComponent } from './image-modal.component';
|
||||||
|
|
||||||
|
describe('ImageModalComponent', () => {
|
||||||
|
let fixture: ComponentFixture<ImageModalComponent>;
|
||||||
|
const modalRef = { dismiss: vi.fn() };
|
||||||
|
const data: ImageModalData = {
|
||||||
|
src: '/images/producto.webp',
|
||||||
|
alt: 'Vista frontal del producto',
|
||||||
|
initialZoom: 1,
|
||||||
|
minZoom: 1,
|
||||||
|
maxZoom: 2,
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
try {
|
||||||
|
getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
|
||||||
|
} catch {
|
||||||
|
// Test environment may already be initialized by another setup entrypoint.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
modalRef.dismiss.mockReset();
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [ImageModalComponent],
|
||||||
|
providers: [
|
||||||
|
{ provide: MODAL_DATA, useValue: data },
|
||||||
|
{ provide: ModalRef, useValue: modalRef },
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ImageModalComponent);
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
fixture.destroy();
|
||||||
|
TestBed.resetTestingModule();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders the image and accessible zoom controls', () => {
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const image = element.querySelector('img') as HTMLImageElement;
|
||||||
|
|
||||||
|
expect(image.getAttribute('src')).toBe('/images/producto.webp');
|
||||||
|
expect(image.alt).toBe('Vista frontal del producto');
|
||||||
|
expect(element.querySelector('[aria-label="Acercar"]')).not.toBeNull();
|
||||||
|
expect(element.querySelector('[aria-label="Alejar"]')).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('zooms with controls, respects limits, and resets', () => {
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const zoomIn = element.querySelector('[aria-label="Acercar"]') as HTMLButtonElement;
|
||||||
|
const zoomOut = element.querySelector('[aria-label="Alejar"]') as HTMLButtonElement;
|
||||||
|
const reset = element.querySelector('[aria-label="Restablecer zoom"]') as HTMLButtonElement;
|
||||||
|
|
||||||
|
zoomIn.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(reset.textContent).toContain('150%');
|
||||||
|
expect(zoomOut.disabled).toBe(false);
|
||||||
|
|
||||||
|
zoomIn.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(reset.textContent).toContain('200%');
|
||||||
|
expect(zoomIn.disabled).toBe(true);
|
||||||
|
|
||||||
|
reset.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(reset.textContent).toContain('100%');
|
||||||
|
expect(zoomOut.disabled).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('supports pinch zoom through touch pointer events', async () => {
|
||||||
|
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||||
|
const zoom = fixture.nativeElement.querySelector(
|
||||||
|
'[aria-label="Restablecer zoom"]',
|
||||||
|
) as HTMLButtonElement;
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 100, 100));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerdown', 2, 200, 100));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointermove', 2, 250, 100));
|
||||||
|
await renderNextFrame();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(zoom.textContent).toContain('150%');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('dismisses with a downward swipe while the image is at its base zoom', async () => {
|
||||||
|
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||||
|
const modal = fixture.nativeElement.querySelector('.image-modal') as HTMLElement;
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointermove', 1, 155, 230));
|
||||||
|
await renderNextFrame();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(modal.style.transform).toBe('translate3d(0, 130px, 0)');
|
||||||
|
expect(Number(modal.style.opacity)).toBeLessThan(1);
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerup', 1, 155, 230));
|
||||||
|
|
||||||
|
expect(modalRef.dismiss).toHaveBeenCalledWith('swipe');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns smoothly to its position when the swipe is too short', async () => {
|
||||||
|
const viewport = fixture.nativeElement.querySelector('.image-modal__viewport') as HTMLElement;
|
||||||
|
const modal = fixture.nativeElement.querySelector('.image-modal') as HTMLElement;
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointermove', 1, 150, 160));
|
||||||
|
await renderNextFrame();
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect(modal.style.transform).toBe('translate3d(0, 60px, 0)');
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerup', 1, 150, 160));
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(modalRef.dismiss).not.toHaveBeenCalled();
|
||||||
|
expect(modal.classList.contains('image-modal--settling')).toBe(true);
|
||||||
|
expect(modal.style.transform).toBe('translate3d(0, 0px, 0)');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not dismiss with a downward gesture while the image is zoomed', () => {
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
const viewport = element.querySelector('.image-modal__viewport') as HTMLElement;
|
||||||
|
const zoomIn = element.querySelector('[aria-label="Acercar"]') as HTMLButtonElement;
|
||||||
|
zoomIn.click();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerdown', 1, 150, 100));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointermove', 1, 155, 230));
|
||||||
|
viewport.dispatchEvent(pointerEvent('pointerup', 1, 155, 230));
|
||||||
|
|
||||||
|
expect(modalRef.dismiss).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a fallback when the image cannot be loaded', () => {
|
||||||
|
const image = fixture.nativeElement.querySelector('img') as HTMLImageElement;
|
||||||
|
image.dispatchEvent(new Event('error'));
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
expect(fixture.nativeElement.querySelector('[role="alert"]')?.textContent).toContain(
|
||||||
|
'No se pudo cargar la imagen',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function pointerEvent(type: string, pointerId: number, clientX: number, clientY: number): Event {
|
||||||
|
const event = new MouseEvent(type, { bubbles: true, clientX, clientY });
|
||||||
|
Object.defineProperties(event, {
|
||||||
|
pointerId: { value: pointerId },
|
||||||
|
pointerType: { value: 'touch' },
|
||||||
|
});
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function renderNextFrame(): Promise<void> {
|
||||||
|
await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
|
||||||
|
}
|
||||||
395
src/app/shared/components/image-modal/image-modal.component.ts
Normal file
395
src/app/shared/components/image-modal/image-modal.component.ts
Normal file
@@ -0,0 +1,395 @@
|
|||||||
|
import {
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
DestroyRef,
|
||||||
|
ElementRef,
|
||||||
|
computed,
|
||||||
|
inject,
|
||||||
|
signal,
|
||||||
|
viewChild,
|
||||||
|
} from '@angular/core';
|
||||||
|
|
||||||
|
import { ImageModalData, MODAL_DATA, ModalRef } from '../../../core/services/modal.service';
|
||||||
|
|
||||||
|
const SWIPE_DISMISS_DISTANCE = 100;
|
||||||
|
const SWIPE_DIRECTION_RATIO = 1.25;
|
||||||
|
|
||||||
|
interface Point {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ViewerGeometry {
|
||||||
|
imageHeight: number;
|
||||||
|
imageWidth: number;
|
||||||
|
viewportHeight: number;
|
||||||
|
viewportLeft: number;
|
||||||
|
viewportTop: number;
|
||||||
|
viewportWidth: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-image-modal',
|
||||||
|
templateUrl: './image-modal.component.html',
|
||||||
|
styleUrl: './image-modal.component.scss',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class ImageModalComponent {
|
||||||
|
protected readonly data = inject<ImageModalData>(MODAL_DATA);
|
||||||
|
private readonly modalRef = inject<ModalRef<void>>(ModalRef);
|
||||||
|
private readonly destroyRef = inject(DestroyRef);
|
||||||
|
private readonly viewport = viewChild.required<ElementRef<HTMLElement>>('viewport');
|
||||||
|
private readonly image = viewChild<ElementRef<HTMLImageElement>>('image');
|
||||||
|
private readonly pointers = new Map<number, Point>();
|
||||||
|
|
||||||
|
protected readonly zoom = signal(this.data.initialZoom);
|
||||||
|
protected readonly offsetX = signal(0);
|
||||||
|
protected readonly offsetY = signal(0);
|
||||||
|
protected readonly imageFailed = signal(false);
|
||||||
|
protected readonly swipeOffsetY = signal(0);
|
||||||
|
protected readonly swipeSettling = signal(false);
|
||||||
|
protected readonly gestureActive = signal(false);
|
||||||
|
protected readonly transform = computed(
|
||||||
|
() => `translate3d(${this.offsetX()}px, ${this.offsetY()}px, 0) scale(${this.zoom()})`,
|
||||||
|
);
|
||||||
|
protected readonly zoomLabel = computed(() => `${Math.round(this.zoom() * 100)}%`);
|
||||||
|
protected readonly swipeTransform = computed(() => `translate3d(0, ${this.swipeOffsetY()}px, 0)`);
|
||||||
|
|
||||||
|
private dragStart: Point | null = null;
|
||||||
|
private dragOffset: Point = { x: 0, y: 0 };
|
||||||
|
private pinchDistance = 0;
|
||||||
|
private pinchZoom = 1;
|
||||||
|
private pinchLocal: Point = { x: 0, y: 0 };
|
||||||
|
private pointerDownAt: Point | null = null;
|
||||||
|
private gestureMoved = false;
|
||||||
|
private hadMultiplePointers = false;
|
||||||
|
private lastTapAt = 0;
|
||||||
|
private swipeStart: Point | null = null;
|
||||||
|
private geometry: ViewerGeometry | null = null;
|
||||||
|
private animationFrameId: number | null = null;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.destroyRef.onDestroy(() => this.cancelGestureFrame());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected zoomIn(): void {
|
||||||
|
this.setZoomAt(Math.min(this.data.maxZoom, this.zoom() + 0.5));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected zoomOut(): void {
|
||||||
|
this.setZoomAt(Math.max(this.data.minZoom, this.zoom() - 0.5));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected reset(): void {
|
||||||
|
this.zoom.set(this.data.initialZoom);
|
||||||
|
this.offsetX.set(0);
|
||||||
|
this.offsetY.set(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onWheel(event: WheelEvent): void {
|
||||||
|
event.preventDefault();
|
||||||
|
const factor = event.deltaY < 0 ? 1.15 : 1 / 1.15;
|
||||||
|
this.setZoomAt(this.zoom() * factor, event.clientX, event.clientY);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onDoubleClick(event: MouseEvent): void {
|
||||||
|
this.toggleZoom(event.clientX, event.clientY);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onPointerDown(event: PointerEvent): void {
|
||||||
|
if (event.pointerType === 'mouse' && event.button !== 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
event.preventDefault();
|
||||||
|
if (this.pointers.size === 0) {
|
||||||
|
this.refreshGeometry();
|
||||||
|
this.gestureActive.set(true);
|
||||||
|
}
|
||||||
|
this.viewport().nativeElement.setPointerCapture?.(event.pointerId);
|
||||||
|
const point = { x: event.clientX, y: event.clientY };
|
||||||
|
this.pointers.set(event.pointerId, point);
|
||||||
|
this.pointerDownAt = point;
|
||||||
|
this.gestureMoved = false;
|
||||||
|
|
||||||
|
if (this.pointers.size === 1) {
|
||||||
|
this.swipeSettling.set(false);
|
||||||
|
this.dragStart = point;
|
||||||
|
this.dragOffset = { x: this.offsetX(), y: this.offsetY() };
|
||||||
|
this.swipeStart =
|
||||||
|
event.pointerType === 'touch' && this.zoom() <= this.data.minZoom + 0.01 ? point : null;
|
||||||
|
} else if (this.pointers.size === 2) {
|
||||||
|
this.hadMultiplePointers = true;
|
||||||
|
this.swipeStart = null;
|
||||||
|
this.swipeOffsetY.set(0);
|
||||||
|
this.beginPinch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onPointerMove(event: PointerEvent): void {
|
||||||
|
if (!this.pointers.has(event.pointerId)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const point = { x: event.clientX, y: event.clientY };
|
||||||
|
this.pointers.set(event.pointerId, point);
|
||||||
|
|
||||||
|
if (this.pointerDownAt && this.distance(this.pointerDownAt, point) > 4) {
|
||||||
|
this.gestureMoved = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.scheduleGestureFrame();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onPointerUp(event: PointerEvent): void {
|
||||||
|
const wasTouch = event.pointerType === 'touch';
|
||||||
|
const trackedPoint = this.pointers.get(event.pointerId);
|
||||||
|
const endPoint = trackedPoint ? { x: event.clientX, y: event.clientY } : null;
|
||||||
|
if (endPoint) {
|
||||||
|
this.pointers.set(event.pointerId, endPoint);
|
||||||
|
if (this.animationFrameId !== null) {
|
||||||
|
this.flushGestureFrame();
|
||||||
|
} else {
|
||||||
|
this.applyPointerMovement();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const shouldDismiss =
|
||||||
|
event.type === 'pointerup' &&
|
||||||
|
wasTouch &&
|
||||||
|
endPoint !== null &&
|
||||||
|
this.isSwipeDown(this.swipeStart, endPoint);
|
||||||
|
this.pointers.delete(event.pointerId);
|
||||||
|
const viewport = this.viewport().nativeElement;
|
||||||
|
if (viewport.hasPointerCapture?.(event.pointerId)) {
|
||||||
|
viewport.releasePointerCapture(event.pointerId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (shouldDismiss) {
|
||||||
|
this.resetGesture();
|
||||||
|
this.modalRef.dismiss('swipe');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wasTouch && endPoint && !this.gestureMoved && !this.hadMultiplePointers) {
|
||||||
|
const now = Date.now();
|
||||||
|
if (now - this.lastTapAt < 300) {
|
||||||
|
this.toggleZoom(endPoint.x, endPoint.y);
|
||||||
|
this.lastTapAt = 0;
|
||||||
|
} else {
|
||||||
|
this.lastTapAt = now;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.pointers.size === 1) {
|
||||||
|
const remaining = [...this.pointers.values()][0];
|
||||||
|
this.dragStart = remaining;
|
||||||
|
this.dragOffset = { x: this.offsetX(), y: this.offsetY() };
|
||||||
|
} else if (this.pointers.size === 0) {
|
||||||
|
this.dragStart = null;
|
||||||
|
this.pointerDownAt = null;
|
||||||
|
this.hadMultiplePointers = false;
|
||||||
|
this.swipeStart = null;
|
||||||
|
this.gestureActive.set(false);
|
||||||
|
if (this.swipeOffsetY() > 0) {
|
||||||
|
this.swipeSettling.set(true);
|
||||||
|
this.swipeOffsetY.set(0);
|
||||||
|
}
|
||||||
|
this.clampOffset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onImageLoad(): void {
|
||||||
|
this.imageFailed.set(false);
|
||||||
|
this.refreshGeometry();
|
||||||
|
this.clampOffset();
|
||||||
|
}
|
||||||
|
|
||||||
|
private beginPinch(): void {
|
||||||
|
const [first, second] = [...this.pointers.values()];
|
||||||
|
const midpoint = this.midpoint(first, second);
|
||||||
|
const geometry = this.geometry ?? this.refreshGeometry();
|
||||||
|
if (!geometry) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pinchDistance = Math.max(1, this.distance(first, second));
|
||||||
|
this.pinchZoom = this.zoom();
|
||||||
|
this.pinchLocal = {
|
||||||
|
x:
|
||||||
|
(midpoint.x - (geometry.viewportLeft + geometry.viewportWidth / 2) - this.offsetX()) /
|
||||||
|
this.zoom(),
|
||||||
|
y:
|
||||||
|
(midpoint.y - (geometry.viewportTop + geometry.viewportHeight / 2) - this.offsetY()) /
|
||||||
|
this.zoom(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private toggleZoom(clientX?: number, clientY?: number): void {
|
||||||
|
const target =
|
||||||
|
this.zoom() > this.data.minZoom + 0.01
|
||||||
|
? this.data.minZoom
|
||||||
|
: Math.min(this.data.maxZoom, Math.max(2, this.data.minZoom));
|
||||||
|
this.setZoomAt(target, clientX, clientY);
|
||||||
|
}
|
||||||
|
|
||||||
|
private setZoomAt(value: number, clientX?: number, clientY?: number): void {
|
||||||
|
const nextZoom = this.clampZoom(value);
|
||||||
|
const currentZoom = this.zoom();
|
||||||
|
const geometry = this.refreshGeometry();
|
||||||
|
|
||||||
|
if (clientX !== undefined && clientY !== undefined && currentZoom > 0 && geometry) {
|
||||||
|
const pointX = clientX - (geometry.viewportLeft + geometry.viewportWidth / 2);
|
||||||
|
const pointY = clientY - (geometry.viewportTop + geometry.viewportHeight / 2);
|
||||||
|
const localX = (pointX - this.offsetX()) / currentZoom;
|
||||||
|
const localY = (pointY - this.offsetY()) / currentZoom;
|
||||||
|
this.offsetX.set(pointX - localX * nextZoom);
|
||||||
|
this.offsetY.set(pointY - localY * nextZoom);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.zoom.set(nextZoom);
|
||||||
|
if (nextZoom <= this.data.minZoom) {
|
||||||
|
this.offsetX.set(0);
|
||||||
|
this.offsetY.set(0);
|
||||||
|
}
|
||||||
|
this.clampOffset();
|
||||||
|
}
|
||||||
|
|
||||||
|
private clampZoom(value: number): number {
|
||||||
|
return Math.min(this.data.maxZoom, Math.max(this.data.minZoom, value));
|
||||||
|
}
|
||||||
|
|
||||||
|
private clampOffset(): void {
|
||||||
|
const geometry = this.geometry;
|
||||||
|
if (!geometry) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxX = Math.max(0, (geometry.imageWidth * this.zoom() - geometry.viewportWidth) / 2);
|
||||||
|
const maxY = Math.max(0, (geometry.imageHeight * this.zoom() - geometry.viewportHeight) / 2);
|
||||||
|
|
||||||
|
this.offsetX.set(Math.min(maxX, Math.max(-maxX, this.offsetX())));
|
||||||
|
this.offsetY.set(Math.min(maxY, Math.max(-maxY, this.offsetY())));
|
||||||
|
}
|
||||||
|
|
||||||
|
private midpoint(first: Point, second: Point): Point {
|
||||||
|
return { x: (first.x + second.x) / 2, y: (first.y + second.y) / 2 };
|
||||||
|
}
|
||||||
|
|
||||||
|
private distance(first: Point, second: Point): number {
|
||||||
|
return Math.hypot(second.x - first.x, second.y - first.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
private isSwipeDown(start: Point | null, end: Point): boolean {
|
||||||
|
if (!start || this.hadMultiplePointers || this.zoom() > this.data.minZoom + 0.01) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const deltaX = Math.abs(end.x - start.x);
|
||||||
|
const deltaY = end.y - start.y;
|
||||||
|
return deltaY >= SWIPE_DISMISS_DISTANCE && deltaY >= deltaX * SWIPE_DIRECTION_RATIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
private resetGesture(): void {
|
||||||
|
this.cancelGestureFrame();
|
||||||
|
this.pointers.clear();
|
||||||
|
this.dragStart = null;
|
||||||
|
this.pointerDownAt = null;
|
||||||
|
this.swipeStart = null;
|
||||||
|
this.hadMultiplePointers = false;
|
||||||
|
this.gestureActive.set(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private scheduleGestureFrame(): void {
|
||||||
|
if (this.animationFrameId !== null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.animationFrameId = requestAnimationFrame(() => {
|
||||||
|
this.animationFrameId = null;
|
||||||
|
this.applyPointerMovement();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private flushGestureFrame(): void {
|
||||||
|
if (this.animationFrameId === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelAnimationFrame(this.animationFrameId);
|
||||||
|
this.animationFrameId = null;
|
||||||
|
this.applyPointerMovement();
|
||||||
|
}
|
||||||
|
|
||||||
|
private cancelGestureFrame(): void {
|
||||||
|
if (this.animationFrameId !== null) {
|
||||||
|
cancelAnimationFrame(this.animationFrameId);
|
||||||
|
this.animationFrameId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private applyPointerMovement(): void {
|
||||||
|
if (this.pointers.size === 2) {
|
||||||
|
const [first, second] = [...this.pointers.values()];
|
||||||
|
const geometry = this.geometry;
|
||||||
|
if (!geometry) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const distance = this.distance(first, second);
|
||||||
|
const midpoint = this.midpoint(first, second);
|
||||||
|
const nextZoom = this.clampZoom(this.pinchZoom * (distance / this.pinchDistance));
|
||||||
|
|
||||||
|
this.zoom.set(nextZoom);
|
||||||
|
this.offsetX.set(
|
||||||
|
midpoint.x -
|
||||||
|
(geometry.viewportLeft + geometry.viewportWidth / 2) -
|
||||||
|
this.pinchLocal.x * nextZoom,
|
||||||
|
);
|
||||||
|
this.offsetY.set(
|
||||||
|
midpoint.y -
|
||||||
|
(geometry.viewportTop + geometry.viewportHeight / 2) -
|
||||||
|
this.pinchLocal.y * nextZoom,
|
||||||
|
);
|
||||||
|
this.clampOffset();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.pointers.size !== 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const point = [...this.pointers.values()][0];
|
||||||
|
if (this.swipeStart) {
|
||||||
|
const deltaX = Math.abs(point.x - this.swipeStart.x);
|
||||||
|
const deltaY = point.y - this.swipeStart.y;
|
||||||
|
this.swipeOffsetY.set(deltaY > 0 && deltaY >= deltaX ? deltaY : 0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.dragStart && this.zoom() > this.data.minZoom) {
|
||||||
|
this.offsetX.set(this.dragOffset.x + point.x - this.dragStart.x);
|
||||||
|
this.offsetY.set(this.dragOffset.y + point.y - this.dragStart.y);
|
||||||
|
this.clampOffset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private refreshGeometry(): ViewerGeometry | null {
|
||||||
|
const viewport = this.viewport().nativeElement;
|
||||||
|
const image = this.image()?.nativeElement;
|
||||||
|
if (!image) {
|
||||||
|
this.geometry = null;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = viewport.getBoundingClientRect();
|
||||||
|
this.geometry = {
|
||||||
|
imageHeight: image.offsetHeight,
|
||||||
|
imageWidth: image.offsetWidth,
|
||||||
|
viewportHeight: viewport.clientHeight,
|
||||||
|
viewportLeft: rect.left,
|
||||||
|
viewportTop: rect.top,
|
||||||
|
viewportWidth: viewport.clientWidth,
|
||||||
|
};
|
||||||
|
return this.geometry;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
<app-modal-shell
|
<app-modal-shell
|
||||||
[title]="modal.config.title"
|
[title]="modal.config.title"
|
||||||
[size]="modal.config.size"
|
[size]="modal.config.size"
|
||||||
|
[presentation]="modal.config.presentation ?? 'dialog'"
|
||||||
[showCloseButton]="modal.config.showCloseButton"
|
[showCloseButton]="modal.config.showCloseButton"
|
||||||
(backdropClick)="onBackdropClick()"
|
(backdropClick)="onBackdropClick()"
|
||||||
(closeRequested)="onCloseRequested()"
|
(closeRequested)="onCloseRequested()"
|
||||||
|
|||||||
@@ -51,6 +51,10 @@ describe('ModalHostComponent', () => {
|
|||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
doc.body.style.overflow = '';
|
doc.body.style.overflow = '';
|
||||||
doc.body.style.paddingRight = '';
|
doc.body.style.paddingRight = '';
|
||||||
|
doc.body.style.position = '';
|
||||||
|
doc.body.style.top = '';
|
||||||
|
doc.body.style.left = '';
|
||||||
|
doc.body.style.width = '';
|
||||||
TestBed.resetTestingModule();
|
TestBed.resetTestingModule();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -99,6 +103,10 @@ describe('ModalHostComponent', () => {
|
|||||||
expect(service.activeModal()).toBeNull();
|
expect(service.activeModal()).toBeNull();
|
||||||
expect(doc.body.style.overflow).toBe('');
|
expect(doc.body.style.overflow).toBe('');
|
||||||
expect(doc.body.style.paddingRight).toBe('');
|
expect(doc.body.style.paddingRight).toBe('');
|
||||||
|
expect(doc.body.style.position).toBe('');
|
||||||
|
expect(doc.body.style.top).toBe('');
|
||||||
|
expect(doc.body.style.left).toBe('');
|
||||||
|
expect(doc.body.style.width).toBe('');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('closes on backdrop click when enabled', () => {
|
it('closes on backdrop click when enabled', () => {
|
||||||
|
|||||||
@@ -55,11 +55,23 @@ export class ModalHostComponent {
|
|||||||
const body = this.document.body;
|
const body = this.document.body;
|
||||||
const previousOverflow = body.style.overflow;
|
const previousOverflow = body.style.overflow;
|
||||||
const previousPaddingRight = body.style.paddingRight;
|
const previousPaddingRight = body.style.paddingRight;
|
||||||
|
const previousPosition = body.style.position;
|
||||||
|
const previousTop = body.style.top;
|
||||||
|
const previousLeft = body.style.left;
|
||||||
|
const previousWidth = body.style.width;
|
||||||
const view = this.document.defaultView;
|
const view = this.document.defaultView;
|
||||||
|
const scrollX = view?.scrollX ?? 0;
|
||||||
|
const scrollY = view?.scrollY ?? 0;
|
||||||
const scrollbarWidth = view
|
const scrollbarWidth = view
|
||||||
? Math.max(0, view.innerWidth - this.document.documentElement.clientWidth)
|
? Math.max(0, view.innerWidth - this.document.documentElement.clientWidth)
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
|
const activeElement = this.document.activeElement;
|
||||||
|
|
||||||
|
if (activeElement instanceof HTMLElement && activeElement !== body) {
|
||||||
|
activeElement.blur();
|
||||||
|
}
|
||||||
|
|
||||||
if (scrollbarWidth > 0 && view) {
|
if (scrollbarWidth > 0 && view) {
|
||||||
const currentPaddingRight =
|
const currentPaddingRight =
|
||||||
Number.parseFloat(view.getComputedStyle(body).paddingRight) || 0;
|
Number.parseFloat(view.getComputedStyle(body).paddingRight) || 0;
|
||||||
@@ -68,6 +80,47 @@ export class ModalHostComponent {
|
|||||||
|
|
||||||
body.style.overflow = 'hidden';
|
body.style.overflow = 'hidden';
|
||||||
|
|
||||||
|
const isIos = view
|
||||||
|
? /iPad|iPhone|iPod/.test(view.navigator.userAgent) ||
|
||||||
|
(view.navigator.platform === 'MacIntel' && view.navigator.maxTouchPoints > 1)
|
||||||
|
: false;
|
||||||
|
|
||||||
|
if (isIos) {
|
||||||
|
body.style.position = 'fixed';
|
||||||
|
body.style.top = `${-scrollY}px`;
|
||||||
|
body.style.left = `${-scrollX}px`;
|
||||||
|
body.style.width = '100%';
|
||||||
|
}
|
||||||
|
|
||||||
|
let viewportFrame: number | undefined;
|
||||||
|
const viewportSyncTimers: number[] = [];
|
||||||
|
const syncVisualViewport = () => {
|
||||||
|
if (!view) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (viewportFrame !== undefined) {
|
||||||
|
view.cancelAnimationFrame(viewportFrame);
|
||||||
|
}
|
||||||
|
|
||||||
|
viewportFrame = view.requestAnimationFrame(() => {
|
||||||
|
viewportFrame = undefined;
|
||||||
|
this.modalShell()?.setVisualViewport(view.visualViewport, view.scrollX, view.scrollY);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
view?.visualViewport?.addEventListener('resize', syncVisualViewport);
|
||||||
|
view?.visualViewport?.addEventListener('scroll', syncVisualViewport);
|
||||||
|
view?.addEventListener('orientationchange', syncVisualViewport);
|
||||||
|
syncVisualViewport();
|
||||||
|
|
||||||
|
if (view) {
|
||||||
|
viewportSyncTimers.push(
|
||||||
|
view.setTimeout(syncVisualViewport, 100),
|
||||||
|
view.setTimeout(syncVisualViewport, 300),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const onKeyDown = (event: KeyboardEvent) => {
|
const onKeyDown = (event: KeyboardEvent) => {
|
||||||
if (event.key !== 'Escape' || !this.activeModal()?.config.closeOnEscape) {
|
if (event.key !== 'Escape' || !this.activeModal()?.config.closeOnEscape) {
|
||||||
return;
|
return;
|
||||||
@@ -82,8 +135,26 @@ export class ModalHostComponent {
|
|||||||
|
|
||||||
onCleanup(() => {
|
onCleanup(() => {
|
||||||
this.document.removeEventListener('keydown', onKeyDown);
|
this.document.removeEventListener('keydown', onKeyDown);
|
||||||
|
view?.visualViewport?.removeEventListener('resize', syncVisualViewport);
|
||||||
|
view?.visualViewport?.removeEventListener('scroll', syncVisualViewport);
|
||||||
|
view?.removeEventListener('orientationchange', syncVisualViewport);
|
||||||
|
|
||||||
|
if (viewportFrame !== undefined) {
|
||||||
|
view?.cancelAnimationFrame(viewportFrame);
|
||||||
|
}
|
||||||
|
|
||||||
|
viewportSyncTimers.forEach((timer) => view?.clearTimeout(timer));
|
||||||
|
|
||||||
body.style.overflow = previousOverflow;
|
body.style.overflow = previousOverflow;
|
||||||
body.style.paddingRight = previousPaddingRight;
|
body.style.paddingRight = previousPaddingRight;
|
||||||
|
body.style.position = previousPosition;
|
||||||
|
body.style.top = previousTop;
|
||||||
|
body.style.left = previousLeft;
|
||||||
|
body.style.width = previousWidth;
|
||||||
|
|
||||||
|
if (isIos) {
|
||||||
|
view?.scrollTo(scrollX, scrollY);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
<div class="modal-shell" (click)="backdropClick.emit()">
|
<div
|
||||||
|
#shell
|
||||||
|
class="modal-shell"
|
||||||
|
[class.modal-shell--fullscreen-media]="presentation() === 'fullscreen-media'"
|
||||||
|
(click)="backdropClick.emit()"
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-shell__dialog"
|
class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-shell__dialog"
|
||||||
[ngClass]="dialogClass()"
|
[ngClass]="dialogClass()"
|
||||||
|
|||||||
@@ -4,7 +4,10 @@
|
|||||||
|
|
||||||
.modal-shell {
|
.modal-shell {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
inset: 0;
|
top: var(--modal-viewport-top, 0);
|
||||||
|
left: var(--modal-viewport-left, 0);
|
||||||
|
width: var(--modal-viewport-width, 100vw);
|
||||||
|
height: var(--modal-viewport-height, 100dvh);
|
||||||
z-index: 2000;
|
z-index: 2000;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -109,6 +112,64 @@
|
|||||||
color: #303030;
|
color: #303030;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media {
|
||||||
|
padding: 1.5rem;
|
||||||
|
background: rgba(0, 0, 0, 0.92);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__dialog {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
height: calc(100dvh - 3rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__content {
|
||||||
|
min-height: 0;
|
||||||
|
height: 100%;
|
||||||
|
max-height: none;
|
||||||
|
overflow: hidden;
|
||||||
|
border-radius: 0.4rem;
|
||||||
|
background: #111111;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__header {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0 0 auto;
|
||||||
|
z-index: 2;
|
||||||
|
justify-content: flex-start;
|
||||||
|
height: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__title {
|
||||||
|
position: absolute;
|
||||||
|
top: max(1.25rem, env(safe-area-inset-top));
|
||||||
|
left: max(1.25rem, env(safe-area-inset-left));
|
||||||
|
width: auto;
|
||||||
|
max-width: calc(100% - 8rem);
|
||||||
|
overflow: hidden;
|
||||||
|
color: #ffffff;
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
text-align: left;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
text-shadow: 0 1px 3px #000000;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__header .btn-close {
|
||||||
|
top: max(1rem, env(safe-area-inset-top));
|
||||||
|
right: max(1rem, env(safe-area-inset-right));
|
||||||
|
filter: invert(1) grayscale(1) brightness(2) drop-shadow(0 1px 2px #000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__body {
|
||||||
|
min-height: 0;
|
||||||
|
padding: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 576px) {
|
@media (max-width: 576px) {
|
||||||
.modal-shell {
|
.modal-shell {
|
||||||
padding: 0.75rem;
|
padding: 0.75rem;
|
||||||
@@ -128,4 +189,18 @@
|
|||||||
max-height: min(100dvh - 1.5rem, 48rem);
|
max-height: min(100dvh - 1.5rem, 48rem);
|
||||||
border-radius: 1.25rem 1.25rem 0.75rem 0.75rem;
|
border-radius: 1.25rem 1.25rem 0.75rem 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media {
|
||||||
|
align-items: center;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__dialog {
|
||||||
|
height: 100dvh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-shell--fullscreen-media .modal-shell__content {
|
||||||
|
max-height: none;
|
||||||
|
border-radius: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import {
|
|||||||
viewChild,
|
viewChild,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
|
|
||||||
import { ModalSize } from '../../../core/services/modal.service';
|
import { ModalPresentation, ModalSize } from '../../../core/services/modal.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-modal-shell',
|
selector: 'app-modal-shell',
|
||||||
@@ -19,10 +19,12 @@ import { ModalSize } from '../../../core/services/modal.service';
|
|||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ModalShellComponent {
|
export class ModalShellComponent {
|
||||||
|
private readonly shell = viewChild.required<ElementRef<HTMLElement>>('shell');
|
||||||
private readonly panel = viewChild.required<ElementRef<HTMLElement>>('panel');
|
private readonly panel = viewChild.required<ElementRef<HTMLElement>>('panel');
|
||||||
|
|
||||||
readonly title = input<string | undefined>();
|
readonly title = input<string | undefined>();
|
||||||
readonly size = input<ModalSize>('md');
|
readonly size = input<ModalSize>('md');
|
||||||
|
readonly presentation = input<ModalPresentation>('dialog');
|
||||||
readonly showCloseButton = input(true);
|
readonly showCloseButton = input(true);
|
||||||
|
|
||||||
readonly backdropClick = output<void>();
|
readonly backdropClick = output<void>();
|
||||||
@@ -46,6 +48,28 @@ export class ModalShellComponent {
|
|||||||
return this.title() ? this.titleId : null;
|
return this.title() ? this.titleId : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setVisualViewport(viewport: VisualViewport | null, layoutScrollX = 0, layoutScrollY = 0): void {
|
||||||
|
const shell = this.shell().nativeElement;
|
||||||
|
|
||||||
|
if (!viewport) {
|
||||||
|
shell.style.removeProperty('--modal-viewport-top');
|
||||||
|
shell.style.removeProperty('--modal-viewport-left');
|
||||||
|
shell.style.removeProperty('--modal-viewport-width');
|
||||||
|
shell.style.removeProperty('--modal-viewport-height');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// pageTop/pageLeft are a useful fallback for WebKit versions that update
|
||||||
|
// offsetTop/offsetLeft one frame late after dismissing a native control.
|
||||||
|
const top = Math.max(viewport.offsetTop, viewport.pageTop - layoutScrollY);
|
||||||
|
const left = Math.max(viewport.offsetLeft, viewport.pageLeft - layoutScrollX);
|
||||||
|
|
||||||
|
shell.style.setProperty('--modal-viewport-top', `${top}px`);
|
||||||
|
shell.style.setProperty('--modal-viewport-left', `${left}px`);
|
||||||
|
shell.style.setProperty('--modal-viewport-width', `${viewport.width}px`);
|
||||||
|
shell.style.setProperty('--modal-viewport-height', `${viewport.height}px`);
|
||||||
|
}
|
||||||
|
|
||||||
focusInitialElement(): void {
|
focusInitialElement(): void {
|
||||||
const panel = this.panel().nativeElement;
|
const panel = this.panel().nativeElement;
|
||||||
const focusTarget = panel.querySelector<HTMLElement>(
|
const focusTarget = panel.querySelector<HTMLElement>(
|
||||||
|
|||||||
@@ -51,7 +51,9 @@
|
|||||||
[title]="item.nombre"
|
[title]="item.nombre"
|
||||||
[originalPrice]="price(item)"
|
[originalPrice]="price(item)"
|
||||||
[unavailableMessage]="item.unavailable_message ?? null"
|
[unavailableMessage]="item.unavailable_message ?? null"
|
||||||
[imagePriority]="loadImages() && index < 4"
|
[imagePriority]="
|
||||||
|
loadImages() && prioritizeFirstImage() && groupLayout() !== 'carousel' && index === 0
|
||||||
|
"
|
||||||
(buy)="emitProductDetailBuy(item)"
|
(buy)="emitProductDetailBuy(item)"
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,6 +143,14 @@ describe('ProductListComponent', () => {
|
|||||||
|
|
||||||
expect(element.querySelector('.product-list--column')).not.toBeNull();
|
expect(element.querySelector('.product-list--column')).not.toBeNull();
|
||||||
expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2);
|
expect(element.querySelectorAll('app-product-column-with-image')).toHaveLength(2);
|
||||||
|
expect(element.querySelectorAll('img[fetchpriority="high"]')).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not prioritize images rendered in a circular carousel', async () => {
|
||||||
|
const fixture = await render('column_with_image', items, 'carousel');
|
||||||
|
const element = fixture.nativeElement as HTMLElement;
|
||||||
|
|
||||||
|
expect(element.querySelectorAll('img[fetchpriority="high"]')).toHaveLength(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('renders cart products next to each other in the column grid', async () => {
|
it('renders cart products next to each other in the column grid', async () => {
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ export class ProductListComponent {
|
|||||||
readonly items = input.required<CatalogFeaturedItems>();
|
readonly items = input.required<CatalogFeaturedItems>();
|
||||||
readonly loading = input(false);
|
readonly loading = input(false);
|
||||||
readonly loadImages = input(true);
|
readonly loadImages = input(true);
|
||||||
|
readonly prioritizeFirstImage = input(true);
|
||||||
readonly unavailableVariantIds = input<ReadonlySet<number>>(new Set<number>());
|
readonly unavailableVariantIds = input<ReadonlySet<number>>(new Set<number>());
|
||||||
readonly savingProductIds = input<ReadonlySet<number>>(new Set<number>());
|
readonly savingProductIds = input<ReadonlySet<number>>(new Set<number>());
|
||||||
|
|
||||||
|
|||||||
@@ -107,6 +107,17 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if (imageUrl(); as image) {
|
@if (imageUrl(); as image) {
|
||||||
<img class="ticket-selector__map" [src]="image" [alt]="'Plano de ubicaciones de ' + title()" />
|
<button
|
||||||
|
type="button"
|
||||||
|
class="ticket-selector__map-button"
|
||||||
|
aria-label="Ampliar plano de ubicaciones"
|
||||||
|
(click)="openImage(image)"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="ticket-selector__map"
|
||||||
|
[src]="image"
|
||||||
|
[alt]="'Plano de ubicaciones de ' + title()"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
}
|
}
|
||||||
</article>
|
</article>
|
||||||
|
|||||||
@@ -153,11 +153,27 @@
|
|||||||
margin-top: 0.75rem;
|
margin-top: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__map {
|
&__map-button {
|
||||||
display: block;
|
display: block;
|
||||||
width: min(100%, 720px);
|
width: min(100%, 720px);
|
||||||
max-height: 680px;
|
|
||||||
margin: 3rem auto 0;
|
margin: 3rem auto 0;
|
||||||
|
padding: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0.4rem;
|
||||||
|
background: transparent;
|
||||||
|
cursor: zoom-in;
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
outline: 3px solid var(--tenant-primary);
|
||||||
|
outline-offset: 0.25rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__map {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
max-height: 680px;
|
||||||
object-fit: contain;
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -188,7 +204,7 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__map {
|
&__map-button {
|
||||||
margin-top: 2rem;
|
margin-top: 2rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,6 +104,10 @@ describe('ProductTicketSelectorComponent', () => {
|
|||||||
};
|
};
|
||||||
catalogService.withoutLoading.mockReturnValue(catalogService);
|
catalogService.withoutLoading.mockReturnValue(catalogService);
|
||||||
cartService.withoutLoading.mockReturnValue(cartService);
|
cartService.withoutLoading.mockReturnValue(cartService);
|
||||||
|
const modalService = {
|
||||||
|
openConfirmDelete: vi.fn().mockReturnValue(of(true)),
|
||||||
|
openImage: vi.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [ProductTicketSelectorComponent],
|
imports: [ProductTicketSelectorComponent],
|
||||||
@@ -112,7 +116,7 @@ describe('ProductTicketSelectorComponent', () => {
|
|||||||
{ provide: CartService, useValue: cartService },
|
{ provide: CartService, useValue: cartService },
|
||||||
{
|
{
|
||||||
provide: ModalService,
|
provide: ModalService,
|
||||||
useValue: { openConfirmDelete: vi.fn().mockReturnValue(of(true)) },
|
useValue: modalService,
|
||||||
},
|
},
|
||||||
{ provide: ToastService, useValue: { danger: toastDanger } },
|
{ provide: ToastService, useValue: { danger: toastDanger } },
|
||||||
],
|
],
|
||||||
@@ -125,7 +129,7 @@ describe('ProductTicketSelectorComponent', () => {
|
|||||||
await fixture.whenStable();
|
await fixture.whenStable();
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
return { fixture, getVariantOptions, cartService, toastDanger };
|
return { fixture, getVariantOptions, cartService, toastDanger, modalService };
|
||||||
}
|
}
|
||||||
|
|
||||||
it('loads one map, recalculates the cascade locally and reserves only after the last select', async () => {
|
it('loads one map, recalculates the cascade locally and reserves only after the last select', async () => {
|
||||||
@@ -226,6 +230,25 @@ describe('ProductTicketSelectorComponent', () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('opens the zoomable image modal when the seating map is clicked', async () => {
|
||||||
|
const { fixture, modalService } = await createComponent({
|
||||||
|
maps: [mapResponse([variant(401, 'general', 'A', '1', '1')])],
|
||||||
|
});
|
||||||
|
fixture.componentRef.setInput('imageUrl', '/images/plano.png');
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
const button = fixture.nativeElement.querySelector(
|
||||||
|
'button[aria-label="Ampliar plano de ubicaciones"]',
|
||||||
|
) as HTMLButtonElement;
|
||||||
|
button.click();
|
||||||
|
|
||||||
|
expect(modalService.openImage).toHaveBeenCalledWith({
|
||||||
|
title: 'Entrada',
|
||||||
|
src: '/images/plano.png',
|
||||||
|
alt: 'Plano de ubicaciones de Entrada',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('clears only the seat after a stock conflict when the row still has alternatives', async () => {
|
it('clears only the seat after a stock conflict when the row still has alternatives', async () => {
|
||||||
const failed = variant(401, 'general', 'A', '1', '1');
|
const failed = variant(401, 'general', 'A', '1', '1');
|
||||||
const alternative = variant(402, 'general', 'A', '1', '2');
|
const alternative = variant(402, 'general', 'A', '1', '2');
|
||||||
|
|||||||
@@ -154,6 +154,14 @@ export class ProductTicketSelectorComponent {
|
|||||||
if (this.hasSelection() && variantIds.length > 0) this.buy.emit(variantIds);
|
if (this.hasSelection() && variantIds.length > 0) this.buy.emit(variantIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected openImage(src: string): void {
|
||||||
|
this.modalService.openImage({
|
||||||
|
title: this.title(),
|
||||||
|
src,
|
||||||
|
alt: `Plano de ubicaciones de ${this.title()}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
protected addRow(): void {
|
protected addRow(): void {
|
||||||
if (!this.canAddRow()) return;
|
if (!this.canAddRow()) return;
|
||||||
const row = this.createRow(this.nextRowId++);
|
const row = this.createRow(this.nextRowId++);
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="es">
|
<html lang="es">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8" />
|
||||||
<title>ShopitFront</title>
|
<title>ShopitFront</title>
|
||||||
<base href="/">
|
<base href="/" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta
|
||||||
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E">
|
name="viewport"
|
||||||
</head>
|
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
|
||||||
<body>
|
/>
|
||||||
<app-root></app-root>
|
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E" />
|
||||||
</body>
|
</head>
|
||||||
|
<body>
|
||||||
|
<app-root></app-root>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user