Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

fixed removed imports from rebase

Browse Source
This commit is contained in:
Edi Cziszter 2022-01-25 16:36:34 +02:00
parent c6992564b0
commit 880318f352
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
View File

@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import * as Papa from 'papaparse'; import * as Papa from 'papaparse';
import { firstValueFrom, Observable } from 'rxjs'; import { firstValueFrom, Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators'; import { map, startWith } from 'rxjs/operators';
import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster, trackBy } from '@iqser/common-ui'; import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster, trackByFactory } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { FileAttributeConfig, FileAttributeConfigTypes, IField, IFileAttributesConfig } from '@red/domain'; import { FileAttributeConfig, FileAttributeConfigTypes, IField, IFileAttributesConfig } from '@red/domain';
import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { FileAttributesService } from '@services/entity-services/file-attributes.service';
@ -34,7 +34,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
columnSample = []; columnSample = [];
initialParseConfig: { delimiter?: string; encoding?: string } = {}; initialParseConfig: { delimiter?: string; encoding?: string } = {};
readonly tableHeaderLabel = ''; readonly tableHeaderLabel = '';
readonly trackBy = trackBy(); readonly trackBy = trackByFactory();
constructor( constructor(
private readonly _toaster: Toaster, private readonly _toaster: Toaster,

6
apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
View File

@ -16,7 +16,7 @@ import { UserService } from '@services/user.service';
import { DictionaryService } from '@shared/services/dictionary.service'; import { DictionaryService } from '@shared/services/dictionary.service';
import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
import { Dictionary, DossierTemplateStats } from '@red/domain'; import { Dictionary, DossierTemplateStats } from '@red/domain';
import { Observable } from 'rxjs'; import { firstValueFrom, Observable } from 'rxjs';
import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service'; import { DossierTemplateStatsService } from '@services/entity-services/dossier-template-stats.service';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { tap } from 'rxjs/operators'; import { tap } from 'rxjs/operators';
@ -70,8 +70,8 @@ export class DictionaryListingScreenComponent extends ListingComponent<Dictionar
this._dictionaryService.deleteDictionaries( this._dictionaryService.deleteDictionaries(
types.map(t => t.type), types.map(t => t.type),
this._dossierTemplatesService.activeDossierTemplateId, this._dossierTemplatesService.activeDossierTemplateId,
) ),
.toPromise(); );
await this._loadDictionaryData(); await this._loadDictionaryData();
this._loadingService.stop(); this._loadingService.stop();
}); });

4
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts
View File

@ -4,7 +4,7 @@ import { ManualAnnotationService } from '../../../../services/manual-annotation.
import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { UserService } from '@services/user.service'; import { UserService } from '@services/user.service';
import { PermissionsService } from '@services/permissions.service'; import { PermissionsService } from '@services/permissions.service';
import { AutoUnsubscribe, InputWithActionComponent, LoadingService, trackBy } from '@iqser/common-ui'; import { AutoUnsubscribe, InputWithActionComponent, LoadingService, trackByFactory } from '@iqser/common-ui';
import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesMapService } from '@services/entity-services/files-map.service';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { firstValueFrom, Observable } from 'rxjs'; import { firstValueFrom, Observable } from 'rxjs';
@ -19,7 +19,7 @@ import { tap } from 'rxjs/operators';
}) })
export class CommentsComponent extends AutoUnsubscribe implements OnChanges { export class CommentsComponent extends AutoUnsubscribe implements OnChanges {
@Input() annotation: AnnotationWrapper; @Input() annotation: AnnotationWrapper;
readonly trackBy = trackBy(); readonly trackBy = trackByFactory();
readonly file$: Observable<File>; readonly file$: Observable<File>;
@HostBinding('class.hidden') _hidden = true; @HostBinding('class.hidden') _hidden = true;
@ViewChild(InputWithActionComponent) private readonly _input: InputWithActionComponent; @ViewChild(InputWithActionComponent) private readonly _input: InputWithActionComponent;

1
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
View File

@ -7,6 +7,7 @@ import { File, IViewedPage } from '@red/domain';
import { AutoUnsubscribe } from '@iqser/common-ui'; import { AutoUnsubscribe } from '@iqser/common-ui';
import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesMapService } from '@services/entity-services/files-map.service';
import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service';
import { firstValueFrom } from 'rxjs';
@Component({ @Component({
selector: 'redaction-page-indicator', selector: 'redaction-page-indicator',