diff --git a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts index 479d2010ae..a85ec745d0 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts @@ -4,7 +4,7 @@ import { BaseViewModel } from 'src/app/site/base/base-view-model'; import { ExportServiceModule } from '../export-service.module'; import { FileExportService } from '../file-export.service'; import { - CsvColumnsDefinition, + BackendCsvColumnsDefinition, DEFAULT_COLUMN_SEPARATOR, DEFAULT_ENCODING, DEFAULT_LINE_SEPARATOR, @@ -30,7 +30,7 @@ export class CsvExportForBackendService { */ public export( models: T[], - columns: CsvColumnsDefinition, + columns: BackendCsvColumnsDefinition, filename: string, { lineSeparator = DEFAULT_LINE_SEPARATOR, @@ -54,7 +54,7 @@ export class CsvExportForBackendService { const header = columns.map(column => { let label = ``; if (isPropertyDefinition(column)) { - label = column.label ? column.label : (column.property as string); + label = column.property as string; } else if (isMapDefinition(column)) { label = column.label; } diff --git a/client/src/app/gateways/export/csv-export.service/csv-export-utils.ts b/client/src/app/gateways/export/csv-export.service/csv-export-utils.ts index 8048796dca..fee0e09cae 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export-utils.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export-utils.ts @@ -1,3 +1,11 @@ +/** + * Defines a csv column with a property of the model and an optional label. If this is not given, the + * translated and capitalized property name is used. + */ +export interface BackendCsvColumnDefinitionProperty { + property: keyof T; +} + /** * Defines a csv column with a property of the model and an optional label. If this is not given, the * translated and capitalized property name is used. @@ -44,6 +52,12 @@ export function isMapDefinition(obj: any): obj is CsvColumnDefinitionMap { */ export type CsvColumnsDefinition = (CsvColumnDefinitionProperty | CsvColumnDefinitionMap)[]; +/** + * The definition of columns in the export. Either use a property for every model or do a custom mapping to + * a string to be put into the csv. + */ +export type BackendCsvColumnsDefinition = (BackendCsvColumnDefinitionProperty | CsvColumnDefinitionMap)[]; + export const ISO_8859_15_ENCODING = `iso-8859-15`; export const DEFAULT_LINE_SEPARATOR = `\r\n`; export const DEFAULT_COLUMN_SEPARATOR = `,`; diff --git a/client/src/app/gateways/repositories/users/user-action.ts b/client/src/app/gateways/repositories/users/user-action.ts index 556516417e..750f45c89a 100644 --- a/client/src/app/gateways/repositories/users/user-action.ts +++ b/client/src/app/gateways/repositories/users/user-action.ts @@ -14,4 +14,6 @@ export class UserAction { public static readonly FORGET_PASSWORD_CONFIRM = `user.forget_password_confirm`; public static readonly ASSIGN_MEETINGS = `user.assign_meetings`; public static readonly MERGE_TOGETHER = `user.merge_together`; + public static readonly ACCOUNT_JSON_UPLOAD = `account.json_upload`; + public static readonly ACCOUNT_IMPORT = `account.import`; } diff --git a/client/src/app/gateways/repositories/users/user-repository.service.ts b/client/src/app/gateways/repositories/users/user-repository.service.ts index fa5014b82c..748a7e1132 100644 --- a/client/src/app/gateways/repositories/users/user-repository.service.ts +++ b/client/src/app/gateways/repositories/users/user-repository.service.ts @@ -5,6 +5,7 @@ import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; import { UserAction } from 'src/app/gateways/repositories/users/user-action'; import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; +import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; import { Id } from '../../../domain/definitions/key-types'; import { Displayable } from '../../../domain/interfaces/displayable'; @@ -497,6 +498,14 @@ export class UserRepositoryService extends BaseRepository { return this.createAction(UserAction.SET_PRESENT, payload); } + public accountJsonUpload(payload: { [key: string]: any }): Action { + return this.createAction(UserAction.ACCOUNT_JSON_UPLOAD, payload); + } + + public accountImport(payload: { id: number; import: boolean }[]): Action { + return this.createAction(UserAction.ACCOUNT_IMPORT, payload); + } + private sanitizePayload(payload: any): any { const temp = { ...payload }; for (const key of Object.keys(temp).filter(field => !this.isFieldAllowedToBeEmpty(field))) { diff --git a/client/src/app/site/base/base-import.service/base-backend-import.service.ts b/client/src/app/site/base/base-import.service/base-backend-import.service.ts index ca892b8a00..3f78c7ee20 100644 --- a/client/src/app/site/base/base-import.service/base-backend-import.service.ts +++ b/client/src/app/site/base/base-import.service/base-backend-import.service.ts @@ -282,15 +282,24 @@ export abstract class BaseBackendImportService implements BackendImportService { isBackendImportRawPreview(result) ) as BackendImportRawPreview[]; this.processRawPreviews(updatedPreviews); - if (this.previewHasRowErrors) { + const statesSet = new Set(updatedPreviews.map(preview => preview.state)); + if (statesSet.has(BackendImportState.Error)) { this._currentImportPhaseSubject.next(BackendImportPhase.ERROR); + } else if (statesSet.has(BackendImportState.Warning)) { + this.processRawPreviews( + updatedPreviews + .filter(preview => preview.state === BackendImportState.Warning) + .map(preview => ({ + ...preview, + rows: preview.rows.filter(row => row.messages && row.messages.length) + })) + ); + this._currentImportPhaseSubject.next(BackendImportPhase.FINISHED_WITH_WARNING); } else { - this._currentImportPhaseSubject.next(BackendImportPhase.TRY_AGAIN); + this._currentImportPhaseSubject.next(BackendImportPhase.FINISHED); + this._csvLines = []; + return true; } - } else { - this._currentImportPhaseSubject.next(BackendImportPhase.FINISHED); - this._csvLines = []; - return true; } return false; } diff --git a/client/src/app/site/base/base-via-backend-import-list.component.ts b/client/src/app/site/base/base-via-backend-import-list.component.ts index b9ba3eb7f0..b11d1c39f4 100644 --- a/client/src/app/site/base/base-via-backend-import-list.component.ts +++ b/client/src/app/site/base/base-via-backend-import-list.component.ts @@ -29,7 +29,7 @@ export abstract class BaseViaBackendImportListComponent extends BaseComponent im * True if the import is in a state in which an import can be conducted */ public get canImport(): boolean { - return this._state === BackendImportPhase.AWAITING_CONFIRM || this.tryAgain; + return this._state === BackendImportPhase.AWAITING_CONFIRM; } /** @@ -42,8 +42,8 @@ export abstract class BaseViaBackendImportListComponent extends BaseComponent im /** * True if, after an attempted import failed, the view is waiting for the user to confirm the import on the new preview. */ - public get tryAgain(): boolean { - return this._state === BackendImportPhase.TRY_AGAIN; + public get finishedWithWarnings(): boolean { + return this._state === BackendImportPhase.FINISHED_WITH_WARNING; } /** diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/components/topic-import/topic-import.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/components/topic-import/topic-import.component.html index 5e9b79a31b..a2093e0426 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/components/topic-import/topic-import.component.html +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/components/topic-import/topic-import.component.html @@ -6,10 +6,16 @@

{{ 'Import topics' | translate }}

done + + done + block diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.html b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.html index 060dceebd8..d2001c0676 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.html +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.html @@ -11,9 +11,9 @@

{{ 'Import accounts' | translate }}

- +> diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts index 9ddfc79615..5c1906e118 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts @@ -1,11 +1,9 @@ -import { Component, OnInit } from '@angular/core'; -import { UntypedFormBuilder } from '@angular/forms'; +import { Component } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { GeneralUser } from 'src/app/gateways/repositories/users'; -import { BaseUserImportListComponent } from 'src/app/site/base/base-user-import-list.component'; +import { BaseViaBackendImportListComponent } from 'src/app/site/base/base-via-backend-import-list.component'; import { ComponentServiceCollectorService } from 'src/app/site/services/component-service-collector.service'; +import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list'; -import { AccountControllerService } from '../../../../services/common/account-controller.service'; import { accountHeadersAndVerboseNames } from '../../definitions'; import { AccountImportService } from '../../services/account-import.service/account-import.service'; @@ -14,45 +12,20 @@ import { AccountImportService } from '../../services/account-import.service/acco templateUrl: `./account-import-list.component.html`, styleUrls: [`./account-import-list.component.scss`] }) -export class AccountImportListComponent extends BaseUserImportListComponent implements OnInit { +export class AccountImportListComponent extends BaseViaBackendImportListComponent { + public possibleFields = Object.keys(accountHeadersAndVerboseNames); + + public columns: ImportListHeaderDefinition[] = Object.keys(accountHeadersAndVerboseNames).map(header => ({ + property: header, + label: (accountHeadersAndVerboseNames)[header], + isTableColumn: true + })); + public constructor( componentServiceCollector: ComponentServiceCollectorService, protected override translate: TranslateService, - formBuilder: UntypedFormBuilder, - public override importer: AccountImportService, - private accountController: AccountControllerService + public override importer: AccountImportService ) { - super(componentServiceCollector, translate, importer, formBuilder, accountHeadersAndVerboseNames); - } - - public override ngOnInit(): void { - super.ngOnInit(); - this.loadUsers(); - } - - private async loadUsers(): Promise { - try { - // const request = await this.accountController.getAllOrgaUsersModelRequest(); - // this.subscribe(request, `load_users`); - } catch (e) { - console.log(`Error`, e); - } - } - - /** - * Guess the type of the property, since - * `const type = typeof User[property];` - * always returns undefined - */ - protected guessType(userProperty: keyof GeneralUser): 'string' | 'number' | 'boolean' { - const numberProperties: (keyof GeneralUser)[] = [`id`, `vote_weight`]; - const booleanProperties: (keyof GeneralUser)[] = [`is_physical_person`, `is_active`]; - if (numberProperties.includes(userProperty)) { - return `number`; - } else if (booleanProperties.includes(userProperty)) { - return `boolean`; - } else { - return `string`; - } + super(componentServiceCollector, translate, importer); } } diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts index fc5ef6e28a..2708ae32fc 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts @@ -1,9 +1,11 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { User } from 'src/app/domain/models/users/user'; import { userHeadersAndVerboseNames } from 'src/app/domain/models/users/user.constants'; export const accountHeadersAndVerboseNames: { [key in keyof User]?: string } = { ...userHeadersAndVerboseNames, - default_structure_level: `Structure level`, - default_number: `Participant number`, - default_vote_weight: `Vote weight` + default_structure_level: _(`Structure level`), + default_number: _(`Participant number`), + default_vote_weight: _(`Vote weight`), + saml_id: _(`SSO identification`) }; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts index c885992deb..5ce1c4489f 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts @@ -1,19 +1,23 @@ import { Injectable } from '@angular/core'; -import { GeneralUser } from 'src/app/gateways/repositories/users'; -import { ImportConfig } from 'src/app/infrastructure/utils/import/import-utils'; -import { BaseUserImportService } from 'src/app/site/base/base-user-import.service'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { BaseBackendImportService } from 'src/app/site/base/base-import.service/base-backend-import.service'; import { ImportServiceCollectorService } from 'src/app/site/services/import-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; import { AccountExportService } from '../../../../services/account-export.service'; -import { accountHeadersAndVerboseNames } from '../../definitions'; +import { AccountControllerService } from '../../../../services/common/account-controller.service'; import { AccountImportServiceModule } from '../account-import-service.module'; @Injectable({ providedIn: AccountImportServiceModule }) -export class AccountImportService extends BaseUserImportService { - public override errorList = { +export class AccountImportService extends BaseBackendImportService { + /** + * The minimimal number of header entries needed to successfully create an entry + */ + public override requiredHeaderLength = 1; + + public errorList = { Duplicates: `This user already exists`, NoName: `Entry has no valid name`, DuplicateImport: `Entry cannot be imported twice. This line will be ommitted`, @@ -22,9 +26,17 @@ export class AccountImportService extends BaseUserImportService { vote_weight: `The vote weight has too many decimal places (max.: 6).` }; + public override readonly verboseSummaryTitles: { [title: string]: string } = { + total: _(`Total accounts`), + created: _(`Accounts created`), + updated: _(`Accounts updated`), + error: _(`Accounts with errors`), + warning: _(`Accounts with warnings (will be skipped)`) + }; + public constructor( importServiceCollector: ImportServiceCollectorService, - private repo: UserControllerService, + private repo: AccountControllerService, private exporter: AccountExportService ) { super(importServiceCollector); @@ -34,13 +46,14 @@ export class AccountImportService extends BaseUserImportService { this.exporter.downloadCsvImportExample(); } - protected getConfig(): ImportConfig { - return { - modelHeadersAndVerboseNames: accountHeadersAndVerboseNames, - verboseNameFn: plural => (plural ? `Accounts` : `Account`), - getDuplicatesFn: (entry: Partial) => - this.repo.getViewModelList().filter(user => user.username === entry.username), - createFn: (entries: any[]) => this.repo.create(...entries) - }; + protected async import( + actionWorkerIds: number[], + abort = false + ): Promise { + return await this.repo.import(actionWorkerIds.map(id => ({ id, import: !abort }))).resolve(); + } + + protected async jsonUpload(payload: { [key: string]: any }): Promise { + return await this.repo.jsonUpload(payload).resolve(); } } diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.html b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.html index f8e77066d8..292518339c 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.html +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.html @@ -155,6 +155,10 @@

{{ 'Accounts' | translate }}

(deselectAll)="deselectAll()" (deleting)="deleteUsers()" > +