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

fix attribute selection

Browse Source
This commit is contained in:
Dan Percic 2021-11-11 13:07:40 +02:00
parent f631d60d9d
commit 3288419fe4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@
(click)="toggleFieldActive(field)"
(mouseenter)="setHoveredColumn(field.csvColumn)"
(mouseleave)="setHoveredColumn()"
*ngFor="let field of fields"
*ngFor="let field of fields; trackBy: trackBy"
class="csv-header-pill-wrapper"
>
<div [class.selected]="isActive(field)" class="csv-header-pill">

9
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 { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster } from '@iqser/common-ui';
import { DefaultListingServices, ListingComponent, TableColumnConfig, Toaster, trackBy } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { FileAttributeConfig, FileAttributeConfigTypes, IField, IFileAttributesConfig } from '@red/domain';
import { FileAttributesService } from '@services/entity-services/file-attributes.service';
@ -28,6 +28,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
columnSample = [];
initialParseConfig: { delimiter?: string; encoding?: string } = {};
readonly tableHeaderLabel = '';
readonly trackBy = trackBy();
constructor(
private readonly _toaster: Toaster,
@ -54,7 +55,6 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
}
get changedParseConfig(): boolean {
console.log(this.baseConfigForm.invalid);
return (
this.initialParseConfig.delimiter !== this.baseConfigForm.get('delimiter').value ||
this.initialParseConfig.encoding !== this.baseConfigForm.get('encoding').value
@ -143,13 +143,12 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<IFi
if (!this.isActive(field)) {
this.activeFields = [...this.activeFields, { ...field, searchKey: field.csvColumn }];
} else {
this.activeFields.splice(this.activeFields.indexOf(field), 1);
this.activeFields = [...this.activeFields];
this.activeFields = this.activeFields.filter(f => f.id !== field.id);
}
}
activateAll() {
this.activeFields = [...this.allEntities.map(item => ({ ...item, searchKey: item.csvColumn }))];
this.activeFields = this.allEntities.map(item => ({ ...item, searchKey: item.csvColumn }));
}
deactivateAll() {