diff --git a/.npmrc b/.npmrc index 17ec3e118..8f87ca382 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1 @@ -@isa:registry=https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/ -@cmf:registry=https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/ -always-auth=true +@paragondata:registry=https://npm.pkg.github.com \ No newline at end of file diff --git a/apps/domain/task-calendar/src/lib/task-calendar.service.ts b/apps/domain/task-calendar/src/lib/task-calendar.service.ts index 4a3886537..a06e5cb70 100644 --- a/apps/domain/task-calendar/src/lib/task-calendar.service.ts +++ b/apps/domain/task-calendar/src/lib/task-calendar.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@swagger/eis'; +import { DisplayInfoDTO, EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@swagger/eis'; import { DateAdapter } from '@ui/common'; import { memorize } from '@utils/common'; import { map, shareReplay, switchMap } from 'rxjs/operators'; @@ -279,4 +279,80 @@ export class DomainTaskCalendarService { ) ); } + + moveRemovedToEnd(a: DisplayInfoDTO, b: DisplayInfoDTO) { + const statusA = this.getProcessingStatusList(a)?.includes('Removed'); + const statusB = this.getProcessingStatusList(b)?.includes('Removed'); + + if (statusA && statusB) { + return 0; + } else if (statusA && !statusB) { + return 1; + } else if (!statusA && statusB) { + return -1; + } + + return 0; + } + + /** + * Returns an Array of DisplayInfoDTO, sorted by ProcessingStatus + * Ignores Overdue if Task is already Completed + * Compared DisploayInfoDTO is of Type Task and Info Or PreInfo then sort by Type + * @param items DisplayInfoDTO Array to sort + * @param order Processing Status Order + * @returns DisplayInfoDTO Array ordered by Processing Status anf Type + */ + sort(items: DisplayInfoDTO[], order: ProcessingStatusList) { + let result = [...items]; + const reversedOrder = [...order].reverse(); + + for (const status of reversedOrder) { + result = result?.sort((a, b) => { + const statusA = this.getProcessingStatusList(a); + const statusB = this.getProcessingStatusList(b); + + // Ignore Overdue when it is already Completed + if (status === 'Overdue' && statusA.includes('Completed')) { + return 0; + } + + const aHasStatus = statusA.includes(status); + const bHasStatus = statusB.includes(status); + + if (aHasStatus && bHasStatus) { + // If it has the same ProcessingStatus then Sort by Type + const aType = this.getInfoType(a); + const bType = this.getInfoType(b); + if (aType !== bType) { + if (aType === 'Info' || aType === 'PreInfo') { + return -1; + } else { + return 1; + } + } + + if (statusB.includes('Completed')) { + return -1; + } + + return 0; + } else if (aHasStatus && !bHasStatus) { + return -1; + } else if (!aHasStatus && bHasStatus) { + return 1; + } + + return 0; + }); + } + + return result; + } + + getDateGroupKey(d: string) { + // Get Date as string key to ignore time for grouping + const date = new Date(d); + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; + } } diff --git a/apps/isa-app/src/assets/icons.svg b/apps/isa-app/src/assets/icons.svg index 4a71a3013..73b9010ff 100644 --- a/apps/isa-app/src/assets/icons.svg +++ b/apps/isa-app/src/assets/icons.svg @@ -212,4 +212,7 @@ + + + diff --git a/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts b/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts index e5c1f3bc2..76a3cde0b 100644 --- a/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts +++ b/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts @@ -46,8 +46,7 @@ export class GoodsOutSearchFilterComponent implements OnInit, OnDestroy { private _goodsOutSearchStore: GoodsOutSearchStore, private _breadcrumb: BreadcrumbService, private _cdr: ChangeDetectorRef, - private _router: Router, - private readonly _config: Config + private _router: Router ) {} ngOnInit() { diff --git a/apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts b/apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts index b14686b6c..d4a1cb2c5 100644 --- a/apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts +++ b/apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts @@ -1,6 +1,16 @@ import { Clipboard } from '@angular/cdk/clipboard'; import { DatePipe } from '@angular/common'; -import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, Optional, HostBinding } from '@angular/core'; +import { + Component, + ChangeDetectionStrategy, + Input, + OnChanges, + SimpleChanges, + Optional, + HostBinding, + EventEmitter, + Output, +} from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; import { FileDTO } from '@swagger/checkout'; import { DisplayInfoDTO } from '@swagger/eis'; @@ -27,6 +37,9 @@ export class TaskInfoComponent implements OnChanges { @Input() info: DisplayInfoDTO; + @Output() + changed = new EventEmitter(); + @Input() showTaskDate: boolean; @@ -210,5 +223,6 @@ export class TaskInfoComponent implements OnChanges { await this.domainTaskCalendarService.addComment({ infoId: this.info.id, text: note }).toPromise(); sessionStorage.removeItem(`INFO_NOTE_${this.info?.id}`); this.noteAdded$.next(); + this.changed.emit(true); } } diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.html b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.html index 729082a7d..86568692f 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.html +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.html @@ -1,33 +1,45 @@ -
- - {{ item?.taskDate || item?.publicationDate | date }} - - - - {{ item?.timeFrom | date: 'HH:mm' }} - {{ item?.timeTo | date: 'HH:mm' }} - - Ganztägig +
+ +
+ + {{ item?.taskDate || item?.publicationDate | date }} + + + + {{ item?.timeFrom | date: 'HH:mm' }} - {{ item?.timeTo | date: 'HH:mm' }} + + Ganztägig + +
+ + -
- -
-
- - - -
- - -
-
- {{ item?.title }} - - - + +
+
+ {{ item?.title }} + + + +
+
{{ item?.category | replace: '##':' / ' }}
+
{{ item?.text | stripHtmlTags | substr: 70 }}
-
{{ item?.category | replace: '##':' / ' }}
-
{{ item?.text | stripHtmlTags | substr: 70 }}
diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.scss b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.scss index 64abff6d2..9fd2ed304 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.scss +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.scss @@ -1,13 +1,20 @@ -:host { - @apply flex flex-row px-4 py-3; +.task-list-item-wrapper { + @apply flex flex-row pr-4 py-3 bg-white border-solid cursor-pointer; + border-radius: 5px 0px 5px 5px; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); .date { - @apply font-bold mr-2 self-start flex-shrink-0 flex-grow-0; + @apply font-bold mr-2 self-start flex-shrink-0 flex-grow-0 ml-4; width: 112px !important; } .indicator { - @apply w-px-2 bg-gray-100 self-stretch mx-4; + @apply bg-gray-100 justify-self-stretch; + width: 6px; + margin-top: -13px; + margin-bottom: -13px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; } .icon { @@ -41,3 +48,7 @@ } } } + +.show { + @apply visible; +} diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.ts b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.ts index f20804181..6a0d3429a 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.ts +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges, Ho import { DomainTaskCalendarService } from '@domain/task-calendar'; import { DisplayInfoDTO } from '@swagger/eis'; import { combineLatest, ReplaySubject } from 'rxjs'; -import { catchError, map, shareReplay, switchMap } from 'rxjs/operators'; +import { map, shareReplay } from 'rxjs/operators'; @Component({ selector: 'page-task-list-item', diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.html b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.html index 25988258d..a0830d5e2 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.html +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.html @@ -1,52 +1,55 @@ - -
-
-

Überfällig

- {{ overdieItems?.length }} Aufgaben -
-
- - + + +
+
+
+

Überfällig

+
+ {{ overdieItems?.length }} Aufgaben +
- -
- + + +
+ +
+ - -
-
-
-

{{ selected | date: 'EEEE' }}

-
{{ selected | date }}
+ +
+
+
+

{{ selected | date: 'EEEE' }}, {{ selected | date }}

+
+
+ + {{ itemsForSelectedDate?.length }} Aufgaben und Infos +
-
- - {{ itemsForSelectedDate?.length }} Aufgaben und Infos -
-
-
- -
- -
- + + +
+ +
+ - -
-
-
-

Laufende Aufgaben

+ +
+
+
+

Laufende Aufgaben

+
+
+ {{ ongoingItems?.length }} Aufgaben +
-
- {{ ongoingItems?.length }} Aufgaben -
-
-
- -
- -
- + + +
+ +
+ + diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.scss b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.scss index fea004b68..fe6a3dd71 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.scss +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.scss @@ -3,13 +3,17 @@ } .task-list { - @apply pt-6; + @apply pt-4; .head-row { - @apply flex flex-row justify-between items-baseline px-4 py-3; + @apply flex flex-row justify-between items-center px-5 py-3; + height: 53px; + background-color: #f5f7fa; + border-radius: 5px 5px 0px 0px; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); .head-row-title { - @apply flex flex-row self-end; + @apply flex flex-row text-lg; .muted { @apply ml-4 self-end; @@ -17,10 +21,10 @@ } .head-row-info { - @apply flex flex-col text-right items-end; + @apply flex flex-col text-right justify-center items-end; .cta-print { - @apply border-none outline-none bg-transparent text-brand text-cta-l font-bold pr-0 mb-3; + @apply border-none outline-none bg-transparent text-brand text-cta-l font-bold pr-0; } } @@ -50,3 +54,7 @@ @apply opacity-30 line-through; } } + +:host ::ng-deep ui-scroll-container .scroll-container { + @apply flex flex-col; +} diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts index 502d3af8c..2db4b49a7 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts @@ -1,7 +1,7 @@ import { DatePipe } from '@angular/common'; import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output } from '@angular/core'; import { DomainPrinterService } from '@domain/printer'; -import { DomainTaskCalendarService, ProcessingStatusList } from '@domain/task-calendar'; +import { DomainTaskCalendarService } from '@domain/task-calendar'; import { PrintModalComponent, PrintModalData } from '@modal/printer'; import { DisplayInfoDTO } from '@swagger/eis'; import { DateAdapter } from '@ui/common'; @@ -43,6 +43,19 @@ export class TaskListComponent { } } + /* @internal */ + fetching$ = new BehaviorSubject(true); + + @Input() + get fetching() { + return this.fetching$.value; + } + set fetching(value) { + if (this.fetching !== value) { + this.fetching$.next(value); + } + } + isToday$ = this.selected$.pipe(map((selected) => this.dateAdapter.equals({ first: selected, second: this.today, precision: 'day' }))); overdueItems$ = combineLatest([this.items$, this.selected$]).pipe( @@ -65,7 +78,7 @@ export class TaskListComponent { : item ) ), - map((list) => list.sort(this.moveRemovedToEnd.bind(this))) + map((list) => list.sort((a, b) => this.domainTaskCalendarService.moveRemovedToEnd(a, b))) ); ongoingItems$ = combineLatest([this.items$, this.selected$]).pipe( @@ -95,8 +108,8 @@ export class TaskListComponent { : item ) ), - map((list) => this.sort(list, ['Overdue', 'InProcess', 'Approved', 'Completed', 'Removed'])), - map((list) => list.sort(this.moveRemovedToEnd.bind(this))) + map((list) => this.domainTaskCalendarService.sort(list, ['Overdue', 'InProcess', 'Approved', 'Completed', 'Removed'])), + map((list) => list.sort(this.domainTaskCalendarService.moveRemovedToEnd)) ); selectedItems$ = combineLatest([this.items$, this.selected$]).pipe( @@ -116,8 +129,8 @@ export class TaskListComponent { ) ), // Sortierung der aufgaben nach Rot => Gelb => Grau => Grün - map((list) => this.sort(list, ['Overdue', 'InProcess', 'Approved', 'Completed', 'Removed'])), - map((list) => list.sort(this.moveRemovedToEnd.bind(this))) + map((list) => this.domainTaskCalendarService.sort(list, ['Overdue', 'InProcess', 'Approved', 'Completed', 'Removed'])), + map((list) => list.sort((a, b) => this.domainTaskCalendarService.moveRemovedToEnd(a, b))) ); @Output() @@ -131,76 +144,6 @@ export class TaskListComponent { private domainPrinterService: DomainPrinterService ) {} - moveRemovedToEnd(a: DisplayInfoDTO, b: DisplayInfoDTO) { - const statusA = this.domainTaskCalendarService.getProcessingStatusList(a)?.includes('Removed'); - const statusB = this.domainTaskCalendarService.getProcessingStatusList(b)?.includes('Removed'); - - if (statusA && statusB) { - return 0; - } else if (statusA && !statusB) { - return 1; - } else if (!statusA && statusB) { - return -1; - } - - return 0; - } - - /** - * Returns an Array of DisplayInfoDTO, sorted by ProcessingStatus - * Ignores Overdue if Task is already Completed - * Compared DisploayInfoDTO is of Type Task and Info Or PreInfo then sort by Type - * @param items DisplayInfoDTO Array to sort - * @param order Processing Status Order - * @returns DisplayInfoDTO Array ordered by Processing Status anf Type - */ - sort(items: DisplayInfoDTO[], order: ProcessingStatusList) { - let result = [...items]; - const reversedOrder = [...order].reverse(); - - for (const status of reversedOrder) { - result = result?.sort((a, b) => { - const statusA = this.domainTaskCalendarService.getProcessingStatusList(a); - const statusB = this.domainTaskCalendarService.getProcessingStatusList(b); - - // Ignore Overdue when it is already Completed - if (status === 'Overdue' && statusA.includes('Completed')) { - return 0; - } - - const aHasStatus = statusA.includes(status); - const bHasStatus = statusB.includes(status); - - if (aHasStatus && bHasStatus) { - // If it has the same ProcessingStatus then Sort by Type - const aType = this.domainTaskCalendarService.getInfoType(a); - const bType = this.domainTaskCalendarService.getInfoType(b); - if (aType !== bType) { - if (aType === 'Info' || aType === 'PreInfo') { - return -1; - } else { - return 1; - } - } - - if (statusB.includes('Completed')) { - return -1; - } - - return 0; - } else if (aHasStatus && !bHasStatus) { - return -1; - } else if (!aHasStatus && bHasStatus) { - return 1; - } - - return 0; - }); - } - - return result; - } - async print() { let displayInfos = await this.selectedItems$.pipe(first()).toPromise(); displayInfos = displayInfos.filter((di) => !this.domainTaskCalendarService.getProcessingStatusList(di).includes('Completed')); diff --git a/apps/page/task-calendar/src/lib/components/task-list/task-list.module.ts b/apps/page/task-calendar/src/lib/components/task-list/task-list.module.ts index f00e6dd0f..cbc268858 100644 --- a/apps/page/task-calendar/src/lib/components/task-list/task-list.module.ts +++ b/apps/page/task-calendar/src/lib/components/task-list/task-list.module.ts @@ -7,10 +7,13 @@ import { FilterStatusPipe, FilterTypePipe } from './pipes'; import { UiCommonModule } from '@ui/common'; import { UiTshirtModule } from '@ui/tshirt'; import { UiIconModule } from '@ui/icon'; +import { RouterModule } from '@angular/router'; +import { UiSpinnerModule } from '@ui/spinner'; +import { UiScrollContainerModule } from '@ui/scroll-container'; @NgModule({ - imports: [CommonModule, UiCommonModule, UiTshirtModule, UiIconModule], - exports: [TaskListComponent], + imports: [CommonModule, UiCommonModule, UiSpinnerModule, UiTshirtModule, UiIconModule, RouterModule, UiScrollContainerModule], + exports: [TaskListComponent, TaskListItemComponent], declarations: [TaskListComponent, TaskListItemComponent, FilterStatusPipe, FilterTypePipe], }) export class TaskListModule {} diff --git a/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.html b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.html new file mode 100644 index 000000000..dfb95ef85 --- /dev/null +++ b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.html @@ -0,0 +1,16 @@ + + + + + + + diff --git a/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.scss b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.scss new file mode 100644 index 000000000..875d646cf --- /dev/null +++ b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.scss @@ -0,0 +1,29 @@ +:host { + @apply grid relative; +} + +input { + @apply py-4 px-4 outline-none h-14 font-bold text-lg; + box-shadow: 0px 6px 24px rgba(206, 212, 219, 0.8); + border-radius: 5px; +} + +button.search { + @apply grid items-center justify-center bg-brand text-white px-2 py-2 rounded-lg -ml-2 w-14 h-14 absolute; + right: 0; +} + +button.clear { + @apply grid items-center justify-center px-2 py-2 rounded-lg -ml-2 w-14 h-14 absolute; + color: #1f466c; + right: 0; +} + +button:disabled { + @apply bg-disabled-branch cursor-not-allowed; +} + +::placeholder { + @apply font-bold text-lg; + color: #596470; +} diff --git a/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.ts b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.ts new file mode 100644 index 000000000..266a9cf17 --- /dev/null +++ b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.component.ts @@ -0,0 +1,97 @@ +import { Component, OnInit, OnDestroy, ViewChild, ElementRef, AfterViewInit } from '@angular/core'; +import { ActivatedRoute, Params, Router } from '@angular/router'; +import { isEqual } from 'lodash'; +import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; +import { map, shareReplay, takeUntil, first } from 'rxjs/operators'; +import { TaskCalendarStore } from '../../task-calendar.store'; + +@Component({ + selector: 'page-task-searchbar', + templateUrl: 'task-searchbar.component.html', + styleUrls: ['task-searchbar.component.scss'], +}) +export class TaskSearchbarComponent implements OnInit, OnDestroy, AfterViewInit { + private _onDestroy$ = new Subject(); + + @ViewChild('searchInput', { static: true }) + searchInput: ElementRef; + + filterActive$ = new BehaviorSubject(false); + + searchActive$ = new BehaviorSubject(false); + searchDisabled$ = new BehaviorSubject(true); + + search$ = new BehaviorSubject(''); + + filter$ = this.taskCalendarStore.selectFilter; + + get search() { + return this.search$.value; + } + set search(search: string) { + this.search$.next(search); + this.searchDisabled$.next(search?.length < 3); + } + + constructor(private taskCalendarStore: TaskCalendarStore, private _router: Router, private _activatedRoute: ActivatedRoute) {} + + ngOnInit(): void { + this._activatedRoute.queryParams.pipe(takeUntil(this._onDestroy$)).subscribe(async (queryParams) => { + const filter = await this.taskCalendarStore.selectFilter.pipe(first()).toPromise(); + const search = filter?.input?.find((_) => true)?.input.find((_) => true)?.value || queryParams?.main_qs || ''; + + this.search$.next(search); + this.searchActive$.next(!!search); + this.focusSearch(); + }); + } + + ngAfterViewInit(): void { + this.focusSearch(); + } + + ngOnDestroy() { + this._onDestroy$.next(); + this._onDestroy$.complete(); + } + + focusSearch() { + setTimeout(() => this.searchInput?.nativeElement?.focus(), 100); + } + + async clearSearch() { + const filter = await this.filter$.pipe(first()).toPromise(); + filter?.input + ?.find((_) => true) + ?.input.find((_) => true) + ?.setValue(''); + this.taskCalendarStore.setFilter({ filters: filter }); + + this.search = ''; + this.searchActive$.next(false); + this.focusSearch(); + } + + async searchTasks() { + const filter = await this.filter$.pipe(first()).toPromise(); + + filter?.input + ?.find((_) => true) + ?.input.find((_) => true) + ?.setValue(this.search); + this.taskCalendarStore.setFilter({ filters: filter }); + + if (this.search?.length >= 3) { + this.navigate('/filiale/task-calendar/search', { ...filter?.getQueryParams() }); + + // ActivatedRouteChange wird nicht aufgerufen, wenn sich die URL nicht verändert. In dem Fall erneute Suche ausführen + if (isEqual(filter.getQueryParams(), this._activatedRoute.snapshot.queryParams)) { + this.taskCalendarStore.search({ clear: true }); + } + } + } + + navigate(uri: string, queryParams?: Params) { + this._router.navigate([uri], { queryParams }); + } +} diff --git a/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.module.ts b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.module.ts new file mode 100644 index 000000000..ca6b10927 --- /dev/null +++ b/apps/page/task-calendar/src/lib/components/task-searchbar/task-searchbar.module.ts @@ -0,0 +1,15 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { UiFormFieldModule } from '@paragondata/ngx-ui/form-field'; +import { UiIconModule } from '@ui/icon'; + +import { TaskSearchbarComponent } from './task-searchbar.component'; + +@NgModule({ + imports: [CommonModule, UiFormFieldModule, FormsModule, UiIconModule], + exports: [TaskSearchbarComponent], + declarations: [TaskSearchbarComponent], + providers: [], +}) +export class TaskSearchbarModule {} diff --git a/apps/page/task-calendar/src/lib/containers/task-calendar-filter/task-calendar-filter.component.ts b/apps/page/task-calendar/src/lib/containers/task-calendar-filter/task-calendar-filter.component.ts index ceb5917c5..966621dd8 100644 --- a/apps/page/task-calendar/src/lib/containers/task-calendar-filter/task-calendar-filter.component.ts +++ b/apps/page/task-calendar/src/lib/containers/task-calendar-filter/task-calendar-filter.component.ts @@ -1,5 +1,9 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { UiFilter } from '@ui/filter'; +import { isEqual } from 'lodash'; +import { BehaviorSubject, Subject } from 'rxjs'; +import { first, takeUntil } from 'rxjs/operators'; import { TaskCalendarStore } from '../../task-calendar.store'; @Component({ @@ -8,24 +12,66 @@ import { TaskCalendarStore } from '../../task-calendar.store'; styleUrls: ['task-calendar-filter.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class TaskCalendarFilterComponent { +export class TaskCalendarFilterComponent implements OnInit, OnDestroy { + private _onDestroy$ = new Subject(); @Output() exitFilter = new EventEmitter(); - filter$ = this.taskCalendarStore.selectFilter; + filter$ = new BehaviorSubject(undefined); fetching$ = this.taskCalendarStore.selectFetching; message$ = this.taskCalendarStore.selectMessage; - constructor(private taskCalendarStore: TaskCalendarStore) {} + constructor(private taskCalendarStore: TaskCalendarStore, private _router: Router, private _activatedRoute: ActivatedRoute) {} + + private _initFilter(filter: UiFilter) { + this.filter$.next(UiFilter.create(filter)); + } + + async ngOnInit() { + this.taskCalendarStore.selectFilter.pipe(takeUntil(this._onDestroy$)).subscribe((filter) => { + this._initFilter(filter); + }); + + const filter = await this.taskCalendarStore.selectFilter.pipe(first()).toPromise(); + this._initFilter(filter); + } + + ngOnDestroy(): void { + this._onDestroy$.next(); + this._onDestroy$.complete(); + } + + async applyFilter(filters: UiFilter) { + const queryParams = { ...filters?.getQueryParams() }; - applyFilter(filters: UiFilter) { this.taskCalendarStore.setFilter({ filters }); - this.taskCalendarStore.loadItems(); - this.exitFilter.emit(); + this.taskCalendarStore.setMessage({ message: '' }); + + const search = this.getSearch(filters); + if (search?.length >= 3 || search === '') { + this.navigate('/filiale/task-calendar/search', queryParams); + + // ActivatedRouteChange wird nicht aufgerufen, wenn sich die URL nicht verändert. In dem Fall erneute Suche ausführen + if (isEqual(filters.getQueryParams(), this._activatedRoute.snapshot.queryParams)) { + this.taskCalendarStore.search({ clear: true }); + } + + this.exitFilter.emit(); + } else { + this.taskCalendarStore.setMessage({ message: 'Mindestens 3 Zeichen' }); + } + } + + getSearch(filter: UiFilter) { + return filter?.input?.find((_) => true)?.input?.find((_) => true)?.value || ''; } resetFilter() { this.taskCalendarStore.loadFilter(); } + + navigate(uri: string, queryParams?: Params) { + this._router.navigate([uri], { queryParams }); + } } diff --git a/apps/page/task-calendar/src/lib/modals/info/info-modal.component.html b/apps/page/task-calendar/src/lib/modals/info/info-modal.component.html index 1014eca56..c6448c765 100644 --- a/apps/page/task-calendar/src/lib/modals/info/info-modal.component.html +++ b/apps/page/task-calendar/src/lib/modals/info/info-modal.component.html @@ -3,7 +3,7 @@

{{ info?.title }}

- +
- +
- +
diff --git a/apps/page/task-calendar/src/lib/modals/task/task-modal.component.ts b/apps/page/task-calendar/src/lib/modals/task/task-modal.component.ts index ff667cb37..1bb6e3c3e 100644 --- a/apps/page/task-calendar/src/lib/modals/task/task-modal.component.ts +++ b/apps/page/task-calendar/src/lib/modals/task/task-modal.component.ts @@ -122,19 +122,26 @@ export class TaskModalComponent { this.modalRef.close({ successorId }); } + changed() { + this.modalRef.markChanged(); + } + async startEdit() { await this.domainTaskCalendarService.setToEdit({ infoId: this.info.id }).toPromise(); this.reloadInfo(); + this.changed(); } async completeEdit() { await this.domainTaskCalendarService.complete({ infoId: this.info.id }).toPromise(); + this.changed(); this.close(); } async edit() { await this.domainTaskCalendarService.setToEdit({ infoId: this.info.id }).toPromise(); this.reloadInfo(); + this.changed(); } reloadInfo() { @@ -159,6 +166,7 @@ export class TaskModalComponent { if (result.data === '') { this.captureInput?.nativeElement?.click(); } else if (result.data?.length > 0) { + this.changed(); this.close(); } }); diff --git a/apps/page/task-calendar/src/lib/page-task-calendar-routing.module.ts b/apps/page/task-calendar/src/lib/page-task-calendar-routing.module.ts index ab30d5982..b4287cc21 100644 --- a/apps/page/task-calendar/src/lib/page-task-calendar-routing.module.ts +++ b/apps/page/task-calendar/src/lib/page-task-calendar-routing.module.ts @@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; import { PageTaskCalendarComponent } from './page-task-calendar.component'; import { CalendarComponent } from './pages/calendar/calendar.component'; import { CalendarModule } from './pages/calendar/calendar.module'; +import { TaskSearchComponent } from './pages/task-search'; import { TasksComponent } from './pages/tasks/tasks.component'; import { TasksModule } from './pages/tasks/tasks.module'; @@ -13,7 +14,8 @@ const routes: Routes = [ children: [ { path: 'calendar', component: CalendarComponent }, { path: 'tasks', component: TasksComponent }, - { path: '', pathMatch: 'full', redirectTo: 'calendar' }, + { path: 'search', component: TaskSearchComponent }, + { path: '', pathMatch: 'full', redirectTo: 'tasks' }, ], }, ]; diff --git a/apps/page/task-calendar/src/lib/page-task-calendar.component.html b/apps/page/task-calendar/src/lib/page-task-calendar.component.html index 3792fad37..1a09e350f 100644 --- a/apps/page/task-calendar/src/lib/page-task-calendar.component.html +++ b/apps/page/task-calendar/src/lib/page-task-calendar.component.html @@ -1,21 +1,16 @@ - +
+ +
- +
+ + +
-
- - - Kalenderansicht - - - - Listenansicht - -
diff --git a/apps/page/task-calendar/src/lib/page-task-calendar.component.scss b/apps/page/task-calendar/src/lib/page-task-calendar.component.scss index 787b90ad0..c876e5f8c 100644 --- a/apps/page/task-calendar/src/lib/page-task-calendar.component.scss +++ b/apps/page/task-calendar/src/lib/page-task-calendar.component.scss @@ -1,20 +1,27 @@ :host { @apply flex flex-col w-full box-content relative; + height: calc(100vh - 14rem); } shell-breadcrumb { - @apply sticky z-sticky top-0 py-4; + @apply sticky z-sticky top-0 h-12 bg-white p-0; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); + border-radius: 5px; } .filter { - @apply absolute font-sans flex items-center font-bold bg-gray-400 border-0 text-regular -top-12 right-0 py-px-8 px-px-15 rounded-filter justify-center z-sticky; - - right: 0; - top: 10px; - min-width: 106px; + @apply font-sans flex items-center font-bold text-lg py-2 px-4 justify-center ml-3 h-14; + width: 108px; + background-color: #aeb7c1; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); + border-radius: 5px; .label { - @apply ml-px-5; + @apply ml-2; + } + + ui-icon { + width: 18px; } &.active { @@ -22,35 +29,27 @@ shell-breadcrumb { } } -.content-container { - max-height: calc(100vh - 267px); - overflow: scroll; - @apply bg-white rounded-card; +.content-header { + @apply grid items-center mt-4 shadow-input gap-1; + height: 56px; + grid-template-columns: 1fr 120px; } -.switch-group { - @apply flex flex-row justify-center my-9; - - a.calendar-switch { - @apply flex flex-row items-center px-7 py-2 no-underline text-black bg-munsell; - &:first-child { - @apply rounded-l-card; - } - - &:last-child { - @apply rounded-r-card; - } - ui-icon { - @apply mr-3; - } - } - - a.calendar-switch.active, - a.calendar-switch:active { - @apply text-white bg-active-branch; - } +.content-container { + @apply overflow-auto; + max-height: calc(100vh - 267px); + border-radius: 0px 0px 5px 5px; } :host ::ng-deep ui-calendar .navigation .title { margin-left: -140px; } + +:host ::ng-deep shell-breadcrumb .link-breadcrumb a { + color: #596470 !important; +} + +:host ::ng-deep shell-breadcrumb .link-back { + @apply top-3 pl-4; + color: #596470 !important; +} diff --git a/apps/page/task-calendar/src/lib/page-task-calendar.component.ts b/apps/page/task-calendar/src/lib/page-task-calendar.component.ts index ab1f5a596..6ed1fcb0d 100644 --- a/apps/page/task-calendar/src/lib/page-task-calendar.component.ts +++ b/apps/page/task-calendar/src/lib/page-task-calendar.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, ViewChild, ElementRef } from '@angular/core'; import { Config } from '@core/config'; import { isEqual } from 'lodash'; import { BehaviorSubject, combineLatest } from 'rxjs'; @@ -12,6 +12,9 @@ import { TaskCalendarStore } from './task-calendar.store'; providers: [TaskCalendarStore], }) export class PageTaskCalendarComponent { + @ViewChild('searchInput', { static: true }) + searchInput: ElementRef; + filterActive$ = new BehaviorSubject(false); taskCalendarKey = this._config.get('process.ids.taskCalendar'); diff --git a/apps/page/task-calendar/src/lib/page-task-calendar.module.ts b/apps/page/task-calendar/src/lib/page-task-calendar.module.ts index a67eb5ce5..b7c5c43fd 100644 --- a/apps/page/task-calendar/src/lib/page-task-calendar.module.ts +++ b/apps/page/task-calendar/src/lib/page-task-calendar.module.ts @@ -4,6 +4,7 @@ import { ShellBreadcrumbModule } from '@shell/breadcrumb'; import { ShellFilterOverlayModule } from '@shell/filter-overlay'; import { UiFilterNextModule } from '@ui/filter'; import { UiIconModule } from '@ui/icon'; +import { TaskSearchbarModule } from './components/task-searchbar/task-searchbar.module'; import { TaskCalendarFilterComponent } from './containers/task-calendar-filter/task-calendar-filter.component'; import { ModalsModule } from './modals/modals.module'; import { PageTaskCalendarRoutingModule } from './page-task-calendar-routing.module'; @@ -19,6 +20,7 @@ import { PageTaskCalendarComponent } from './page-task-calendar.component'; ModalsModule, UiFilterNextModule, ShellFilterOverlayModule, + TaskSearchbarModule, ], exports: [PageTaskCalendarComponent], }) diff --git a/apps/page/task-calendar/src/lib/pages/calendar/calendar.component.html b/apps/page/task-calendar/src/lib/pages/calendar/calendar.component.html index 3383468f6..dce4024fb 100644 --- a/apps/page/task-calendar/src/lib/pages/calendar/calendar.component.html +++ b/apps/page/task-calendar/src/lib/pages/calendar/calendar.component.html @@ -1,10 +1,12 @@ - +
+ +
diff --git a/apps/page/task-calendar/src/lib/pages/task-search/index.ts b/apps/page/task-calendar/src/lib/pages/task-search/index.ts new file mode 100644 index 000000000..d0e10077e --- /dev/null +++ b/apps/page/task-calendar/src/lib/pages/task-search/index.ts @@ -0,0 +1,4 @@ +// start:ng42.barrel +export * from './task-search.component'; +export * from './task-search.module'; +// end:ng42.barrel diff --git a/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.html b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.html new file mode 100644 index 000000000..d7c144b4a --- /dev/null +++ b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.html @@ -0,0 +1,39 @@ + + +
+
+
+

{{ group.group | date: 'EEEE' }}, {{ group.group | date }}

+
+
+ + {{ group.items?.length }} Aufgaben und Infos +
+
+
+ + +
+ +
+ + + + +
+ Keine Suchergebnisse +
+ + +
+ + Zurück zur Übersicht + +
diff --git a/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.scss b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.scss new file mode 100644 index 000000000..a6096db92 --- /dev/null +++ b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.scss @@ -0,0 +1,73 @@ +:host { + @apply flex flex-col box-border; +} + +.task-list { + @apply pt-4; + + .head-row { + @apply flex flex-row justify-between items-center px-5 py-3; + height: 53px; + background-color: #f5f7fa; + border-radius: 5px 5px 0px 0px; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); + + .head-row-title { + @apply flex flex-row text-lg; + + .muted { + @apply ml-4 self-end; + } + } + + .head-row-info { + @apply flex flex-col text-right justify-center items-end; + + .cta-print { + @apply border-none outline-none bg-transparent text-brand text-cta-l font-bold pr-0; + } + } + + h4 { + @apply m-0 font-bold; + } + + .muted { + @apply text-active-branch font-semibold text-sm; + } + } +} + +.empty-message { + @apply bg-white text-center font-semibold text-inactive-customer py-10 rounded-card; +} + +:host ::ng-deep ui-scroll-container .scroll-container { + @apply flex flex-col; + max-height: calc(100vh - 23rem) !important; +} + +.task-list ::ng-deep page-task-list-item.Removed { + .date, + .shirt-size, + .task-content { + @apply opacity-30 line-through; + } +} + +.actions { + @apply fixed bottom-28 inline-grid grid-flow-col gap-7; + left: 50%; + transform: translateX(-50%); + + .cta-back { + @apply border-2 border-solid border-brand rounded-full py-3 px-6 font-bold text-lg outline-none self-end whitespace-nowrap; + &:disabled { + @apply bg-inactive-branch border-inactive-branch; + } + } + + .cta-action-primary { + @apply bg-brand text-white; + } +} diff --git a/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.ts b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.ts new file mode 100644 index 000000000..b9a89fdf9 --- /dev/null +++ b/apps/page/task-calendar/src/lib/pages/task-search/task-search.component.ts @@ -0,0 +1,135 @@ +import { DatePipe } from '@angular/common'; +import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { ActivatedRoute, Params } from '@angular/router'; +import { BreadcrumbService } from '@core/breadcrumb'; +import { Config } from '@core/config'; +import { DomainPrinterService } from '@domain/printer'; +import { DomainTaskCalendarService } from '@domain/task-calendar'; +import { PrintModalComponent, PrintModalData } from '@modal/printer'; +import { DisplayInfoDTO } from '@swagger/eis'; +import { DateAdapter, groupBy } from '@ui/common'; +import { UiFilter } from '@ui/filter'; +import { UiModalService } from '@ui/modal'; +import { combineLatest, Subject } from 'rxjs'; +import { first, map, takeUntil, debounceTime } from 'rxjs/operators'; +import { TaskCalendarStore } from '../../task-calendar.store'; + +@Component({ + selector: 'page-task-search', + templateUrl: 'task-search.component.html', + styleUrls: ['task-search.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [DatePipe], +}) +export class TaskSearchComponent implements OnInit { + private _onDestroy$ = new Subject(); + + today = this.dateAdapter.today(); + byDate = (item: DisplayInfoDTO) => this.domainTaskCalendarService.getDateGroupKey(item.taskDate || item.publicationDate); + + searchResults$ = this.taskCalendarStore.searchResults$; + searchResultsLength$ = this.searchResults$.pipe(map((r) => r.length || 0)); + fetching$ = this.taskCalendarStore.isSearching$; + + displayItems$ = this.searchResults$.pipe( + map((r) => { + const grouped = groupBy(r, this.byDate); + grouped.sort((a, b) => new Date(b.group).getTime() - new Date(a.group).getTime()); + return grouped; + }), + // Sortierung der aufgaben nach Rot => Gelb => Grau => Grün + map((grouped) => + grouped.map((g) => ({ + ...g, + items: this.domainTaskCalendarService.sort(g.items, ['Overdue', 'InProcess', 'Approved', 'Completed', 'Removed']), + })) + ), + // Entfernte ans ende der Gruppe setzen + map((grouped) => grouped.map((g) => ({ ...g, items: g.items.sort((a, b) => this.domainTaskCalendarService.moveRemovedToEnd(a, b)) }))) + ); + + showEmptyMessage$ = combineLatest([this.fetching$, this.searchResultsLength$, this.taskCalendarStore.hits$]).pipe( + map(([fetching, length, hits]) => !fetching && length <= 0 && hits === 0) + ); + + constructor( + private dateAdapter: DateAdapter, + private taskCalendarStore: TaskCalendarStore, + private domainTaskCalendarService: DomainTaskCalendarService, + private uiModal: UiModalService, + private domainPrinterService: DomainPrinterService, + private datePipe: DatePipe, + private _activatedRoute: ActivatedRoute, + private _config: Config, + private _breadcrumb: BreadcrumbService + ) {} + + ngOnInit() { + this._activatedRoute.queryParams.pipe(takeUntil(this._onDestroy$), debounceTime(500)).subscribe(async (queryParams) => { + if (queryParams) { + const filters = UiFilter.create(await this.taskCalendarStore.selectFilter.pipe(first()).toPromise()); + if (queryParams) { + filters.fromQueryParams(queryParams); + } + this.taskCalendarStore.setFilter({ filters }); + } + + this.taskCalendarStore.search({ clear: true }); + this.updateBreadcrumb(queryParams); + }); + + this.taskCalendarStore.searchTarget$.pipe(takeUntil(this._onDestroy$)).subscribe((target) => { + setTimeout(() => { + document.getElementById(target)?.scrollIntoView(); + }, 150); + }); + } + + open(item: DisplayInfoDTO) { + this.taskCalendarStore.open(item); + } + + async print(date: string) { + let displayInfos = await this.searchResults$.pipe(first()).toPromise(); + displayInfos = displayInfos.filter((di) => !this.domainTaskCalendarService.getProcessingStatusList(di).includes('Completed')); + this.uiModal.open({ + content: PrintModalComponent, + data: { + printerType: 'Office', + print: (printer) => + this.domainPrinterService + .printDisplayInfoDTOList({ + displayInfos, + printer, + title: `Tätigkeitskalender \n Liste für ${this.datePipe.transform(date, 'EEEE, dd. MMMM yyyy')}`, + }) + .toPromise(), + } as PrintModalData, + config: { + panelClass: [], + showScrollbarY: false, + }, + }); + } + + async search() { + const hits = await this.taskCalendarStore.hits$.pipe(first()).toPromise(); + const results = await this.taskCalendarStore.searchResults$.pipe(first()).toPromise(); + const fetching = await this.taskCalendarStore.selectFetching.pipe(first()).toPromise(); + + if (hits > results.length && !fetching) { + this.taskCalendarStore.search({}); + } + } + + updateBreadcrumb(queryParams?: Params) { + this._breadcrumb.addOrUpdateBreadcrumbIfNotExists({ + key: this._config.get('process.ids.taskCalendar'), + name: queryParams?.main_qs || 'Suchergebnisse', + path: '/filiale/task-calendar/search', + tags: ['task-calendar', 'search'], + section: 'branch', + params: queryParams, + }); + } +} diff --git a/apps/page/task-calendar/src/lib/pages/task-search/task-search.module.ts b/apps/page/task-calendar/src/lib/pages/task-search/task-search.module.ts new file mode 100644 index 000000000..d6a3e3130 --- /dev/null +++ b/apps/page/task-calendar/src/lib/pages/task-search/task-search.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { UiCommonModule } from '@ui/common'; +import { UiIconModule } from '@ui/icon'; +import { RouterModule } from '@angular/router'; +import { UiScrollContainerModule } from '@ui/scroll-container'; +import { TaskSearchComponent } from './task-search.component'; +import { TaskListModule } from '../../components/task-list'; + +@NgModule({ + imports: [CommonModule, UiCommonModule, UiIconModule, RouterModule, UiScrollContainerModule, TaskListModule], + exports: [TaskSearchComponent], + declarations: [TaskSearchComponent], +}) +export class TaskSearchModule {} diff --git a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.html b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.html index d65d6b507..b88e91262 100644 --- a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.html +++ b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.html @@ -1,12 +1,19 @@ - +
+ +
- + diff --git a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.scss b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.scss index a9804769f..249c71ad1 100644 --- a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.scss +++ b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.scss @@ -1,3 +1,3 @@ :host { - @apply block pb-24; + @apply block; } diff --git a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.ts b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.ts index 740024ef2..eb14284bb 100644 --- a/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.ts +++ b/apps/page/task-calendar/src/lib/pages/tasks/tasks.component.ts @@ -21,6 +21,10 @@ export class TasksComponent implements OnInit { readonly items$ = this.taskCalendarStore.selectDisplayInfos; + readonly searchResults$ = this.taskCalendarStore.searchResults$; + + readonly fetching$ = this.taskCalendarStore.select((s) => s.fetching); + readonly minDate = this.dateAdapter.addCalendarMonths(this.dateAdapter.today(), -6); readonly maxDate = this.dateAdapter.addCalendarMonths(this.dateAdapter.today(), 6); @@ -46,8 +50,11 @@ export class TasksComponent implements OnInit { this.updateBreadcrumb({}); } - this.taskCalendarStore.setMode({ mode: 'week' }); this.taskCalendarStore.loadItems(); + this.removeSearchBreadcrumbs(); + + this.taskCalendarStore.resetSearch(); + this.taskCalendarStore.setMode({ mode: 'week' }); } setSelectedAndDisplayedDate({ displayDate, selectedDate }: { displayDate?: Date; selectedDate?: Date }) { @@ -56,7 +63,6 @@ export class TasksComponent implements OnInit { if (displayDate && selectedDate) { this.taskCalendarStore.setSelectedDate({ date: selectedDate }); this.taskCalendarStore.setDisplayedDate({ date: displayDate }); - this.taskCalendarStore.loadItems(); this.router.navigate([], { queryParams: { displayDate: displayDate?.toJSON(), selectedDate: selectedDate?.toJSON() }, }); @@ -74,7 +80,6 @@ export class TasksComponent implements OnInit { if (displayDate) { this.taskCalendarStore.setDisplayedDate({ date: displayDate }); - this.taskCalendarStore.loadItems(); this.router.navigate([], { queryParams: { ...queryParams, displayDate: displayDate?.toJSON() }, }); @@ -86,6 +91,10 @@ export class TasksComponent implements OnInit { this.taskCalendarStore.open(item); } + removeSearchBreadcrumbs() { + this.breadcrumb.removeBreadcrumbsByKeyAndTags(this._config.get('process.ids.taskCalendar'), ['task-calendar', 'search']); + } + updateBreadcrumb({ displayDate, selectedDate }: { displayDate?: Date; selectedDate?: Date }) { const queryParams = this.activatedRoute.snapshot.queryParams; this.breadcrumb.addOrUpdateBreadcrumbIfNotExists({ diff --git a/apps/page/task-calendar/src/lib/pages/tasks/tasks.module.ts b/apps/page/task-calendar/src/lib/pages/tasks/tasks.module.ts index 5346d5055..83db4f426 100644 --- a/apps/page/task-calendar/src/lib/pages/tasks/tasks.module.ts +++ b/apps/page/task-calendar/src/lib/pages/tasks/tasks.module.ts @@ -4,7 +4,6 @@ import { CommonModule } from '@angular/common'; import { TasksComponent } from './tasks.component'; import { UiCalendarModule } from '@ui/calendar'; import { TaskListModule } from '../../components/task-list'; - @NgModule({ imports: [CommonModule, UiCalendarModule, TaskListModule], exports: [TasksComponent], diff --git a/apps/page/task-calendar/src/lib/task-calendar.store.ts b/apps/page/task-calendar/src/lib/task-calendar.store.ts index eb4de4eeb..dcccff4f3 100644 --- a/apps/page/task-calendar/src/lib/task-calendar.store.ts +++ b/apps/page/task-calendar/src/lib/task-calendar.store.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; import { ComponentStore, tapResponse } from '@ngrx/component-store'; -import { DisplayInfoDTO, InputDTO, QuerySettingsDTO, ResponseArgsOfIEnumerableOfInputDTO } from '@swagger/eis'; +import { DisplayInfoDTO, InputDTO, QuerySettingsDTO } from '@swagger/eis'; import { CalendarIndicator } from '@ui/calendar'; import { DateAdapter } from '@ui/common'; import { Filter, FilterOption, SelectFilter, UiFilter, UiFilterMappingService } from '@ui/filter'; import { UiMessageModalComponent, UiModalRef, UiModalResult, UiModalService } from '@ui/modal'; import { clone } from 'lodash'; import { Observable } from 'rxjs'; -import { debounceTime, map, switchMap, tap, withLatestFrom } from 'rxjs/operators'; +import { debounceTime, map, switchMap, tap, withLatestFrom, first, filter } from 'rxjs/operators'; import { InfoModalComponent } from './modals/info/info-modal.component'; import { PreInfoModalComponent } from './modals/preinfo/preinfo-modal.component'; import { TaskModalComponent } from './modals/task/task-modal.component'; @@ -21,7 +21,11 @@ export interface TaskCalendarState { initialFilter: UiFilter; filter: UiFilter; message: string; + searchResults: DisplayInfoDTO[]; + searchTarget: string; fetching: boolean; + isSearching: boolean; + hits: number; } @Injectable() @@ -38,6 +42,14 @@ export class TaskCalendarStore extends ComponentStore { readonly selectDisplayInfos = this.select((s) => s.displayInfos); + readonly searchResults$ = this.select((s) => s.searchResults); + + readonly hits$ = this.select((s) => s.hits); + + readonly searchTarget$ = this.select((s) => s.searchTarget); + + readonly isSearching$ = this.select((s) => s.isSearching); + readonly selectCalendarIndicators = this.select(this.selectDisplayInfos, (displayItems) => displayItems.reduce((agg, item) => { const calendarIndicator = this.mapDisplayInfoToCalendarIndicator(item); @@ -60,6 +72,7 @@ export class TaskCalendarStore extends ComponentStore { readonly selectFilter = this.select((s) => s.filter); readonly selectFetching = this.select((s) => s.fetching); + readonly fetching = this.get((s) => s.fetching); readonly selectMessage = this.select((s) => s.message); @@ -88,9 +101,11 @@ export class TaskCalendarStore extends ComponentStore { } }); + hits = this.get((s) => s.hits); + constructor( + public domainTaskCalendarService: DomainTaskCalendarService, private dateAdapter: DateAdapter, - private domainTaskCalendarService: DomainTaskCalendarService, private uiModal: UiModalService, private uiFilterMappingService: UiFilterMappingService ) { @@ -103,6 +118,10 @@ export class TaskCalendarStore extends ComponentStore { filter: undefined, message: undefined, fetching: false, + searchResults: [], + isSearching: false, + hits: undefined, + searchTarget: '', }); } @@ -126,11 +145,89 @@ export class TaskCalendarStore extends ComponentStore { mode, })); + readonly setMessage = this.updater((s, { message }: { message: string }) => ({ + ...s, + message, + })); + + /** + * Der Key der Datums-Gruppe, zu der initial navigiert werden soll + */ + readonly setSearchTarget = this.updater((s, { searchTarget }: { searchTarget: string }) => ({ + ...s, + searchTarget, + })); + + readonly search = this.effect((options$: Observable<{ clear?: boolean }>) => + options$.pipe( + tap(() => this.patchState({ isSearching: true })), + debounceTime(500), + withLatestFrom(this.domainTaskCalendarService.currentBranchId$, this.selectFilter), + switchMap(([options, branchId, filter]) => { + const querytoken = { + ...filter?.getQueryToken(), + // Paging ist vorbereitet aber vorerst deaktiviert + // skip: results.length || 0, + // take: 50, + }; + + // Im Zeitraum von 6 Monaten in der Vergangenheit und 6 Monate in der Zukunft abfragen + const start = this.dateAdapter.addCalendarMonths(this.dateAdapter.today(), -6); + const stop = this.dateAdapter.addCalendarMonths(this.dateAdapter.today(), 6); + return this.domainTaskCalendarService + .getInfos({ + ...querytoken, + filter: { + timespan: `"${start.toISOString()}"-"${stop?.toISOString()}"`, + ...querytoken?.filter, + branch_id: String(branchId), + }, + }) + .pipe( + tapResponse( + (response) => { + if (!response.error) { + response = this.preparePreInfos(response); + + const results = this.get((s) => s.searchResults); + const searchResults = results.length > 0 && !options?.clear ? [...results, ...response.result] : [...response.result]; + const sorted = searchResults.sort((a, b) => + this.dateAdapter.findClosestDate(new Date(a.taskDate || a.publicationDate), new Date(b.taskDate || b.publicationDate)) + ); + this.patchState({ + searchResults, + searchTarget: + sorted?.length > 0 && response.skip === 0 + ? this.domainTaskCalendarService.getDateGroupKey(sorted[0].taskDate || sorted[0].publicationDate) + : '', + isSearching: false, + message: undefined, + hits: response.hits, + }); + } else { + this.uiModal.open({ content: UiMessageModalComponent, data: response }); + this.patchState({ searchResults: [], isSearching: false, message: 'Keine Suchergebnisse' }); + } + }, + (error) => { + console.error(error); + this.patchState({ searchResults: [], isSearching: false, message: 'Keine Suchergebnisse' }); + } + ) + ); + }) + ) + ); + + resetSearch() { + this.patchState({ searchResults: [], hits: undefined }); + } + readonly loadItems = this.effect(($: Observable) => $.pipe( tap(() => this.patchState({ fetching: true })), debounceTime(500), - withLatestFrom(this.domainTaskCalendarService.currentBranchId$, this.selectStartStop, this.selectFilter), + withLatestFrom(this.domainTaskCalendarService.currentBranchId$, this.selectStartStop, this.selectInitialFilter), switchMap(([_, branchId, date, filter]) => { const querytoken = { ...filter?.getQueryToken() }; return this.domainTaskCalendarService @@ -146,13 +243,7 @@ export class TaskCalendarStore extends ComponentStore { tapResponse( (response) => { if (!response.error) { - const preInfos = response.result.filter((info) => this.domainTaskCalendarService.getInfoType(info) === 'PreInfo'); - preInfos.forEach((info) => { - const preInfoTask = clone(info); - delete preInfoTask.publicationDate; - response.result.push(preInfoTask); - }); - + response = this.preparePreInfos(response); this.patchState({ displayInfos: response.result, fetching: false, message: undefined }); } else { this.uiModal.open({ @@ -172,6 +263,16 @@ export class TaskCalendarStore extends ComponentStore { ) ); + preparePreInfos(response) { + const preInfos = response.result.filter((info) => this.domainTaskCalendarService.getInfoType(info) === 'PreInfo'); + preInfos.forEach((info) => { + const preInfoTask = clone(info); + delete preInfoTask.publicationDate; + response.result.push(preInfoTask); + }); + return response; + } + readonly loadFilter = this.effect(($: Observable) => $.pipe( tap(() => this.patchState({ fetching: true })), @@ -227,7 +328,20 @@ export class TaskCalendarStore extends ComponentStore { } } }, - complete: () => this.loadItems(), + }); + + let hasChanged = false; + taskModalRef?.afterChanged$.subscribe({ + next: (changed) => (hasChanged = changed), + complete: async () => { + if (hasChanged) { + this.loadItems(); + const searchResults = await this.searchResults$.pipe(first()).toPromise(); + if (searchResults?.length > 0) { + this.search({ clear: true }); + } + } + }, }); } diff --git a/apps/ui/calendar/src/lib/calendar-body/calendar-body.component.scss b/apps/ui/calendar/src/lib/calendar-body/calendar-body.component.scss index 307c6f9f0..77d3ea450 100644 --- a/apps/ui/calendar/src/lib/calendar-body/calendar-body.component.scss +++ b/apps/ui/calendar/src/lib/calendar-body/calendar-body.component.scss @@ -1,5 +1,5 @@ :host { - @apply grid grid-cols-8; + @apply grid grid-cols-8 pr-4; } .cell { @@ -11,7 +11,8 @@ } .cell-day-of-week:not(.cell-first) { - @apply border-0 border-t-2 border-solid border-gray-200; + @apply border-0 border-t-2 border-solid; + border-color: #edeff0; } .cell-first { diff --git a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.html b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.html index e459468ee..a13e58445 100644 --- a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.html +++ b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.html @@ -1,15 +1,26 @@
- - -
- {{ calendar.displayed | date: 'MMMM yyyy' }} +
+ +
+ {{ calendar.displayed | date: 'MMMM yyyy' }} +
+
- - +
+ + + zum Kalender + + + + zur Liste + + +
diff --git a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.scss b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.scss index fd94f6b0c..fe0f55b35 100644 --- a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.scss +++ b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.scss @@ -1,26 +1,51 @@ :host { - @apply grid grid-cols-8 box-border items-center; + @apply grid grid-cols-8 box-border items-center pt-2 pr-4; +} + +a { + @apply flex flex-row items-center py-2 px-4 no-underline border-2 border-solid font-bold text-lg whitespace-nowrap; + border: 1px solid #aeb7c1; + border-radius: 5px; + + &.task-nav { + width: 141px; + } + + &.calendar-nav { + width: 188px; + } + + ui-icon { + @apply ml-2; + color: #596470; + } } button { - @apply outline-none border-none bg-transparent text-xl text-black; + @apply grid grid-flow-col items-center py-2 px-4 outline-none font-bold rounded-lg text-lg; &.today { - @apply mr-11; + border: 1px solid #aeb7c1; + border-radius: 5px; } } .nav-wrapper { - @apply flex flex-row items-center col-span-7; + @apply grid grid-flow-col items-center col-span-7; } .display-year-month { - @apply flex-grow text-center font-bold text-xl; + @apply flex flex-row items-center justify-center text-center font-bold whitespace-nowrap text-2xl; + width: 200px; } .prev, .next { - @apply text-ucla-blue; + @apply grid justify-center w-12 h-8; + color: #596470; + background: #ffffff; + box-shadow: 0px 0px 10px rgba(220, 226, 233, 0.5); + border-radius: 5px; } .prev { diff --git a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.ts b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.ts index facf02cfc..eb181ffbd 100644 --- a/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.ts +++ b/apps/ui/calendar/src/lib/calendar-header/calendar-header.component.ts @@ -1,5 +1,4 @@ import { Component, ChangeDetectionStrategy, Host } from '@angular/core'; -import { DateAdapter } from '@ui/common'; import { UiCalendarComponent } from '../ui-calendar.component'; @Component({ diff --git a/apps/ui/calendar/src/lib/ui-calendar.component.html b/apps/ui/calendar/src/lib/ui-calendar.component.html index 4ba12c13f..6fb2afd56 100644 --- a/apps/ui/calendar/src/lib/ui-calendar.component.html +++ b/apps/ui/calendar/src/lib/ui-calendar.component.html @@ -1,98 +1,2 @@ - diff --git a/apps/ui/calendar/src/lib/ui-calendar.component.scss b/apps/ui/calendar/src/lib/ui-calendar.component.scss index b9cabb7b2..b13f6720d 100644 --- a/apps/ui/calendar/src/lib/ui-calendar.component.scss +++ b/apps/ui/calendar/src/lib/ui-calendar.component.scss @@ -1,125 +1,3 @@ -:host { -} - ui-calendar-header { - @apply my-7; + @apply my-4; } - -// :host { -// @apply block; -// } - -// .calendar { -// @apply my-0 mx-auto; -// width: 95%; - -// .header { -// @apply grid items-center; -// grid-template-columns: 2.5fr 14fr; - -// .navigation { -// @apply flex justify-between items-center mb-5; - -// .button { -// @apply appearance-none border-none bg-transparent text-ucla-blue; - -// &:focus { -// @apply outline-none; -// } -// } -// } - -// .title { -// @apply text-lg font-bold; -// } -// } - -// .body { -// @apply w-full; - -// > *:not(:empty) { -// @apply cursor-pointer; -// } - -// .row { -// @apply grid; -// grid-template-columns: 2fr repeat(7, 2fr); -// grid-template-rows: 5rem; - -// &:only-child { -// grid-template-rows: 6rem; -// } - -// .kw-cell { -// @apply font-bold; -// color: rgba(89, 100, 112, 1); -// } - -// th { -// @apply flex justify-center items-center; -// color: rgba(89, 100, 112, 1); -// border-top: 1px solid #555; -// } - -// th:first-child { -// @apply border-t-0; -// } - -// th:first-child, -// td:first-child { -// border-right: 1px solid #555; -// } - -// th, -// td { -// @apply text-center p-2; - -// &:first-child { -// @apply text-left; -// } -// } - -// .day-cell.out-of-month { -// .day, -// .items, -// .indicator { -// @apply hidden; -// } -// } - -// .day-cell { -// .day { -// @apply text-lg; -// color: rgba(0, 0, 0, 1); - -// &.is-sunday { -// color: rgba(137, 148, 158, 1); -// } - -// .selected { -// @apply border rounded-full bg-active-branch text-white p-3; -// } - -// .today { -// @apply border rounded-full bg-cool-grey text-white p-3; -// } -// } - -// .items { -// @apply flex justify-center; - -// .indicator { -// @apply block m-1 text-white rounded-full; -// height: 0.7rem; -// width: 0.7rem; - -// &.info { -// @apply flex items-center justify-center; -// font-size: 0.6rem; -// } -// } -// } -// } -// } -// } -// } diff --git a/apps/ui/calendar/src/lib/ui-calendar.module.ts b/apps/ui/calendar/src/lib/ui-calendar.module.ts index adc341f31..854d97ea7 100644 --- a/apps/ui/calendar/src/lib/ui-calendar.module.ts +++ b/apps/ui/calendar/src/lib/ui-calendar.module.ts @@ -1,5 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; import { UiIconModule } from '@ui/icon'; import { UiCalendarBodyComponent } from './calendar-body/calendar-body.component'; import { UiCalendarCellDirective } from './calendar-body/calendar-cell.directive'; @@ -15,7 +16,7 @@ import { UiCalendarComponent } from './ui-calendar.component'; UiCalendarCellDirective, UiFilterIndicatorsByDatePipe, ], - imports: [CommonModule, UiIconModule], + imports: [CommonModule, UiIconModule, RouterModule], exports: [UiCalendarComponent], }) export class UiCalendarModule {} diff --git a/apps/ui/common/src/lib/date/date.adapter.ts b/apps/ui/common/src/lib/date/date.adapter.ts index 0d738bef1..18b471c22 100644 --- a/apps/ui/common/src/lib/date/date.adapter.ts +++ b/apps/ui/common/src/lib/date/date.adapter.ts @@ -193,6 +193,13 @@ export class DateAdapter { return this.getYear(first) - this.getYear(second) || this.getMonth(first) - this.getMonth(second); } + findClosestDate(a: Date, b: Date, compareDate?: Date) { + const date = compareDate || this.today(); + var distancea = Math.abs(date.getTime() - a.getTime()); + var distanceb = Math.abs(date.getTime() - b.getTime()); + return distancea - distanceb; + } + isLessThan({ first, second, precision }: { first: Date; second: Date; precision?: Precision }): boolean { return this.formatDate(first, precision) < this.formatDate(second, precision); } diff --git a/apps/ui/filter/src/lib/next/tree/ui-filter.ts b/apps/ui/filter/src/lib/next/tree/ui-filter.ts index 891e732dd..7c064e251 100644 --- a/apps/ui/filter/src/lib/next/tree/ui-filter.ts +++ b/apps/ui/filter/src/lib/next/tree/ui-filter.ts @@ -1,6 +1,7 @@ import { QueryTokenDTO } from '@swagger/oms'; import { Subject } from 'rxjs'; import { IUiInputGroup, UiInputGroup } from './ui-input-group'; +import { UiInputType } from './ui-input-type.enum'; import { IUiOrderBy, UiOrderBy } from './ui-order-by'; export interface IUiFilter { @@ -55,7 +56,13 @@ export class UiFilter implements IUiFilter { inputGroup.input.forEach((input) => { const key = input.key; - params[`${group}_${key}`] = input.toStringValue(); + const values = inputGroup.input + ?.filter((i) => i.key === key) + ?.map((i) => i.toStringValue()) + ?.filter((i) => !!i) + ?.join(';'); + + params[`${group}_${key}`] = values; }); }); @@ -90,13 +97,21 @@ export class UiFilter implements IUiFilter { .forEach((inputGroup) => { inputGroup.input .filter((i) => i.key === key) - .forEach((input) => { - input.fromStringValue(key, params[gk]); + .forEach((input, index) => { + let value = params[gk]; + + if (input.type === UiInputType.Text && value?.includes(';')) { + const splitted = value?.split(';'); + if (splitted?.length >= index) { + value = splitted[index]; + } + } + input.fromStringValue(key, value); }); }); }); - this.orderBy.forEach((ob) => { + this.orderBy?.forEach((ob) => { const order = params[`order_by_${ob.by}`]; const selected = (order && ob.desc && order === 'desc') || (!ob.desc && order === 'asc'); ob.setSelected(selected); @@ -133,7 +148,11 @@ export class UiFilter implements IUiFilter { for (const inputGroup of this.filter) { for (const input of inputGroup.input.filter((i) => i.target === 'filter')) { const key = input.key; - const value = input.toStringValue(); + const value = inputGroup.input + ?.filter((i) => i.key === key) + ?.map((i) => i.toStringValue()) + ?.filter((i) => !!i) + ?.join(';'); if (!!value) { filter[key] = value; diff --git a/apps/ui/loader/src/lib/loader.component.html b/apps/ui/loader/src/lib/loader.component.html index 0b1fa8cd9..dd68054bd 100644 --- a/apps/ui/loader/src/lib/loader.component.html +++ b/apps/ui/loader/src/lib/loader.component.html @@ -1,4 +1,6 @@ +
+
- diff --git a/apps/ui/loader/src/lib/loader.component.scss b/apps/ui/loader/src/lib/loader.component.scss index e69de29bb..26514aad7 100644 --- a/apps/ui/loader/src/lib/loader.component.scss +++ b/apps/ui/loader/src/lib/loader.component.scss @@ -0,0 +1,13 @@ +:host { + @apply flex flex-col h-full mt-12 text-gray-500; +} + +.spinner { + @apply animate-spin absolute; + top: 4rem; + left: calc(50% - 14px); +} + +.content { + @apply mt-16; +} diff --git a/apps/ui/modal/src/lib/defs/modal-ref.ts b/apps/ui/modal/src/lib/defs/modal-ref.ts index 0f749b4b9..98b1a52af 100644 --- a/apps/ui/modal/src/lib/defs/modal-ref.ts +++ b/apps/ui/modal/src/lib/defs/modal-ref.ts @@ -1,11 +1,20 @@ import { OverlayRef } from '@angular/cdk/overlay'; import { TemplateRef, Type } from '@angular/core'; import { UiModalConfig } from '@ui/modal'; -import { Subject } from 'rxjs'; +import { Subject, BehaviorSubject } from 'rxjs'; import { UiModalResult } from './modal-result'; export class UiModalRef { afterClosed$ = new Subject>(); + afterChanged$ = new BehaviorSubject(false); + + private _result: TR; + get result(): TR { + return this._result; + } + set result(value) { + this._result = value; + } constructor( public overlay: OverlayRef, @@ -22,10 +31,15 @@ export class UiModalRef { data, }); + this.afterChanged$.complete(); this.afterClosed$.complete(); } close(data?: TR): void { this._close({ type: 'close', data }); } + + markChanged() { + this.afterChanged$.next(true); + } } diff --git a/apps/ui/scroll-container/src/lib/scroll-container.component.html b/apps/ui/scroll-container/src/lib/scroll-container.component.html index 933b160fc..9c80a2bfb 100644 --- a/apps/ui/scroll-container/src/lib/scroll-container.component.html +++ b/apps/ui/scroll-container/src/lib/scroll-container.component.html @@ -13,8 +13,8 @@ - - + + diff --git a/apps/ui/scroll-container/src/lib/scroll-container.component.ts b/apps/ui/scroll-container/src/lib/scroll-container.component.ts index b1ff32203..120c72f8d 100644 --- a/apps/ui/scroll-container/src/lib/scroll-container.component.ts +++ b/apps/ui/scroll-container/src/lib/scroll-container.component.ts @@ -48,6 +48,8 @@ export class UiScrollContainerComponent implements OnInit { @Input() initialScroll: number; + @Input() skeletonTemplate?: string; + get containerHeightString() { return `calc(100vh - ${this.containerHeight}rem)`; } diff --git a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.html b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.html index 2a3337f84..f8c6ad4e1 100644 --- a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.html +++ b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.html @@ -1,28 +1,48 @@ -
-
-
-
+ +
+
+
+
+
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.scss b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.scss index 24db2e6ea..0056a7a7e 100644 --- a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.scss +++ b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.scss @@ -1,8 +1,44 @@ -:host { +.default { @apply flex flex-col pt-4 pb-6 pl-1 pr-4 bg-white; height: 300px; } +.task-calendar { + @apply h-40 p-6; + + .task-calendar-header { + @apply flex flex-row justify-between w-full; + + .left { + @apply h-6 bg-ucla-blue; + width: 240px; + } + + .right { + @apply h-6 bg-ucla-blue; + width: 130px; + } + } + + .task-calendar-details { + @apply grid mt-6; + grid-template-columns: 170px 40px 1fr; + + .date { + @apply col-start-1 h-4 bg-ucla-blue; + width: 120px; + } + + .icon { + @apply col-start-2 w-6 h-4 bg-ucla-blue; + } + + .col { + @apply flex flex-col col-start-3; + } + } +} + .header { @apply w-full flex flex-row justify-between mt-5; diff --git a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.ts b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.ts index 70fd35f1e..8cc1538ac 100644 --- a/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.ts +++ b/apps/ui/scroll-container/src/lib/skeleton-loader/skeleton-loader.component.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; @Component({ selector: 'ui-skeleton-loader', @@ -7,5 +7,8 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class UiSkeletonLoaderComponent { + @Input() + template?: string; + constructor() {} } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88a4170ae..106a99ff1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,7 @@ variables: value: "$[counter(format('{0}.{1}', variables['Major'], variables['Minor']),0)]" - name: 'BuildUniqueID' value: '$(Build.BuildID)-$(Agent.Id)-$(System.DefinitionId)-$(System.JobId)' + - group: 'GithubCMF' jobs: # - job: cibuild_fast @@ -52,6 +53,7 @@ jobs: displayName: 'npm auth' inputs: workingFile: .npmrc + customEndpoint: GitHub-read-packages - bash: | echo Build and Run Tests in docker docker build . \ @@ -110,6 +112,7 @@ jobs: displayName: 'npm auth' inputs: workingFile: .npmrc + customEndpoint: GitHub-read-packages - task: Docker@2 displayName: 'build ISAClient Debug' inputs: @@ -170,6 +173,7 @@ jobs: displayName: 'npm auth' inputs: workingFile: .npmrc + customEndpoint: GitHub-read-packages - task: Docker@2 displayName: 'build ISAClient Prod' inputs: diff --git a/package-lock.json b/package-lock.json index 4474a0289..ce74c4448 100644 --- a/package-lock.json +++ b/package-lock.json @@ -615,9 +615,9 @@ } }, "@babel/compat-data": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz", - "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz", + "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==", "dev": true }, "@babel/core": { @@ -694,14 +694,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", - "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz", + "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==", "dev": true, "requires": { - "@babel/compat-data": "^7.18.8", + "@babel/compat-data": "^7.19.1", "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.20.2", + "browserslist": "^4.21.3", "semver": "^6.3.0" }, "dependencies": { @@ -714,14 +714,14 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz", - "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz", + "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", "@babel/helper-member-expression-to-functions": "^7.18.9", "@babel/helper-optimise-call-expression": "^7.18.6", "@babel/helper-replace-supers": "^7.18.9", @@ -736,13 +736,66 @@ "requires": { "@babel/types": "^7.18.6" } + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, + "@babel/template": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } + } } } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz", - "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", + "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", @@ -807,14 +860,31 @@ "@babel/types": "^7.18.9" }, "dependencies": { + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==" + }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } } } } @@ -846,9 +916,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", - "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz", + "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", @@ -856,20 +926,76 @@ "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.0", + "@babel/types": "^7.19.0" }, "dependencies": { + "@babel/generator": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", + "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", + "dev": true, + "requires": { + "@babel/types": "^7.19.0", + "@jridgewell/gen-mapping": "^0.3.2", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + } + }, + "@babel/traverse": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz", + "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.19.0", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.19.1", + "@babel/types": "^7.19.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" } } } @@ -884,9 +1010,9 @@ } }, "@babel/helper-plugin-utils": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz", - "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz", + "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==", "dev": true }, "@babel/helper-remap-async-to-generator": { @@ -913,16 +1039,85 @@ } }, "@babel/helper-replace-supers": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz", - "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz", + "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-member-expression-to-functions": "^7.18.9", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/traverse": "^7.19.1", + "@babel/types": "^7.19.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", + "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", + "dev": true, + "requires": { + "@babel/types": "^7.19.0", + "@jridgewell/gen-mapping": "^0.3.2", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, + "@babel/template": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + } + }, + "@babel/traverse": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz", + "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.19.0", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.19.1", + "@babel/types": "^7.19.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-simple-access": { @@ -951,6 +1146,11 @@ "@babel/types": "^7.18.6" } }, + "@babel/helper-string-parser": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", + "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==" + }, "@babel/helper-validator-identifier": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", @@ -963,26 +1163,82 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.9.tgz", - "integrity": "sha512-cG2ru3TRAL6a60tfQflpEfs4ldiPwF6YW3zfJiRgmoFVIaC1vGnBBgatfec+ZUziPHkHSaXAuEck3Cdkf3eRpQ==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", + "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/helper-function-name": "^7.19.0", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.0", + "@babel/types": "^7.19.0" }, "dependencies": { + "@babel/generator": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", + "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", + "dev": true, + "requires": { + "@babel/types": "^7.19.0", + "@jridgewell/gen-mapping": "^0.3.2", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + } + }, + "@babel/traverse": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz", + "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.19.0", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.19.1", + "@babel/types": "^7.19.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" } } } @@ -997,14 +1253,31 @@ "@babel/types": "^7.18.9" }, "dependencies": { + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==" + }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } } } } @@ -1369,16 +1642,17 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz", - "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz", + "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-compilation-targets": "^7.19.0", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.9", + "@babel/helper-plugin-utils": "^7.19.0", "@babel/helper-replace-supers": "^7.18.9", "@babel/helper-split-export-declaration": "^7.18.6", "globals": "^11.1.0" @@ -1392,6 +1666,59 @@ "requires": { "@babel/types": "^7.18.6" } + }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, + "@babel/template": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } + } } } }, @@ -1405,9 +1732,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz", - "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz", + "integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.18.9" @@ -1504,14 +1831,14 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz", - "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz", + "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.18.9", - "@babel/helper-plugin-utils": "^7.18.9", + "@babel/helper-module-transforms": "^7.19.0", + "@babel/helper-plugin-utils": "^7.19.0", "@babel/helper-validator-identifier": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" } @@ -1527,13 +1854,13 @@ } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz", - "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", + "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-regexp-features-plugin": "^7.19.0", + "@babel/helper-plugin-utils": "^7.19.0" } }, "@babel/plugin-transform-new-target": { @@ -1624,12 +1951,12 @@ } }, "@babel/plugin-transform-spread": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz", - "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz", + "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9", + "@babel/helper-plugin-utils": "^7.19.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9" } }, @@ -1661,12 +1988,12 @@ } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz", - "integrity": "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", + "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.18.9" } }, "@babel/plugin-transform-unicode-regex": { @@ -1791,12 +2118,12 @@ } }, "@babel/runtime-corejs3": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz", - "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz", + "integrity": "sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==", "dev": true, "requires": { - "core-js-pure": "^3.20.2", + "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.4" } }, @@ -1828,13 +2155,25 @@ }, "dependencies": { "@babel/generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz", - "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", + "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", "requires": { - "@babel/types": "^7.18.9", + "@babel/types": "^7.19.0", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + } + } } } } @@ -2170,6 +2509,11 @@ "read-package-json-fast": "^2.0.1" } }, + "@paragondata/ngx-ui": { + "version": "12.0.0-beta.23", + "resolved": "https://npm.pkg.github.com/download/@paragondata/ngx-ui/12.0.0-beta.23/ab48954d688bfaecc50162b2fe2724aea55a9702", + "integrity": "sha512-GqNEsBlDVEPjheVFWdEZig0ahTIChag2sDdokwxryaIpZu7LPY3ocSGfMPnCS31j5eJhp++XnwzZGbAzhNzqNQ==" + }, "@rollup/plugin-commonjs": { "version": "20.0.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz", @@ -2244,6 +2588,12 @@ "jsonc-parser": "3.0.0" } }, + "@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==", + "dev": true + }, "@stylelint/postcss-css-in-js": { "version": "0.37.3", "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz", @@ -2254,21 +2604,21 @@ }, "dependencies": { "@babel/core": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz", - "integrity": "sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz", + "integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-module-transforms": "^7.18.9", - "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/generator": "^7.19.0", + "@babel/helper-compilation-targets": "^7.19.1", + "@babel/helper-module-transforms": "^7.19.0", + "@babel/helpers": "^7.19.0", + "@babel/parser": "^7.19.1", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.1", + "@babel/types": "^7.19.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -2277,25 +2627,81 @@ } }, "@babel/generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz", - "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", + "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", "dev": true, "requires": { - "@babel/types": "^7.18.9", + "@babel/types": "^7.19.0", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" } }, + "@babel/helper-function-name": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" + } + }, + "@babel/helpers": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz", + "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==", + "dev": true, + "requires": { + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.0", + "@babel/types": "^7.19.0" + } + }, + "@babel/parser": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", + "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "dev": true + }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" + } + }, + "@babel/traverse": { + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz", + "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.19.0", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.19.1", + "@babel/types": "^7.19.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" } }, "semver": { @@ -2425,12 +2831,6 @@ "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==", "dev": true }, - "@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==", - "dev": true - }, "@types/cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", @@ -2444,9 +2844,9 @@ "dev": true }, "@types/eslint": { - "version": "8.4.5", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz", - "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==", + "version": "8.4.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz", + "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==", "dev": true, "requires": { "@types/estree": "*", @@ -2546,9 +2946,9 @@ } }, "@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", "dev": true }, "@types/minimist": { @@ -3053,9 +3453,9 @@ } }, "app-root-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz", - "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", + "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", "dev": true }, "aproba": { @@ -3065,9 +3465,9 @@ "dev": true }, "are-we-there-yet": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz", - "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", "dev": true, "requires": { "delegates": "^1.0.0", @@ -3231,6 +3631,45 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, + "autoprefixer": { + "version": "9.8.8", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", + "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", + "dev": true, + "requires": { + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "picocolors": "^0.2.1", + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" + }, + "dependencies": { + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, + "postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "requires": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -3560,15 +3999,15 @@ } }, "browserslist": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.2.tgz", - "integrity": "sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001366", - "electron-to-chromium": "^1.4.188", + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.4" + "update-browserslist-db": "^1.0.9" } }, "browserstack": { @@ -3750,9 +4189,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001370", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz", - "integrity": "sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==", + "version": "1.0.30001410", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz", + "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==", "dev": true }, "canonical-path": { @@ -4075,9 +4514,9 @@ "dev": true }, "colord": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", - "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", "dev": true }, "colorette": { @@ -4387,27 +4826,18 @@ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-js-compat": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.0.tgz", - "integrity": "sha512-F+2E63X3ff/nj8uIrf8Rf24UDGIz7p838+xjEp+Bx3y8OWXj+VTPPZNCtdqovPaS9o7Tka5mCH01Zn5vOd6UQg==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz", + "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==", "dev": true, "requires": { - "browserslist": "^4.21.2", - "semver": "7.0.0" - }, - "dependencies": { - "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true - } + "browserslist": "^4.21.4" } }, "core-js-pure": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.0.tgz", - "integrity": "sha512-uzMmW8cRh7uYw4JQtzqvGWRyC2T5+4zipQLQdi2FmiRqP83k3d6F3stv2iAlNhOs6cXN401FCD5TL0vvleuHgA==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz", + "integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==", "dev": true }, "core-util-is": { @@ -4595,9 +5025,9 @@ "dev": true }, "css-declaration-sorter": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz", - "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", + "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", "dev": true }, "css-has-pseudo": { @@ -4911,9 +5341,9 @@ "dev": true }, "cssnano": { - "version": "5.1.12", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.12.tgz", - "integrity": "sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==", + "version": "5.1.13", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz", + "integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==", "dev": true, "requires": { "cssnano-preset-default": "^5.2.12", @@ -5391,9 +5821,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.199", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.199.tgz", - "integrity": "sha512-WIGME0Cs7oob3mxsJwHbeWkH0tYkIE/sjkJ8ML2BYmuRcjhRl/q5kVDXG7W9LOOKwzPU5M0LBlXRq9rlSgnNlg==", + "version": "1.4.258", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz", + "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A==", "dev": true }, "emoji-regex": { @@ -5473,9 +5903,9 @@ } }, "engine.io-client": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", - "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.3.tgz", + "integrity": "sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==", "requires": { "component-emitter": "~1.3.0", "component-inherit": "0.0.3", @@ -5575,31 +6005,32 @@ } }, "es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz", + "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", + "get-intrinsic": "^1.1.3", "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-symbols": "^1.0.3", "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", + "is-callable": "^1.2.6", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", + "object-inspect": "^1.12.2", "object-keys": "^1.1.1", - "object.assign": "^4.1.2", + "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", "string.prototype.trimend": "^1.0.5", "string.prototype.trimstart": "^1.0.5", "unbox-primitive": "^1.0.2" @@ -5648,32 +6079,6 @@ "es6-promise": "^4.0.3" } }, - "esbuild": { - "version": "0.13.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.8.tgz", - "integrity": "sha512-A4af7G7YZLfG5OnARJRMtlpEsCkq/zHZQXewgPA864l9D6VjjbH1SuFYK/OSV6BtHwDGkdwyRrX0qQFLnMfUcw==", - "dev": true, - "optional": true, - "requires": { - "esbuild-android-arm64": "0.13.8", - "esbuild-darwin-64": "0.13.8", - "esbuild-darwin-arm64": "0.13.8", - "esbuild-freebsd-64": "0.13.8", - "esbuild-freebsd-arm64": "0.13.8", - "esbuild-linux-32": "0.13.8", - "esbuild-linux-64": "0.13.8", - "esbuild-linux-arm": "0.13.8", - "esbuild-linux-arm64": "0.13.8", - "esbuild-linux-mips64le": "0.13.8", - "esbuild-linux-ppc64le": "0.13.8", - "esbuild-netbsd-64": "0.13.8", - "esbuild-openbsd-64": "0.13.8", - "esbuild-sunos-64": "0.13.8", - "esbuild-windows-32": "0.13.8", - "esbuild-windows-64": "0.13.8", - "esbuild-windows-arm64": "0.13.8" - } - }, "esbuild-android-arm64": { "version": "0.13.8", "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.8.tgz", @@ -5772,6 +6177,12 @@ "dev": true, "optional": true }, + "esbuild-wasm": { + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.8.tgz", + "integrity": "sha512-UbD+3nloiSpJWXTCInZQrqPe8Y+RLfDkY/5kEHiXsw/lmaEvibe69qTzQu16m5R9je/0bF7VYQ5jaEOq0z9lLA==", + "dev": true + }, "esbuild-windows-32": { "version": "0.13.8", "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.8.tgz", @@ -6158,9 +6569,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -6193,9 +6604,9 @@ "integrity": "sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==" }, "fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, "fastparse": { @@ -6337,9 +6748,9 @@ } }, "flatted": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", - "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "flatten": { @@ -6349,9 +6760,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true }, "for-in": { @@ -6492,9 +6903,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", - "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -6586,9 +6997,9 @@ }, "dependencies": { "core-js": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.0.tgz", - "integrity": "sha512-IeOyT8A6iK37Ep4kZDD423mpi6JfPRoPUdQwEWYiGolvn4o6j2diaRzNfDfpTdu3a5qMbrGUzKUpYpRY8jXCkQ==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz", + "integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A==", "dev": true } } @@ -7730,18 +8141,18 @@ "dev": true }, "is-builtin-module": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz", - "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", + "integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", "dev": true, "requires": { - "builtin-modules": "^3.0.0" + "builtin-modules": "^3.3.0" } }, "is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz", + "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==", "dev": true }, "is-color-stop": { @@ -8349,14 +8760,14 @@ } }, "jsrsasign": { - "version": "10.5.26", - "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.5.26.tgz", - "integrity": "sha512-TjEu1yPdI+8whpe6CA/6XNb7U1sm9+PUItOUfSThOLvx7JCfYHIfuvZK2Egz2DWUKioafn98LPuk+geLGckxMg==" + "version": "10.5.27", + "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.5.27.tgz", + "integrity": "sha512-1F4LmDeJZHYwoVvB44jEo2uZL3XuwYNzXCDOu53Ui6vqofGQ/gCYDmaxfVZtN0TGd92UKXr/BONcfrPonUIcQQ==" }, "jszip": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz", - "integrity": "sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "dev": true, "requires": { "lie": "~3.3.0", @@ -8469,9 +8880,9 @@ } }, "socket.io": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz", - "integrity": "sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.2.tgz", + "integrity": "sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==", "dev": true, "requires": { "accepts": "~1.3.4", @@ -8479,7 +8890,7 @@ "debug": "~4.3.2", "engine.io": "~6.2.0", "socket.io-adapter": "~2.4.0", - "socket.io-parser": "~4.0.4" + "socket.io-parser": "~4.2.0" } }, "socket.io-adapter": { @@ -8489,13 +8900,12 @@ "dev": true }, "socket.io-parser": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz", - "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", "dev": true, "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", + "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" } }, @@ -8956,16 +9366,16 @@ } }, "log4js": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.6.0.tgz", - "integrity": "sha512-3v8R7fd45UB6THucSht6wN2/7AZEruQbXdjygPZcxt5TA/msO6si9CN5MefUuKXbYnJHTBnYcx4famwcyQd+sA==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.6.1.tgz", + "integrity": "sha512-J8VYFH2UQq/xucdNu71io4Fo+purYYudyErgBbswWKO0MC6QVOERRomt5su/z6d3RJSmLyTGmXl3Q/XjKCf+/A==", "dev": true, "requires": { - "date-format": "^4.0.11", + "date-format": "^4.0.13", "debug": "^4.3.4", - "flatted": "^3.2.5", + "flatted": "^3.2.6", "rfdc": "^1.3.0", - "streamroller": "^3.1.1" + "streamroller": "^3.1.2" }, "dependencies": { "debug": { @@ -9613,6 +10023,14 @@ "array-union": "^2.1.0", "arrify": "^2.0.1", "minimatch": "^3.0.4" + }, + "dependencies": { + "@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "dev": true + } } }, "mustache": { @@ -9734,11 +10152,31 @@ "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "dev": true }, - "esbuild-wasm": { + "esbuild": { "version": "0.13.8", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.8.tgz", - "integrity": "sha512-UbD+3nloiSpJWXTCInZQrqPe8Y+RLfDkY/5kEHiXsw/lmaEvibe69qTzQu16m5R9je/0bF7VYQ5jaEOq0z9lLA==", - "dev": true + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.8.tgz", + "integrity": "sha512-A4af7G7YZLfG5OnARJRMtlpEsCkq/zHZQXewgPA864l9D6VjjbH1SuFYK/OSV6BtHwDGkdwyRrX0qQFLnMfUcw==", + "dev": true, + "optional": true, + "requires": { + "esbuild-android-arm64": "0.13.8", + "esbuild-darwin-64": "0.13.8", + "esbuild-darwin-arm64": "0.13.8", + "esbuild-freebsd-64": "0.13.8", + "esbuild-freebsd-arm64": "0.13.8", + "esbuild-linux-32": "0.13.8", + "esbuild-linux-64": "0.13.8", + "esbuild-linux-arm": "0.13.8", + "esbuild-linux-arm64": "0.13.8", + "esbuild-linux-mips64le": "0.13.8", + "esbuild-linux-ppc64le": "0.13.8", + "esbuild-netbsd-64": "0.13.8", + "esbuild-openbsd-64": "0.13.8", + "esbuild-sunos-64": "0.13.8", + "esbuild-windows-32": "0.13.8", + "esbuild-windows-64": "0.13.8", + "esbuild-windows-arm64": "0.13.8" + } } } }, @@ -10147,14 +10585,14 @@ } }, "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, @@ -10645,14 +11083,14 @@ } }, "portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz", + "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==", "dev": true, "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" + "async": "^2.6.4", + "debug": "^3.2.7", + "mkdirp": "^0.5.6" }, "dependencies": { "debug": { @@ -11988,21 +12426,6 @@ "postcss-selector-not": "^4.0.0" }, "dependencies": { - "autoprefixer": { - "version": "9.8.8", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", - "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "picocolors": "^0.2.1", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } - }, "picocolors": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", @@ -13187,9 +13610,9 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz", - "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", + "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", "dev": true, "requires": { "regenerate": "^1.4.2" @@ -13238,29 +13661,29 @@ } }, "regexpu-core": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz", - "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", + "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", "dev": true, "requires": { "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.0.1", - "regjsgen": "^0.6.0", - "regjsparser": "^0.8.2", + "regenerate-unicode-properties": "^10.1.0", + "regjsgen": "^0.7.1", + "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.0.0" } }, "regjsgen": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz", - "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", + "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", "dev": true }, "regjsparser": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz", - "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", + "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -13614,9 +14037,9 @@ } }, "rollup": { - "version": "2.77.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz", - "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==", + "version": "2.79.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", + "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -13676,6 +14099,17 @@ "ret": "~0.1.10" } }, + "safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + } + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -14601,9 +15035,9 @@ } }, "spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", + "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", "dev": true }, "spdy": { @@ -14952,21 +15386,6 @@ "color-convert": "^2.0.1" } }, - "autoprefixer": { - "version": "9.8.8", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", - "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "picocolors": "^0.2.1", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } - }, "balanced-match": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", @@ -15796,9 +16215,9 @@ "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", - "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", + "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", "dev": true }, "unified": { @@ -15948,9 +16367,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", + "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -17068,9 +17487,9 @@ }, "dependencies": { "yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==" + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" } } }, diff --git a/package.json b/package.json index c7de1407c..91d652dcb 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "@ngrx/entity": "~12.5.1", "@ngrx/store": "~12.5.1", "@ngrx/store-devtools": "~12.5.1", + "@paragondata/ngx-ui": "^12.0.0-beta.23", "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", "core-js": "^2.6.5", diff --git a/tsconfig.json b/tsconfig.json index 5bf24aba9..61dee7d75 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -304,7 +304,10 @@ ], "@ui/branch-dropdown": [ "apps/ui/branch-dropdown/src/public-api.ts" - ] + ], + "@paragondata/ngx-ui/form-field": [ + "node_modules/@paragondata/ngx-ui/form-field" + ], } } } \ No newline at end of file