Compare commits
2 Commits
a7e1d8995f
...
f87f7f55a9
| Author | SHA1 | Date | |
|---|---|---|---|
| f87f7f55a9 | |||
| 17dbf52181 |
@@ -26,6 +26,7 @@ import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
import { CheckoutCountdownService } from '../../services/checkout-countdown.service';
|
||||
import { TenantUrlSerializer } from '../../services/tenant-url.serializer';
|
||||
import { EventDateNoticeService } from '../../services/event-date-notice.service';
|
||||
|
||||
const tenant: Tenant = {
|
||||
id: 1,
|
||||
@@ -224,6 +225,12 @@ describe('StoreLayoutComponent', () => {
|
||||
remainingSeconds: checkoutRemainingSecondsState.asReadonly(),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: EventDateNoticeService,
|
||||
useValue: {
|
||||
claim: vi.fn().mockReturnValue(of({ data: [] })),
|
||||
},
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
@@ -574,17 +581,13 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(authService.logout).toHaveBeenCalled();
|
||||
expect(cartService.clearCart).toHaveBeenCalled();
|
||||
expect(router.navigate).toHaveBeenCalledWith(['/']);
|
||||
expect(TestBed.inject(ToastService).info).toHaveBeenCalledWith(
|
||||
'Sesión cerrada correctamente.',
|
||||
);
|
||||
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 } })),
|
||||
);
|
||||
(authService.logout as any).mockReturnValue(throwError(() => ({ error: { message } })));
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
import { isPlatformBrowser } from '@angular/common';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import {
|
||||
Component,
|
||||
computed,
|
||||
DestroyRef,
|
||||
effect,
|
||||
inject,
|
||||
OnInit,
|
||||
PLATFORM_ID,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
import {
|
||||
ActivatedRoute,
|
||||
@@ -8,7 +18,7 @@ import {
|
||||
Router,
|
||||
RouterOutlet,
|
||||
} from '@angular/router';
|
||||
import { filter } from 'rxjs';
|
||||
import { filter, firstValueFrom } from 'rxjs';
|
||||
import { TenantService } from '../../services/tenant.service';
|
||||
import { CartService } from '../../services/cart/cart.service';
|
||||
import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-footer.component';
|
||||
@@ -25,6 +35,9 @@ import {
|
||||
import { ToastService } from '../../services/toast.service';
|
||||
import { Category } from '../../services/tenant.interface';
|
||||
import { CheckoutCountdownService } from '../../services/checkout-countdown.service';
|
||||
import { EventDateNotice, EventDateNoticeService } from '../../services/event-date-notice.service';
|
||||
import { ModalService } from '../../services/modal.service';
|
||||
import { EventDateNoticeModalComponent } from '../../../shared/components/event-date-notice-modal/event-date-notice-modal.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-store-layout',
|
||||
@@ -48,6 +61,10 @@ export class StoreLayoutComponent implements OnInit {
|
||||
private readonly router = inject(Router);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly destroyRef = inject(DestroyRef);
|
||||
private readonly platformId = inject(PLATFORM_ID);
|
||||
private readonly eventDateNoticeService = inject(EventDateNoticeService);
|
||||
private readonly modalService = inject(ModalService);
|
||||
private claimedNoticeUserId: number | null = null;
|
||||
|
||||
protected readonly isCartOpen = signal(false);
|
||||
protected readonly isCheckoutRoute = signal(this.isCheckoutUrl(this.router.url));
|
||||
@@ -68,6 +85,27 @@ export class StoreLayoutComponent implements OnInit {
|
||||
() => this.cartEditingPolicy()?.allow_update_variant ?? false,
|
||||
);
|
||||
|
||||
constructor() {
|
||||
effect(() => {
|
||||
const user = this.authService.user();
|
||||
|
||||
if (!isPlatformBrowser(this.platformId) || !user) {
|
||||
this.claimedNoticeUserId = null;
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.claimedNoticeUserId === user.id) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.claimedNoticeUserId = user.id;
|
||||
this.eventDateNoticeService.claim().subscribe({
|
||||
next: ({ data }) => void this.showEventDateNotices(data, user.id),
|
||||
error: (error) => console.error('Error loading event date notices', error),
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
protected readonly cartSubtotal = computed(() => {
|
||||
const cart = this.cartService.cart();
|
||||
return cart ? parseFloat(cart.subtotal) : 0;
|
||||
@@ -207,6 +245,28 @@ export class StoreLayoutComponent implements OnInit {
|
||||
this.isCartOpen.update((isOpen) => !isOpen);
|
||||
}
|
||||
|
||||
private async showEventDateNotices(notices: EventDateNotice[], userId: number): Promise<void> {
|
||||
for (const notice of notices) {
|
||||
if (this.authService.user()?.id !== userId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const modalRef = this.modalService.open<EventDateNoticeModalComponent, void, EventDateNotice>(
|
||||
EventDateNoticeModalComponent,
|
||||
{
|
||||
size: 'sm',
|
||||
data: notice,
|
||||
},
|
||||
);
|
||||
|
||||
await firstValueFrom(modalRef.afterClosed$);
|
||||
|
||||
if (modalRef.dismissReason() === 'replaced') {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected onSearch(term: string): void {
|
||||
void this.router.navigate(['/buscar'], {
|
||||
queryParams: { q: term, page: 1 },
|
||||
|
||||
@@ -1,32 +1,39 @@
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { inject, Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { EventDateNoticeModalComponent } from '../../shared/components/event-date-notice-modal/event-date-notice-modal.component';
|
||||
import { ModalService } from './modal.service';
|
||||
import { TenantEventDateNotice } from './tenant.interface';
|
||||
import { environment } from '../../../environments/environment';
|
||||
import { ApiResponse } from './api-response.interface';
|
||||
import { BaseApiService } from './base-api.service';
|
||||
import { TenantService } from './tenant.service';
|
||||
|
||||
export type EventDateNoticeType = 'rescheduled' | 'suspended';
|
||||
|
||||
export interface EventDateNoticeSegment {
|
||||
text: string;
|
||||
bold: boolean;
|
||||
}
|
||||
|
||||
export interface EventDateNotice {
|
||||
type: EventDateNoticeType;
|
||||
change_ids: number[];
|
||||
title: string;
|
||||
message: EventDateNoticeSegment[];
|
||||
}
|
||||
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class EventDateNoticeService {
|
||||
private readonly modalService = inject(ModalService);
|
||||
export class EventDateNoticeService extends BaseApiService {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
show(notices: readonly TenantEventDateNotice[]): void {
|
||||
this.showNext(notices, 0);
|
||||
claim(): Observable<ApiResponse<EventDateNotice[]>> {
|
||||
const tenant = this.tenantService.getTenant();
|
||||
|
||||
if (!tenant) {
|
||||
throw new Error('No se pudo resolver el tenant activo.');
|
||||
}
|
||||
|
||||
private showNext(notices: readonly TenantEventDateNotice[], index: number): void {
|
||||
const notice = notices[index];
|
||||
|
||||
if (!notice) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.modalService
|
||||
.open<EventDateNoticeModalComponent, void, TenantEventDateNotice>(
|
||||
EventDateNoticeModalComponent,
|
||||
{
|
||||
size: 'sm',
|
||||
data: notice,
|
||||
},
|
||||
)
|
||||
.afterClosed$.subscribe(() => this.showNext(notices, index + 1));
|
||||
return this.withoutLoading().http.post<ApiResponse<EventDateNotice[]>>(
|
||||
`${environment.url}tenants/${tenant.codigo}/event-date-notices/claim`,
|
||||
{},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,6 +51,8 @@ export interface EventDate {
|
||||
date: string;
|
||||
start_time: string;
|
||||
end_time: string;
|
||||
info_text: string | null;
|
||||
isCanceled: boolean;
|
||||
}
|
||||
|
||||
export interface EventConfig {
|
||||
@@ -67,6 +69,8 @@ export interface ActiveEventDate {
|
||||
date: string;
|
||||
time_start: string;
|
||||
time_end: string;
|
||||
info_text: string | null;
|
||||
isCanceled: boolean;
|
||||
}
|
||||
|
||||
export type TenantEventDateChangeType = 'rescheduled' | 'suspended';
|
||||
|
||||
@@ -233,12 +233,16 @@ describe('StoreHomePageComponent', () => {
|
||||
date: '2026-12-05',
|
||||
time_start: '09:00:00',
|
||||
time_end: '18:00:00',
|
||||
info_text: null,
|
||||
isCanceled: false,
|
||||
},
|
||||
{
|
||||
id: 21,
|
||||
date: '2026-12-06',
|
||||
time_start: '09:00:00',
|
||||
time_end: '18:00:00',
|
||||
info_text: null,
|
||||
isCanceled: false,
|
||||
},
|
||||
],
|
||||
};
|
||||
@@ -369,6 +373,8 @@ describe('StoreHomePageComponent', () => {
|
||||
date: '2026-10-09',
|
||||
time_start: '09:00:00',
|
||||
time_end: '18:00:00',
|
||||
info_text: null,
|
||||
isCanceled: false,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -89,6 +89,8 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
date: eventDate.date,
|
||||
start_time: eventDate.time_start,
|
||||
end_time: eventDate.time_end,
|
||||
info_text: eventDate.info_text,
|
||||
isCanceled: eventDate.isCanceled,
|
||||
})),
|
||||
contact,
|
||||
};
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
<article class="event-date-notice">
|
||||
<h2 class="event-date-notice__title">{{ data.title }}</h2>
|
||||
<div class="event-date-notice-modal">
|
||||
<h2>{{ notice.title }}</h2>
|
||||
|
||||
<p class="event-date-notice__description">
|
||||
@for (part of data.message; track $index) {
|
||||
@if (part.bold) {
|
||||
<strong>{{ part.text }}</strong>
|
||||
<p>
|
||||
@for (segment of notice.message; track $index) {
|
||||
@if (segment.bold) {
|
||||
<b>{{ segment.text }}</b>
|
||||
} @else {
|
||||
{{ part.text }}
|
||||
<span>{{ segment.text }}</span>
|
||||
}
|
||||
}
|
||||
</p>
|
||||
|
||||
<div class="event-date-notice__actions">
|
||||
<app-button (click)="close()">Cerrar</app-button>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
@@ -1,33 +1,28 @@
|
||||
.event-date-notice {
|
||||
.event-date-notice-modal {
|
||||
display: grid;
|
||||
gap: 20px;
|
||||
justify-items: center;
|
||||
gap: 1.5rem;
|
||||
justify-items: stretch;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.event-date-notice__title,
|
||||
.event-date-notice__description {
|
||||
h2,
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.event-date-notice__title {
|
||||
color: var(--color-danger, #dc3545);
|
||||
h2 {
|
||||
color: var(--tenant-danger);
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
line-height: 1.25;
|
||||
}
|
||||
|
||||
.event-date-notice__description {
|
||||
p {
|
||||
color: #666666;
|
||||
font-size: 15px;
|
||||
font-weight: 400;
|
||||
line-height: 1.4;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.event-date-notice__description strong {
|
||||
b {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.event-date-notice__actions {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
|
||||
|
||||
import { EventDateNotice } from '../../../core/services/event-date-notice.service';
|
||||
import { MODAL_DATA, ModalRef } from '../../../core/services/modal.service';
|
||||
import { TenantEventDateNotice } from '../../../core/services/tenant.interface';
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
|
||||
@Component({
|
||||
@@ -12,7 +12,7 @@ import { ButtonComponent } from '../button/button.component';
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class EventDateNoticeModalComponent {
|
||||
protected readonly data = inject<TenantEventDateNotice>(MODAL_DATA);
|
||||
protected readonly notice = inject<EventDateNotice>(MODAL_DATA);
|
||||
private readonly modalRef = inject<ModalRef<void>>(ModalRef);
|
||||
|
||||
protected close(): void {
|
||||
|
||||
@@ -88,7 +88,12 @@
|
||||
<td>
|
||||
<span class="event-schedule-value">
|
||||
<i class="fa-regular fa-calendar" aria-hidden="true"></i>
|
||||
<span>{{ formatScheduleDate(eventDate.date) }}</span>
|
||||
<span [class.event-schedule-date--canceled]="eventDate.isCanceled">
|
||||
{{ formatScheduleDate(eventDate.date) }}
|
||||
</span>
|
||||
@if (eventDate.info_text) {
|
||||
<app-tooltip [message]="eventDate.info_text" />
|
||||
}
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@@ -164,6 +164,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.event-schedule-date--canceled {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.hero-banner-container {
|
||||
padding-bottom: 0;
|
||||
|
||||
@@ -22,9 +22,7 @@ describe('HeroBannerComponent', () => {
|
||||
expect(element.querySelector('img')?.getAttribute('src')).toBe(
|
||||
'https://example.com/desktop.jpg',
|
||||
);
|
||||
expect(element.querySelector('.hero-banner')?.classList).toContain(
|
||||
'hero-banner--with-media',
|
||||
);
|
||||
expect(element.querySelector('.hero-banner')?.classList).toContain('hero-banner--with-media');
|
||||
});
|
||||
|
||||
it('keeps the fallback banner sizing when there is no image', async () => {
|
||||
@@ -52,12 +50,16 @@ describe('HeroBannerComponent', () => {
|
||||
date: '2026-10-09',
|
||||
start_time: '10:00:00',
|
||||
end_time: '20:30:00',
|
||||
info_text: 'Esta fecha fue cancelada.',
|
||||
isCanceled: true,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
date: '2026-10-10',
|
||||
start_time: '10:00:00',
|
||||
end_time: '22:00:00',
|
||||
info_text: null,
|
||||
isCanceled: false,
|
||||
},
|
||||
],
|
||||
});
|
||||
@@ -78,6 +80,10 @@ describe('HeroBannerComponent', () => {
|
||||
expect(element.querySelectorAll('.event-schedules tbody tr')).toHaveLength(2);
|
||||
expect(element.querySelector('.event-schedules')?.textContent).toContain('9 de Octubre 2026');
|
||||
expect(element.querySelector('.event-schedules')?.textContent).toContain('10:00 - 20:30');
|
||||
expect(element.querySelector('.event-schedule-date--canceled')).not.toBeNull();
|
||||
expect(element.querySelector('app-tooltip')?.textContent).toContain(
|
||||
'Esta fecha fue cancelada.',
|
||||
);
|
||||
|
||||
toggle?.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
@@ -3,11 +3,12 @@ import { CommonModule } from '@angular/common';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { EventConfig, HeroConfig } from '../../../core/services/tenant.interface';
|
||||
import { ButtonComponent } from '../button/button.component';
|
||||
import { TooltipComponent } from '../tooltip/tooltip.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-hero-banner',
|
||||
standalone: true,
|
||||
imports: [CommonModule, RouterModule, ButtonComponent],
|
||||
imports: [CommonModule, RouterModule, ButtonComponent, TooltipComponent],
|
||||
templateUrl: './hero-banner.component.html',
|
||||
styleUrl: './hero-banner.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
|
||||
@@ -3,9 +3,21 @@
|
||||
class="tooltip-trigger"
|
||||
[attr.aria-describedby]="tooltipId"
|
||||
[attr.aria-label]="message()"
|
||||
(mouseenter)="showTooltip($event)"
|
||||
(mouseleave)="hideTooltip()"
|
||||
(focus)="showTooltip($event)"
|
||||
(blur)="hideTooltip()"
|
||||
>
|
||||
<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
|
||||
<span class="tooltip-message" [id]="tooltipId" role="tooltip">
|
||||
<span
|
||||
class="tooltip-message"
|
||||
[class.tooltip-message--visible]="tooltipVisible"
|
||||
[style.left.px]="tooltipLeft"
|
||||
[style.top.px]="tooltipTop"
|
||||
[id]="tooltipId"
|
||||
popover="manual"
|
||||
role="tooltip"
|
||||
>
|
||||
{{ message() }}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
@@ -22,22 +22,15 @@
|
||||
outline: 2px solid currentColor;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
&:hover .tooltip-message,
|
||||
&:focus-visible .tooltip-message {
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
transform: translate(-50%, -0.25rem);
|
||||
}
|
||||
}
|
||||
|
||||
.tooltip-message {
|
||||
position: absolute;
|
||||
z-index: 1100;
|
||||
bottom: calc(100% + 0.625rem);
|
||||
left: 50%;
|
||||
position: fixed;
|
||||
inset: auto;
|
||||
z-index: 2000;
|
||||
width: max-content;
|
||||
max-width: min(16rem, 75vw);
|
||||
margin: 0;
|
||||
padding: 0.5rem 0.75rem;
|
||||
border-radius: 0.375rem;
|
||||
border: 1px solid var(--tenant-primary, var(--color-primary, #0d6efd));
|
||||
@@ -54,9 +47,13 @@
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
transform: translate(-50%, 0);
|
||||
transform: translateX(-50%);
|
||||
transition:
|
||||
opacity 0.15s ease,
|
||||
transform 0.15s ease,
|
||||
visibility 0.15s ease;
|
||||
}
|
||||
|
||||
.tooltip-message--visible {
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
@@ -28,5 +28,15 @@ describe('TooltipComponent', () => {
|
||||
expect(trigger?.querySelector('i.fa-solid.fa-circle-info')).not.toBeNull();
|
||||
expect(message?.textContent?.trim()).toBe('Este producto no tiene stock disponible.');
|
||||
expect(trigger?.getAttribute('aria-describedby')).toBe(message?.id);
|
||||
|
||||
trigger?.dispatchEvent(new MouseEvent('mouseenter'));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(message?.classList).toContain('tooltip-message--visible');
|
||||
|
||||
trigger?.dispatchEvent(new MouseEvent('mouseleave'));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(message?.classList).not.toContain('tooltip-message--visible');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -11,4 +11,40 @@ let nextTooltipId = 0;
|
||||
export class TooltipComponent {
|
||||
readonly message = input.required<string>();
|
||||
protected readonly tooltipId = `app-tooltip-${nextTooltipId++}`;
|
||||
protected tooltipVisible = false;
|
||||
protected tooltipLeft = 0;
|
||||
protected tooltipTop = 0;
|
||||
private activeTooltip: HTMLElement | null = null;
|
||||
|
||||
protected showTooltip(event: MouseEvent | FocusEvent): void {
|
||||
const trigger = event.currentTarget as HTMLElement;
|
||||
const rect = trigger.getBoundingClientRect();
|
||||
|
||||
this.tooltipLeft = rect.left + rect.width / 2;
|
||||
this.tooltipTop = rect.bottom + 10;
|
||||
this.tooltipVisible = true;
|
||||
this.activeTooltip = trigger.querySelector<HTMLElement>('.tooltip-message');
|
||||
|
||||
if (
|
||||
this.activeTooltip &&
|
||||
typeof this.activeTooltip.showPopover === 'function' &&
|
||||
!this.activeTooltip.matches(':popover-open')
|
||||
) {
|
||||
this.activeTooltip.showPopover();
|
||||
}
|
||||
}
|
||||
|
||||
protected hideTooltip(): void {
|
||||
this.tooltipVisible = false;
|
||||
|
||||
if (
|
||||
this.activeTooltip &&
|
||||
typeof this.activeTooltip.hidePopover === 'function' &&
|
||||
this.activeTooltip.matches(':popover-open')
|
||||
) {
|
||||
this.activeTooltip.hidePopover();
|
||||
}
|
||||
|
||||
this.activeTooltip = null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user