diff --git a/README.md b/README.md index 28ce2da2a..49fa5d365 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ To re-generate http rune swagger YOu need swagger-codegen installed `brew install swagger-codegen` ``` -BASE=https://red-staging.iqser.cloud/ +BASE=https://dev-06.iqser.cloud/ URL="$BASE"redaction-gateway-v1/v2/api-docs?group=redaction-gateway-v1 rm -Rf /tmp/swagger mkdir -p /tmp/swagger diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index 212351a57..841ea9b8c 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -46,7 +46,7 @@ export class NotificationsComponent { async markRead(notification: Notification, $event, isRead: boolean = true) { $event.stopPropagation(); - const ids = [notification.notificationId]; + const ids = [`${notification.id}`]; await this._notificationControllerService.toggleNotificationRead(ids, isRead).toPromise(); if (isRead) { notification.readDate = moment().format('YYYY-MM-DDTHH:mm:ss Z'); diff --git a/apps/red-ui/src/app/models/audit-model-wrapper.model.ts b/apps/red-ui/src/app/models/audit-model-wrapper.model.ts new file mode 100644 index 000000000..e69de29bb diff --git a/apps/red-ui/src/app/models/audit.model.ts b/apps/red-ui/src/app/models/audit.model.ts index 3fab0969d..d653e3099 100644 --- a/apps/red-ui/src/app/models/audit.model.ts +++ b/apps/red-ui/src/app/models/audit.model.ts @@ -2,12 +2,12 @@ import { IAudit } from '@redaction/red-ui-http'; import { IListable } from '@iqser/common-ui'; export class Audit implements IAudit, IListable { + readonly recordId?: number; readonly category?: string; readonly details?: unknown; readonly message?: string; readonly objectId?: string; readonly recordDate?: string; - readonly recordId?: string; readonly userId?: string; constructor(audit: IAudit) { diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 357f280d6..05b4ef6c3 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -56,7 +56,7 @@ export class AnnotationWrapper { textBefore?: string; isChangeLogEntry?: boolean; - changeLogType?: 'ADDED' | 'REMOVED'; + changeLogType?: 'ADDED' | 'REMOVED' | 'CHANGED'; engines?: string[]; private _origin: RedactionLogEntryWrapper; @@ -204,7 +204,7 @@ export class AnnotationWrapper { annotationWrapper.changeLogType = redactionLogEntry.changeLogType; annotationWrapper.redaction = redactionLogEntry.redacted; annotationWrapper.hint = redactionLogEntry.hint; - annotationWrapper.typeValue = redactionLogEntry.type; + annotationWrapper.typeValue = redactionLogEntry.typeId; annotationWrapper.recategorizationType = redactionLogEntry.recategorizationType; annotationWrapper.value = redactionLogEntry.value; annotationWrapper.firstTopLeftPoint = redactionLogEntry.positions[0]?.topLeft; @@ -231,7 +231,7 @@ export class AnnotationWrapper { private static _handleRecommendations(annotationWrapper: AnnotationWrapper, redactionLogEntry: RedactionLogEntryWrapper) { if (annotationWrapper.superType === 'recommendation') { - annotationWrapper.recommendationType = redactionLogEntry.type.substr('recommendation_'.length); + annotationWrapper.recommendationType = redactionLogEntry.typeId.substr('recommendation_'.length); } } @@ -277,7 +277,7 @@ export class AnnotationWrapper { return; } - if (redactionLogEntryWrapper.type?.toLowerCase() === 'manual') { + if (redactionLogEntryWrapper.typeId?.startsWith('manual')) { if (redactionLogEntryWrapper.status === 'REQUESTED') { annotationWrapper.superType = 'suggestion-add'; return; @@ -408,7 +408,7 @@ export class AnnotationWrapper { private static _getShortContent(annotationWrapper: AnnotationWrapper, entry: RedactionLogEntryWrapper) { if (annotationWrapper.legalBasis) { - const lb = entry.legalBasisMapping?.find(lbm => lbm.reason.toLowerCase().includes(annotationWrapper.legalBasis.toLowerCase())); + const lb = entry.legalBasisList?.find(lbm => lbm.reason.toLowerCase().includes(annotationWrapper.legalBasis.toLowerCase())); if (lb) { return lb.name; } diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts index 8644abaf0..6118f24b8 100644 --- a/apps/red-ui/src/app/models/file/file-data.model.ts +++ b/apps/red-ui/src/app/models/file/file-data.model.ts @@ -1,8 +1,9 @@ -import { RedactionChangeLog, RedactionLog, ViewedPages } from '@redaction/red-ui-http'; +import { RedactionLog, RedactionLogEntry, ViewedPages } from '@redaction/red-ui-http'; import { File } from './file'; import { AnnotationWrapper } from './annotation.wrapper'; import { RedactionLogEntryWrapper } from './redaction-log-entry.wrapper'; import { ViewMode } from './view-mode'; +import * as moment from 'moment'; import { TypeValue } from './type-value'; import { User } from '@models/user'; @@ -16,7 +17,6 @@ export class FileDataModel { public file: File, public fileData: Blob, public redactionLog: RedactionLog, - public redactionChangeLog: RedactionChangeLog, public viewedPages?: ViewedPages ) {} @@ -54,42 +54,21 @@ export class FileDataModel { private _convertData(): RedactionLogEntryWrapper[] { let result: RedactionLogEntryWrapper[] = []; - this.redactionChangeLog?.redactionLogEntry?.forEach(changeLogEntry => { - if (changeLogEntry.changeType === 'REMOVED') { - // Fix backend issue where some annotations are both added and removed - const sameEntryExistsAsAdd = !!this.redactionChangeLog.redactionLogEntry.find( - rle => rle.id === changeLogEntry.id && rle.changeType === 'ADDED' - ); - if (sameEntryExistsAsAdd) { - return; - } - - const redactionLogEntryWrapper: RedactionLogEntryWrapper = {}; - - Object.assign(redactionLogEntryWrapper, changeLogEntry); - - redactionLogEntryWrapper.isChangeLogEntry = true; - redactionLogEntryWrapper.changeLogType = changeLogEntry.changeType; - redactionLogEntryWrapper.id = 'changed-log-removed-' + redactionLogEntryWrapper.id; - - result.push(redactionLogEntryWrapper); - } - }); - const reasonAnnotationIds: { [key: string]: RedactionLogEntryWrapper[] } = {}; this.redactionLog.redactionLogEntry?.forEach(redactionLogEntry => { - const existingChangeLogEntry = this.redactionChangeLog?.redactionLogEntry?.find(rle => rle.id === redactionLogEntry.id); - // copy the redactionLog Entry const redactionLogEntryWrapper: RedactionLogEntryWrapper = {}; Object.assign(redactionLogEntryWrapper, redactionLogEntry); - redactionLogEntryWrapper.isChangeLogEntry = !!existingChangeLogEntry; + + redactionLogEntryWrapper.isChangeLogEntry = this._isChangeLogEntry(redactionLogEntry); + // redactionLogEntryWrapper.changeLogType = changeLogEntry.changeType; + // redactionLogEntryWrapper.isChangeLogEntry = !!existingChangeLogEntry; redactionLogEntryWrapper.changeLogType = 'ADDED'; if ( redactionLogEntryWrapper.status === 'DECLINED' && redactionLogEntryWrapper.manualRedactionType === 'ADD' && - redactionLogEntryWrapper.type === 'false_positive' + redactionLogEntryWrapper.typeId.startsWith('false_positive') ) { // ignore these return; @@ -120,9 +99,25 @@ export class FileDataModel { }); result.forEach(redactionLogEntry => { - redactionLogEntry.legalBasisMapping = this.redactionLog.legalBasis; + redactionLogEntry.legalBasisList = this.redactionLog.legalBasis; }); return result; } + + get hasChangeLog() { + return true; + } + + private _isChangeLogEntry(redactionLogEntry: RedactionLogEntry) { + redactionLogEntry.changes.sort((a, b) => moment(a.dateTime).date() - moment(b.dateTime).date()); + // + // relevantChanges = redactionLogEntry.changes.filter(moment(change.dateTime).date() > ); + // + // lastSeenState = redactionLogEntry.changes.indexOf(relevantChanges[0]-1); + // + // + // if(redactionLogEntry.) + return false; + } } diff --git a/apps/red-ui/src/app/models/file/manual-annotation-response.ts b/apps/red-ui/src/app/models/file/manual-annotation-response.ts index c19074328..c2203d0e0 100644 --- a/apps/red-ui/src/app/models/file/manual-annotation-response.ts +++ b/apps/red-ui/src/app/models/file/manual-annotation-response.ts @@ -11,6 +11,6 @@ export class ManualAnnotationResponse { } get dictionary() { - return this.manualRedactionEntryWrapper.manualRedactionEntry.type; + return this.manualRedactionEntryWrapper.manualRedactionEntry.typeId; } } diff --git a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts index 728a87532..3b60bb94e 100644 --- a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts +++ b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts @@ -1,12 +1,21 @@ -import { Comment, LegalBasisMapping, Rectangle } from '@redaction/red-ui-http'; +import { Change, Comment, LegalBasis, Rectangle } from '@redaction/red-ui-http'; export interface RedactionLogEntryWrapper { + changes?: Array; + dossierDictionaryEntry?: boolean; + endOffset?: number; + excluded?: boolean; + imageHasTransparency?: boolean; + manualRedactionUserId?: string; + reference?: Array; + startOffset?: number; + typeId?: string; + color?: Array; dictionaryEntry?: boolean; hint?: boolean; id?: string; legalBasis?: string; - legalBasisMapping?: Array; manual?: boolean; manualRedactionType?: 'ADD' | 'REMOVE' | 'UNDO' | 'LEGAL_BASIS_CHANGE' | 'FORCE_REDACT' | 'RECATEGORIZE'; matchedRule?: number; @@ -18,9 +27,9 @@ export interface RedactionLogEntryWrapper { status?: 'REQUESTED' | 'APPROVED' | 'DECLINED'; textAfter?: string; textBefore?: string; - type?: string; value?: string; image?: boolean; + legalBasisList?: Array; recommendation?: boolean; recommendationAnnotationId?: string; @@ -31,7 +40,7 @@ export interface RedactionLogEntryWrapper { comments?: Comment[]; isChangeLogEntry?: boolean; - changeLogType?: 'ADDED' | 'REMOVED'; + changeLogType?: 'ADDED' | 'REMOVED' | 'CHANGED'; recategorizationType?: string; legalBasisChangeValue?: string; diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts index d40f8e673..c85be54f3 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts @@ -62,6 +62,7 @@ export class DossierTemplateActionsComponent implements OnInit { await this._appStateService.loadAllDossierTemplates(); await this._appStateService.loadDictionaryData(); await this._router.navigate(['main', 'admin']); + this._loadingService.stop(); this.loadDossierTemplatesData?.emit(); }); } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html index 3c97b65c9..ab2e62288 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html @@ -95,7 +95,3 @@ - - - {{ option.fileName }} - diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index fd062b7b8..33bb0f47a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts @@ -1,25 +1,19 @@ -import { Component, Inject, OnInit } from '@angular/core'; -import { AppStateService } from '@state/app-state.service'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import {Component, Inject} from '@angular/core'; +import {AppStateService} from '@state/app-state.service'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import * as moment from 'moment'; -import { Moment } from 'moment'; -import { - DossierTemplateControllerService, - DownloadFileType, - IDossierTemplate, - ReportTemplate, - ReportTemplateControllerService -} from '@redaction/red-ui-http'; -import { applyIntervalConstraints } from '@utils/date-inputs-utils'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import {Moment} from 'moment'; +import {DossierTemplateControllerService, DownloadFileType, IDossierTemplate} from '@redaction/red-ui-http'; +import {applyIntervalConstraints} from '@utils/date-inputs-utils'; +import {downloadTypesTranslations} from '../../../../translations/download-types-translations'; @Component({ selector: 'redaction-add-edit-dossier-template-dialog', templateUrl: './add-edit-dossier-template-dialog.component.html', styleUrls: ['./add-edit-dossier-template-dialog.component.scss'] }) -export class AddEditDossierTemplateDialogComponent implements OnInit { +export class AddEditDossierTemplateDialogComponent { dossierTemplateForm: FormGroup; hasValidFrom: boolean; hasValidTo: boolean; @@ -28,7 +22,6 @@ export class AddEditDossierTemplateDialogComponent implements OnInit { key: type, label: downloadTypesTranslations[type] })); - availableReportTypes: ReportTemplate[] = []; private _previousValidFrom: Moment; private _previousValidTo: Moment; @@ -37,7 +30,6 @@ export class AddEditDossierTemplateDialogComponent implements OnInit { private readonly _appStateService: AppStateService, private readonly _formBuilder: FormBuilder, private readonly _dossierTemplateController: DossierTemplateControllerService, - private readonly _reportTemplateController: ReportTemplateControllerService, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly dossierTemplate: IDossierTemplate ) { @@ -98,13 +90,6 @@ export class AddEditDossierTemplateDialogComponent implements OnInit { return false; } - reportTemplateValueMapper = (reportTemplate: ReportTemplate) => reportTemplate.templateId; - - async ngOnInit() { - this.availableReportTypes = - (await this._reportTemplateController.getAvailableReportTemplates(this.dossierTemplate?.dossierTemplateId).toPromise()) || []; - } - async saveDossierTemplate() { const dossierTemplate = { dossierTemplateId: this.dossierTemplate?.dossierTemplateId, diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts index 06e99ce26..8a4adf108 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UserService } from '@services/user.service'; -import { SMTPConfigurationModel } from '@redaction/red-ui-http'; +import { SMTPConfiguration } from '@redaction/red-ui-http'; @Component({ selector: 'redaction-smtp-auth-dialog', @@ -16,7 +16,7 @@ export class SmtpAuthDialogComponent { private readonly _formBuilder: FormBuilder, private readonly _userService: UserService, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: SMTPConfigurationModel + @Inject(MAT_DIALOG_DATA) public data: SMTPConfiguration ) { this.authForm = this._formBuilder.group({ user: [data?.user || this._userService.currentUser.email, [Validators.required]], diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts index 49eac232b..635d4b141 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.ts @@ -117,7 +117,6 @@ export class AuditScreenComponent extends ListingComponent implements OnD } const logsRequestBody: AuditSearchRequest = { pageSize: PAGE_SIZE, - withTotalHits: true, page: page, category: category === this.ALL_CATEGORIES ? undefined : category, userId: userId === this.ALL_USERS ? undefined : userId, diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts index 26ed04f75..384cda27c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts @@ -90,14 +90,16 @@ export class DefaultColorsScreenComponent extends ListingComponent imp private async _loadColors() { this._loadingService.start(); - const data = await this._dictionaryService.getColors(this._appStateService.activeDossierTemplateId).toPromise(); + const data = await this._appStateService.loadColors(this._appStateService.activeDossierTemplateId).toPromise(); this._colorsObj = data; - const entities: ListItem[] = Object.keys(data).map(key => ({ - id: key, - key, - searchKey: key, - value: data[key] - })); + const entities = Object.keys(data) + .map(key => ({ + id: key, + key, + searchKey: key, + value: data[key] + })) + .filter(entry => entry.id !== 'dossierTemplateId'); this.entitiesService.setEntities(entities); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts index 6b2a70eae..4105133ad 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts @@ -4,8 +4,8 @@ import { AdminDialogService } from '../../services/admin-dialog.service'; import { GeneralConfigurationModel, GeneralSettingsControllerService, - SmtpConfigurationControllerService, - SMTPConfigurationModel + SMTPConfiguration, + SmtpConfigurationControllerService } from '@redaction/red-ui-http'; import { ConfigService } from '@services/config.service'; import { AutoUnsubscribe, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; @@ -25,7 +25,7 @@ export class GeneralConfigScreenComponent extends AutoUnsubscribe implements OnI readonly smtpForm: FormGroup; private _initialGeneralConfiguration: GeneralConfigurationModel; - private _initialSMTPConfiguration: SMTPConfigurationModel; + private _initialSMTPConfiguration: SMTPConfiguration; constructor( private readonly _toaster: Toaster, diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts index 6de8a32e5..d08bcdcc2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts @@ -6,19 +6,19 @@ import { environment } from '@environments/environment'; import { HttpClient } from '@angular/common/http'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Debounce, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; -import { WatermarkControllerService, WatermarkModelRes } from '@redaction/red-ui-http'; +import { WatermarkControllerService, WatermarkModel } from '@redaction/red-ui-http'; import { ActivatedRoute } from '@angular/router'; import { BASE_HREF } from '../../../../tokens'; import { stampPDFPage } from '@utils/page-stamper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const DEFAULT_WATERMARK: WatermarkModelRes = { +export const DEFAULT_WATERMARK: WatermarkModel = { text: null, hexColor: '#dd4d50', opacity: 70, fontSize: 11, fontType: 'sans-serif', - orientation: WatermarkModelRes.OrientationEnum.DIAGONAL + orientation: WatermarkModel.OrientationEnum.DIAGONAL } as const; @Component({ @@ -30,7 +30,7 @@ export class WatermarkScreenComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; configForm: FormGroup; private _instance: WebViewerInstance; - private _watermark: WatermarkModelRes = {}; + private _watermark: WatermarkModel = {}; @ViewChild('viewer', { static: true }) private _viewer: ElementRef; @@ -165,7 +165,7 @@ export class WatermarkScreenComponent implements OnInit { const text = this.configForm.get('text').value || ''; const fontSize = this.configForm.get('fontSize').value; const fontType = this.configForm.get('fontType').value; - const orientation: WatermarkModelRes.OrientationEnum = this.configForm.get('orientation').value; + const orientation: WatermarkModel.OrientationEnum = this.configForm.get('orientation').value; const opacity = this.configForm.get('opacity').value; const color = this.configForm.get('hexColor').value; diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts index 40537f464..19ce51c9f 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts @@ -30,7 +30,7 @@ export class CommentsComponent { .then(commentResponse => { this.annotation.comments.push({ text: value, - id: commentResponse.commentId, + id: parseInt(commentResponse.commentId, 10), user: this._userService.currentUser.id }); }); @@ -43,7 +43,7 @@ export class CommentsComponent { deleteComment(comment: Comment): void { this._manualAnnotationService - .deleteComment(comment.id, this.annotation.id) + .deleteComment(`${comment.id}`, this.annotation.id) .toPromise() .then(() => { this.annotation.comments.splice(this.annotation.comments.indexOf(comment), 1); diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts index 4c0d85d8a..6d1fa343f 100644 --- a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.ts @@ -82,7 +82,7 @@ export class DossierDetailsComponent implements OnInit { async assignOwner(user: User | string) { this.owner = typeof user === 'string' ? this._userService.getRedUserById(user) : user; - const dw = { ...this.appStateService.activeDossier, ownerId: this.owner.id }; + const dw = { ...this.appStateService.activeDossier, id: this.appStateService.activeDossierId, ownerId: this.owner.id }; await this.appStateService.createOrUpdateDossier(dw); const ownerName = this._userService.getNameForId(this.owner.id); diff --git a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts index 8f6934f6e..0ee4986c0 100644 --- a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts @@ -30,7 +30,7 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy { ) {} get read() { - return this.viewedPages?.pages?.indexOf(this.number) >= 0; + return this.viewedPages?.pages?.findIndex(p => p.page === this.number) >= 0; } ngOnInit(): void { @@ -96,8 +96,8 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy { private _markPageRead() { this._viewedPagesControllerService .addPage({ page: this.number }, this._appStateService.activeDossierId, this._appStateService.activeFileId) - .subscribe(() => { - this.viewedPages?.pages?.push(this.number); + .subscribe(page => { + this.viewedPages?.pages?.push(page); }); } @@ -105,7 +105,10 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy { this._viewedPagesControllerService .removePage(this._appStateService.activeDossierId, this._appStateService.activeFileId, this.number) .subscribe(() => { - this.viewedPages?.pages?.splice(this.viewedPages?.pages?.indexOf(this.number), 1); + this.viewedPages?.pages?.splice( + this.viewedPages?.pages?.findIndex(p => p.page === this.number), + 1 + ); }); } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 0aee65cd9..a894ed1c6 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -1,11 +1,11 @@ -import { Component } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; -import { DownloadFileType, IDossier, IDossierTemplate, ReportTemplate, ReportTemplateControllerService } from '@redaction/red-ui-http'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { AppStateService } from '@state/app-state.service'; +import {Component} from '@angular/core'; +import {MatDialogRef} from '@angular/material/dialog'; +import {DossierRequest, DownloadFileType, IDossierTemplate, ReportTemplate, ReportTemplateControllerService} from '@redaction/red-ui-http'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {AppStateService} from '@state/app-state.service'; import * as moment from 'moment'; -import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; -import { IconButtonTypes } from '@iqser/common-ui'; +import {downloadTypesTranslations} from '../../../../translations/download-types-translations'; +import {IconButtonTypes} from '@iqser/common-ui'; @Component({ templateUrl: './add-dossier-dialog.component.html', @@ -45,7 +45,7 @@ export class AddDossierDialogComponent { validators: control => control.value.reportTemplateIds?.length > 0 || control.value.downloadFileTypes?.length > 0 ? null - : { downloadPackage: true } + : {downloadPackage: true} } ); } @@ -69,15 +69,15 @@ export class AddDossierDialogComponent { async saveDossier() { const savedDossier = await this._appStateService.createOrUpdateDossier(this._formToObject()); if (savedDossier) { - this.dialogRef.close({ dossier: savedDossier }); + this.dialogRef.close({dossier: savedDossier}); } } async saveDossierAndAddMembers() { - const dossier: IDossier = this._formToObject(); + const dossier: DossierRequest = this._formToObject(); const savedDossier = await this._appStateService.createOrUpdateDossier(dossier); if (savedDossier) { - this.dialogRef.close({ addMembers: true, dossier: savedDossier }); + this.dialogRef.close({addMembers: true, dossier: savedDossier}); } } @@ -92,9 +92,9 @@ export class AddDossierDialogComponent { this.dossierForm.patchValue( { downloadFileTypes: dossierTemplate.downloadFileTypes, - reportTemplateIds: dossierTemplate.reportTemplateIds + reportTemplateIds: [] // TODO DEFAULT }, - { emitEvent: false } + {emitEvent: false} ); } else { this.availableReportTypes = []; @@ -103,7 +103,7 @@ export class AddDossierDialogComponent { downloadFileTypes: [], reportTemplateIds: [] }, - { emitEvent: false } + {emitEvent: false} ); } } @@ -116,7 +116,7 @@ export class AddDossierDialogComponent { }); } - private _formToObject(): IDossier { + private _formToObject(): DossierRequest { return { dossierName: this.dossierForm.get('dossierName').value, description: this.dossierForm.get('description').value, @@ -124,8 +124,6 @@ export class AddDossierDialogComponent { dossierTemplateId: this.dossierForm.get('dossierTemplateId').value, downloadFileTypes: this.dossierForm.get('downloadFileTypes').value, reportTemplateIds: this.dossierForm.get('reportTemplateIds').value, - // TODO REMOVE THIS - reportTypes: [], watermarkEnabled: this.dossierForm.get('watermarkEnabled').value }; } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts index f54adcb99..fe9029f9d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts @@ -168,7 +168,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } get displayedInFileListAttributes() { - return this.fileAttributeConfigs.filter(config => config.displayedInFileList); + return this.fileAttributeConfigs?.filter(config => config.displayedInFileList) || []; } unassignFn = async (file: File) => { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index d09344511..cb769ebad 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -147,7 +147,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } get canSwitchToDeltaView(): boolean { - return this.fileData?.redactionChangeLog?.redactionLogEntry?.length > 0 && !this.fileData.file.excluded; + return this.fileData.hasChangeLog; } get canAssign(): boolean { @@ -604,7 +604,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni if (!fileData.file?.isPending && !fileData.file?.isError) { if (performUpdate) { this.fileData.redactionLog = fileData.redactionLog; - this.fileData.redactionChangeLog = fileData.redactionChangeLog; this.fileData.file = fileData.file; this.rebuildFilters(true); } else { diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts index d5f0ebaaf..5744621d9 100644 --- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts @@ -35,17 +35,11 @@ export class PdfViewerDataService { } loadActiveFileData(): Observable { - const dossierId = this._appStateService.activeDossierId; - const fileId = this._appStateService.activeFileId; - const file$ = this.downloadOriginalFile(this._appStateService.activeFile); const reactionLog$ = this.loadActiveFileRedactionLog(); - const redactionChangeLog$ = this._redactionLogControllerService - .getRedactionChangeLog(dossierId, fileId) - .pipe(catchError(() => of({}))); const viewedPages$ = this.getViewedPagesForActiveFile(); - return forkJoin([file$, reactionLog$, redactionChangeLog$, viewedPages$]).pipe( + return forkJoin([file$, reactionLog$, viewedPages$]).pipe( map(data => new FileDataModel(this._appStateService.activeFile, ...data)) ); } diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts index 1b11fb087..b6fa9b25e 100644 --- a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts @@ -1,10 +1,5 @@ import { Injectable } from '@angular/core'; -import { - DossierAttributeReq, - DossierAttributesControllerService, - DossierAttributesRes, - IDossierAttributeConfig -} from '@redaction/red-ui-http'; +import { DossierAttribute, DossierAttributes, DossierAttributesControllerService, IDossierAttributeConfig } from '@redaction/red-ui-http'; import { Dossier } from '@state/model/dossier'; import { DossierAttributeWithValue } from '@models/dossier-attributes.model'; import { AppStateService } from '@state/app-state.service'; @@ -28,11 +23,11 @@ export class DossierAttributesService { return attributesConfig.dossierAttributeConfigs.map(config => ({ ...config, - value: attributes.dossierAttributeList.find(attr => attr.dossierAttributeId === config.id)?.value + value: attributes.dossierAttributeList.find(attr => attr.dossierAttributeConfigId === config.id)?.value })); } - setValues(dossier: Dossier, dossierAttributeList: DossierAttributeReq[]): Promise { + setValues(dossier: Dossier, dossierAttributeList: DossierAttribute[]): Promise { return this._dossierAttributesControllerService.setDossierAttributes({ dossierAttributeList }, dossier.id).toPromise(); } diff --git a/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts b/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts index 156e1ebc7..9b08fbd2c 100644 --- a/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts +++ b/apps/red-ui/src/app/modules/upload-download/model/download-status.wrapper.ts @@ -1,10 +1,11 @@ -import { DownloadDetails, DownloadStatus } from '@redaction/red-ui-http'; -import { IListable } from '@iqser/common-ui'; +import {DownloadStatus} from '@redaction/red-ui-http'; +import {IListable} from '@iqser/common-ui'; export class DownloadStatusWrapper implements IListable { inProgress: boolean; - constructor(private _downloadStatus: DownloadStatus) {} + constructor(private _downloadStatus: DownloadStatus) { + } get id() { return this.storageId; @@ -23,9 +24,6 @@ export class DownloadStatusWrapper implements IListable { return this._downloadStatus.creationDate; } - get downloadDetails(): DownloadDetails { - return this._downloadStatus.downloadDetails; - } get filename() { return this._downloadStatus.filename; diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index c32e29691..d02eae4e9 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { + Colors, DossierTemplateControllerService, FileAttributesConfig, FileAttributesControllerService, @@ -438,6 +439,25 @@ export class AppStateService { this._dictionaryData[dossierTemplateId] = await this._getDictionaryDataForDossierTemplateObservables(dossierTemplateId).toPromise(); } + loadColors(dossierTemplateId: string) { + return this._dictionaryService.getColors(dossierTemplateId).pipe( + catchError(() => + of({ + analysisColor: FALLBACK_COLOR, + dictionaryRequestColor: FALLBACK_COLOR, + defaultColor: FALLBACK_COLOR, + manualRedactionColor: FALLBACK_COLOR, + notRedacted: FALLBACK_COLOR, + requestAdd: FALLBACK_COLOR, + previewColor: FALLBACK_COLOR, + requestRemove: FALLBACK_COLOR, + updatedColor: FALLBACK_COLOR, + dossierTemplateId: dossierTemplateId + } as Colors) + ) + ); + } + private _getDictionaryDataForDossierTemplateObservables(dossierTemplateId: string): Observable<{ [key: string]: any }> { const dictionaryData: { [key: string]: any } = {}; @@ -449,7 +469,7 @@ export class AppStateService { }) ); - const colorsObs = this._dictionaryService.getColors(dossierTemplateId).pipe( + const colorsObs = this.loadColors(dossierTemplateId).pipe( tap(colors => { for (const key of Object.keys(colors)) { const color = colors[key]; @@ -465,7 +485,7 @@ export class AppStateService { dictionaryData['declined-suggestion'] = new TypeValue( { - hexColor: colors.notRedacted, + hexColor: colors.notRedacted || FALLBACK_COLOR, type: 'declined-suggestion' }, true @@ -473,7 +493,7 @@ export class AppStateService { dictionaryData['manual'] = new TypeValue( { - hexColor: colors.manualRedactionColor, + hexColor: colors.manualRedactionColor || FALLBACK_COLOR, type: 'manual' }, true @@ -481,7 +501,7 @@ export class AppStateService { dictionaryData['manual-redaction'] = new TypeValue( { - hexColor: colors.manualRedactionColor, + hexColor: colors.manualRedactionColor || FALLBACK_COLOR, type: 'manual-redaction' }, true @@ -497,21 +517,21 @@ export class AppStateService { // dictionary actions dictionaryData['add-dictionary'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'add-dictionary' }, true ); dictionaryData['remove-dictionary'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'remove-dictionary' }, true ); dictionaryData['remove-only-here'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'remove-only-here' }, true @@ -519,7 +539,7 @@ export class AppStateService { // generic suggestions dictionaryData['suggestion'] = new TypeValue( { - hexColor: colors.requestAdd, + hexColor: colors.requestAdd || FALLBACK_COLOR, type: 'suggestion' }, true @@ -527,7 +547,7 @@ export class AppStateService { dictionaryData['suggestion-add'] = new TypeValue( { - hexColor: colors.requestAdd, + hexColor: colors.requestAdd || FALLBACK_COLOR, type: 'suggestion-add' }, true @@ -535,21 +555,21 @@ export class AppStateService { // add suggestions dictionaryData['suggestion-change-legal-basis'] = new TypeValue( { - hexColor: colors.requestAdd, + hexColor: colors.requestAdd || FALLBACK_COLOR, type: 'suggestion-change-legal-basis' }, true ); dictionaryData['suggestion-recategorize-image'] = new TypeValue( { - hexColor: colors.requestAdd, + hexColor: colors.requestAdd || FALLBACK_COLOR, type: 'suggestion-recategorize-image' }, true ); dictionaryData['suggestion-add-dictionary'] = new TypeValue( { - hexColor: colors.dictionaryRequestColor, + hexColor: colors.dictionaryRequestColor || FALLBACK_COLOR, type: 'suggestion-add' }, true @@ -557,7 +577,7 @@ export class AppStateService { dictionaryData['suggestion-remove'] = new TypeValue( { - hexColor: colors.requestRemove, + hexColor: colors.requestRemove || FALLBACK_COLOR, type: 'suggestion-add' }, true @@ -565,7 +585,7 @@ export class AppStateService { dictionaryData['suggestion-remove-dictionary'] = new TypeValue( { - hexColor: colors.dictionaryRequestColor, + hexColor: colors.dictionaryRequestColor || FALLBACK_COLOR, type: 'suggestion-add' }, true @@ -573,7 +593,7 @@ export class AppStateService { dictionaryData['skipped'] = new TypeValue( { - hexColor: colors.notRedacted, + hexColor: colors.notRedacted || FALLBACK_COLOR, type: 'skipped' }, true @@ -581,7 +601,7 @@ export class AppStateService { dictionaryData['default'] = new TypeValue( { - hexColor: colors.defaultColor, + hexColor: colors.defaultColor || FALLBACK_COLOR, type: 'default' }, true @@ -589,7 +609,7 @@ export class AppStateService { dictionaryData['add'] = new TypeValue( { - hexColor: colors.requestAdd, + hexColor: colors.requestAdd || FALLBACK_COLOR, type: 'add' }, true @@ -597,7 +617,7 @@ export class AppStateService { dictionaryData['analysis'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'analysis' }, true @@ -605,7 +625,7 @@ export class AppStateService { dictionaryData['pending-analysis'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'analysis' }, true @@ -613,7 +633,7 @@ export class AppStateService { dictionaryData['change-legal-basis'] = new TypeValue( { - hexColor: colors.analysisColor, + hexColor: colors.analysisColor || FALLBACK_COLOR, type: 'analysis' }, true @@ -630,7 +650,7 @@ export class AppStateService { dictionaryData['redaction'] = new TypeValue( { - hexColor: colors.previewColor, + hexColor: colors.previewColor || FALLBACK_COLOR, type: 'redaction' }, true @@ -638,7 +658,7 @@ export class AppStateService { dictionaryData['updated'] = new TypeValue( { - hexColor: colors.updatedColor, + hexColor: colors.updatedColor || FALLBACK_COLOR, type: 'updated' }, true diff --git a/apps/red-ui/src/app/state/model/dossier.wrapper.ts b/apps/red-ui/src/app/state/model/dossier.wrapper.ts new file mode 100644 index 000000000..e69de29bb diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index d1e68990c..4b4441fbb 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://red-staging.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-06.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 1.5, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://red-staging.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-06.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural" } diff --git a/libs/common-ui b/libs/common-ui index 33da1ce58..1ab7d6bba 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 33da1ce58575adf4fc0bddf8f8e3e8c0f4304765 +Subproject commit 1ab7d6bbad76ab82ce3582101d60cecb5494122b diff --git a/libs/red-ui-http/src/lib/api.module.ts b/libs/red-ui-http/src/lib/api.module.ts index 93f794458..966a38535 100644 --- a/libs/red-ui-http/src/lib/api.module.ts +++ b/libs/red-ui-http/src/lib/api.module.ts @@ -27,6 +27,7 @@ import { ViewedPagesControllerService } from './api/viewedPagesController.servic import { WatermarkControllerService } from './api/watermarkController.service'; import { SearchControllerService } from './api/searchController.service'; import { NotificationControllerService } from './api/notificationController.service'; +import { StatusReportControllerService } from './api/statusReportController.service'; @NgModule({ imports: [], @@ -57,7 +58,8 @@ import { NotificationControllerService } from './api/notificationController.serv ViewedPagesControllerService, WatermarkControllerService, SearchControllerService, - NotificationControllerService + NotificationControllerService, + StatusReportControllerService ] }) export class ApiModule { diff --git a/libs/red-ui-http/src/lib/api/api.ts b/libs/red-ui-http/src/lib/api/api.ts index 3c6557617..272b97ef0 100644 --- a/libs/red-ui-http/src/lib/api/api.ts +++ b/libs/red-ui-http/src/lib/api/api.ts @@ -1,36 +1,52 @@ +export * from './auditController.service'; import { AuditControllerService } from './auditController.service'; -import { DebugControllerService } from './debugController.service'; +import { DictionaryControllerService } from './dictionaryController.service'; +import { DigitalSignatureControllerService } from './digitalSignatureController.service'; +import { DossierAttributesControllerService } from './dossierAttributesController.service'; +import { DossierControllerService } from './dossierController.service'; +import { DossierTemplateControllerService } from './dossierTemplateController.service'; +import { DownloadControllerService } from './downloadController.service'; +import { FileAttributesControllerService } from './fileAttributesController.service'; import { FileManagementControllerService } from './fileManagementController.service'; +import { GeneralSettingsControllerService } from './generalSettingsController.service'; import { InfoControllerService } from './infoController.service'; import { LegalBasisMappingControllerService } from './legalBasisMappingController.service'; import { LicenseReportControllerService } from './licenseReportController.service'; import { ManualRedactionControllerService } from './manualRedactionController.service'; +import { NotificationControllerService } from './notificationController.service'; import { ReanalysisControllerService } from './reanalysisController.service'; import { RedactionLogControllerService } from './redactionLogController.service'; -import { DossierTemplateControllerService } from './dossierTemplateController.service'; +import { ReportTemplateControllerService } from './reportTemplateController.service'; import { RulesControllerService } from './rulesController.service'; +import { SearchControllerService } from './searchController.service'; +import { SmtpConfigurationControllerService } from './smtpConfigurationController.service'; +import { StatusControllerService } from './statusController.service'; +import { StatusReportControllerService } from './statusReportController.service'; +import { UploadControllerService } from './uploadController.service'; import { UserControllerService } from './userController.service'; import { UserPreferenceControllerService } from './userPreferenceController.service'; import { VersionsControllerService } from './versionsController.service'; import { ViewedPagesControllerService } from './viewedPagesController.service'; import { WatermarkControllerService } from './watermarkController.service'; -import { DownloadControllerService } from './downloadController.service'; -import { DigitalSignatureControllerService } from './digitalSignatureController.service'; -import { FileAttributesControllerService } from './fileAttributesController.service'; -import { SmtpConfigurationControllerService } from './smtpConfigurationController.service'; -import { ReportTemplateControllerService } from './reportTemplateController.service'; -import { UploadControllerService } from './uploadController.service'; -import { GeneralSettingsControllerService } from './generalSettingsController.service'; -import { DossierAttributesControllerService } from './dossierAttributesController.service'; -import { SearchControllerService } from './searchController.service'; -import { NotificationControllerService } from './notificationController.service'; - -export * from './auditController.service'; export * from './dictionaryController.service'; +export * from './digitalSignatureController.service'; + +export * from './dossierAttributesController.service'; + +export * from './dossierController.service'; + +export * from './dossierTemplateController.service'; + +export * from './downloadController.service'; + +export * from './fileAttributesController.service'; + export * from './fileManagementController.service'; +export * from './generalSettingsController.service'; + export * from './infoController.service'; export * from './legalBasisMappingController.service'; @@ -39,18 +55,26 @@ export * from './licenseReportController.service'; export * from './manualRedactionController.service'; -export * from './dossierController.service'; +export * from './notificationController.service'; export * from './reanalysisController.service'; export * from './redactionLogController.service'; -export * from './dossierTemplateController.service'; +export * from './reportTemplateController.service'; export * from './rulesController.service'; +export * from './searchController.service'; + +export * from './smtpConfigurationController.service'; + export * from './statusController.service'; +export * from './statusReportController.service'; + +export * from './uploadController.service'; + export * from './userController.service'; export * from './userPreferenceController.service'; @@ -61,53 +85,34 @@ export * from './viewedPagesController.service'; export * from './watermarkController.service'; -export * from './downloadController.service'; - -export * from './digitalSignatureController.service'; - -export * from './debugController.service'; - -export * from './fileAttributesController.service'; - -export * from './smtpConfigurationController.service'; - -export * from './reportTemplateController.service'; - -export * from './uploadController.service'; - -export * from './generalSettingsController.service'; - -export * from './dossierAttributesController.service'; - -export * from './searchController.service'; - -export * from './notificationController.service'; - export const APIS = [ AuditControllerService, - DebugControllerService, + DictionaryControllerService, + DigitalSignatureControllerService, + DossierAttributesControllerService, + DossierControllerService, + DossierTemplateControllerService, + DownloadControllerService, + FileAttributesControllerService, FileManagementControllerService, + GeneralSettingsControllerService, InfoControllerService, LegalBasisMappingControllerService, LicenseReportControllerService, ManualRedactionControllerService, + NotificationControllerService, ReanalysisControllerService, RedactionLogControllerService, - DossierTemplateControllerService, + ReportTemplateControllerService, RulesControllerService, + SearchControllerService, + SmtpConfigurationControllerService, + StatusControllerService, + StatusReportControllerService, + UploadControllerService, UserControllerService, UserPreferenceControllerService, VersionsControllerService, ViewedPagesControllerService, - WatermarkControllerService, - DownloadControllerService, - DigitalSignatureControllerService, - FileAttributesControllerService, - SmtpConfigurationControllerService, - ReportTemplateControllerService, - UploadControllerService, - GeneralSettingsControllerService, - DossierAttributesControllerService, - SearchControllerService, - NotificationControllerService + WatermarkControllerService ]; diff --git a/libs/red-ui-http/src/lib/api/auditController.service.ts b/libs/red-ui-http/src/lib/api/auditController.service.ts index 187f4185d..75a9a80c6 100644 --- a/libs/red-ui-http/src/lib/api/auditController.service.ts +++ b/libs/red-ui-http/src/lib/api/auditController.service.ts @@ -132,4 +132,18 @@ export class AuditControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/debugController.service.ts b/libs/red-ui-http/src/lib/api/debugController.service.ts deleted file mode 100644 index 27b384295..000000000 --- a/libs/red-ui-http/src/lib/api/debugController.service.ts +++ /dev/null @@ -1,373 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */ - -import { Inject, Injectable, Optional } from '@angular/core'; -import { HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'; -import { CustomHttpUrlEncodingCodec } from '../encoder'; - -import { Observable } from 'rxjs'; - -import { BASE_PATH } from '../variables'; -import { Configuration } from '../configuration'; - -@Injectable() -export class DebugControllerService { - public defaultHeaders = new HttpHeaders(); - public configuration = new Configuration(); - protected basePath = ''; - - constructor( - protected httpClient: HttpClient, - @Optional() @Inject(BASE_PATH) basePath: string, - @Optional() configuration: Configuration - ) { - if (basePath) { - this.basePath = basePath; - } - if (configuration) { - this.configuration = configuration; - this.basePath = basePath || configuration.basePath || this.basePath; - } - } - - /** - * Receives an uploaded file and returns it with its classified elements visualized for debugging. - * None - * @param file - * @param inline inline - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public debugClassificationsForm(file: Blob, inline?: boolean, observe?: 'body', reportProgress?: boolean): Observable; - - public debugClassificationsForm( - file: Blob, - inline?: boolean, - observe?: 'response', - reportProgress?: boolean - ): Observable>; - - public debugClassificationsForm(file: Blob, inline?: boolean, observe?: 'events', reportProgress?: boolean): Observable>; - - public debugClassificationsForm(file: Blob, inline?: boolean, observe: any = 'body', reportProgress: boolean = false): Observable { - if (file === null || file === undefined) { - throw new Error('Required parameter file was null or undefined when calling debugClassifications.'); - } - - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - if (inline !== undefined && inline !== null) { - queryParameters = queryParameters.set('inline', inline); - } - - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = ['*/*']; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - // to determine the Content-Type header - const consumes: string[] = ['multipart/form-data']; - - const canConsumeForm = this.canConsumeForm(consumes); - - let formParams: { append(param: string, value: any): void }; - let useForm = false; - const convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); - } else { - formParams = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - } - - if (file !== undefined) { - formParams = (formParams.append('file', file) as any) || formParams; - } - - return this.httpClient.request('post', `${this.basePath}/debug/classification`, { - body: convertFormParamsToString ? formParams.toString() : formParams, - params: queryParameters, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); - } - - /** - * Receives an uploaded file and returns a html file with its extracted tables for debugging. - * None - * @param file - * @param inline inline - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public debugHtmlTablesForm(file: Blob, inline?: boolean, observe?: 'body', reportProgress?: boolean): Observable; - - public debugHtmlTablesForm(file: Blob, inline?: boolean, observe?: 'response', reportProgress?: boolean): Observable>; - - public debugHtmlTablesForm(file: Blob, inline?: boolean, observe?: 'events', reportProgress?: boolean): Observable>; - - public debugHtmlTablesForm(file: Blob, inline?: boolean, observe: any = 'body', reportProgress: boolean = false): Observable { - if (file === null || file === undefined) { - throw new Error('Required parameter file was null or undefined when calling debugHtmlTables.'); - } - - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - if (inline !== undefined && inline !== null) { - queryParameters = queryParameters.set('inline', inline); - } - - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = ['*/*']; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - // to determine the Content-Type header - const consumes: string[] = ['multipart/form-data']; - - const canConsumeForm = this.canConsumeForm(consumes); - - let formParams: { append(param: string, value: any): void }; - let useForm = false; - const convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); - } else { - formParams = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - } - - if (file !== undefined) { - formParams = (formParams.append('file', file) as any) || formParams; - } - - return this.httpClient.request('post', `${this.basePath}/debug/htmlTables`, { - responseType: 'blob', - body: convertFormParamsToString ? formParams.toString() : formParams, - params: queryParameters, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); - } - - /** - * Receives an uploaded file and returns it with its sections visualized for debugging. - * None - * @param file - * @param inline inline - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public debugSectionsForm(file: Blob, inline?: boolean, observe?: 'body', reportProgress?: boolean): Observable; - - public debugSectionsForm(file: Blob, inline?: boolean, observe?: 'response', reportProgress?: boolean): Observable>; - - public debugSectionsForm(file: Blob, inline?: boolean, observe?: 'events', reportProgress?: boolean): Observable>; - - public debugSectionsForm(file: Blob, inline?: boolean, observe: any = 'body', reportProgress: boolean = false): Observable { - if (file === null || file === undefined) { - throw new Error('Required parameter file was null or undefined when calling debugSections.'); - } - - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - if (inline !== undefined && inline !== null) { - queryParameters = queryParameters.set('inline', inline); - } - - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = ['*/*']; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - // to determine the Content-Type header - const consumes: string[] = ['multipart/form-data']; - - const canConsumeForm = this.canConsumeForm(consumes); - - let formParams: { append(param: string, value: any): void }; - let useForm = false; - const convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); - } else { - formParams = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - } - - if (file !== undefined) { - formParams = (formParams.append('file', file) as any) || formParams; - } - - return this.httpClient.request('post', `${this.basePath}/debug/sections`, { - body: convertFormParamsToString ? formParams.toString() : formParams, - params: queryParameters, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); - } - - /** - * Receives an uploaded file and returns it redacted. - * None - * @param file - * @param inline inline - * @param flatRedaction flatRedaction - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public redactionForm( - file: Blob, - inline?: boolean, - flatRedaction?: boolean, - observe?: 'body', - reportProgress?: boolean - ): Observable; - - public redactionForm( - file: Blob, - inline?: boolean, - flatRedaction?: boolean, - observe?: 'response', - reportProgress?: boolean - ): Observable>; - - public redactionForm( - file: Blob, - inline?: boolean, - flatRedaction?: boolean, - observe?: 'events', - reportProgress?: boolean - ): Observable>; - - public redactionForm( - file: Blob, - inline?: boolean, - flatRedaction?: boolean, - observe: any = 'body', - reportProgress: boolean = false - ): Observable { - if (file === null || file === undefined) { - throw new Error('Required parameter file was null or undefined when calling redaction.'); - } - - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - if (inline !== undefined && inline !== null) { - queryParameters = queryParameters.set('inline', inline); - } - if (flatRedaction !== undefined && flatRedaction !== null) { - queryParameters = queryParameters.set('flatRedaction', flatRedaction); - } - - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = ['*/*']; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - // to determine the Content-Type header - const consumes: string[] = ['multipart/form-data']; - - const canConsumeForm = this.canConsumeForm(consumes); - - let formParams: { append(param: string, value: any): void }; - let useForm = false; - const convertFormParamsToString = false; - // use FormData to transmit files using content-type "multipart/form-data" - // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data - useForm = canConsumeForm; - if (useForm) { - formParams = new FormData(); - } else { - formParams = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - } - - if (file !== undefined) { - formParams = (formParams.append('file', file) as any) || formParams; - } - - return this.httpClient.request('post', `${this.basePath}/debug/redaction`, { - body: convertFormParamsToString ? formParams.toString() : formParams, - params: queryParameters, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); - } - - /** - * @param consumes string[] mime-types - * @return true: consumes contains 'multipart/form-data', false: otherwise - */ - private canConsumeForm(consumes: string[]): boolean { - const form = 'multipart/form-data'; - for (const consume of consumes) { - if (form === consume) { - return true; - } - } - return false; - } -} diff --git a/libs/red-ui-http/src/lib/api/dictionaryController.service.ts b/libs/red-ui-http/src/lib/api/dictionaryController.service.ts index 8c50fab00..407dc89e6 100644 --- a/libs/red-ui-http/src/lib/api/dictionaryController.service.ts +++ b/libs/red-ui-http/src/lib/api/dictionaryController.service.ts @@ -10,20 +10,20 @@ * Do not edit the class manually. */ /* tslint:disable:no-unused-variable member-ordering */ -import { Inject, Injectable, Optional } from "@angular/core"; -import { HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from "@angular/common/http"; -import { CustomHttpUrlEncodingCodec } from "../encoder"; +import {Inject, Injectable, Optional} from "@angular/core"; +import {HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse} from "@angular/common/http"; +import {CustomHttpUrlEncodingCodec} from "../encoder"; -import { Observable } from "rxjs"; +import {Observable} from "rxjs"; -import { Colors } from "../model/colors"; -import { IDictionary } from "../model/dictionary"; -import { TypeResponse } from "../model/typeResponse"; -import { ITypeValue } from "../model/typeValue"; -import { UpdateTypeValue } from "../model/updateTypeValue"; +import {Colors} from "../model/colors"; +import {IDictionary} from "../model/dictionary"; +import {TypeResponse} from "../model/typeResponse"; +import {ITypeValue} from "../model/typeValue"; +import {UpdateTypeValue} from "../model/updateTypeValue"; -import { BASE_PATH } from "../variables"; -import { Configuration } from "../configuration"; +import {BASE_PATH} from "../variables"; +import {Configuration} from "../configuration"; @Injectable() export class DictionaryControllerService { @@ -107,7 +107,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling addEntry.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -171,7 +171,7 @@ export class DictionaryControllerService { throw new Error('Required parameter body was null or undefined when calling addType.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -266,7 +266,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling deleteEntries.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -365,7 +365,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling deleteEntry.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -449,7 +449,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling deleteType.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -531,7 +531,7 @@ export class DictionaryControllerService { throw new Error('Required parameter dossierTemplateId was null or undefined when calling deleteTypes.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -621,7 +621,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling downloadDictionaryFile.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -689,7 +689,7 @@ export class DictionaryControllerService { throw new Error('Required parameter dossierTemplateId was null or undefined when calling getAllTypes.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -813,7 +813,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling getDictionaryForType.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -964,7 +964,7 @@ export class DictionaryControllerService { throw new Error('Required parameter type was null or undefined when calling updateType.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierId !== undefined && dossierId !== null) { queryParameters = queryParameters.set('dossierId', dossierId); } @@ -1089,7 +1089,7 @@ export class DictionaryControllerService { if (useForm) { formParams = new FormData(); } else { - formParams = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); } if (file !== undefined) { diff --git a/libs/red-ui-http/src/lib/api/digitalSignatureController.service.ts b/libs/red-ui-http/src/lib/api/digitalSignatureController.service.ts index 541ff9518..3336e0594 100644 --- a/libs/red-ui-http/src/lib/api/digitalSignatureController.service.ts +++ b/libs/red-ui-http/src/lib/api/digitalSignatureController.service.ts @@ -16,8 +16,7 @@ import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/commo import { Observable } from 'rxjs'; import { DigitalSignature } from '../model/digitalSignature'; -import { DigitalSignatureViewModelReq } from '../model/digitalSignatureViewModelReq'; -import { DigitalSignatureViewModelRes } from '../model/digitalSignatureViewModelRes'; +import { DigitalSignatureViewModel } from '../model/digitalSignatureViewModel'; import { BASE_PATH } from '../variables'; import { Configuration } from '../configuration'; @@ -85,11 +84,11 @@ export class DigitalSignatureControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getDigitalSignature(observe?: 'body', reportProgress?: boolean): Observable; + public getDigitalSignature(observe?: 'body', reportProgress?: boolean): Observable; - public getDigitalSignature(observe?: 'response', reportProgress?: boolean): Observable>; + public getDigitalSignature(observe?: 'response', reportProgress?: boolean): Observable>; - public getDigitalSignature(observe?: 'events', reportProgress?: boolean): Observable>; + public getDigitalSignature(observe?: 'events', reportProgress?: boolean): Observable>; public getDigitalSignature(observe: any = 'body', reportProgress: boolean = false): Observable { let headers = this.defaultHeaders; @@ -108,7 +107,7 @@ export class DigitalSignatureControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request('get', `${this.basePath}/digital-signature`, { + return this.httpClient.request('get', `${this.basePath}/digital-signature`, { withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, @@ -123,23 +122,19 @@ export class DigitalSignatureControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public saveDigitalSignature( - body: DigitalSignature, - observe?: 'body', - reportProgress?: boolean - ): Observable; + public saveDigitalSignature(body: DigitalSignature, observe?: 'body', reportProgress?: boolean): Observable; public saveDigitalSignature( body: DigitalSignature, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; public saveDigitalSignature( body: DigitalSignature, observe?: 'events', reportProgress?: boolean - ): Observable>; + ): Observable>; public saveDigitalSignature(body: DigitalSignature, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { @@ -169,7 +164,7 @@ export class DigitalSignatureControllerService { headers = headers.set('Content-Type', httpContentTypeSelected); } - return this.httpClient.request('post', `${this.basePath}/digital-signature`, { + return this.httpClient.request('post', `${this.basePath}/digital-signature`, { body: body, withCredentials: this.configuration.withCredentials, headers: headers, @@ -185,27 +180,27 @@ export class DigitalSignatureControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public updateDigitalSignature(body: DigitalSignatureViewModelReq, observe?: 'body', reportProgress?: boolean): Observable; + public updateDigitalSignature(body: DigitalSignatureViewModel, observe?: 'body', reportProgress?: boolean): Observable; public updateDigitalSignature( - body: DigitalSignatureViewModelReq, + body: DigitalSignatureViewModel, observe?: 'response', reportProgress?: boolean ): Observable>; public updateDigitalSignature( - body: DigitalSignatureViewModelReq, + body: DigitalSignatureViewModel, observe?: 'events', reportProgress?: boolean ): Observable>; public updateDigitalSignature( - body: DigitalSignatureViewModelReq, + body: DigitalSignatureViewModel, observe: any = 'body', reportProgress: boolean = false ): Observable { if (body === null || body === undefined) { - throw new Error('Required parameter body was null or undefined when calling saveDigitalSignature1.'); + throw new Error('Required parameter body was null or undefined when calling updateDigitalSignaturegit_.'); } let headers = this.defaultHeaders; @@ -239,4 +234,18 @@ export class DigitalSignatureControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/dossierAttributesController.service.ts b/libs/red-ui-http/src/lib/api/dossierAttributesController.service.ts index 9e809d6c6..0858bad17 100644 --- a/libs/red-ui-http/src/lib/api/dossierAttributesController.service.ts +++ b/libs/red-ui-http/src/lib/api/dossierAttributesController.service.ts @@ -10,20 +10,18 @@ * Do not edit the class manually. */ /* tslint:disable:no-unused-variable member-ordering */ -import { Inject, Injectable, Optional } from "@angular/core"; -import { HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from "@angular/common/http"; +import {Inject, Injectable, Optional} from "@angular/core"; +import {HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse} from "@angular/common/http"; +import {CustomHttpUrlEncodingCodec} from '../encoder'; -import { Observable } from "rxjs"; +import {Observable} from "rxjs"; +import { DossierAttributes } from '../model/dossierAttributes'; +import { DossierAttribute } from '../model/dossierAttribute'; +import {IDossierAttributeConfig} from "../model/dossierAttributeConfig"; +import {DossierAttributesConfig} from "../model/dossierAttributesConfig"; -import { IDossierAttributeConfig } from "../model/dossierAttributeConfig"; -import { DossierAttributeReq } from "../model/dossierAttributeReq"; -import { DossierAttributesConfig } from "../model/dossierAttributesConfig"; -import { DossierAttributesReq } from "../model/dossierAttributesReq"; -import { DossierAttributesRes } from "../model/dossierAttributesRes"; - -import { BASE_PATH } from "../variables"; -import { Configuration } from "../configuration"; -import { CustomHttpUrlEncodingCodec } from "../encoder"; +import {BASE_PATH} from "../variables"; +import {Configuration} from "../configuration"; @Injectable() export class DossierAttributesControllerService { @@ -54,28 +52,28 @@ export class DossierAttributesControllerService { * @param reportProgress flag to report request and response progress. */ public addOrUpdateDossierAttributes( - body: DossierAttributeReq, + body: DossierAttribute, dossierId: string, observe?: 'body', reportProgress?: boolean - ): Observable; + ): Observable; public addOrUpdateDossierAttributes( - body: DossierAttributeReq, + body: DossierAttribute, dossierId: string, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; public addOrUpdateDossierAttributes( - body: DossierAttributeReq, + body: DossierAttribute, dossierId: string, observe?: 'events', reportProgress?: boolean - ): Observable>; + ): Observable>; public addOrUpdateDossierAttributes( - body: DossierAttributeReq, + body: DossierAttribute, dossierId: string, observe: any = 'body', reportProgress: boolean = false @@ -111,7 +109,7 @@ export class DossierAttributesControllerService { headers = headers.set('Content-Type', httpContentTypeSelected); } - return this.httpClient.request( + return this.httpClient.request( 'post', `${this.basePath}/dossier-attributes/update/${encodeURIComponent(String(dossierId))}`, { @@ -392,7 +390,7 @@ export class DossierAttributesControllerService { throw new Error('Required parameter dossierTemplateId was null or undefined when calling deleteDossierAttributesConfig.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (dossierAttributeIds) { dossierAttributeIds.forEach(element => { queryParameters = queryParameters.append('dossierAttributeIds', element); @@ -435,19 +433,15 @@ export class DossierAttributesControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getDossierAttributes(dossierId: string, observe?: 'body', reportProgress?: boolean): Observable; + public getDossierAttributes(dossierId: string, observe?: 'body', reportProgress?: boolean): Observable; public getDossierAttributes( dossierId: string, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; - public getDossierAttributes( - dossierId: string, - observe?: 'events', - reportProgress?: boolean - ): Observable>; + public getDossierAttributes(dossierId: string, observe?: 'events', reportProgress?: boolean): Observable>; public getDossierAttributes(dossierId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierId === null || dossierId === undefined) { @@ -470,7 +464,7 @@ export class DossierAttributesControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request( + return this.httpClient.request( 'get', `${this.basePath}/dossier-attributes/${encodeURIComponent(String(dossierId))}`, { @@ -549,28 +543,28 @@ export class DossierAttributesControllerService { * @param reportProgress flag to report request and response progress. */ public setDossierAttributes( - body: DossierAttributesReq, + body: DossierAttributes, dossierId: string, observe?: 'body', reportProgress?: boolean - ): Observable; + ): Observable; public setDossierAttributes( - body: DossierAttributesReq, + body: DossierAttributes, dossierId: string, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; public setDossierAttributes( - body: DossierAttributesReq, + body: DossierAttributes, dossierId: string, observe?: 'events', reportProgress?: boolean - ): Observable>; + ): Observable>; public setDossierAttributes( - body: DossierAttributesReq, + body: DossierAttributes, dossierId: string, observe: any = 'body', reportProgress: boolean = false @@ -606,7 +600,7 @@ export class DossierAttributesControllerService { headers = headers.set('Content-Type', httpContentTypeSelected); } - return this.httpClient.request( + return this.httpClient.request( 'post', `${this.basePath}/dossier-attributes/set/${encodeURIComponent(String(dossierId))}`, { diff --git a/libs/red-ui-http/src/lib/api/dossierController.service.ts b/libs/red-ui-http/src/lib/api/dossierController.service.ts index 858653fd6..78debc69a 100644 --- a/libs/red-ui-http/src/lib/api/dossierController.service.ts +++ b/libs/red-ui-http/src/lib/api/dossierController.service.ts @@ -253,19 +253,26 @@ export class DossierControllerService { /** * Hard deletes existing dossiers. * None - * @param body dossierId + * @param dossierId dossierId * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public hardDeleteDossiers(body: Array, observe?: 'body', reportProgress?: boolean): Observable; + public hardDeleteDossiers(dossierId: Array, observe?: 'body', reportProgress?: boolean): Observable; - public hardDeleteDossiers(body: Array, observe?: 'response', reportProgress?: boolean): Observable>; + public hardDeleteDossiers(dossierId: Array, observe?: 'response', reportProgress?: boolean): Observable>; - public hardDeleteDossiers(body: Array, observe?: 'events', reportProgress?: boolean): Observable>; + public hardDeleteDossiers(dossierId: Array, observe?: 'events', reportProgress?: boolean): Observable>; - public hardDeleteDossiers(body: Array, observe: any = 'body', reportProgress: boolean = false): Observable { - if (body === null || body === undefined) { - throw new Error('Required parameter body was null or undefined when calling hardDeleteDossiers.'); + public hardDeleteDossiers(dossierId: Array, observe: any = 'body', reportProgress: boolean = false): Observable { + if (dossierId === null || dossierId === undefined) { + throw new Error('Required parameter dossierId was null or undefined when calling hardDeleteDossiers.'); + } + + let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + if (dossierId) { + dossierId.forEach(element => { + queryParameters = queryParameters.append('dossierId', element); + }); } let headers = this.defaultHeaders; @@ -277,27 +284,14 @@ export class DossierControllerService { headers = headers.set('Authorization', 'Bearer ' + accessToken); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - for (const dossierId of body) { - queryParameters = queryParameters.set('dossierId', dossierId); - } - // to determine the Accept header - const httpHeaderAccepts: string[] = ['application/json']; + const httpHeaderAccepts: string[] = []; const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); if (httpHeaderAcceptSelected !== undefined) { headers = headers.set('Accept', httpHeaderAcceptSelected); } - // to determine the Content-Type header - const consumes: string[] = ['application/json']; - const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); - if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); - } - return this.httpClient.request('delete', `${this.basePath}/deleted-dossiers/hard-delete`, { - body: body, params: queryParameters, withCredentials: this.configuration.withCredentials, headers: headers, @@ -309,7 +303,7 @@ export class DossierControllerService { /** * Restores dossiers. * None - * @param body dossierId + * @param body dossierIds * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ @@ -333,11 +327,6 @@ export class DossierControllerService { headers = headers.set('Authorization', 'Bearer ' + accessToken); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); - for (const dossierId of body) { - queryParameters = queryParameters.set('dossierId', dossierId); - } - // to determine the Accept header const httpHeaderAccepts: string[] = []; const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); @@ -354,7 +343,6 @@ export class DossierControllerService { return this.httpClient.request('post', `${this.basePath}/deleted-dossiers/restore`, { body: body, - params: queryParameters, withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, diff --git a/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts b/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts index 6a8f20a86..8a78317a1 100644 --- a/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts +++ b/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts @@ -10,15 +10,14 @@ * Do not edit the class manually. */ /* tslint:disable:no-unused-variable member-ordering */ -import { Inject, Injectable, Optional } from "@angular/core"; -import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from "@angular/common/http"; +import {Inject, Injectable, Optional} from "@angular/core"; +import {HttpClient, HttpEvent, HttpHeaders, HttpResponse} from "@angular/common/http"; -import { Observable } from "rxjs"; +import {Observable} from "rxjs"; -import { IDossierTemplate } from "../model/dossierTemplate"; - -import { BASE_PATH } from "../variables"; -import { Configuration } from "../configuration"; +import {BASE_PATH} from '../variables'; +import {Configuration} from '../configuration'; +import {IDossierTemplate} from "../model/dossierTemplate"; @Injectable() export class DossierTemplateControllerService { @@ -152,8 +151,11 @@ export class DossierTemplateControllerService { * @param reportProgress flag to report request and response progress. */ public deleteDossierTemplates(body: Array, observe?: 'body', reportProgress?: boolean): Observable; + public deleteDossierTemplates(body: Array, observe?: 'response', reportProgress?: boolean): Observable>; + public deleteDossierTemplates(body: Array, observe?: 'events', reportProgress?: boolean): Observable>; + public deleteDossierTemplates(body: Array, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { throw new Error('Required parameter body was null or undefined when calling deleteDossierTemplates.'); @@ -281,4 +283,18 @@ export class DossierTemplateControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/downloadController.service.ts b/libs/red-ui-http/src/lib/api/downloadController.service.ts index 0905bfff4..b1d4f862b 100644 --- a/libs/red-ui-http/src/lib/api/downloadController.service.ts +++ b/libs/red-ui-http/src/lib/api/downloadController.service.ts @@ -44,6 +44,56 @@ export class DownloadControllerService { } } + /** + * Removes a previously created download status + * None + * @param body removeDownloadRequest + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public deleteDownload(body: RemoveDownloadRequest, observe?: 'body', reportProgress?: boolean): Observable; + + public deleteDownload(body: RemoveDownloadRequest, observe?: 'response', reportProgress?: boolean): Observable>; + + public deleteDownload(body: RemoveDownloadRequest, observe?: 'events', reportProgress?: boolean): Observable>; + + public deleteDownload(body: RemoveDownloadRequest, observe: any = 'body', reportProgress: boolean = false): Observable { + if (body === null || body === undefined) { + throw new Error('Required parameter body was null or undefined when calling deleteDownload.'); + } + + let headers = this.defaultHeaders; + + // authentication (RED-OAUTH) required + if (this.configuration.accessToken) { + const accessToken = + typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; + headers = headers.set('Authorization', 'Bearer ' + accessToken); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = []; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected !== undefined) { + headers = headers.set('Accept', httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = ['application/json']; + const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected !== undefined) { + headers = headers.set('Content-Type', httpContentTypeSelected); + } + + return this.httpClient.request('post', `${this.basePath}/async/download/delete`, { + body: body, + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + }); + } + /** * Returns a downloadable byte stream of the requested file * Use the optional \"inline\" request parameter to select, if this report will be opened in the browser. @@ -192,52 +242,16 @@ export class DownloadControllerService { } /** - * Removes a previously created download status - * None - * @param body removeDownloadRequest - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise */ - public deleteDownload(body: RemoveDownloadRequest, observe?: 'body', reportProgress?: boolean): Observable; - - public deleteDownload(body: RemoveDownloadRequest, observe?: 'response', reportProgress?: boolean): Observable>; - - public deleteDownload(body: RemoveDownloadRequest, observe?: 'events', reportProgress?: boolean): Observable>; - - public deleteDownload(body: RemoveDownloadRequest, observe: any = 'body', reportProgress: boolean = false): Observable { - if (body === null || body === undefined) { - throw new Error('Required parameter body was null or undefined when calling prepareDownload1.'); + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } } - - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = []; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - // to determine the Content-Type header - const consumes: string[] = ['application/json']; - const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); - if (httpContentTypeSelected !== undefined) { - headers = headers.set('Content-Type', httpContentTypeSelected); - } - - return this.httpClient.request('post', `${this.basePath}/async/download/delete`, { - body: body, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); + return false; } } diff --git a/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts b/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts index a7b368f18..add461f4f 100644 --- a/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts +++ b/libs/red-ui-http/src/lib/api/fileAttributesController.service.ts @@ -501,4 +501,18 @@ export class FileAttributesControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/fileManagementController.service.ts b/libs/red-ui-http/src/lib/api/fileManagementController.service.ts index e42afb52d..fdeb33527 100644 --- a/libs/red-ui-http/src/lib/api/fileManagementController.service.ts +++ b/libs/red-ui-http/src/lib/api/fileManagementController.service.ts @@ -331,18 +331,21 @@ export class FileManagementControllerService { * @param reportProgress flag to report request and response progress. */ public hardDeleteFile(dossierId: string, fileIds: Array, observe?: 'body', reportProgress?: boolean): Observable; + public hardDeleteFile( dossierId: string, fileIds: Array, observe?: 'response', reportProgress?: boolean ): Observable>; + public hardDeleteFile( dossierId: string, fileIds: Array, observe?: 'events', reportProgress?: boolean ): Observable>; + public hardDeleteFile( dossierId: string, fileIds: Array, diff --git a/libs/red-ui-http/src/lib/api/generalSettingsController.service.ts b/libs/red-ui-http/src/lib/api/generalSettingsController.service.ts index bc1256dee..3b9b5b853 100644 --- a/libs/red-ui-http/src/lib/api/generalSettingsController.service.ts +++ b/libs/red-ui-http/src/lib/api/generalSettingsController.service.ts @@ -138,4 +138,18 @@ export class GeneralSettingsControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/infoController.service.ts b/libs/red-ui-http/src/lib/api/infoController.service.ts index f570b22fa..f91a00a58 100644 --- a/libs/red-ui-http/src/lib/api/infoController.service.ts +++ b/libs/red-ui-http/src/lib/api/infoController.service.ts @@ -76,4 +76,18 @@ export class InfoControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts b/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts index d0398013c..86b72ad6c 100644 --- a/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts +++ b/libs/red-ui-http/src/lib/api/legalBasisMappingController.service.ts @@ -15,7 +15,7 @@ import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/commo import { Observable } from 'rxjs'; -import { LegalBasisMapping } from '../model/legalBasisMapping'; +import { LegalBasis } from '../model/legalBasis'; import { BASE_PATH } from '../variables'; import { Configuration } from '../configuration'; @@ -47,23 +47,19 @@ export class LegalBasisMappingControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getLegalBasisMapping( - dossierTemplateId: string, - observe?: 'body', - reportProgress?: boolean - ): Observable>; + public getLegalBasisMapping(dossierTemplateId: string, observe?: 'body', reportProgress?: boolean): Observable>; public getLegalBasisMapping( dossierTemplateId: string, observe?: 'response', reportProgress?: boolean - ): Observable>>; + ): Observable>>; public getLegalBasisMapping( dossierTemplateId: string, observe?: 'events', reportProgress?: boolean - ): Observable>>; + ): Observable>>; public getLegalBasisMapping(dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierTemplateId === null || dossierTemplateId === undefined) { @@ -86,7 +82,7 @@ export class LegalBasisMappingControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request>( + return this.httpClient.request>( 'get', `${this.basePath}/legalBasis/${encodeURIComponent(String(dossierTemplateId))}`, { @@ -107,28 +103,28 @@ export class LegalBasisMappingControllerService { * @param reportProgress flag to report request and response progress. */ public setLegalBasisMapping( - body: Array, + body: Array, dossierTemplateId: string, observe?: 'body', reportProgress?: boolean ): Observable; public setLegalBasisMapping( - body: Array, + body: Array, dossierTemplateId: string, observe?: 'response', reportProgress?: boolean ): Observable>; public setLegalBasisMapping( - body: Array, + body: Array, dossierTemplateId: string, observe?: 'events', reportProgress?: boolean ): Observable>; public setLegalBasisMapping( - body: Array, + body: Array, dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false @@ -172,4 +168,18 @@ export class LegalBasisMappingControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/licenseReportController.service.ts b/libs/red-ui-http/src/lib/api/licenseReportController.service.ts index 1e0fa4ea6..8a8090751 100644 --- a/libs/red-ui-http/src/lib/api/licenseReportController.service.ts +++ b/libs/red-ui-http/src/lib/api/licenseReportController.service.ts @@ -126,4 +126,18 @@ export class LicenseReportControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts b/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts index 9bf849ccc..58ac7b83c 100644 --- a/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts +++ b/libs/red-ui-http/src/lib/api/manualRedactionController.service.ts @@ -67,6 +67,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public addComment( body: AddCommentRequest, annotationId: string, @@ -75,6 +76,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public addComment( body: AddCommentRequest, annotationId: string, @@ -83,6 +85,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public addComment( body: AddCommentRequest, annotationId: string, @@ -161,6 +164,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public addRedaction( body: AddRedactionRequest, dossierId: string, @@ -168,6 +172,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public addRedaction( body: AddRedactionRequest, dossierId: string, @@ -175,6 +180,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public addRedaction( body: AddRedactionRequest, dossierId: string, @@ -248,6 +254,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public approveRequest( body: ApproveRequest, annotationId: string, @@ -256,6 +263,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public approveRequest( body: ApproveRequest, annotationId: string, @@ -264,6 +272,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public approveRequest( body: ApproveRequest, annotationId: string, @@ -342,6 +351,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public declineRequest( annotationId: string, dossierId: string, @@ -349,6 +359,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public declineRequest( annotationId: string, dossierId: string, @@ -356,6 +367,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public declineRequest( annotationId: string, dossierId: string, @@ -421,6 +433,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public forceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -428,6 +441,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public forceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -435,6 +449,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public forceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -501,18 +516,21 @@ export class ManualRedactionControllerService { * @param reportProgress flag to report request and response progress. */ public getManualRedaction(dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable; + public getManualRedaction( dossierId: string, fileId: string, observe?: 'response', reportProgress?: boolean ): Observable>; + public getManualRedaction( dossierId: string, fileId: string, observe?: 'events', reportProgress?: boolean ): Observable>; + public getManualRedaction(dossierId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierId === null || dossierId === undefined) { throw new Error('Required parameter dossierId was null or undefined when calling getManualRedaction.'); @@ -566,6 +584,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public legalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -573,6 +592,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public legalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -580,6 +600,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public legalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -653,6 +674,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public recategorizeImage( body: ImageRecategorizationRequest, dossierId: string, @@ -660,6 +682,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public recategorizeImage( body: ImageRecategorizationRequest, dossierId: string, @@ -667,6 +690,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public recategorizeImage( body: ImageRecategorizationRequest, dossierId: string, @@ -740,6 +764,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public removeRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -747,6 +772,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public removeRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -754,6 +780,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public removeRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -827,6 +854,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public requestAddRedaction( body: AddRedactionRequest, dossierId: string, @@ -834,6 +862,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public requestAddRedaction( body: AddRedactionRequest, dossierId: string, @@ -841,6 +870,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public requestAddRedaction( body: AddRedactionRequest, dossierId: string, @@ -912,6 +942,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public requestForceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -919,6 +950,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public requestForceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -926,6 +958,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public requestForceRedaction( body: ForceRedactionRequest, dossierId: string, @@ -997,6 +1030,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public requestImageRecategorization( body: ImageRecategorizationRequest, dossierId: string, @@ -1004,6 +1038,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public requestImageRecategorization( body: ImageRecategorizationRequest, dossierId: string, @@ -1011,6 +1046,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public requestImageRecategorization( body: ImageRecategorizationRequest, dossierId: string, @@ -1084,6 +1120,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public requestLegalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -1091,6 +1128,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public requestLegalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -1098,6 +1136,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public requestLegalBasisChange( body: LegalBasisChangeRequest, dossierId: string, @@ -1171,6 +1210,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public requestRemoveRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -1178,6 +1218,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public requestRemoveRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -1185,6 +1226,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public requestRemoveRedaction( body: RemoveRedactionRequest, dossierId: string, @@ -1252,6 +1294,7 @@ export class ManualRedactionControllerService { * @param reportProgress flag to report request and response progress. */ public undo(annotationId: string, dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable; + public undo( annotationId: string, dossierId: string, @@ -1259,6 +1302,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public undo( annotationId: string, dossierId: string, @@ -1266,6 +1310,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public undo( annotationId: string, dossierId: string, @@ -1333,6 +1378,7 @@ export class ManualRedactionControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public undoComment( annotationId: string, commentId: string, @@ -1341,6 +1387,7 @@ export class ManualRedactionControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public undoComment( annotationId: string, commentId: string, @@ -1349,6 +1396,7 @@ export class ManualRedactionControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public undoComment( annotationId: string, commentId: string, @@ -1389,7 +1437,6 @@ export class ManualRedactionControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - // to determine the Content-Type header return this.httpClient.request( 'delete', `${this.basePath}/manualRedaction/comment/undo/${encodeURIComponent(String(dossierId))}/${encodeURIComponent( @@ -1403,4 +1450,18 @@ export class ManualRedactionControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/notificationController.service.ts b/libs/red-ui-http/src/lib/api/notificationController.service.ts index 591f1383a..4e9262f7b 100644 --- a/libs/red-ui-http/src/lib/api/notificationController.service.ts +++ b/libs/red-ui-http/src/lib/api/notificationController.service.ts @@ -23,9 +23,9 @@ import { Configuration } from '../configuration'; @Injectable() export class NotificationControllerService { - protected basePath = ''; public defaultHeaders = new HttpHeaders(); public configuration = new Configuration(); + protected basePath = ''; constructor( protected httpClient: HttpClient, @@ -41,20 +41,6 @@ export class NotificationControllerService { } } - /** - * @param consumes string[] mime-types - * @return true: consumes contains 'multipart/form-data', false: otherwise - */ - private canConsumeForm(consumes: string[]): boolean { - const form = 'multipart/form-data'; - for (const consume of consumes) { - if (form === consume) { - return true; - } - } - return false; - } - /** * Delete notifications * None @@ -63,8 +49,11 @@ export class NotificationControllerService { * @param reportProgress flag to report request and response progress. */ public deleteNotifications(body: Array, observe?: 'body', reportProgress?: boolean): Observable; + public deleteNotifications(body: Array, observe?: 'response', reportProgress?: boolean): Observable>; + public deleteNotifications(body: Array, observe?: 'events', reportProgress?: boolean): Observable>; + public deleteNotifications(body: Array, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { throw new Error('Required parameter body was null or undefined when calling deleteNotifications.'); @@ -110,16 +99,19 @@ export class NotificationControllerService { * @param reportProgress flag to report request and response progress. */ public getNotifications(includeSeen: boolean, observe?: 'body', reportProgress?: boolean): Observable; + public getNotifications( includeSeen: boolean, observe?: 'response', reportProgress?: boolean ): Observable>; + public getNotifications( includeSeen: boolean, observe?: 'events', reportProgress?: boolean ): Observable>; + public getNotifications(includeSeen: boolean, observe: any = 'body', reportProgress: boolean = false): Observable { if (includeSeen === null || includeSeen === undefined) { throw new Error('Required parameter includeSeen was null or undefined when calling getNotifications.'); @@ -164,18 +156,21 @@ export class NotificationControllerService { * @param reportProgress flag to report request and response progress. */ public toggleNotificationRead(body: Array, setRead: boolean, observe?: 'body', reportProgress?: boolean): Observable; + public toggleNotificationRead( body: Array, setRead: boolean, observe?: 'response', reportProgress?: boolean ): Observable>; + public toggleNotificationRead( body: Array, setRead: boolean, observe?: 'events', reportProgress?: boolean ): Observable>; + public toggleNotificationRead( body: Array, setRead: boolean, @@ -237,18 +232,21 @@ export class NotificationControllerService { * @param reportProgress flag to report request and response progress. */ public toggleNotificationSeen(body: Array, setSeen: boolean, observe?: 'body', reportProgress?: boolean): Observable; + public toggleNotificationSeen( body: Array, setSeen: boolean, observe?: 'response', reportProgress?: boolean ): Observable>; + public toggleNotificationSeen( body: Array, setSeen: boolean, observe?: 'events', reportProgress?: boolean ): Observable>; + public toggleNotificationSeen( body: Array, setSeen: boolean, @@ -300,4 +298,18 @@ export class NotificationControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/reanalysisController.service.ts b/libs/red-ui-http/src/lib/api/reanalysisController.service.ts index 540f5dcad..5103e081f 100644 --- a/libs/red-ui-http/src/lib/api/reanalysisController.service.ts +++ b/libs/red-ui-http/src/lib/api/reanalysisController.service.ts @@ -264,16 +264,35 @@ export class ReanalysisControllerService { * None * @param dossierId dossierId * @param fileId fileId + * @param force force * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public ocrFile(dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable; + public ocrFile(dossierId: string, fileId: string, force?: boolean, observe?: 'body', reportProgress?: boolean): Observable; - public ocrFile(dossierId: string, fileId: string, observe?: 'response', reportProgress?: boolean): Observable>; + public ocrFile( + dossierId: string, + fileId: string, + force?: boolean, + observe?: 'response', + reportProgress?: boolean + ): Observable>; - public ocrFile(dossierId: string, fileId: string, observe?: 'events', reportProgress?: boolean): Observable>; + public ocrFile( + dossierId: string, + fileId: string, + force?: boolean, + observe?: 'events', + reportProgress?: boolean + ): Observable>; - public ocrFile(dossierId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable { + public ocrFile( + dossierId: string, + fileId: string, + force?: boolean, + observe: any = 'body', + reportProgress: boolean = false + ): Observable { if (dossierId === null || dossierId === undefined) { throw new Error('Required parameter dossierId was null or undefined when calling ocrFile.'); } @@ -282,6 +301,11 @@ export class ReanalysisControllerService { throw new Error('Required parameter fileId was null or undefined when calling ocrFile.'); } + let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + if (force !== undefined && force !== null) { + queryParameters = queryParameters.set('force', force); + } + let headers = this.defaultHeaders; // authentication (RED-OAUTH) required @@ -302,6 +326,7 @@ export class ReanalysisControllerService { 'post', `${this.basePath}/ocr/reanalyze/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`, { + params: queryParameters, withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, @@ -581,6 +606,63 @@ export class ReanalysisControllerService { }); } + /** + * Reindex a dossier, files of a dossier or all + * None + * @param body fileIds + * @param dossierId dossierId + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public reindex(body: Array, dossierId?: string, observe?: 'body', reportProgress?: boolean): Observable; + + public reindex(body: Array, dossierId?: string, observe?: 'response', reportProgress?: boolean): Observable>; + + public reindex(body: Array, dossierId?: string, observe?: 'events', reportProgress?: boolean): Observable>; + + public reindex(body: Array, dossierId?: string, observe: any = 'body', reportProgress: boolean = false): Observable { + if (body === null || body === undefined) { + throw new Error('Required parameter body was null or undefined when calling reindex.'); + } + + let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + if (dossierId !== undefined && dossierId !== null) { + queryParameters = queryParameters.set('dossierId', dossierId); + } + + let headers = this.defaultHeaders; + + // authentication (RED-OAUTH) required + if (this.configuration.accessToken) { + const accessToken = + typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; + headers = headers.set('Authorization', 'Bearer ' + accessToken); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = []; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected !== undefined) { + headers = headers.set('Accept', httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = ['application/json']; + const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected !== undefined) { + headers = headers.set('Content-Type', httpContentTypeSelected); + } + + return this.httpClient.request('post', `${this.basePath}/reindex`, { + body: body, + params: queryParameters, + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + }); + } + /** * Exclude or re-include a file to analysis * None @@ -662,4 +744,18 @@ export class ReanalysisControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts index 26b7adc72..96548d57c 100644 --- a/libs/red-ui-http/src/lib/api/redactionLogController.service.ts +++ b/libs/red-ui-http/src/lib/api/redactionLogController.service.ts @@ -11,11 +11,11 @@ */ /* tslint:disable:no-unused-variable member-ordering */ import { Inject, Injectable, Optional } from '@angular/core'; -import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http'; +import { HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'; +import { CustomHttpUrlEncodingCodec } from '../encoder'; import { Observable } from 'rxjs'; -import { RedactionChangeLog } from '../model/redactionChangeLog'; import { RedactionLog } from '../model/redactionLog'; import { SectionGrid } from '../model/sectionGrid'; @@ -43,37 +43,42 @@ export class RedactionLogControllerService { } /** - * Gets the redaction changelog for a fileId + * Gets the redaction log for a fileId * None * @param dossierId dossierId * @param fileId fileId + * @param withManualRedactions withManualRedactions * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getRedactionChangeLog( + public getRedactionLog( dossierId: string, fileId: string, + withManualRedactions?: boolean, observe?: 'body', reportProgress?: boolean - ): Observable; + ): Observable; - public getRedactionChangeLog( + public getRedactionLog( dossierId: string, fileId: string, + withManualRedactions?: boolean, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; - public getRedactionChangeLog( + public getRedactionLog( dossierId: string, fileId: string, + withManualRedactions?: boolean, observe?: 'events', reportProgress?: boolean - ): Observable>; + ): Observable>; - public getRedactionChangeLog( + public getRedactionLog( dossierId: string, fileId: string, + withManualRedactions?: boolean, observe: any = 'body', reportProgress: boolean = false ): Observable { @@ -85,65 +90,9 @@ export class RedactionLogControllerService { throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog.'); } - let headers = this.defaultHeaders; - - // authentication (RED-OAUTH) required - if (this.configuration.accessToken) { - const accessToken = - typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; - headers = headers.set('Authorization', 'Bearer ' + accessToken); - } - - // to determine the Accept header - const httpHeaderAccepts: string[] = ['application/json']; - const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); - if (httpHeaderAcceptSelected !== undefined) { - headers = headers.set('Accept', httpHeaderAcceptSelected); - } - - return this.httpClient.request( - 'get', - `${this.basePath}/redactionChnageLog/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`, - { - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - } - ); - } - - /** - * Gets the redaction log for a fileId - * None - * @param dossierId dossierId - * @param fileId fileId - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public getRedactionLog(dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable; - - public getRedactionLog( - dossierId: string, - fileId: string, - observe?: 'response', - reportProgress?: boolean - ): Observable>; - - public getRedactionLog( - dossierId: string, - fileId: string, - observe?: 'events', - reportProgress?: boolean - ): Observable>; - - public getRedactionLog(dossierId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable { - if (dossierId === null || dossierId === undefined) { - throw new Error('Required parameter dossierId was null or undefined when calling getRedactionLog1.'); - } - - if (fileId === null || fileId === undefined) { - throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog1.'); + let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + if (withManualRedactions !== undefined && withManualRedactions !== null) { + queryParameters = queryParameters.set('withManualRedactions', withManualRedactions); } let headers = this.defaultHeaders; @@ -166,6 +115,7 @@ export class RedactionLogControllerService { 'get', `${this.basePath}/redactionLog/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`, { + params: queryParameters, withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, @@ -234,4 +184,18 @@ export class RedactionLogControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/reportTemplateController.service.ts b/libs/red-ui-http/src/lib/api/reportTemplateController.service.ts index 02331bb5a..748667ad5 100644 --- a/libs/red-ui-http/src/lib/api/reportTemplateController.service.ts +++ b/libs/red-ui-http/src/lib/api/reportTemplateController.service.ts @@ -24,9 +24,9 @@ import { Configuration } from '../configuration'; @Injectable() export class ReportTemplateControllerService { - protected basePath = ''; public defaultHeaders = new HttpHeaders(); public configuration = new Configuration(); + protected basePath = ''; constructor( protected httpClient: HttpClient, @@ -42,20 +42,6 @@ export class ReportTemplateControllerService { } } - /** - * @param consumes string[] mime-types - * @return true: consumes contains 'multipart/form-data', false: otherwise - */ - private canConsumeForm(consumes: string[]): boolean { - const form = 'multipart/form-data'; - for (const consume of consumes) { - if (form === consume) { - return true; - } - } - return false; - } - /** * Delete template file for redaction-report * None @@ -65,18 +51,21 @@ export class ReportTemplateControllerService { * @param reportProgress flag to report request and response progress. */ public deleteTemplate(dossierTemplateId: string, templateId: string, observe?: 'body', reportProgress?: boolean): Observable; + public deleteTemplate( dossierTemplateId: string, templateId: string, observe?: 'response', reportProgress?: boolean ): Observable>; + public deleteTemplate( dossierTemplateId: string, templateId: string, observe?: 'events', reportProgress?: boolean ): Observable>; + public deleteTemplate( dossierTemplateId: string, templateId: string, @@ -133,18 +122,21 @@ export class ReportTemplateControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public downloadReportTemplate( dossierTemplateId: string, templateId: string, observe?: 'response', reportProgress?: boolean ): Observable>; + public downloadReportTemplate( dossierTemplateId: string, templateId: string, observe?: 'events', reportProgress?: boolean ): Observable>; + public downloadReportTemplate( dossierTemplateId: string, templateId: string, @@ -175,11 +167,10 @@ export class ReportTemplateControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request( + return this.httpClient.request( 'get', `${this.basePath}/templateUpload/${encodeURIComponent(String(dossierTemplateId))}/${encodeURIComponent(String(templateId))}`, { - responseType: 'blob', withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, @@ -200,16 +191,19 @@ export class ReportTemplateControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public getAvailablePlaceholders( dossierTemplateId: string, observe?: 'response', reportProgress?: boolean ): Observable>; + public getAvailablePlaceholders( dossierTemplateId: string, observe?: 'events', reportProgress?: boolean ): Observable>; + public getAvailablePlaceholders(dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierTemplateId === null || dossierTemplateId === undefined) { throw new Error('Required parameter dossierTemplateId was null or undefined when calling getAvailablePlaceholders.'); @@ -255,16 +249,19 @@ export class ReportTemplateControllerService { observe?: 'body', reportProgress?: boolean ): Observable>; + public getAvailableReportTemplates( dossierTemplateId: string, observe?: 'response', reportProgress?: boolean ): Observable>>; + public getAvailableReportTemplates( dossierTemplateId: string, observe?: 'events', reportProgress?: boolean ): Observable>>; + public getAvailableReportTemplates(dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierTemplateId === null || dossierTemplateId === undefined) { throw new Error('Required parameter dossierTemplateId was null or undefined when calling getAvailableReportTemplates.'); @@ -314,6 +311,7 @@ export class ReportTemplateControllerService { observe?: 'body', reportProgress?: boolean ): Observable; + public uploadTemplateForm( dossierTemplateId: string, multiFileReport?: boolean, @@ -321,6 +319,7 @@ export class ReportTemplateControllerService { observe?: 'response', reportProgress?: boolean ): Observable>; + public uploadTemplateForm( dossierTemplateId: string, multiFileReport?: boolean, @@ -328,6 +327,7 @@ export class ReportTemplateControllerService { observe?: 'events', reportProgress?: boolean ): Observable>; + public uploadTemplateForm( dossierTemplateId: string, multiFileReport?: boolean, @@ -391,4 +391,18 @@ export class ReportTemplateControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/searchController.service.ts b/libs/red-ui-http/src/lib/api/searchController.service.ts index be3e16fdb..07eb74578 100644 --- a/libs/red-ui-http/src/lib/api/searchController.service.ts +++ b/libs/red-ui-http/src/lib/api/searchController.service.ts @@ -23,9 +23,9 @@ import { Configuration } from '../configuration'; @Injectable() export class SearchControllerService { - protected basePath = ''; public defaultHeaders = new HttpHeaders(); public configuration = new Configuration(); + protected basePath = ''; constructor( protected httpClient: HttpClient, @@ -49,8 +49,11 @@ export class SearchControllerService { * @param reportProgress flag to report request and response progress. */ public search(body: SearchRequest, observe?: 'body', reportProgress?: boolean): Observable; + public search(body: SearchRequest, observe?: 'response', reportProgress?: boolean): Observable>; + public search(body: SearchRequest, observe?: 'events', reportProgress?: boolean): Observable>; + public search(body: SearchRequest, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { throw new Error('Required parameter body was null or undefined when calling search.'); @@ -87,4 +90,18 @@ export class SearchControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts b/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts index b628aa76b..7b4815dc3 100644 --- a/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts +++ b/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts @@ -15,10 +15,9 @@ import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/commo import { Observable } from 'rxjs'; -import { SMTPConfigurationModel } from '../model/sMTPConfigurationModel'; - import { BASE_PATH } from '../variables'; import { Configuration } from '../configuration'; +import { SMTPConfiguration } from '../model/SMTPConfiguration'; @Injectable() export class SmtpConfigurationControllerService { @@ -83,11 +82,11 @@ export class SmtpConfigurationControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getCurrentSMTPConfiguration(observe?: 'body', reportProgress?: boolean): Observable; + public getCurrentSMTPConfiguration(observe?: 'body', reportProgress?: boolean): Observable; - public getCurrentSMTPConfiguration(observe?: 'response', reportProgress?: boolean): Observable>; + public getCurrentSMTPConfiguration(observe?: 'response', reportProgress?: boolean): Observable>; - public getCurrentSMTPConfiguration(observe?: 'events', reportProgress?: boolean): Observable>; + public getCurrentSMTPConfiguration(observe?: 'events', reportProgress?: boolean): Observable>; public getCurrentSMTPConfiguration(observe: any = 'body', reportProgress: boolean = false): Observable { let headers = this.defaultHeaders; @@ -106,7 +105,7 @@ export class SmtpConfigurationControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request('get', `${this.basePath}/configuration/smtp`, { + return this.httpClient.request('get', `${this.basePath}/configuration/smtp`, { withCredentials: this.configuration.withCredentials, headers: headers, observe: observe, @@ -121,17 +120,13 @@ export class SmtpConfigurationControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public testSMTPConfiguration(body: SMTPConfigurationModel, observe?: 'body', reportProgress?: boolean): Observable; + public testSMTPConfiguration(body: SMTPConfiguration, observe?: 'body', reportProgress?: boolean): Observable; - public testSMTPConfiguration( - body: SMTPConfigurationModel, - observe?: 'response', - reportProgress?: boolean - ): Observable>; + public testSMTPConfiguration(body: SMTPConfiguration, observe?: 'response', reportProgress?: boolean): Observable>; - public testSMTPConfiguration(body: SMTPConfigurationModel, observe?: 'events', reportProgress?: boolean): Observable>; + public testSMTPConfiguration(body: SMTPConfiguration, observe?: 'events', reportProgress?: boolean): Observable>; - public testSMTPConfiguration(body: SMTPConfigurationModel, observe: any = 'body', reportProgress: boolean = false): Observable { + public testSMTPConfiguration(body: SMTPConfiguration, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { throw new Error('Required parameter body was null or undefined when calling testSMTPConfiguration.'); } @@ -175,17 +170,13 @@ export class SmtpConfigurationControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public updateSMTPConfiguration(body: SMTPConfigurationModel, observe?: 'body', reportProgress?: boolean): Observable; + public updateSMTPConfiguration(body: SMTPConfiguration, observe?: 'body', reportProgress?: boolean): Observable; - public updateSMTPConfiguration( - body: SMTPConfigurationModel, - observe?: 'response', - reportProgress?: boolean - ): Observable>; + public updateSMTPConfiguration(body: SMTPConfiguration, observe?: 'response', reportProgress?: boolean): Observable>; - public updateSMTPConfiguration(body: SMTPConfigurationModel, observe?: 'events', reportProgress?: boolean): Observable>; + public updateSMTPConfiguration(body: SMTPConfiguration, observe?: 'events', reportProgress?: boolean): Observable>; - public updateSMTPConfiguration(body: SMTPConfigurationModel, observe: any = 'body', reportProgress: boolean = false): Observable { + public updateSMTPConfiguration(body: SMTPConfiguration, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { throw new Error('Required parameter body was null or undefined when calling updateSMTPConfiguration.'); } @@ -221,4 +212,18 @@ export class SmtpConfigurationControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/statusController.service.ts b/libs/red-ui-http/src/lib/api/statusController.service.ts index d7afabc56..7bfd0ff97 100644 --- a/libs/red-ui-http/src/lib/api/statusController.service.ts +++ b/libs/red-ui-http/src/lib/api/statusController.service.ts @@ -10,16 +10,17 @@ * Do not edit the class manually. */ /* tslint:disable:no-unused-variable member-ordering */ -import { Inject, Injectable, Optional } from "@angular/core"; -import { HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from "@angular/common/http"; -import { CustomHttpUrlEncodingCodec } from "../encoder"; +import {Inject, Injectable, Optional} from "@angular/core"; +import {HttpClient, HttpEvent, HttpHeaders, HttpParams, HttpResponse} from "@angular/common/http"; +import {CustomHttpUrlEncodingCodec} from "../encoder"; -import { Observable } from "rxjs"; +import {Observable} from "rxjs"; -import { IFile } from "../model/file"; +import {IFile} from "../model/file"; +import {JSONPrimitive} from '../model/JSONPrimitive'; -import { BASE_PATH } from "../variables"; -import { Configuration } from "../configuration"; +import {BASE_PATH} from "../variables"; +import {Configuration} from "../configuration"; @Injectable() export class StatusControllerService { @@ -49,7 +50,9 @@ export class StatusControllerService { * @param reportProgress flag to report request and response progress. */ public getDeletedFileStatus(dossierId: string, observe?: 'body', reportProgress?: boolean): Observable>; + public getDeletedFileStatus(dossierId: string, observe?: 'response', reportProgress?: boolean): Observable>>; + public getDeletedFileStatus(dossierId: string, observe?: 'events', reportProgress?: boolean): Observable>>; public getDeletedFileStatus(dossierId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierId === null || dossierId === undefined) { @@ -247,43 +250,47 @@ export class StatusControllerService { /** * Assigns a reviewer for a file. * None + * @param body reviewerId * @param dossierId dossierId * @param fileId fileId - * @param reviewerId reviewerId * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ public setFileReviewer( + body: JSONPrimitive, dossierId: string, fileId: string, - reviewerId: string, observe?: 'body', reportProgress?: boolean ): Observable; public setFileReviewer( + body: JSONPrimitive, dossierId: string, fileId: string, - reviewerId: string, observe?: 'response', reportProgress?: boolean ): Observable>; public setFileReviewer( + body: JSONPrimitive, dossierId: string, fileId: string, - reviewerId: string, observe?: 'events', reportProgress?: boolean ): Observable>; public setFileReviewer( + body: JSONPrimitive, dossierId: string, fileId: string, - reviewerId: string, observe: any = 'body', reportProgress: boolean = false ): Observable { + if (body === null || body === undefined) { + throw new Error('Required parameter body was null or undefined when calling setFileReviewer.'); + } + if (dossierId === null || dossierId === undefined) { throw new Error('Required parameter dossierId was null or undefined when calling setFileReviewer.'); } @@ -292,8 +299,92 @@ export class StatusControllerService { throw new Error('Required parameter fileId was null or undefined when calling setFileReviewer.'); } + let headers = this.defaultHeaders; + + // authentication (RED-OAUTH) required + if (this.configuration.accessToken) { + const accessToken = + typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; + headers = headers.set('Authorization', 'Bearer ' + accessToken); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = []; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected !== undefined) { + headers = headers.set('Accept', httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = ['application/json']; + const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected !== undefined) { + headers = headers.set('Content-Type', httpContentTypeSelected); + } + + return this.httpClient.request( + 'post', + `${this.basePath}/status/set-reviewer/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`, + { + body: body, + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + } + ); + } + + /** + * Assigns a reviewer for a file. + * None + * @param dossierId dossierId + * @param fileId fileId + * @param reviewerId reviewerId + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public setFileReviewer1( + dossierId: string, + fileId: string, + reviewerId: string, + observe?: 'body', + reportProgress?: boolean + ): Observable; + + public setFileReviewer1( + dossierId: string, + fileId: string, + reviewerId: string, + observe?: 'response', + reportProgress?: boolean + ): Observable>; + + public setFileReviewer1( + dossierId: string, + fileId: string, + reviewerId: string, + observe?: 'events', + reportProgress?: boolean + ): Observable>; + + public setFileReviewer1( + dossierId: string, + fileId: string, + reviewerId: string, + observe: any = 'body', + reportProgress: boolean = false + ): Observable { + if (dossierId === null || dossierId === undefined) { + throw new Error('Required parameter dossierId was null or undefined when calling setFileReviewer1.'); + } + + if (fileId === null || fileId === undefined) { + throw new Error('Required parameter fileId was null or undefined when calling setFileReviewer1.'); + } + if (reviewerId === null || reviewerId === undefined) { - throw new Error('Required parameter reviewerId was null or undefined when calling setFileReviewer.'); + throw new Error('Required parameter reviewerId was null or undefined when calling setFileReviewer1.'); } let headers = this.defaultHeaders; @@ -543,43 +634,47 @@ export class StatusControllerService { /** * Sets the status UNDER_APPROVAL for a file. * None + * @param body approverId * @param dossierId dossierId * @param fileId fileId - * @param approverId approverId * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ public setStatusUnderApproval( + body: JSONPrimitive, dossierId: string, fileId: string, - approverId?: string, observe?: 'body', reportProgress?: boolean ): Observable; public setStatusUnderApproval( + body: JSONPrimitive, dossierId: string, fileId: string, - approverId?: string, observe?: 'response', reportProgress?: boolean ): Observable>; public setStatusUnderApproval( + body: JSONPrimitive, dossierId: string, fileId: string, - approverId?: string, observe?: 'events', reportProgress?: boolean ): Observable>; public setStatusUnderApproval( + body: JSONPrimitive, dossierId: string, fileId: string, - approverId?: string, observe: any = 'body', reportProgress: boolean = false ): Observable { + if (body === null || body === undefined) { + throw new Error('Required parameter body was null or undefined when calling setStatusUnderApproval.'); + } + if (dossierId === null || dossierId === undefined) { throw new Error('Required parameter dossierId was null or undefined when calling setStatusUnderApproval.'); } @@ -588,7 +683,91 @@ export class StatusControllerService { throw new Error('Required parameter fileId was null or undefined when calling setStatusUnderApproval.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let headers = this.defaultHeaders; + + // authentication (RED-OAUTH) required + if (this.configuration.accessToken) { + const accessToken = + typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; + headers = headers.set('Authorization', 'Bearer ' + accessToken); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = []; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected !== undefined) { + headers = headers.set('Accept', httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = ['application/json']; + const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected !== undefined) { + headers = headers.set('Content-Type', httpContentTypeSelected); + } + + return this.httpClient.request( + 'post', + `${this.basePath}/status/under-approval/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`, + { + body: body, + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + } + ); + } + + /** + * Sets the status UNDER_APPROVAL for a file. + * None + * @param dossierId dossierId + * @param fileId fileId + * @param approverId approverId + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public setStatusUnderApproval1( + dossierId: string, + fileId: string, + approverId?: string, + observe?: 'body', + reportProgress?: boolean + ): Observable; + + public setStatusUnderApproval1( + dossierId: string, + fileId: string, + approverId?: string, + observe?: 'response', + reportProgress?: boolean + ): Observable>; + + public setStatusUnderApproval1( + dossierId: string, + fileId: string, + approverId?: string, + observe?: 'events', + reportProgress?: boolean + ): Observable>; + + public setStatusUnderApproval1( + dossierId: string, + fileId: string, + approverId?: string, + observe: any = 'body', + reportProgress: boolean = false + ): Observable { + if (dossierId === null || dossierId === undefined) { + throw new Error('Required parameter dossierId was null or undefined when calling setStatusUnderApproval1.'); + } + + if (fileId === null || fileId === undefined) { + throw new Error('Required parameter fileId was null or undefined when calling setStatusUnderApproval1.'); + } + + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (approverId !== undefined && approverId !== null) { queryParameters = queryParameters.set('approverId', approverId); } @@ -674,7 +853,7 @@ export class StatusControllerService { throw new Error('Required parameter dossierId was null or undefined when calling setStatusUnderApprovalForList.'); } - let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); + let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()}); if (approverId !== undefined && approverId !== null) { queryParameters = queryParameters.set('approverId', approverId); } @@ -847,4 +1026,18 @@ export class StatusControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/statusReportController.service.ts b/libs/red-ui-http/src/lib/api/statusReportController.service.ts new file mode 100644 index 000000000..c6985682d --- /dev/null +++ b/libs/red-ui-http/src/lib/api/statusReportController.service.ts @@ -0,0 +1,96 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ /* tslint:disable:no-unused-variable member-ordering */ + +import { Inject, Injectable, Optional } from '@angular/core'; +import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http'; + +import { Observable } from 'rxjs'; + +import { BASE_PATH } from '../variables'; +import { Configuration } from '../configuration'; + +@Injectable() +export class StatusReportControllerService { + public defaultHeaders = new HttpHeaders(); + public configuration = new Configuration(); + protected basePath = ''; + + constructor( + protected httpClient: HttpClient, + @Optional() @Inject(BASE_PATH) basePath: string, + @Optional() configuration: Configuration + ) { + if (basePath) { + this.basePath = basePath; + } + if (configuration) { + this.configuration = configuration; + this.basePath = basePath || configuration.basePath || this.basePath; + } + } + + /** + * Generate status report for dossier + * None + * @param dossierId dossierId + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public generateStatusReport(dossierId: string, observe?: 'body', reportProgress?: boolean): Observable; + + public generateStatusReport(dossierId: string, observe?: 'response', reportProgress?: boolean): Observable>; + + public generateStatusReport(dossierId: string, observe?: 'events', reportProgress?: boolean): Observable>; + + public generateStatusReport(dossierId: string, observe: any = 'body', reportProgress: boolean = false): Observable { + if (dossierId === null || dossierId === undefined) { + throw new Error('Required parameter dossierId was null or undefined when calling generateStatusReport.'); + } + + let headers = this.defaultHeaders; + + // authentication (RED-OAUTH) required + if (this.configuration.accessToken) { + const accessToken = + typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken; + headers = headers.set('Authorization', 'Bearer ' + accessToken); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = ['*/*']; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected !== undefined) { + headers = headers.set('Accept', httpHeaderAcceptSelected); + } + + return this.httpClient.request('get', `${this.basePath}/statusReport/${encodeURIComponent(String(dossierId))}`, { + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + }); + } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } +} diff --git a/libs/red-ui-http/src/lib/api/userController.service.ts b/libs/red-ui-http/src/lib/api/userController.service.ts index 1fbce4576..ce6d838a7 100644 --- a/libs/red-ui-http/src/lib/api/userController.service.ts +++ b/libs/red-ui-http/src/lib/api/userController.service.ts @@ -212,7 +212,7 @@ export class UserControllerService { public deleteUsers(userId: Array, observe: any = 'body', reportProgress: boolean = false): Observable { if (userId === null || userId === undefined) { - throw new Error('Required parameter userId was null or undefined when calling deleteUser1.'); + throw new Error('Required parameter userId was null or undefined when calling deleteUsers.'); } let queryParameters = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() }); @@ -462,7 +462,7 @@ export class UserControllerService { public updateMyProfile(body: UpdateMyProfileRequest, observe: any = 'body', reportProgress: boolean = false): Observable { if (body === null || body === undefined) { - throw new Error('Required parameter body was null or undefined when calling updateProfile.'); + throw new Error('Required parameter body was null or undefined when calling updateMyProfile.'); } let headers = this.defaultHeaders; @@ -528,11 +528,11 @@ export class UserControllerService { reportProgress: boolean = false ): Observable { if (body === null || body === undefined) { - throw new Error('Required parameter body was null or undefined when calling updateProfile1.'); + throw new Error('Required parameter body was null or undefined when calling updateProfile.'); } if (userId === null || userId === undefined) { - throw new Error('Required parameter userId was null or undefined when calling updateProfile1.'); + throw new Error('Required parameter userId was null or undefined when calling updateProfile.'); } let headers = this.defaultHeaders; @@ -566,4 +566,18 @@ export class UserControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/userPreferenceController.service.ts b/libs/red-ui-http/src/lib/api/userPreferenceController.service.ts index 3496ca8aa..b01b06d56 100644 --- a/libs/red-ui-http/src/lib/api/userPreferenceController.service.ts +++ b/libs/red-ui-http/src/lib/api/userPreferenceController.service.ts @@ -171,4 +171,18 @@ export class UserPreferenceControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/versionsController.service.ts b/libs/red-ui-http/src/lib/api/versionsController.service.ts index 7232b1106..57ff97418 100644 --- a/libs/red-ui-http/src/lib/api/versionsController.service.ts +++ b/libs/red-ui-http/src/lib/api/versionsController.service.ts @@ -173,4 +173,18 @@ export class VersionsControllerService { reportProgress: reportProgress }); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts b/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts index dfe0202ee..d91adceaf 100644 --- a/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts +++ b/libs/red-ui-http/src/lib/api/viewedPagesController.service.ts @@ -265,4 +265,18 @@ export class ViewedPagesControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/api/watermarkController.service.ts b/libs/red-ui-http/src/lib/api/watermarkController.service.ts index f5c2db566..997bdfeb9 100644 --- a/libs/red-ui-http/src/lib/api/watermarkController.service.ts +++ b/libs/red-ui-http/src/lib/api/watermarkController.service.ts @@ -15,8 +15,7 @@ import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/commo import { Observable } from 'rxjs'; -import { WatermarkModelReq } from '../model/watermarkModelReq'; -import { WatermarkModelRes } from '../model/watermarkModelRes'; +import { WatermarkModel } from '../model/watermarkModel'; import { BASE_PATH } from '../variables'; import { Configuration } from '../configuration'; @@ -90,15 +89,15 @@ export class WatermarkControllerService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getWatermark(dossierTemplateId: string, observe?: 'body', reportProgress?: boolean): Observable; + public getWatermark(dossierTemplateId: string, observe?: 'body', reportProgress?: boolean): Observable; public getWatermark( dossierTemplateId: string, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; - public getWatermark(dossierTemplateId: string, observe?: 'events', reportProgress?: boolean): Observable>; + public getWatermark(dossierTemplateId: string, observe?: 'events', reportProgress?: boolean): Observable>; public getWatermark(dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false): Observable { if (dossierTemplateId === null || dossierTemplateId === undefined) { @@ -121,7 +120,7 @@ export class WatermarkControllerService { headers = headers.set('Accept', httpHeaderAcceptSelected); } - return this.httpClient.request( + return this.httpClient.request( 'get', `${this.basePath}/watermark/${encodeURIComponent(String(dossierTemplateId))}`, { @@ -142,28 +141,28 @@ export class WatermarkControllerService { * @param reportProgress flag to report request and response progress. */ public saveWatermark( - body: WatermarkModelReq, + body: WatermarkModel, dossierTemplateId: string, observe?: 'body', reportProgress?: boolean - ): Observable; + ): Observable; public saveWatermark( - body: WatermarkModelReq, + body: WatermarkModel, dossierTemplateId: string, observe?: 'response', reportProgress?: boolean - ): Observable>; + ): Observable>; public saveWatermark( - body: WatermarkModelReq, + body: WatermarkModel, dossierTemplateId: string, observe?: 'events', reportProgress?: boolean - ): Observable>; + ): Observable>; public saveWatermark( - body: WatermarkModelReq, + body: WatermarkModel, dossierTemplateId: string, observe: any = 'body', reportProgress: boolean = false @@ -199,7 +198,7 @@ export class WatermarkControllerService { headers = headers.set('Content-Type', httpContentTypeSelected); } - return this.httpClient.request( + return this.httpClient.request( 'post', `${this.basePath}/watermark/${encodeURIComponent(String(dossierTemplateId))}`, { @@ -211,4 +210,18 @@ export class WatermarkControllerService { } ); } + + /** + * @param consumes string[] mime-types + * @return true: consumes contains 'multipart/form-data', false: otherwise + */ + private canConsumeForm(consumes: string[]): boolean { + const form = 'multipart/form-data'; + for (const consume of consumes) { + if (form === consume) { + return true; + } + } + return false; + } } diff --git a/libs/red-ui-http/src/lib/model/dossierAttributeRes.ts b/libs/red-ui-http/src/lib/model/JSONPrimitive.ts similarity index 75% rename from libs/red-ui-http/src/lib/model/dossierAttributeRes.ts rename to libs/red-ui-http/src/lib/model/JSONPrimitive.ts index fa161d361..9dbc1ed49 100644 --- a/libs/red-ui-http/src/lib/model/dossierAttributeRes.ts +++ b/libs/red-ui-http/src/lib/model/JSONPrimitive.ts @@ -10,7 +10,6 @@ * Do not edit the class manually. */ -export interface DossierAttributeRes { - dossierAttributeId?: string; - value?: string; +export interface JSONPrimitive { + value?: T; } diff --git a/libs/red-ui-http/src/lib/model/audit.ts b/libs/red-ui-http/src/lib/model/audit.ts index 9427a4896..940f7eb76 100644 --- a/libs/red-ui-http/src/lib/model/audit.ts +++ b/libs/red-ui-http/src/lib/model/audit.ts @@ -16,6 +16,6 @@ export interface IAudit { readonly message?: string; readonly objectId?: string; readonly recordDate?: string; - readonly recordId?: string; + readonly recordId?: number; readonly userId?: string; } diff --git a/libs/red-ui-http/src/lib/model/auditSearchRequest.ts b/libs/red-ui-http/src/lib/model/auditSearchRequest.ts index 3dfbafe83..1ed35a5d2 100644 --- a/libs/red-ui-http/src/lib/model/auditSearchRequest.ts +++ b/libs/red-ui-http/src/lib/model/auditSearchRequest.ts @@ -19,5 +19,4 @@ export interface AuditSearchRequest { requestingUserId?: string; to?: string; userId?: string; - withTotalHits?: boolean; } diff --git a/libs/red-ui-http/src/lib/model/change.ts b/libs/red-ui-http/src/lib/model/change.ts new file mode 100644 index 000000000..bb2e530b5 --- /dev/null +++ b/libs/red-ui-http/src/lib/model/change.ts @@ -0,0 +1,25 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface Change { + dateTime?: string; + type?: Change.TypeEnum; +} + +export namespace Change { + export type TypeEnum = 'ADDED' | 'CHANGED' | 'REMOVED'; + export const TypeEnum = { + ADDED: 'ADDED' as TypeEnum, + CHANGED: 'CHANGED' as TypeEnum, + REMOVED: 'REMOVED' as TypeEnum + }; +} diff --git a/libs/red-ui-http/src/lib/model/colors.ts b/libs/red-ui-http/src/lib/model/colors.ts index f8444246c..de52b1baa 100644 --- a/libs/red-ui-http/src/lib/model/colors.ts +++ b/libs/red-ui-http/src/lib/model/colors.ts @@ -14,6 +14,7 @@ export interface Colors { analysisColor?: string; defaultColor?: string; dictionaryRequestColor?: string; + dossierTemplateId?: string; manualRedactionColor?: string; notRedacted?: string; previewColor?: string; diff --git a/libs/red-ui-http/src/lib/model/comment.ts b/libs/red-ui-http/src/lib/model/comment.ts index 6755e4750..310cc2176 100644 --- a/libs/red-ui-http/src/lib/model/comment.ts +++ b/libs/red-ui-http/src/lib/model/comment.ts @@ -11,8 +11,11 @@ */ export interface Comment { + annotationId?: string; date?: string; - id?: string; + fileId?: string; + id?: number; + softDeletedTime?: string; text?: string; user?: string; } diff --git a/libs/red-ui-http/src/lib/model/digitalSignatureViewModelReq.ts b/libs/red-ui-http/src/lib/model/digitalSignatureViewModel.ts similarity index 88% rename from libs/red-ui-http/src/lib/model/digitalSignatureViewModelReq.ts rename to libs/red-ui-http/src/lib/model/digitalSignatureViewModel.ts index fbbe24d69..f5e3110fb 100644 --- a/libs/red-ui-http/src/lib/model/digitalSignatureViewModelReq.ts +++ b/libs/red-ui-http/src/lib/model/digitalSignatureViewModel.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -export interface DigitalSignatureViewModelReq { +export interface DigitalSignatureViewModel { certificateName?: string; contactInfo?: string; location?: string; diff --git a/libs/red-ui-http/src/lib/model/digitalSignatureViewModelRes.ts b/libs/red-ui-http/src/lib/model/dossierAttribute.ts similarity index 65% rename from libs/red-ui-http/src/lib/model/digitalSignatureViewModelRes.ts rename to libs/red-ui-http/src/lib/model/dossierAttribute.ts index 1a7d4ec3b..f77674536 100644 --- a/libs/red-ui-http/src/lib/model/digitalSignatureViewModelRes.ts +++ b/libs/red-ui-http/src/lib/model/dossierAttribute.ts @@ -10,9 +10,8 @@ * Do not edit the class manually. */ -export interface DigitalSignatureViewModelRes { - certificateName?: string; - contactInfo?: string; - location?: string; - reason?: string; +export interface DossierAttribute { + dossierAttributeConfigId?: string; + dossierId?: string; + value?: string; } diff --git a/libs/red-ui-http/src/lib/model/dossierAttributeConfig.ts b/libs/red-ui-http/src/lib/model/dossierAttributeConfig.ts index 570df6c11..ba1173cad 100644 --- a/libs/red-ui-http/src/lib/model/dossierAttributeConfig.ts +++ b/libs/red-ui-http/src/lib/model/dossierAttributeConfig.ts @@ -15,6 +15,7 @@ export interface IDossierAttributeConfig { readonly editable?: boolean; readonly label?: string; readonly placeholder?: string; + readonly dossierTemplateId?: string; readonly type?: DossierAttributeConfigType; } diff --git a/libs/red-ui-http/src/lib/model/dossierAttributes.ts b/libs/red-ui-http/src/lib/model/dossierAttributes.ts new file mode 100644 index 000000000..cea45607b --- /dev/null +++ b/libs/red-ui-http/src/lib/model/dossierAttributes.ts @@ -0,0 +1,16 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ +import { DossierAttribute } from './dossierAttribute'; + +export interface DossierAttributes { + dossierAttributeList?: Array; +} diff --git a/libs/red-ui-http/src/lib/model/dossierAttributesReq.ts b/libs/red-ui-http/src/lib/model/dossierAttributesReq.ts deleted file mode 100644 index b67f7556f..000000000 --- a/libs/red-ui-http/src/lib/model/dossierAttributesReq.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { DossierAttributeReq } from './dossierAttributeReq'; - -export interface DossierAttributesReq { - dossierAttributeList?: Array; -} diff --git a/libs/red-ui-http/src/lib/model/dossierAttributesRes.ts b/libs/red-ui-http/src/lib/model/dossierAttributesRes.ts deleted file mode 100644 index e2056b351..000000000 --- a/libs/red-ui-http/src/lib/model/dossierAttributesRes.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { DossierAttributeRes } from './dossierAttributeRes'; - -export interface DossierAttributesRes { - dossierAttributeList?: Array; -} diff --git a/libs/red-ui-http/src/lib/model/dossierRequest.ts b/libs/red-ui-http/src/lib/model/dossierRequest.ts index 71682ec00..6a422951e 100644 --- a/libs/red-ui-http/src/lib/model/dossierRequest.ts +++ b/libs/red-ui-http/src/lib/model/dossierRequest.ts @@ -56,10 +56,6 @@ export interface DossierRequest { * Id(s) of the word report templates used to generate downloads */ readonly reportTemplateIds?: List; - /** - * Report File Types for this dossiers submission package. - */ - readonly reportTypes?: List; /** * Whether a watermark will be applied to the redacted files or not. */ diff --git a/libs/red-ui-http/src/lib/model/dossierAttributeReq.ts b/libs/red-ui-http/src/lib/model/dossierTemplateIdUploadBody.ts similarity index 75% rename from libs/red-ui-http/src/lib/model/dossierAttributeReq.ts rename to libs/red-ui-http/src/lib/model/dossierTemplateIdUploadBody.ts index aad5d3da5..fcdf8fb1d 100644 --- a/libs/red-ui-http/src/lib/model/dossierAttributeReq.ts +++ b/libs/red-ui-http/src/lib/model/dossierTemplateIdUploadBody.ts @@ -10,7 +10,6 @@ * Do not edit the class manually. */ -export interface DossierAttributeReq { - dossierAttributeId?: string; - value?: string; +export interface DossierTemplateIdUploadBody { + file?: Blob; } diff --git a/libs/red-ui-http/src/lib/model/downloadDetails.ts b/libs/red-ui-http/src/lib/model/downloadDetails.ts deleted file mode 100644 index 4f5543a9f..000000000 --- a/libs/red-ui-http/src/lib/model/downloadDetails.ts +++ /dev/null @@ -1,28 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -export interface DownloadDetails { - downloadFileTypes?: Array; - fileIds?: Array; - reportTemplateIds?: Array; -} - -export namespace DownloadDetails { - export type DownloadFileTypesEnum = 'ANNOTATED' | 'FLATTEN' | 'ORIGINAL' | 'PREVIEW' | 'REDACTED'; - export const DownloadFileTypesEnum = { - ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum, - FLATTEN: 'FLATTEN' as DownloadFileTypesEnum, - ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum, - PREVIEW: 'PREVIEW' as DownloadFileTypesEnum, - REDACTED: 'REDACTED' as DownloadFileTypesEnum - }; -} diff --git a/libs/red-ui-http/src/lib/model/downloadStatus.ts b/libs/red-ui-http/src/lib/model/downloadStatus.ts index fa4802390..ed87259c2 100644 --- a/libs/red-ui-http/src/lib/model/downloadStatus.ts +++ b/libs/red-ui-http/src/lib/model/downloadStatus.ts @@ -9,12 +9,12 @@ * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ -import { DownloadDetails } from './downloadDetails'; export interface DownloadStatus { creationDate?: string; dossierId?: string; - downloadDetails?: DownloadDetails; + downloadFileTypes?: Array; + fileIds?: Array; fileSize?: number; filename?: string; lastDownload?: string; @@ -25,6 +25,14 @@ export interface DownloadStatus { } export namespace DownloadStatus { + export type DownloadFileTypesEnum = 'ANNOTATED' | 'FLATTEN' | 'ORIGINAL' | 'PREVIEW' | 'REDACTED'; + export const DownloadFileTypesEnum = { + ANNOTATED: 'ANNOTATED' as DownloadFileTypesEnum, + FLATTEN: 'FLATTEN' as DownloadFileTypesEnum, + ORIGINAL: 'ORIGINAL' as DownloadFileTypesEnum, + PREVIEW: 'PREVIEW' as DownloadFileTypesEnum, + REDACTED: 'REDACTED' as DownloadFileTypesEnum + }; export type StatusEnum = 'FAILED' | 'GENERATING' | 'QUEUED' | 'READY'; export const StatusEnum = { FAILED: 'FAILED' as StatusEnum, diff --git a/libs/red-ui-http/src/lib/model/fileAttributeConfig.ts b/libs/red-ui-http/src/lib/model/fileAttributeConfig.ts index affcab95a..1afe9dfa7 100644 --- a/libs/red-ui-http/src/lib/model/fileAttributeConfig.ts +++ b/libs/red-ui-http/src/lib/model/fileAttributeConfig.ts @@ -11,15 +11,17 @@ */ export interface IFileAttributeConfig { - readonly id: string; readonly csvColumnHeader?: string; - readonly editable?: boolean; - readonly label?: string; - readonly placeholder?: string; - readonly primaryAttribute?: boolean; - readonly displayedInFileList?: boolean; - readonly filterable?: boolean; - readonly type?: FileAttributeConfigType; + readonly displayedInFileList?: boolean; + readonly dossierTemplateId?: string; + readonly editable?: boolean; + readonly filterable?: boolean; + readonly id: string; + readonly label?: string; + readonly placeholder?: string; + readonly primaryAttribute?: boolean; + readonly type?: FileAttributeConfigType; + } export const FileAttributeConfigTypes = { diff --git a/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts b/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts index 03a5ec8a9..de1c46a8b 100644 --- a/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts +++ b/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts @@ -11,7 +11,7 @@ */ export interface GeneralConfigurationModel { - forgotPasswordFunctionEnabled?: boolean; - displayName?: string; auxiliaryName?: string; + displayName?: string; + forgotPasswordFunctionEnabled?: boolean; } diff --git a/libs/red-ui-http/src/lib/model/idRemoval.ts b/libs/red-ui-http/src/lib/model/idRemoval.ts index d6cac1213..a11baafe1 100644 --- a/libs/red-ui-http/src/lib/model/idRemoval.ts +++ b/libs/red-ui-http/src/lib/model/idRemoval.ts @@ -11,10 +11,12 @@ */ export interface IdRemoval { - id?: string; + annotationId?: string; + fileId?: string; processedDate?: string; removeFromDictionary?: boolean; requestDate?: string; + softDeletedTime?: string; status?: IdRemoval.StatusEnum; user?: string; } diff --git a/libs/red-ui-http/src/lib/model/legalBasisMapping.ts b/libs/red-ui-http/src/lib/model/legalBasis.ts similarity index 88% rename from libs/red-ui-http/src/lib/model/legalBasisMapping.ts rename to libs/red-ui-http/src/lib/model/legalBasis.ts index 6bc09b5b4..e31c7ab97 100644 --- a/libs/red-ui-http/src/lib/model/legalBasisMapping.ts +++ b/libs/red-ui-http/src/lib/model/legalBasis.ts @@ -10,8 +10,9 @@ * Do not edit the class manually. */ -export interface LegalBasisMapping { +export interface LegalBasis { description?: string; + id?: number; name?: string; reason?: string; } diff --git a/libs/red-ui-http/src/lib/model/manualAddResponse.ts b/libs/red-ui-http/src/lib/model/manualAddResponse.ts index 74db9ace3..a2fd87ab6 100644 --- a/libs/red-ui-http/src/lib/model/manualAddResponse.ts +++ b/libs/red-ui-http/src/lib/model/manualAddResponse.ts @@ -12,5 +12,5 @@ export interface ManualAddResponse { annotationId?: string; - commentId?: string; + commentId?: number; } diff --git a/libs/red-ui-http/src/lib/model/manualForceRedaction.ts b/libs/red-ui-http/src/lib/model/manualForceRedaction.ts index f573bfc04..2d8f7d7b8 100644 --- a/libs/red-ui-http/src/lib/model/manualForceRedaction.ts +++ b/libs/red-ui-http/src/lib/model/manualForceRedaction.ts @@ -11,10 +11,12 @@ */ export interface ManualForceRedaction { - id?: string; + annotationId?: string; + fileId?: string; legalBasis?: string; processedDate?: string; requestDate?: string; + softDeletedTime?: string; status?: ManualForceRedaction.StatusEnum; user?: string; } diff --git a/libs/red-ui-http/src/lib/model/manualImageRecategorization.ts b/libs/red-ui-http/src/lib/model/manualImageRecategorization.ts index e15eff08f..1a1e77124 100644 --- a/libs/red-ui-http/src/lib/model/manualImageRecategorization.ts +++ b/libs/red-ui-http/src/lib/model/manualImageRecategorization.ts @@ -11,11 +11,11 @@ */ export interface ManualImageRecategorization { - id?: string; - legalBasis?: string; + annotationId?: string; + fileId?: string; processedDate?: string; - redacted?: boolean; requestDate?: string; + softDeletedTime?: string; status?: ManualImageRecategorization.StatusEnum; type?: string; user?: string; diff --git a/libs/red-ui-http/src/lib/model/manualLegalBasisChange.ts b/libs/red-ui-http/src/lib/model/manualLegalBasisChange.ts index f5b7bfe08..8d5977d9d 100644 --- a/libs/red-ui-http/src/lib/model/manualLegalBasisChange.ts +++ b/libs/red-ui-http/src/lib/model/manualLegalBasisChange.ts @@ -11,10 +11,12 @@ */ export interface ManualLegalBasisChange { - id?: string; + annotationId?: string; + fileId?: string; legalBasis?: string; processedDate?: string; requestDate?: string; + softDeletedTime?: string; status?: ManualLegalBasisChange.StatusEnum; user?: string; } diff --git a/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts b/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts index 0018ec996..8a5f5ec3a 100644 --- a/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts +++ b/libs/red-ui-http/src/lib/model/manualRedactionEntry.ts @@ -14,14 +14,16 @@ import { Rectangle } from './rectangle'; export interface ManualRedactionEntry { addToDictionary?: boolean; addToDossierDictionary?: boolean; - id?: string; + annotationId?: string; + fileId?: string; legalBasis?: string; positions?: Array; processedDate?: string; reason?: string; requestDate?: string; + softDeletedTime?: string; status?: ManualRedactionEntry.StatusEnum; - type?: string; + typeId?: string; user?: string; value?: string; } diff --git a/libs/red-ui-http/src/lib/model/manualRedactions.ts b/libs/red-ui-http/src/lib/model/manualRedactions.ts index 9807ac2e3..e94bf13e4 100644 --- a/libs/red-ui-http/src/lib/model/manualRedactions.ts +++ b/libs/red-ui-http/src/lib/model/manualRedactions.ts @@ -13,8 +13,8 @@ import { Comment } from './comment'; import { IdRemoval } from './idRemoval'; import { ManualForceRedaction } from './manualForceRedaction'; import { ManualImageRecategorization } from './manualImageRecategorization'; -import { ManualRedactionEntry } from './manualRedactionEntry'; import { ManualLegalBasisChange } from './manualLegalBasisChange'; +import { ManualRedactionEntry } from './manualRedactionEntry'; export interface ManualRedactions { comments?: { [key: string]: Array }; diff --git a/libs/red-ui-http/src/lib/model/matchedDocument.ts b/libs/red-ui-http/src/lib/model/matchedDocument.ts index 097231ac7..28d35624e 100644 --- a/libs/red-ui-http/src/lib/model/matchedDocument.ts +++ b/libs/red-ui-http/src/lib/model/matchedDocument.ts @@ -14,6 +14,7 @@ import { MatchedSection } from './matchedSection'; export interface MatchedDocument { containsAllMatchedSections?: boolean; dossierId?: string; + dossierTemplateId?: string; fileId?: string; highlights?: { [key: string]: Array }; matchedSections?: Array; diff --git a/libs/red-ui-http/src/lib/model/models.ts b/libs/red-ui-http/src/lib/model/models.ts index 0bea96612..6b0c060bc 100644 --- a/libs/red-ui-http/src/lib/model/models.ts +++ b/libs/red-ui-http/src/lib/model/models.ts @@ -7,24 +7,22 @@ export * from './auditSearchRequest'; export * from './authInfo'; export * from './categoryModel'; export * from './cellRectangle'; +export * from './change'; export * from './colors'; export * from './comment'; export * from './commentResponse'; export * from './createUserRequest'; export * from './dictionary'; export * from './digitalSignature'; -export * from './digitalSignatureViewModelReq'; -export * from './digitalSignatureViewModelRes'; +export * from './digitalSignatureViewModel'; export * from './dossier'; export * from './dossierAttributeConfig'; -export * from './dossierAttributeReq'; -export * from './dossierAttributeRes'; +export * from './dossierAttribute'; export * from './dossierAttributesConfig'; -export * from './dossierAttributesReq'; -export * from './dossierAttributesRes'; +export * from './dossierAttributes'; export * from './dossierRequest'; +export * from './dossierTemplateIdUploadBody'; export * from './dossierTemplate'; -export * from './downloadDetails'; export * from './downloadResponse'; export * from './downloadStatus'; export * from './downloadStatusResponse'; @@ -37,21 +35,28 @@ export * from './forceRedactionRequest'; export * from './generalConfigurationModel'; export * from './idRemoval'; export * from './imageRecategorizationRequest'; -export * from './legalBasisMapping'; +export * from './JSONPrimitive'; +export * from './legalBasis'; +export * from './legalBasisChangeRequest'; +export * from './legalBasis'; export * from './licenseReport'; export * from './licenseReportRequest'; export * from './manualAddResponse'; export * from './manualForceRedaction'; export * from './manualImageRecategorization'; +export * from './manualLegalBasisChange'; export * from './manualRedactionEntry'; export * from './manualRedactions'; +export * from './matchedDocument'; +export * from './matchedSection'; +export * from './notification'; +export * from './notificationResponse'; export * from './pageExclusionRequest'; export * from './pageRange'; +export * from './placeholdersResponse'; export * from './point'; export * from './prepareDownloadRequest'; export * from './rectangle'; -export * from './redactionChangeLog'; -export * from './redactionChangeLogEntry'; export * from './redactionLog'; export * from './redactionLogEntry'; export * from './removeDownloadRequest'; @@ -60,25 +65,22 @@ export * from './reportData'; export * from './reportTemplate'; export * from './resetPasswordRequest'; export * from './rules'; -export * from './sMTPConfigurationModel'; +export * from './sMTPConfiguration'; +export * from './searchRequest'; +export * from './searchResult'; export * from './sectionGrid'; export * from './sectionRectangle'; +export * from './templateUploadDossierTemplateIdBody'; +export * from './typeDossierTemplateIdBody'; export * from './typeResponse'; export * from './typeValue'; export * from './updateMyProfileRequest'; export * from './updateProfileRequest'; export * from './updateTypeValue'; +export * from './uploadDossierIdBody'; export * from './user'; export * from './versionsResponse'; +export * from './viewedPage'; export * from './viewedPages'; export * from './viewedPagesRequest'; -export * from './watermarkModelReq'; -export * from './watermarkModelRes'; -export * from './legalBasisChangeRequest'; -export * from './manualLegalBasisChange'; -export * from './searchRequest'; -export * from './searchResult'; -export * from './matchedDocument'; -export * from './placeholdersResponse'; -export * from './notification'; -export * from './notificationResponse'; +export * from './watermarkModel'; diff --git a/libs/red-ui-http/src/lib/model/notification.ts b/libs/red-ui-http/src/lib/model/notification.ts index db999aeb3..cd163288f 100644 --- a/libs/red-ui-http/src/lib/model/notification.ts +++ b/libs/red-ui-http/src/lib/model/notification.ts @@ -12,8 +12,9 @@ export interface Notification { creationDate?: string; + id?: number; issuerId?: string; - notificationId?: string; + notificationDetails?: string; notificationType?: string; readDate?: string; seenDate?: string; diff --git a/libs/red-ui-http/src/lib/model/redactionChangeLog.ts b/libs/red-ui-http/src/lib/model/redactionChangeLog.ts deleted file mode 100644 index 1ff8181e6..000000000 --- a/libs/red-ui-http/src/lib/model/redactionChangeLog.ts +++ /dev/null @@ -1,20 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { RedactionChangeLogEntry } from './redactionChangeLogEntry'; - -export interface RedactionChangeLog { - dictionaryVersion?: number; - dossierDictionaryVersion?: number; - legalBasisVersion?: number; - redactionLogEntry?: Array; - rulesVersion?: number; -} diff --git a/libs/red-ui-http/src/lib/model/redactionChangeLogEntry.ts b/libs/red-ui-http/src/lib/model/redactionChangeLogEntry.ts deleted file mode 100644 index b95759d34..000000000 --- a/libs/red-ui-http/src/lib/model/redactionChangeLogEntry.ts +++ /dev/null @@ -1,60 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { Comment } from './comment'; -import { Rectangle } from './rectangle'; - -export interface RedactionChangeLogEntry { - changeType?: RedactionChangeLogEntry.ChangeTypeEnum; - color?: Array; - comments?: Array; - dictionaryEntry?: boolean; - dossierDictionaryEntry?: boolean; - excluded?: boolean; - hint?: boolean; - id?: string; - legalBasis?: string; - manual?: boolean; - manualRedactionType?: RedactionChangeLogEntry.ManualRedactionTypeEnum; - matchedRule?: number; - positions?: Array; - reason?: string; - recommendation?: boolean; - redacted?: boolean; - section?: string; - sectionNumber?: number; - status?: RedactionChangeLogEntry.StatusEnum; - textAfter?: string; - textBefore?: string; - type?: string; - value?: string; -} - -export namespace RedactionChangeLogEntry { - export type ChangeTypeEnum = 'ADDED' | 'REMOVED'; - export const ChangeTypeEnum = { - ADDED: 'ADDED' as ChangeTypeEnum, - REMOVED: 'REMOVED' as ChangeTypeEnum - }; - export type ManualRedactionTypeEnum = 'ADD' | 'FORCE_REDACT' | 'RECATEGORIZE' | 'REMOVE'; - export const ManualRedactionTypeEnum = { - ADD: 'ADD' as ManualRedactionTypeEnum, - FORCEREDACT: 'FORCE_REDACT' as ManualRedactionTypeEnum, - RECATEGORIZE: 'RECATEGORIZE' as ManualRedactionTypeEnum, - REMOVE: 'REMOVE' as ManualRedactionTypeEnum - }; - export type StatusEnum = 'APPROVED' | 'DECLINED' | 'REQUESTED'; - export const StatusEnum = { - APPROVED: 'APPROVED' as StatusEnum, - DECLINED: 'DECLINED' as StatusEnum, - REQUESTED: 'REQUESTED' as StatusEnum - }; -} diff --git a/libs/red-ui-http/src/lib/model/redactionLog.ts b/libs/red-ui-http/src/lib/model/redactionLog.ts index 054ca02a5..575a7f4b7 100644 --- a/libs/red-ui-http/src/lib/model/redactionLog.ts +++ b/libs/red-ui-http/src/lib/model/redactionLog.ts @@ -9,13 +9,14 @@ * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ -import { LegalBasisMapping } from './legalBasisMapping'; +import { LegalBasis } from './legalBasis'; import { RedactionLogEntry } from './redactionLogEntry'; export interface RedactionLog { + analysisVersion?: number; dictionaryVersion?: number; dossierDictionaryVersion?: number; - legalBasis?: Array; + legalBasis?: Array; legalBasisVersion?: number; redactionLogEntry?: Array; rulesVersion?: number; diff --git a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts index c4b9745f1..ad0b523d6 100644 --- a/libs/red-ui-http/src/lib/model/redactionLogEntry.ts +++ b/libs/red-ui-http/src/lib/model/redactionLogEntry.ts @@ -9,45 +9,57 @@ * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ +import { Change } from './change'; import { Comment } from './comment'; import { Rectangle } from './rectangle'; export interface RedactionLogEntry { + changes?: Array; color?: Array; comments?: Array; dictionaryEntry?: boolean; dossierDictionaryEntry?: boolean; endOffset?: number; + engines?: Array; excluded?: boolean; hint?: boolean; id?: string; image?: boolean; + imageHasTransparency?: boolean; legalBasis?: string; + legalBasisChangeValue?: string; manual?: boolean; manualRedactionType?: RedactionLogEntry.ManualRedactionTypeEnum; + manualRedactionUserId?: string; matchedRule?: number; positions?: Array; reason?: string; recategorizationType?: string; recommendation?: boolean; redacted?: boolean; + reference?: Array; section?: string; sectionNumber?: number; startOffset?: number; status?: RedactionLogEntry.StatusEnum; textAfter?: string; textBefore?: string; - type?: string; + typeId?: string; value?: string; - legalBasisChangeValue?: string; - engines?: string[]; } export namespace RedactionLogEntry { - export type ManualRedactionTypeEnum = 'ADD' | 'FORCE_REDACT' | 'RECATEGORIZE' | 'REMOVE'; + export type EnginesEnum = 'DICTIONARY' | 'NER' | 'RULE'; + export const EnginesEnum = { + DICTIONARY: 'DICTIONARY' as EnginesEnum, + NER: 'NER' as EnginesEnum, + RULE: 'RULE' as EnginesEnum + }; + export type ManualRedactionTypeEnum = 'ADD' | 'FORCE_REDACT' | 'LEGAL_BASIS_CHANGE' | 'RECATEGORIZE' | 'REMOVE'; export const ManualRedactionTypeEnum = { ADD: 'ADD' as ManualRedactionTypeEnum, FORCEREDACT: 'FORCE_REDACT' as ManualRedactionTypeEnum, + LEGALBASISCHANGE: 'LEGAL_BASIS_CHANGE' as ManualRedactionTypeEnum, RECATEGORIZE: 'RECATEGORIZE' as ManualRedactionTypeEnum, REMOVE: 'REMOVE' as ManualRedactionTypeEnum }; diff --git a/libs/red-ui-http/src/lib/model/removeDownloadRequest.ts b/libs/red-ui-http/src/lib/model/removeDownloadRequest.ts index 87003df06..db24606fc 100644 --- a/libs/red-ui-http/src/lib/model/removeDownloadRequest.ts +++ b/libs/red-ui-http/src/lib/model/removeDownloadRequest.ts @@ -11,5 +11,5 @@ */ export interface RemoveDownloadRequest { - storageIds?: string[]; + storageIds?: Array; } diff --git a/libs/red-ui-http/src/lib/model/reportData.ts b/libs/red-ui-http/src/lib/model/reportData.ts index d5fba5555..7ff08f9aa 100644 --- a/libs/red-ui-http/src/lib/model/reportData.ts +++ b/libs/red-ui-http/src/lib/model/reportData.ts @@ -18,6 +18,7 @@ export interface ReportData { fileName?: string; lastUpdatedDate?: Date; numberOfAnalyzedPages?: number; + numberOfOcrPages?: number; status?: ReportData.StatusEnum; } @@ -26,8 +27,8 @@ export namespace ReportData { | 'APPROVED' | 'DELETED' | 'ERROR' - | 'EXCLUDED' | 'FULLREPROCESS' + | 'INDEXING' | 'OCR_PROCESSING' | 'PROCESSING' | 'REPROCESS' @@ -39,7 +40,6 @@ export namespace ReportData { APPROVED: 'APPROVED' as StatusEnum, DELETED: 'DELETED' as StatusEnum, ERROR: 'ERROR' as StatusEnum, - EXCLUDED: 'EXCLUDED' as StatusEnum, FULLREPROCESS: 'FULLREPROCESS' as StatusEnum, OCR_PROCESSING: 'OCR_PROCESSING' as StatusEnum, PROCESSING: 'PROCESSING' as StatusEnum, diff --git a/libs/red-ui-http/src/lib/model/reportTemplate.ts b/libs/red-ui-http/src/lib/model/reportTemplate.ts index 6271c26c4..362155b99 100644 --- a/libs/red-ui-http/src/lib/model/reportTemplate.ts +++ b/libs/red-ui-http/src/lib/model/reportTemplate.ts @@ -11,6 +11,7 @@ */ export interface ReportTemplate { + activeByDefault?: boolean; dossierTemplateId?: string; fileName?: string; multiFileReport?: boolean; diff --git a/libs/red-ui-http/src/lib/model/sMTPConfigurationModel.ts b/libs/red-ui-http/src/lib/model/sMTPConfiguration.ts similarity index 91% rename from libs/red-ui-http/src/lib/model/sMTPConfigurationModel.ts rename to libs/red-ui-http/src/lib/model/sMTPConfiguration.ts index f9125a02c..cc2cf9a33 100644 --- a/libs/red-ui-http/src/lib/model/sMTPConfigurationModel.ts +++ b/libs/red-ui-http/src/lib/model/sMTPConfiguration.ts @@ -10,12 +10,13 @@ * Do not edit the class manually. */ -export interface SMTPConfigurationModel { +export interface SMTPConfiguration { auth?: boolean; envelopeFrom?: string; from?: string; fromDisplayName?: string; host?: string; + id?: string; password?: string; port?: number; replyTo?: string; diff --git a/libs/red-ui-http/src/lib/model/searchRequest.ts b/libs/red-ui-http/src/lib/model/searchRequest.ts index d1152c782..bb5a86150 100644 --- a/libs/red-ui-http/src/lib/model/searchRequest.ts +++ b/libs/red-ui-http/src/lib/model/searchRequest.ts @@ -11,8 +11,8 @@ */ export interface SearchRequest { - dossierIds?: string[]; - dossierTemplateIds?: string[]; + dossierIds?: Array; + dossierTemplateIds?: Array; fileId?: string; page?: number; pageSize?: number; diff --git a/libs/red-ui-http/src/lib/model/templateUploadDossierTemplateIdBody.ts b/libs/red-ui-http/src/lib/model/templateUploadDossierTemplateIdBody.ts new file mode 100644 index 000000000..8be86646e --- /dev/null +++ b/libs/red-ui-http/src/lib/model/templateUploadDossierTemplateIdBody.ts @@ -0,0 +1,16 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface TemplateUploadDossierTemplateIdBody { + multiFileReport?: boolean; + file?: Blob; +} diff --git a/libs/red-ui-http/src/lib/model/typeDossierTemplateIdBody.ts b/libs/red-ui-http/src/lib/model/typeDossierTemplateIdBody.ts new file mode 100644 index 000000000..950bce8bd --- /dev/null +++ b/libs/red-ui-http/src/lib/model/typeDossierTemplateIdBody.ts @@ -0,0 +1,16 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface TypeDossierTemplateIdBody { + file?: Blob; + dossierId?: string; +} diff --git a/libs/red-ui-http/src/lib/model/updateTypeValue.ts b/libs/red-ui-http/src/lib/model/updateTypeValue.ts index 358251343..4ff9cb059 100644 --- a/libs/red-ui-http/src/lib/model/updateTypeValue.ts +++ b/libs/red-ui-http/src/lib/model/updateTypeValue.ts @@ -34,6 +34,10 @@ export interface UpdateTypeValue { * True if the type just for hint, not for redaction, default is false. */ hint?: boolean; + /** + * Label of the type + */ + label?: string; /** * The rank of this dictionary, higher rank means higher importance. */ @@ -42,8 +46,4 @@ export interface UpdateTypeValue { * True if the type just for recommendations, not for redaction, default is false. */ recommendation?: boolean; - /** - * The label of this type - */ - label?: string; } diff --git a/libs/red-ui-http/src/lib/model/uploadDossierIdBody.ts b/libs/red-ui-http/src/lib/model/uploadDossierIdBody.ts new file mode 100644 index 000000000..04559d32d --- /dev/null +++ b/libs/red-ui-http/src/lib/model/uploadDossierIdBody.ts @@ -0,0 +1,15 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface UploadDossierIdBody { + file?: Blob; +} diff --git a/libs/red-ui-http/src/lib/model/viewedPage.ts b/libs/red-ui-http/src/lib/model/viewedPage.ts new file mode 100644 index 000000000..8dd917b3a --- /dev/null +++ b/libs/red-ui-http/src/lib/model/viewedPage.ts @@ -0,0 +1,18 @@ +/** + * API Documentation for Redaction Gateway + * Description for redaction + * + * OpenAPI spec version: 1.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface ViewedPage { + fileId?: string; + page?: number; + userId?: string; + viewedTime?: string; +} diff --git a/libs/red-ui-http/src/lib/model/viewedPages.ts b/libs/red-ui-http/src/lib/model/viewedPages.ts index 039bb09a4..5860bf5a1 100644 --- a/libs/red-ui-http/src/lib/model/viewedPages.ts +++ b/libs/red-ui-http/src/lib/model/viewedPages.ts @@ -9,7 +9,8 @@ * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ +import { ViewedPage } from './viewedPage'; export interface ViewedPages { - pages?: Array; + pages?: Array; } diff --git a/libs/red-ui-http/src/lib/model/watermarkModelReq.ts b/libs/red-ui-http/src/lib/model/watermarkModel.ts similarity index 84% rename from libs/red-ui-http/src/lib/model/watermarkModelReq.ts rename to libs/red-ui-http/src/lib/model/watermarkModel.ts index 903b3ed1a..32447e6b0 100644 --- a/libs/red-ui-http/src/lib/model/watermarkModelReq.ts +++ b/libs/red-ui-http/src/lib/model/watermarkModel.ts @@ -10,16 +10,16 @@ * Do not edit the class manually. */ -export interface WatermarkModelReq { +export interface WatermarkModel { fontSize?: number; fontType?: string; hexColor?: string; opacity?: number; - orientation?: WatermarkModelReq.OrientationEnum; + orientation?: WatermarkModel.OrientationEnum; text?: string; } -export namespace WatermarkModelReq { +export namespace WatermarkModel { export type OrientationEnum = 'DIAGONAL' | 'HORIZONTAL' | 'VERTICAL'; export const OrientationEnum = { DIAGONAL: 'DIAGONAL' as OrientationEnum, diff --git a/libs/red-ui-http/src/lib/model/watermarkModelRes.ts b/libs/red-ui-http/src/lib/model/watermarkModelRes.ts deleted file mode 100644 index 88eb36bff..000000000 --- a/libs/red-ui-http/src/lib/model/watermarkModelRes.ts +++ /dev/null @@ -1,29 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -export interface WatermarkModelRes { - fontSize?: number; - fontType?: string; - hexColor?: string; - opacity?: number; - orientation?: WatermarkModelRes.OrientationEnum; - text?: string; -} - -export namespace WatermarkModelRes { - export type OrientationEnum = 'DIAGONAL' | 'HORIZONTAL' | 'VERTICAL'; - export const OrientationEnum = { - DIAGONAL: 'DIAGONAL' as OrientationEnum, - HORIZONTAL: 'HORIZONTAL' as OrientationEnum, - VERTICAL: 'VERTICAL' as OrientationEnum - }; -}