Skip to content

Commit

Permalink
fix: remove handlersjs logger from front-end packages (#164)
Browse files Browse the repository at this point in the history
* chore: remove logger

* fix: typo in index title

* chore: remove logger

* build: coverage update

* build: coverage update

* build: coverage update

* chore: remove logger van test setup

* build: package update
  • Loading branch information
JasperVandenberghen authored Apr 29, 2022
1 parent dcdb72d commit c406468
Show file tree
Hide file tree
Showing 46 changed files with 79 additions and 857 deletions.
2 changes: 1 addition & 1 deletion packages/dgt-components/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>SemCom Components</title>
<title>DGT Components</title>
<base href="/">
<link href="./styles.module.css" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com">
Expand Down
11 changes: 0 additions & 11 deletions packages/dgt-components/lib/components/alerts/alert.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { css, CSSResult, html, LitElement, property, TemplateResult, unsafeCSS } from 'lit-element';
import { ArgumentError, Translator } from '@digita-ai/dgt-utils';
import { getLoggerFor, Logger } from '@digita-ai/handlersjs-logging';
import { Bell, Cross, Theme } from '@digita-ai/dgt-theme';
import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
import { Alert } from './alert';
Expand All @@ -10,10 +9,6 @@ import { Alert } from './alert';
*/
export class AlertComponent extends LitElement {

/**
* The component's logger.
*/
private logger: Logger = getLoggerFor(this, 5, 5);
/**
* The component's translator.
*/
Expand Down Expand Up @@ -42,12 +37,8 @@ export class AlertComponent extends LitElement {
*/
dismiss(): void {

this.logger.debug('Dismissing alert', this.alert);

if (!this.alert) {

this.logger.warn('No alert to dismiss');

throw new ArgumentError('Argument this.alert should be set.', this.alert);

}
Expand All @@ -66,8 +57,6 @@ export class AlertComponent extends LitElement {
const message = this.translator ? this.translator.translate(this.alert?.message) : this.alert?.message;
const type = this.alert && this.alert.type ? this.alert.type : 'warning';

this.logger.info(`Rendering alert of type: ${type}, with message: ${message}`, this.alert);

return html`
<div part="alert" class="alert ${ type }">
<div class="icon" ?hidden="${this.hideIcon}">${ unsafeSVG(Bell) }</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { createMachine, DoneEvent, interpret, Interpreter, State, StateMachine }
import { RxLitElement } from 'rx-lit';
import { from } from 'rxjs';
import { map } from 'rxjs/operators';
import { getLoggerFor, Logger } from '@digita-ai/handlersjs-logging';
import { Theme, DigitaBlue } from '@digita-ai/dgt-theme';
import { SolidService } from '@digita-ai/inrupt-solid-service';
import { Translator } from '@digita-ai/dgt-utils';
Expand All @@ -19,7 +18,6 @@ export class AuthenticateComponent extends RxLitElement {

private actor: Interpreter<AuthenticateContext, AuthenticateStateSchema, AuthenticateEvent, AuthenticateState>;
private machine: StateMachine<AuthenticateContext, AuthenticateStateSchema, AuthenticateEvent, AuthenticateState>;
private logger: Logger = getLoggerFor(this, 5, 5);

@internalProperty()
state?: State<AuthenticateContext>;
Expand Down Expand Up @@ -101,23 +99,20 @@ export class AuthenticateComponent extends RxLitElement {

onSubmit = (event: CustomEvent): void => {

this.logger.info('onSubmit', event);
event.preventDefault();
this.actor.send(new ClickedLoginEvent(event.detail));

};

onWebIdChange = (event: CustomEvent): void => {

this.logger.info('onWebIdChange', event);
event.preventDefault();
this.actor.send(new WebIdEnteredEvent(event.detail));

};

onButtonCreateWebIDClick = (): void => {

this.logger.info('onButtonCreateWebIDClick');
this.dispatchEvent(new CustomEvent('create-webid', { bubbles: true }));

};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { addProtocolPrefix } from '@digita-ai/dgt-utils';
import { getLogger, Logger } from '@digita-ai/handlersjs-logging';
import { AuthenticateContext, WebIdEnteredEvent } from './authenticate.machine';

/**
Expand All @@ -14,18 +13,14 @@ Promise<{ webId: string; validationResults: string[] }> => {

let validationResults: string[] = [];
let webId = event.webId;
const logger: Logger = getLogger();

try {

webId = event.webId.match(/^https?:\/\/.*$/) ? event.webId : await addProtocolPrefix(event.webId);
logger.info('Checking webid: ' + webId);
validationResults = await context.webIdValidator(webId);
logger.info(`Validation results for ${webId}`, validationResults);

} catch(e){

logger.verbose('Validation failed: invalid uri', e.message);
validationResults.push('common.webid-validation.invalid-uri');

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Theme } from '@digita-ai/dgt-theme';
import { debounce } from 'debounce';
import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
import { Translator } from '@digita-ai/dgt-utils';
import { getLoggerFor, Logger } from '@digita-ai/handlersjs-logging';
import { define } from '../../util/define';
import { AlertComponent } from '../alerts/alert.component';

Expand All @@ -21,8 +20,6 @@ export class WebIdComponent extends RxLitElement {
@property({ type: Boolean }) disableLogin = true; // disable button by default
@property({ type: Translator }) translator?: Translator;

private logger: Logger = getLoggerFor(this, 5, 5);

constructor() {

super();
Expand All @@ -35,8 +32,6 @@ export class WebIdComponent extends RxLitElement {

event.preventDefault();

this.logger.info('onSubmit', event.target);

this.dispatchEvent(new CustomEvent('submit-webid', {
detail: event.target.querySelector<HTMLInputElement>('input[name=webid]').value,
}));
Expand All @@ -45,8 +40,6 @@ export class WebIdComponent extends RxLitElement {

onWebIdChange = debounce((target: HTMLInputElement): void => {

this.logger.info('onWebIdChange', target);

this.dispatchEvent(new CustomEvent('change-webid', {
detail: target.value,
}));
Expand All @@ -55,7 +48,6 @@ export class WebIdComponent extends RxLitElement {

onButtonCreateWebIDClick = (): void => {

this.logger.info('onButtonCreateWebIDClick');
this.dispatchEvent(new CustomEvent('create-webid'));

};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@ import { Translator } from '@digita-ai/dgt-utils';
import { Checkbox, Theme } from '@digita-ai/dgt-theme';
import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
import { ifDefined } from 'lit-html/directives/if-defined';
import { getLoggerFor, Logger } from '@digita-ai/handlersjs-logging';

/**
* A component which shows the details of a single alert.
*/
export class CheckboxComponent extends LitElement {

/**
* The component's logger.
*/
private logger: Logger = getLoggerFor(this, 5, 5);

/**
* The component's translator.
*/
Expand All @@ -29,8 +23,6 @@ export class CheckboxComponent extends LitElement {

private toggle = (event: Event): void => {

this.logger.info('Checkbox toggled', event);

this.toggleAttribute('checked');
this.dispatchEvent(new Event('change', { ...event }));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { css, CSSResultArray, html, internalProperty, LitElement, property, TemplateResult, unsafeCSS } from 'lit-element';
import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
import { Location, Edit, Theme } from '@digita-ai/dgt-theme';
import { getLoggerFor } from '@digita-ai/handlersjs-logging';
import { Purpose } from '../../models/purpose.model';
import { predicateTranslations } from '../../models/predicate-translations';

export class ConsentRequestComponent extends LitElement {

private logger = getLoggerFor(this, 5, 5);

@property({ type: Object })
public purpose: Purpose;

Expand All @@ -22,14 +19,12 @@ export class ConsentRequestComponent extends LitElement {

onButtonClick = (): void => {

this.logger.info('onButtonClick');
this.dispatchEvent(new CustomEvent('consent-given'));

};

onConsentCheck = (): void => {

this.logger.info('onConsentCheck');
this.checked = !this.checked;

};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { css, CSSResultArray, html, LitElement, property, TemplateResult, unsafeCSS } from 'lit-element';
import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
import { Theme, Location } from '@digita-ai/dgt-theme';
import { getLoggerFor } from '@digita-ai/handlersjs-logging';
import { predicateTranslations } from '../../models/predicate-translations';
import { Purpose } from '../../models/purpose.model';

export class ConsentResultComponent extends LitElement {

private logger = getLoggerFor(this, 5, 5);

@property({ type: String })
public title: string;

Expand All @@ -21,13 +18,7 @@ export class ConsentResultComponent extends LitElement {
@property({ type: Object })
public purpose: Purpose;

onButtonClick = (): boolean => {

this.logger.info('onButtonClick');

return this.dispatchEvent(new CustomEvent('button-clicked'));

};
onButtonClick = (): boolean => this.dispatchEvent(new CustomEvent('button-clicked'));

render(): TemplateResult {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { RxLitElement } from 'rx-lit';
import { from } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import { Loading, Theme } from '@digita-ai/dgt-theme';
import { getLoggerFor } from '@digita-ai/handlersjs-logging';
import { FormContext, FormRootStates, FormState, FormStateSchema, FormSubmissionStates, FormValidationStates } from './form.machine';
import { FormValidatorResult } from './form-validator-result';
import { FormEvent, FormEvents, FormUpdatedEvent } from './form.events';
Expand All @@ -16,8 +15,6 @@ import { FormEvent, FormEvents, FormUpdatedEvent } from './form.events';
*/
export class FormElementComponent<T> extends RxLitElement {

private logger = getLoggerFor(this, 5, 5);

/**
* All input elements slotted in the form element.
*/
Expand Down Expand Up @@ -130,8 +127,6 @@ export class FormElementComponent<T> extends RxLitElement {

protected firstUpdated(changed: PropertyValues): void {

this.logger.info('firstUpdated', changed);

super.firstUpdated(changed);

this.bindActorToInput(this.inputSlot, this.actor, this.field, this.data);
Expand All @@ -150,28 +145,24 @@ export class FormElementComponent<T> extends RxLitElement {

if (!slot) {

this.logger.warn('bindActorToInput', 'No slot found.');
throw new ArgumentError('Argument slot should be set.', slot);

}

if (!actor) {

this.logger.warn('bindActorToInput', 'No actor found.');
throw new ArgumentError('Argument actor should be set.', actor);

}

if (!field) {

this.logger.warn('bindActorToInput', 'No field found.');
throw new ArgumentError('Argument field should be set.', field);

}

if (!data) {

this.logger.warn('bindActorToInput', 'No data found.');
throw new ArgumentError('Argument data should be set.', data);

}
Expand All @@ -196,8 +187,6 @@ export class FormElementComponent<T> extends RxLitElement {

if (event.key === 'Enter') {

this.logger.info('bindActorToInput', 'Enter pressed, submitting form');

actor.send({ type: FormEvents.FORM_SUBMITTED });

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css, html, LitElement, property, unsafeCSS } from 'lit-element';
import { css, html, LitElement, unsafeCSS, CSSResult, TemplateResult } from 'lit-element';
import { Theme } from '@digita-ai/dgt-theme';

/**
Expand All @@ -11,7 +11,7 @@ export class ContentHeaderComponent extends LitElement {
*
* @returns The rendered HTML of the component.
*/
render() {
render(): TemplateResult {

return html`
<div class="icon">
Expand All @@ -33,7 +33,7 @@ export class ContentHeaderComponent extends LitElement {
/**
* The styles associated with the component.
*/
static get styles() {
static get styles(): CSSResult[] {

return [
unsafeCSS(Theme),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { css, html, LitElement, unsafeCSS } from 'lit-element';
import { css, html, LitElement, unsafeCSS, CSSResult, TemplateResult } from 'lit-element';
import { Theme } from '@digita-ai/dgt-theme';

/**
Expand All @@ -9,7 +9,7 @@ export class ListItemComponent extends LitElement {
/**
* The styles associated with the component.
*/
static get styles() {
static get styles(): CSSResult[] {

return [
unsafeCSS(Theme),
Expand Down Expand Up @@ -45,7 +45,7 @@ export class ListItemComponent extends LitElement {
*
* @returns The rendered HTML of the component.
*/
render() {
render(): TemplateResult {

return html`
<div class="icon">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { css, CSSResultArray, html, internalProperty, LitElement, property, TemplateResult, unsafeCSS } from 'lit-element';
import { Theme } from '@digita-ai/dgt-theme';
import { getLoggerFor } from '@digita-ai/handlersjs-logging';
import { Issuer } from '../../models/issuer.model';
import { ProviderListItemComponent } from './provider-list-item.component';

export class ProviderListComponent extends LitElement {

private logger = getLoggerFor(this, 5, 5);

@property({ type: Array })
public providers: Issuer[];

Expand All @@ -24,7 +21,6 @@ export class ProviderListComponent extends LitElement {

onIssuerSelected = (issuer: Issuer) => (): void => {

this.logger.info('Issuer selected', issuer);
this.buttonsEnabled = false;
this.dispatchEvent(new CustomEvent('issuer-selected', { detail: issuer }));

Expand Down
Loading

0 comments on commit c406468

Please sign in to comment.