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

upload adjustments

Browse Source
This commit is contained in:
Timo 2021-04-09 00:15:36 +03:00
parent 0394957942
commit 6bdcbec091
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
View File

@ -32,7 +32,7 @@
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="audit"
*ngIf="root && permissionService.isAdmin() && userPreferenceService.areDevFeaturesEnabled"
*ngIf="root && permissionService.isAdmin()"
></a>
<a
@ -41,7 +41,7 @@
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="user-management"
*ngIf="root && permissionService.canManageUsers() && userPreferenceService.areDevFeaturesEnabled"
*ngIf="root && permissionService.canManageUsers()"
></a>
<a
@ -50,7 +50,7 @@
[routerLinkActiveOptions]="{ exact: true }"
routerLinkActive="active"
translate="configurations"
*ngIf="root && userPreferenceService.areDevFeaturesEnabled"
*ngIf="root && permissionService.isAdmin()"
></a>
<ng-container *ngIf="appStateService.activeRuleSet">

2
apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts
View File

@ -17,7 +17,7 @@ export class TabsComponent implements OnInit {
{ screen: 'rules', onlyDevMode: true, label: 'rule-editor' },
{ screen: 'default-colors' },
{ screen: 'watermark' },
{ screen: 'file-attributes', onlyAdmin: true, onlyDevMode: true }
{ screen: 'file-attributes', onlyAdmin: true }
];
constructor(

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

@ -65,7 +65,7 @@
<div class="csv-header-pill-content">
<div
class="csv-header-pill"
*ngFor="let field of parseResult?.fields"
*ngFor="let field of relevantFields"
(mouseenter)="hoveredColumn = field.csvColumn"
(mouseleave)="hoveredColumn = undefined"
(click)="toggleFieldActive(field)"

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

@ -57,6 +57,10 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
this._readFile();
}
get relevantFields() {
return this.parseResult?.fields.filter((f) => this.getEntries(f.csvColumn) > 0);
}
ngOnInit(): void {
setTimeout(() => {
this.cdkVirtualScrollViewport.checkViewportSize();
@ -190,7 +194,13 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
.toPromise()
);
}
await Promise.all(promises);
await this.resolveInSequence(promises);
this.dialogRef.close(true);
}
async resolveInSequence(requests) {
for (const request of requests) {
await request;
}
}
}

10
apps/red-ui/src/app/utils/file-drop-utils.ts
View File

@ -43,7 +43,15 @@ export function convertFiles(files: FileList | File[], project: ProjectWrapper):
});
}
uploadFiles = uploadFiles.filter((file) => file.file.type?.toLowerCase() === 'application/pdf' || file.file.name.toLowerCase().endsWith('.pdf'));
uploadFiles = uploadFiles.filter(
(file) =>
file.file.type?.toLowerCase() === 'application/pdf' ||
file.file.name.toLowerCase().endsWith('.pdf') ||
file.file.type?.toLowerCase() === 'application/zip' ||
file.file.name.toLowerCase().endsWith('.zip') ||
file.file.type?.toLowerCase() === 'text/csv' ||
file.file.name.toLowerCase().endsWith('.csv')
);
uploadFiles.sort((a, b) => a.size - b.size);
return uploadFiles;
}