Merge branch 'dev' into feature-permissions

This commit is contained in:
Michael Shamoon
2022-12-17 20:05:12 -08:00
41 changed files with 3562 additions and 1179 deletions

View File

@@ -1,6 +1,6 @@
<app-widget-frame title="Statistics" [loading]="loading" i18n-title>
<ng-container content>
<p class="card-text" i18n *ngIf="statistics?.documents_inbox != null">Documents in inbox: {{statistics?.documents_inbox}}</p>
<p class="card-text" i18n *ngIf="statistics?.documents_inbox !== null">Documents in inbox: {{statistics?.documents_inbox}}</p>
<p class="card-text" i18n>Total documents: {{statistics?.documents_total}}</p>
</ng-container>
</app-widget-frame>

View File

@@ -1,6 +1,5 @@
import { HttpEventType } from '@angular/common/http'
import { Component, OnInit } from '@angular/core'
import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop'
import { Component } from '@angular/core'
import { NgxFileDropEntry } from 'ngx-file-drop'
import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component'
import {
ConsumerStatusService,
@@ -16,10 +15,7 @@ const MAX_ALERTS = 5
templateUrl: './upload-file-widget.component.html',
styleUrls: ['./upload-file-widget.component.scss'],
})
export class UploadFileWidgetComponent
extends ComponentWithPermissions
implements OnInit
{
export class UploadFileWidgetComponent extends ComponentWithPermissions {
alertsExpanded = false
constructor(
@@ -115,8 +111,6 @@ export class UploadFileWidgetComponent
this.consumerStatusService.dismissCompleted()
}
ngOnInit(): void {}
public fileOver(event) {}
public fileLeave(event) {}

View File

@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'
import { Component } from '@angular/core'
import { TourService } from 'ngx-ui-tour-ng-bootstrap'
@Component({
@@ -6,8 +6,6 @@ import { TourService } from 'ngx-ui-tour-ng-bootstrap'
templateUrl: './welcome-widget.component.html',
styleUrls: ['./welcome-widget.component.scss'],
})
export class WelcomeWidgetComponent implements OnInit {
export class WelcomeWidgetComponent {
constructor(public readonly tourService: TourService) {}
ngOnInit(): void {}
}

View File

@@ -1,11 +1,11 @@
import { Component, Input, OnInit } from '@angular/core'
import { Component, Input } from '@angular/core'
@Component({
selector: 'app-widget-frame',
templateUrl: './widget-frame.component.html',
styleUrls: ['./widget-frame.component.scss'],
})
export class WidgetFrameComponent implements OnInit {
export class WidgetFrameComponent {
constructor() {}
@Input()
@@ -13,6 +13,4 @@ export class WidgetFrameComponent implements OnInit {
@Input()
loading: boolean = false
ngOnInit(): void {}
}