From 42b40636991b97fe818007fab19091764fc5db73 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 15 Jul 2022 15:30:14 +0200 Subject: Add ability for client to create server logs --- .../src/app/+admin/overview/users/user-list/user-list.component.ts | 5 +++-- .../app/+admin/plugins/plugin-search/plugin-search.component.ts | 3 ++- client/src/app/+admin/system/logs/log-row.model.ts | 7 ++++--- client/src/app/+admin/system/logs/logs.component.ts | 6 +++--- client/src/app/+admin/system/logs/logs.service.ts | 4 ++-- 5 files changed, 14 insertions(+), 11 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts index 3e1a5f6b8..99987fdff 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts @@ -2,11 +2,12 @@ import { SortMeta } from 'primeng/api' import { Component, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { AuthService, ConfirmService, LocalStorageService, Notifier, RestPagination, RestTable, ServerService } from '@app/core' -import { prepareIcu, getAPIHost } from '@app/helpers' +import { getAPIHost, prepareIcu } from '@app/helpers' import { AdvancedInputFilter } from '@app/shared/shared-forms' import { Actor, DropdownAction } from '@app/shared/shared-main' import { AccountMutedStatus, BlocklistService, UserBanModalComponent, UserModerationDisplayType } from '@app/shared/shared-moderation' import { UserAdminService } from '@app/shared/shared-users' +import { logger } from '@root-helpers/logger' import { User, UserRole } from '@shared/models' type UserForList = User & { @@ -149,7 +150,7 @@ export class UserListComponent extends RestTable implements OnInit { this.selectedColumns = JSON.parse(result) return } catch (err) { - console.error('Cannot load selected columns.', err) + logger.error('Cannot load selected columns.', err) } } diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts index d39c2ea1c..b02c054a2 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts @@ -4,6 +4,7 @@ import { Component, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service' import { ComponentPagination, ConfirmService, hasMoreItems, Notifier, PluginService } from '@app/core' +import { logger } from '@root-helpers/logger' import { PeerTubePluginIndex, PluginType } from '@shared/models' @Component({ @@ -94,7 +95,7 @@ export class PluginSearchComponent implements OnInit { }, error: err => { - console.error(err) + logger.error(err) const message = $localize`The plugin index is not available. Please retry later.` this.notifier.error(message) diff --git a/client/src/app/+admin/system/logs/log-row.model.ts b/client/src/app/+admin/system/logs/log-row.model.ts index 615778210..e83c7b064 100644 --- a/client/src/app/+admin/system/logs/log-row.model.ts +++ b/client/src/app/+admin/system/logs/log-row.model.ts @@ -1,10 +1,11 @@ -import { LogLevel } from '@shared/models' import omit from 'lodash-es/omit' +import { logger } from '@root-helpers/logger' +import { ServerLogLevel } from '@shared/models' export class LogRow { date: Date localeDate: string - level: LogLevel + level: ServerLogLevel message: string meta: string @@ -33,7 +34,7 @@ export class LogRow { this.meta = JSON.stringify(message, null, 2) this.message = '' } catch (err) { - console.error('Cannot parse audit message.', err) + logger.error('Cannot parse audit message.', err) } } } diff --git a/client/src/app/+admin/system/logs/logs.component.ts b/client/src/app/+admin/system/logs/logs.component.ts index 06237522a..939e710d7 100644 --- a/client/src/app/+admin/system/logs/logs.component.ts +++ b/client/src/app/+admin/system/logs/logs.component.ts @@ -1,6 +1,6 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core' import { LocalStorageService, Notifier } from '@app/core' -import { LogLevel } from '@shared/models' +import { ServerLogLevel } from '@shared/models' import { LogRow } from './log-row.model' import { LogsService } from './logs.service' @@ -17,11 +17,11 @@ export class LogsComponent implements OnInit { logs: LogRow[] = [] timeChoices: { id: string, label: string, dateFormat: string }[] = [] - levelChoices: { id: LogLevel, label: string }[] = [] + levelChoices: { id: ServerLogLevel, label: string }[] = [] logTypeChoices: { id: 'audit' | 'standard', label: string }[] = [] startDate: string - level: LogLevel + level: ServerLogLevel logType: 'audit' | 'standard' tagsOneOf: string[] = [] diff --git a/client/src/app/+admin/system/logs/logs.service.ts b/client/src/app/+admin/system/logs/logs.service.ts index ea7e08b9b..933a074a8 100644 --- a/client/src/app/+admin/system/logs/logs.service.ts +++ b/client/src/app/+admin/system/logs/logs.service.ts @@ -3,7 +3,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { RestExtractor, RestService } from '@app/core' -import { LogLevel } from '@shared/models' +import { ServerLogLevel } from '@shared/models' import { environment } from '../../../../environments/environment' import { LogRow } from './log-row.model' @@ -22,7 +22,7 @@ export class LogsService { isAuditLog: boolean startDate: string tagsOneOf?: string[] - level?: LogLevel + level?: ServerLogLevel endDate?: string }): Observable { const { isAuditLog, startDate, endDate, tagsOneOf } = options -- cgit v1.2.3