diff --git a/src/app/components/toast/toast.component.html b/src/app/components/toast/toast.component.html index 08d233ba5cb760d42af51d0be0210c9fbb82473e..8499d0ce27e89c5041e598821e9d9becd9fc318f 100644 --- a/src/app/components/toast/toast.component.html +++ b/src/app/components/toast/toast.component.html @@ -1,9 +1,9 @@ <div class="toast-holder"> - <div *ngFor="let toast of toasts | keyvalue" id="{{toastIdPrefix + toast.key}}"> - <div class="toast {{toast.value.type}}" [class.fade-in]="isSeen(toast.key)"> + <div *ngFor="let toast of toasts | keyvalue"> + <div class="toast {{toast.value.type}}"> <a (click)="close(toast.key)" aria-label="close" class="close"> <span class="icon" title="Close analysis"> - <i class="fas fa-times" aria-hidden="true"></i> + <i class="fas fa-times" aria-hidden="true"></i> </span> </a> <p>{{toast.value.message}}</p> diff --git a/src/app/components/toast/toast.component.scss b/src/app/components/toast/toast.component.scss index 257775c4bd06b12faad3c9df281fb7cfccc9b56f..6a7f84779bb18529b6adcf049a4e9206eac3d067 100644 --- a/src/app/components/toast/toast.component.scss +++ b/src/app/components/toast/toast.component.scss @@ -16,19 +16,19 @@ box-shadow: 0 0.5em 1em -0.125em hsla(0, 0%, 4%, 0.1), 0 0 0 1px hsla(0, 0%, 4%, 0.02); margin: 0 auto; - &.danger { + &.drugstone-prefix-danger { color: var(--drgstn-text-secondary); background-color: var(--drgstn-danger); } - &.success { + &.drugstone-prefix-success { color: var(--drgstn-text-secondary) !important; background-color: var(--drgstn-success); } - &.warning { + &.drugstone-prefix-warning { color: var(--drgstn-text-secondary); background-color: var(--drgstn-warning); } - &.info { + &.drugstone-prefix-info { color: var(--drgstn-text-secondary); background-color: var(--drgstn-info); } diff --git a/src/app/components/toast/toast.component.ts b/src/app/components/toast/toast.component.ts index 53bbf9784f418a9f4881058cf1c051dfb734f83c..3003715b45d77acadf32c445e4f7a6155f1b32b4 100644 --- a/src/app/components/toast/toast.component.ts +++ b/src/app/components/toast/toast.component.ts @@ -10,7 +10,6 @@ import { ToastService } from 'src/app/services/toast/toast.service'; export class ToastComponent implements OnInit { public toasts: LiveToasts = {}; - public seen: any = new Set(); public toastIdPrefix = 'drugstone-toast-id-'; @@ -22,19 +21,8 @@ export class ToastComponent implements OnInit { }) } - public isSeen(id) { - console.log(this.seen.has(id)) - if (this.seen.has(id)) { - return true - } else { - this.seen.add(id); - return false - } - } - public close(id: number) { this.toast.deleteToast(id); - document.getElementById(`${this.toastIdPrefix}` + id).remove(); } } diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts index b0247cf101a2b3cf17de2e3327ed3f373f59aca5..b8c3735130b2b8cfe022e05e9828e59752d7e58c 100644 --- a/src/app/services/analysis/analysis.service.ts +++ b/src/app/services/analysis/analysis.service.ts @@ -2,7 +2,6 @@ import {Wrapper, Task, getWrapperFromNode, Node, Dataset, Tissue} from '../../in import {Subject} from 'rxjs'; import {HttpClient} from '@angular/common/http'; import {environment} from '../../../environments/environment'; -import {toast} from 'bulma-toast'; import {Injectable} from '@angular/core'; import {NetexControllerService} from '../netex-controller/netex-controller.service'; import {DrugstoneConfigService} from "../drugstone-config/drugstone-config.service";