diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index ec9f8643f..c7ae270ea 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -121,7 +121,7 @@ export class ViewEventPage implements OnInit { ev.target.complete(); } - @XTracerAsync({name:'ViewEventPage/loadEvent', log: false, bugPrint: true}) + @XTracerAsync({name:'ViewEventPage/loadEvent', bugPrint: true}) async loadEvent(tracing?: TracingType) { const loader = this.toastService.loading(); diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 30cfcc408..6a5235848 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -678,7 +678,7 @@ export class AgendaPage implements OnInit { }); }; - @XTracerAsync({name:'AgendaPage/loadRangeEventRun', log: false, bugPrint: true}) + @XTracerAsync({name:'AgendaPage/loadRangeEventRun', bugPrint: true}) async loadRangeEventRun(startTime: Date, endTime: Date, tracing?: TracingType) { tracing.addEvent('load range start') diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index aee88781e..ac652e865 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -191,7 +191,7 @@ export class ViewEventPage implements OnInit { this.TimeZoneString = this.loadedEvent.TimeZone } - @XTracerAsync({name:'ViewEventPage/loadEvent', log: false, bugPrint: true}) + @XTracerAsync({name:'ViewEventPage/loadEvent', bugPrint: true}) async loadEvent(tracing?: TracingType) { const loader = this.toastService.loading(); diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 1a0d3d21b..62108513b 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -99,7 +99,7 @@ export class ApproveEventPage implements OnInit { } - @XTracerAsync({name:'ApproveEventPage/getTask', log: false, bugPrint: true}) + @XTracerAsync({name:'ApproveEventPage/getTask', bugPrint: true}) async getTask(tracing?: TracingType) { const res = await this.AgendaDataRepositoryService.getEventToApproveById(this.serialNumber, tracing) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index d014ee800..bf54385ee 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -217,7 +217,7 @@ export class EventListPage implements OnInit { this.LoadToApproveEvents(); } - @XTracerAsync({name:'EventListPage/LoadToApproveEvents', log: false, bugPrint: true}) + @XTracerAsync({name:'EventListPage/LoadToApproveEvents', bugPrint: true}) async LoadToApproveEvents(tracing?: TracingType) { console.log('aprove event') this.showLoader = true; diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts index beb98949b..aeaa6ccf4 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts @@ -116,7 +116,7 @@ export class AgendaDataRepositoryService { return ok(result) } catch (e) { if(isHttpError(e)) { - alert(e.status) + console.log(e.status) tracing?.setAttribute('status.code', e.status.toString()) if (e.status == 400) { tracing?.bugFlag() diff --git a/src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts b/src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts index f0569401d..74573dda4 100644 --- a/src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts +++ b/src/app/services/Repositorys/Agenda/model/eventDTOOutput.ts @@ -39,13 +39,13 @@ const OrganizerSchema = z.object({ }); const EventRecurrenceSchema = z.object({ - Type: z.number(), - Day: null, - DayOfWeek: null, - Month: null, - LastOccurrence: null, - frequency: z.number(), - until: z.string() + Type: z.number().optional(), + Day: z.any().optional(), + DayOfWeek: z.any(), + Month: z.any(), + LastOccurrence: z.any().optional(), + frequency: z.number().optional(), + until: z.string().optional() }).nullable() diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index c557c0d1f..f5bed2847 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -21,7 +21,7 @@ export class BackgroundService { private themeservice: ThemeService, private storageservice: StorageService, private http: HttpClient, - ) { + ) { window.addEventListener('focus', (event) => { if(this.status == 'offline') { @@ -35,7 +35,7 @@ export class BackgroundService { return false } this.status = 'online' - + this.paint() this.callBacks.forEach((e) => { if (e.type == 'Online') { @@ -104,14 +104,14 @@ export class BackgroundService { } try { - await this.http.post(environment.apiURL + "UserAuthentication/Login", '', opts).toPromise(); - + await this.http.get("assets/images/theme/gov/governoangola_A.png").toPromise(); + return true } catch (error) { if(error.status === 0) { return false - } + } return true } diff --git a/src/app/services/decorator/api-validate-schema.decorator.ts b/src/app/services/decorator/api-validate-schema.decorator.ts index fcc8e9000..903b12c6a 100644 --- a/src/app/services/decorator/api-validate-schema.decorator.ts +++ b/src/app/services/decorator/api-validate-schema.decorator.ts @@ -19,7 +19,6 @@ export function APIReturn(schema: z.ZodTypeAny, path: string) { } catch (error) { if (error instanceof ZodError) { // If validation fails, throw an error with the details - // console.error('unexpected data structure', path) // Capture the Zod validation error with additional context console.error('Validation failed:', error.errors); diff --git a/src/app/services/monitoring/opentelemetry/opentelemetry.ts b/src/app/services/monitoring/opentelemetry/opentelemetry.ts index c2334fa3f..78ceb77bc 100644 --- a/src/app/services/monitoring/opentelemetry/opentelemetry.ts +++ b/src/app/services/monitoring/opentelemetry/opentelemetry.ts @@ -31,4 +31,5 @@ function createProvider(serviceName) { export const OpentelemetryChatProvider = createProvider('FO-chat-service'); export const OpentelemetryAgendaProvider = createProvider('FO-agenda-service'); export const OpentelemetryNotificationProvider = createProvider('FO-notification'); +export const OpentelemetryInterceptorProvider = createProvider('FO-interceptor'); export const OpentelemetryPublicationProvider = createProvider('FO-publication-service'); diff --git a/src/app/services/monitoring/opentelemetry/tracer.ts b/src/app/services/monitoring/opentelemetry/tracer.ts index f3474bd80..ab8176062 100644 --- a/src/app/services/monitoring/opentelemetry/tracer.ts +++ b/src/app/services/monitoring/opentelemetry/tracer.ts @@ -1,13 +1,12 @@ import { v4 as uuidv4 } from 'uuid'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { Tracer, Span } from '@opentelemetry/sdk-trace-base'; -import { OpentelemetryAgendaProvider, OpentelemetryNotificationProvider } from './opentelemetry'; +import { OpentelemetryAgendaProvider, OpentelemetryInterceptorProvider, OpentelemetryNotificationProvider } from './opentelemetry'; import { Device, DeviceInfo } from '@capacitor/device'; const tracerInstance = OpentelemetryAgendaProvider.getTracer('example-tracer-hole', '111', {}) const tracerNotificationInstance = OpentelemetryNotificationProvider.getTracer('example-tracer-hole', '111', {}) - // const logger: ILoggerAdapter = new ColoredLoggerService() let device: DeviceInfo; @@ -59,7 +58,10 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp span.setAttribute(key, value); }, finish: () => { - span.end(); + if(!window.location.origin.includes('https')) { + span.end(); + } + if(bugPrint && hasBug) { console.error(name, data) } @@ -73,7 +75,7 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp } } -export function XTracerAsync({ name, log, bugPrint, module = null, autoFinish = true }) { +export function XTracerAsync({ name, bugPrint, module = null, autoFinish = true }) { return ( target: unknown, propertyKey: string, @@ -114,7 +116,7 @@ export function XTracerAsync({ name, log, bugPrint, module = null, autoFinish = } -export function XTracer({ name, log, bugPrint, module, autoFinish = true }: any) { +export function XTracer({ name, bugPrint, module, autoFinish = true }) { return ( target: unknown, propertyKey: string, diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 148c159e7..1d5bdc9cf 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -99,7 +99,7 @@ export class NotificationsService { } } - @XTracerAsync({name:'Notification/getAndpostToken', log: false, bugPrint: true, module:'notification', autoFinish: false}) + @XTracerAsync({name:'Notification/getAndpostToken', bugPrint: true, module:'notification', autoFinish: false}) private getAndpostToken(username, tracing?: TracingType) { const geturl = environment.apiURL + 'notifications/token'; diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 2c457c5f4..12db62b38 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -313,7 +313,7 @@ export class TaskService { } - @XTracerAsync({name:'taskService/loadEventosParaAprovacao', log: false, bugPrint: true}) + @XTracerAsync({name:'taskService/loadEventosParaAprovacao', bugPrint: true}) async loadEventosParaAprovacao(tracing?: TracingType) { this.showLoaderNum++ console.log('PR') diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index cd6754476..133cafb36 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -82,7 +82,7 @@ export class ApproveEventPage implements OnInit { this.modalController.dismiss(); } - @XTracerAsync({name:'ApproveEventPage/getTask', log: false, bugPrint: true}) + @XTracerAsync({name:'ApproveEventPage/getTask', bugPrint: true}) async getTask(tracing?: TracingType) { const res = await this.agendaDataRepository.getEventToApproveById(this.serialNumber, tracing) diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 21c3baf18..52035beca 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -119,7 +119,7 @@ export class EventListPage implements OnInit { return new Date(e).toDateString() } - @XTracerAsync({name:'EventListPageShared/LoadToApproveEvents', log: false, bugPrint: true}) + @XTracerAsync({name:'EventListPageShared/LoadToApproveEvents', bugPrint: true}) async LoadToApproveEvents(tracing?: TracingType) { this.showLoader = true; diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index b8d150411..eec5e2630 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -126,7 +126,7 @@ export class ViewEventPage implements OnInit { setTimeZone() { this.TimeZoneString = this.loadedEvent.TimeZone } - @XTracerAsync({name:'ViewEventPage/loadEvent', log: false, bugPrint: true}) + @XTracerAsync({name:'ViewEventPage/loadEvent', bugPrint: true}) async loadEvent(tracing?: TracingType) { let res = await this.agendaDataRepository.getEventById(this.eventId, tracing) diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index f3f13586a..1e372dfdd 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -193,7 +193,7 @@ export class EventsToApprovePage implements OnInit { this.dynamicSearch() } - @XTracerAsync({name:'Events-to-approve/LoadToApproveEvents', log: false, bugPrint: true}) + @XTracerAsync({name:'Events-to-approve/LoadToApproveEvents', bugPrint: true}) async LoadToApproveEvents(tracing?: TracingType) { this.showLoader = true; const segment = this.selectedUserCalendar diff --git a/src/app/store/session.service.ts b/src/app/store/session.service.ts index d00172c4e..965389ecf 100644 --- a/src/app/store/session.service.ts +++ b/src/app/store/session.service.ts @@ -52,6 +52,10 @@ class SessionService { this._user.Inactivity = false } + window['clearS'] = () => { + delete this._user.Authorization + } + } getDataFromLocalStorage() {