From 91662a2d59d23bc4d034a63fa1c175b8c727927e Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 29 Oct 2021 14:21:11 +0300 Subject: [PATCH] move remaining files, remove red-ui-http --- .eslintrc.json | 1 - angular.json | 35 --------------- .../edit-color-dialog.component.ts | 6 +-- .../default-colors-screen.component.ts | 4 +- .../reports/reports-screen.component.ts | 5 +-- .../watermark/watermark-screen.component.ts | 2 +- .../modules/admin/services/audit.service.ts | 7 ++- .../modules/admin/services/rules.service.ts | 6 +-- .../admin/services/watermark.service.ts | 2 +- .../services/manual-annotation.service.ts | 16 ++++--- .../shared/services/dictionary.service.ts | 7 ++- .../app/services/report-template.service.ts | 5 +-- .../red-ui/src/app/state/app-state.service.ts | 5 +-- apps/red-ui/src/app/utils/types.d.ts | 4 +- libs/red-domain/src/lib/audit/category.ts | 4 ++ libs/red-domain/src/lib/audit/index.ts | 1 + .../red-domain/src/lib/dictionaries/colors.ts | 12 ++++++ libs/red-domain/src/lib/dictionaries/index.ts | 1 + .../src/lib/redaction-log/approve-request.ts | 3 ++ .../image-recategorization.request.ts | 5 +++ .../red-domain/src/lib/redaction-log/index.ts | 2 + libs/red-domain/src/lib/reports/index.ts | 1 + .../src/lib/reports/placeholders-response.ts | 8 ++++ libs/red-domain/src/lib/shared/index.ts | 2 + libs/red-domain/src/lib/shared/rules.ts | 13 ++++++ .../src/lib/shared/watermark.ts} | 12 ------ libs/red-ui-http/.eslintrc.json | 43 ------------------- libs/red-ui-http/jest.config.js | 20 --------- libs/red-ui-http/ng-package.json | 7 --- libs/red-ui-http/package.json | 8 ---- libs/red-ui-http/src/index.ts | 1 - libs/red-ui-http/src/lib/index.ts | 1 - .../src/lib/model/approveRequest.ts | 15 ------- .../src/lib/model/categoryModel.ts | 16 ------- libs/red-ui-http/src/lib/model/colors.ts | 24 ----------- libs/red-ui-http/src/lib/model/idRemoval.ts | 31 ------------- .../lib/model/imageRecategorizationRequest.ts | 17 -------- libs/red-ui-http/src/lib/model/models.ts | 8 ---- .../src/lib/model/placeholdersResponse.ts | 20 --------- libs/red-ui-http/src/lib/model/rules.ts | 25 ----------- libs/red-ui-http/src/lib/red-types.ts | 1 - libs/red-ui-http/tsconfig.json | 13 ------ libs/red-ui-http/tsconfig.lib.json | 18 -------- nx.json | 3 -- package.json | 6 +-- tsconfig.base.json | 1 - 46 files changed, 90 insertions(+), 357 deletions(-) create mode 100644 libs/red-domain/src/lib/audit/category.ts create mode 100644 libs/red-domain/src/lib/dictionaries/colors.ts create mode 100644 libs/red-domain/src/lib/redaction-log/approve-request.ts create mode 100644 libs/red-domain/src/lib/redaction-log/image-recategorization.request.ts create mode 100644 libs/red-domain/src/lib/reports/placeholders-response.ts create mode 100644 libs/red-domain/src/lib/shared/rules.ts rename libs/{red-ui-http/src/lib/model/watermarkModel.ts => red-domain/src/lib/shared/watermark.ts} (57%) delete mode 100644 libs/red-ui-http/.eslintrc.json delete mode 100644 libs/red-ui-http/jest.config.js delete mode 100644 libs/red-ui-http/ng-package.json delete mode 100644 libs/red-ui-http/package.json delete mode 100644 libs/red-ui-http/src/index.ts delete mode 100644 libs/red-ui-http/src/lib/index.ts delete mode 100644 libs/red-ui-http/src/lib/model/approveRequest.ts delete mode 100644 libs/red-ui-http/src/lib/model/categoryModel.ts delete mode 100644 libs/red-ui-http/src/lib/model/colors.ts delete mode 100644 libs/red-ui-http/src/lib/model/idRemoval.ts delete mode 100644 libs/red-ui-http/src/lib/model/imageRecategorizationRequest.ts delete mode 100644 libs/red-ui-http/src/lib/model/models.ts delete mode 100644 libs/red-ui-http/src/lib/model/placeholdersResponse.ts delete mode 100644 libs/red-ui-http/src/lib/model/rules.ts delete mode 100644 libs/red-ui-http/src/lib/red-types.ts delete mode 100644 libs/red-ui-http/tsconfig.json delete mode 100644 libs/red-ui-http/tsconfig.lib.json diff --git a/.eslintrc.json b/.eslintrc.json index 567c024ba..6790da491 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,7 +11,6 @@ { "enforceBuildableLibDependency": true, "allow": [ - "@redaction/red-ui-http", "@redaction/red-cache", "@services/**", "@components/**", diff --git a/angular.json b/angular.json index 0e78f4204..990116c5b 100644 --- a/angular.json +++ b/angular.json @@ -210,41 +210,6 @@ "outputs": ["coverage/apps/red-ui"] } } - }, - "red-ui-http": { - "projectType": "library", - "root": "libs/red-ui-http", - "sourceRoot": "libs/red-ui-http/src", - "prefix": "redaction", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:ng-packagr", - "options": { - "tsConfig": "libs/red-ui-http/tsconfig.lib.json", - "project": "libs/red-ui-http/ng-package.json" - } - }, - "lint": { - "builder": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": ["libs/red-ui-http/src/**/*.ts", "libs/red-ui-http/src/**/*.html"] - }, - "outputs": ["{options.outputFile}"] - }, - "test": { - "builder": "@nrwl/jest:jest", - "options": { - "jestConfig": "libs/red-ui-http/jest.config.js", - "passWithNoTests": true - }, - "outputs": ["coverage/libs/red-ui-http"] - } - }, - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - } } } } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts index a97eb94b7..52246f6e0 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/edit-color-dialog/edit-color-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Colors } from '@redaction/red-ui-http'; +import { IColors } from '@red/domain'; import { Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; @@ -15,7 +15,7 @@ import { DictionaryService } from '@shared/services/dictionary.service'; styleUrls: ['./edit-color-dialog.component.scss'], }) export class EditColorDialogComponent { - readonly colors: Colors; + readonly colors: IColors; readonly colorKey: DefaultColorType; colorForm: FormGroup; translations = defaultColorsTranslations; @@ -29,7 +29,7 @@ export class EditColorDialogComponent { private readonly _translateService: TranslateService, private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) - private readonly _data: { colors: Colors; colorKey: DefaultColorType; dossierTemplateId: string }, + private readonly _data: { colors: IColors; colorKey: DefaultColorType; dossierTemplateId: string }, ) { this.colors = _data.colors; this.colorKey = _data.colorKey; 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 bd78df974..6e22a1453 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 @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { Colors } from '@redaction/red-ui-http'; +import { IColors } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { @@ -38,7 +38,7 @@ export class DefaultColorsScreenComponent extends ListingComponent imp { label: _('default-colors-screen.table-col-names.key'), sortByKey: 'searchKey', width: '2fr' }, { label: _('default-colors-screen.table-col-names.color'), class: 'flex-center' }, ]; - private _colorsObj: Colors; + private _colorsObj: IColors; constructor( protected readonly _injector: Injector, diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts index 24196c0c4..d9d5224a6 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.ts @@ -1,7 +1,7 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { AppStateService } from '@state/app-state.service'; -import { PlaceholdersResponse } from '@redaction/red-ui-http'; +import { IPlaceholdersResponse, IReportTemplate } from '@red/domain'; import { download } from '@utils/file-download-utils'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; @@ -14,7 +14,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; -import { IReportTemplate } from '@red/domain'; interface Placeholder { placeholder: string; @@ -133,7 +132,7 @@ export class ReportsScreenComponent implements OnInit { } private async _loadPlaceholders() { - const placeholdersResponse: PlaceholdersResponse = await this._reportTemplateService + const placeholdersResponse: IPlaceholdersResponse = await this._reportTemplateService .getAvailablePlaceholders(this._dossierTemplatesService.activeDossierTemplateId) .toPromise(); this.placeholders = placeholderTypes.flatMap(type => 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 15d5ce6ca..fd4130b86 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 @@ -5,7 +5,7 @@ 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 { IWatermark, WatermarkOrientation, WatermarkOrientations } from '@redaction/red-ui-http'; +import { IWatermark, WatermarkOrientation, WatermarkOrientations } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { BASE_HREF } from '../../../../tokens'; import { stampPDFPage } from '@utils/page-stamper'; diff --git a/apps/red-ui/src/app/modules/admin/services/audit.service.ts b/apps/red-ui/src/app/modules/admin/services/audit.service.ts index 2ef8569b4..6cf421b2d 100644 --- a/apps/red-ui/src/app/modules/admin/services/audit.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/audit.service.ts @@ -1,8 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; -import { CategoryModel } from '@redaction/red-ui-http'; +import { IAudit, IAuditResponse, IAuditSearchRequest, ICategory } from '@red/domain'; import { Observable } from 'rxjs'; -import { IAudit, IAuditResponse, IAuditSearchRequest } from '@red/domain'; @Injectable() export class AuditService extends GenericService { @@ -10,8 +9,8 @@ export class AuditService extends GenericService { super(_injector, 'audit'); } - getCategories(): Observable { - return super.getAll(`${this._defaultModelPath}/categories`); + getCategories(): Observable { + return super.getAll(`${this._defaultModelPath}/categories`); } @Validate() diff --git a/apps/red-ui/src/app/modules/admin/services/rules.service.ts b/apps/red-ui/src/app/modules/admin/services/rules.service.ts index fb53d0d25..368058d8e 100644 --- a/apps/red-ui/src/app/modules/admin/services/rules.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/rules.service.ts @@ -1,9 +1,9 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; -import { Rules } from '@redaction/red-ui-http'; +import { IRules } from '@red/domain'; @Injectable() -export class RulesService extends GenericService { +export class RulesService extends GenericService { constructor(protected readonly _injector: Injector) { super(_injector, 'rules'); } @@ -14,7 +14,7 @@ export class RulesService extends GenericService { } @Validate() - uploadRules(@RequiredParam() body: Rules) { + uploadRules(@RequiredParam() body: IRules) { return this._post(body); } } diff --git a/apps/red-ui/src/app/modules/admin/services/watermark.service.ts b/apps/red-ui/src/app/modules/admin/services/watermark.service.ts index 69335bb26..de2805af5 100644 --- a/apps/red-ui/src/app/modules/admin/services/watermark.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/watermark.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; -import { IWatermark } from '@redaction/red-ui-http'; +import { IWatermark } from '@red/domain'; @Injectable() export class WatermarkService extends GenericService { diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts index 2864bea1f..991478045 100644 --- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts @@ -1,6 +1,13 @@ import { Injectable, Injector } from '@angular/core'; import { AppStateService } from '@state/app-state.service'; -import { ApproveRequest, ImageRecategorizationRequest } from '@redaction/red-ui-http'; +import { + IAddRedactionRequest, + IApproveRequest, + IImageRecategorizationRequest, + ILegalBasisChangeRequest, + IManualAddResponse, + IRemoveRedactionRequest, +} from '@red/domain'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { CONFLICT_ERROR_CODE, ErrorMessageService, GenericService, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; import { TranslateService } from '@ngx-translate/core'; @@ -12,7 +19,6 @@ import { annotationActionsTranslations } from '../translations/annotation-action import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { HttpErrorResponse } from '@angular/common/http'; -import { IAddRedactionRequest, ILegalBasisChangeRequest, IManualAddResponse, IRemoveRedactionRequest } from '@red/domain'; @Injectable() export class ManualAnnotationService extends GenericService { @@ -221,7 +227,7 @@ export class ManualAnnotationService extends GenericService @Validate() recategorizeImage( - @RequiredParam() body: ImageRecategorizationRequest, + @RequiredParam() body: IImageRecategorizationRequest, @RequiredParam() dossierId: string, @RequiredParam() fileId: string, ) { @@ -231,7 +237,7 @@ export class ManualAnnotationService extends GenericService @Validate() requestImageRecategorization( - @RequiredParam() body: ImageRecategorizationRequest, + @RequiredParam() body: IImageRecategorizationRequest, @RequiredParam() dossierId: string, @RequiredParam() fileId: string, ) { @@ -267,7 +273,7 @@ export class ManualAnnotationService extends GenericService @Validate() approveRequest( - @RequiredParam() body: ApproveRequest, + @RequiredParam() body: IApproveRequest, @RequiredParam() annotationId: string, @RequiredParam() dossierId: string, @RequiredParam() fileId: string, diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts index 99ef807e0..3e6aad186 100644 --- a/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/dictionary.service.ts @@ -1,10 +1,9 @@ import { Injectable, Injector } from '@angular/core'; import { Observable, throwError } from 'rxjs'; import { EntitiesService, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; -import { Colors } from '@redaction/red-ui-http'; +import { Dictionary, IColors, IDictionary, IUpdateDictionary } from '@red/domain'; import { tap } from 'rxjs/operators'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { Dictionary, IDictionary, IUpdateDictionary } from '@red/domain'; const MIN_WORD_LENGTH = 2; @@ -49,7 +48,7 @@ export class DictionaryService extends EntitiesService */ @Validate() getColors(@RequiredParam() dossierTemplateId: string) { - return this._getOne([dossierTemplateId], 'color'); + return this._getOne([dossierTemplateId], 'color'); } /** @@ -71,7 +70,7 @@ export class DictionaryService extends EntitiesService * Set system colors for redaction */ @Validate() - setColors(@RequiredParam() body: Colors, @RequiredParam() dossierTemplateId: string) { + setColors(@RequiredParam() body: IColors, @RequiredParam() dossierTemplateId: string) { return this._post(body, `color/${dossierTemplateId}`); } diff --git a/apps/red-ui/src/app/services/report-template.service.ts b/apps/red-ui/src/app/services/report-template.service.ts index d59f2a264..72083e60e 100644 --- a/apps/red-ui/src/app/services/report-template.service.ts +++ b/apps/red-ui/src/app/services/report-template.service.ts @@ -1,9 +1,8 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, HeadersConfiguration, RequiredParam, Validate } from '@iqser/common-ui'; -import { PlaceholdersResponse } from '@redaction/red-ui-http'; +import { IPlaceholdersResponse, IReportTemplate } from '@red/domain'; import { Observable } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; -import { IReportTemplate } from '@red/domain'; @Injectable({ providedIn: 'root', @@ -41,7 +40,7 @@ export class ReportTemplateService extends GenericService { @Validate() getAvailablePlaceholders(@RequiredParam() dossierTemplateId: string) { - return this._getOne([dossierTemplateId], 'placeholders'); + return this._getOne([dossierTemplateId], 'placeholders'); } downloadReportTemplate(dossierTemplateId: string, templateId: string, observe: 'response'): Observable>; 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 d58688e80..95323132d 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; -import { Colors } from '@redaction/red-ui-http'; +import { Dictionary, Dossier, DossierTemplate, File, IColors, IDossier, IFile } from '@red/domain'; import { ActivationEnd, Router } from '@angular/router'; import { UserService } from '@services/user.service'; import { forkJoin, Observable, of, Subject } from 'rxjs'; import { catchError, filter, first, map, tap } from 'rxjs/operators'; import { currentComponentRoute, FALLBACK_COLOR, hexToRgb } from '@utils/functions'; -import { Dictionary, Dossier, DossierTemplate, File, IDossier, IFile } from '@red/domain'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesService } from '@services/entity-services/files.service'; @@ -274,7 +273,7 @@ export class AppStateService { requestRemove: FALLBACK_COLOR, updatedColor: FALLBACK_COLOR, dossierTemplateId: dossierTemplateId, - } as Colors), + } as IColors), ), ); } diff --git a/apps/red-ui/src/app/utils/types.d.ts b/apps/red-ui/src/app/utils/types.d.ts index acc52b81e..9b37405ff 100644 --- a/apps/red-ui/src/app/utils/types.d.ts +++ b/apps/red-ui/src/app/utils/types.d.ts @@ -1,3 +1,3 @@ -import { FileStatus } from '@redaction/red-ui-http'; +import { DossierStatus, FileStatus } from '@red/domain'; -export type Color = FileStatus | DossierStatus.StatusEnum; +export type Color = FileStatus | DossierStatus | string; diff --git a/libs/red-domain/src/lib/audit/category.ts b/libs/red-domain/src/lib/audit/category.ts new file mode 100644 index 000000000..d1df0f16a --- /dev/null +++ b/libs/red-domain/src/lib/audit/category.ts @@ -0,0 +1,4 @@ +export interface ICategory { + category?: string; + recordCount?: number; +} diff --git a/libs/red-domain/src/lib/audit/index.ts b/libs/red-domain/src/lib/audit/index.ts index a5b25b760..2680f3c23 100644 --- a/libs/red-domain/src/lib/audit/index.ts +++ b/libs/red-domain/src/lib/audit/index.ts @@ -2,3 +2,4 @@ export * from './audit.model'; export * from './audit'; export * from './audit.response'; export * from './audit-search.request'; +export * from './category'; diff --git a/libs/red-domain/src/lib/dictionaries/colors.ts b/libs/red-domain/src/lib/dictionaries/colors.ts new file mode 100644 index 000000000..8e7f10800 --- /dev/null +++ b/libs/red-domain/src/lib/dictionaries/colors.ts @@ -0,0 +1,12 @@ +export interface IColors { + analysisColor?: string; + defaultColor?: string; + dictionaryRequestColor?: string; + dossierTemplateId?: string; + manualRedactionColor?: string; + notRedacted?: string; + previewColor?: string; + requestAdd?: string; + requestRemove?: string; + updatedColor?: string; +} diff --git a/libs/red-domain/src/lib/dictionaries/index.ts b/libs/red-domain/src/lib/dictionaries/index.ts index babf806d3..83c5659e5 100644 --- a/libs/red-domain/src/lib/dictionaries/index.ts +++ b/libs/red-domain/src/lib/dictionaries/index.ts @@ -1,3 +1,4 @@ +export * from './colors'; export * from './dictionary'; export * from './update-dictionary'; export * from './dictionary.model'; diff --git a/libs/red-domain/src/lib/redaction-log/approve-request.ts b/libs/red-domain/src/lib/redaction-log/approve-request.ts new file mode 100644 index 000000000..d816cee65 --- /dev/null +++ b/libs/red-domain/src/lib/redaction-log/approve-request.ts @@ -0,0 +1,3 @@ +export interface IApproveRequest { + addOrRemoveFromDictionary?: boolean; +} diff --git a/libs/red-domain/src/lib/redaction-log/image-recategorization.request.ts b/libs/red-domain/src/lib/redaction-log/image-recategorization.request.ts new file mode 100644 index 000000000..1870b00f5 --- /dev/null +++ b/libs/red-domain/src/lib/redaction-log/image-recategorization.request.ts @@ -0,0 +1,5 @@ +export interface IImageRecategorizationRequest { + annotationId?: string; + comment?: string; + type?: string; +} diff --git a/libs/red-domain/src/lib/redaction-log/index.ts b/libs/red-domain/src/lib/redaction-log/index.ts index 7619e9717..ac8b3d300 100644 --- a/libs/red-domain/src/lib/redaction-log/index.ts +++ b/libs/red-domain/src/lib/redaction-log/index.ts @@ -9,3 +9,5 @@ export * from './redaction-log'; export * from './legal-basis-change.request'; export * from './remove-redaction.request'; export * from './manual-add.response'; +export * from './approve-request'; +export * from './image-recategorization.request'; diff --git a/libs/red-domain/src/lib/reports/index.ts b/libs/red-domain/src/lib/reports/index.ts index 4626c6c39..7c1d66f17 100644 --- a/libs/red-domain/src/lib/reports/index.ts +++ b/libs/red-domain/src/lib/reports/index.ts @@ -3,3 +3,4 @@ export * from './report-template'; export * from './types'; export * from './license-report.request'; export * from './license-report'; +export * from './placeholders-response'; diff --git a/libs/red-domain/src/lib/reports/placeholders-response.ts b/libs/red-domain/src/lib/reports/placeholders-response.ts new file mode 100644 index 000000000..83d9812d9 --- /dev/null +++ b/libs/red-domain/src/lib/reports/placeholders-response.ts @@ -0,0 +1,8 @@ +/** + * Object containing available placeholders. + */ +export interface IPlaceholdersResponse { + dossierAttributePlaceholders?: Array; + fileAttributePlaceholders?: Array; + generalPlaceholders?: Array; +} diff --git a/libs/red-domain/src/lib/shared/index.ts b/libs/red-domain/src/lib/shared/index.ts index 7b1e19669..5c1b8a78a 100644 --- a/libs/red-domain/src/lib/shared/index.ts +++ b/libs/red-domain/src/lib/shared/index.ts @@ -1,2 +1,4 @@ export * from './sorters/status-sorter'; export * from './types'; +export * from './rules'; +export * from './watermark'; diff --git a/libs/red-domain/src/lib/shared/rules.ts b/libs/red-domain/src/lib/shared/rules.ts new file mode 100644 index 000000000..64a4f9550 --- /dev/null +++ b/libs/red-domain/src/lib/shared/rules.ts @@ -0,0 +1,13 @@ +/** + * Object containing a string of Drools rules. + */ +export interface IRules { + /** + * The DossierTemplate Id for these rules + */ + dossierTemplateId?: string; + /** + * The actual string of rules. + */ + rules?: string; +} diff --git a/libs/red-ui-http/src/lib/model/watermarkModel.ts b/libs/red-domain/src/lib/shared/watermark.ts similarity index 57% rename from libs/red-ui-http/src/lib/model/watermarkModel.ts rename to libs/red-domain/src/lib/shared/watermark.ts index 4d897973d..16f88f466 100644 --- a/libs/red-ui-http/src/lib/model/watermarkModel.ts +++ b/libs/red-domain/src/lib/shared/watermark.ts @@ -1,15 +1,3 @@ -/** - * 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 IWatermark { fontSize?: number; fontType?: string; diff --git a/libs/red-ui-http/.eslintrc.json b/libs/red-ui-http/.eslintrc.json deleted file mode 100644 index 4b905e040..000000000 --- a/libs/red-ui-http/.eslintrc.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "extends": ["../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"], - "parserOptions": { - "project": ["libs/red-ui-http/tsconfig.*?.json"] - }, - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "redaction", - "style": "camelCase" - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "redaction", - "style": "kebab-case" - } - ], - "@typescript-eslint/no-namespace": "off", - "@typescript-eslint/no-inferrable-types": "off", - "@typescript-eslint/explicit-member-accessibility": "off", - "@typescript-eslint/naming-convention": "off", - "no-control-regex": "off", - "max-len": "off" - }, - "plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"] - }, - { - "files": ["*.html"], - "extends": ["plugin:@nrwl/nx/angular-template"], - "rules": {} - } - ] -} diff --git a/libs/red-ui-http/jest.config.js b/libs/red-ui-http/jest.config.js deleted file mode 100644 index d91499a36..000000000 --- a/libs/red-ui-http/jest.config.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - preset: '../../jest.preset.js', - setupFilesAfterEnv: ['/src/test-setup.ts'], - globals: { - 'ts-jest': { - stringifyContentPathRegex: '\\.(html|svg)$', - - tsconfig: '/tsconfig.spec.json' - } - }, - coverageDirectory: '../../coverage/libs/red-ui-http', - - displayName: 'red-ui-http', - snapshotSerializers: [ - 'jest-preset-angular/build/serializers/no-ng-attributes', - 'jest-preset-angular/build/serializers/ng-snapshot', - 'jest-preset-angular/build/serializers/html-comment' - ], - transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' } -}; diff --git a/libs/red-ui-http/ng-package.json b/libs/red-ui-http/ng-package.json deleted file mode 100644 index f29047cf7..000000000 --- a/libs/red-ui-http/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/red-ui-http", - "lib": { - "entryFile": "src/index.ts" - } -} diff --git a/libs/red-ui-http/package.json b/libs/red-ui-http/package.json deleted file mode 100644 index fe8f1348b..000000000 --- a/libs/red-ui-http/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "@redaction/red-ui-http", - "version": "1.1", - "peerDependencies": { - "@angular/common": "^7.2.0", - "@angular/core": "^7.2.0" - } -} diff --git a/libs/red-ui-http/src/index.ts b/libs/red-ui-http/src/index.ts deleted file mode 100644 index 11aece60c..000000000 --- a/libs/red-ui-http/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './lib/index'; diff --git a/libs/red-ui-http/src/lib/index.ts b/libs/red-ui-http/src/lib/index.ts deleted file mode 100644 index 3ddad16a0..000000000 --- a/libs/red-ui-http/src/lib/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './model/models'; diff --git a/libs/red-ui-http/src/lib/model/approveRequest.ts b/libs/red-ui-http/src/lib/model/approveRequest.ts deleted file mode 100644 index fc4f7ff49..000000000 --- a/libs/red-ui-http/src/lib/model/approveRequest.ts +++ /dev/null @@ -1,15 +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 ApproveRequest { - addOrRemoveFromDictionary?: boolean; -} diff --git a/libs/red-ui-http/src/lib/model/categoryModel.ts b/libs/red-ui-http/src/lib/model/categoryModel.ts deleted file mode 100644 index 501052aa8..000000000 --- a/libs/red-ui-http/src/lib/model/categoryModel.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. - */ - -export interface CategoryModel { - category?: string; - recordCount?: number; -} diff --git a/libs/red-ui-http/src/lib/model/colors.ts b/libs/red-ui-http/src/lib/model/colors.ts deleted file mode 100644 index de52b1baa..000000000 --- a/libs/red-ui-http/src/lib/model/colors.ts +++ /dev/null @@ -1,24 +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 Colors { - analysisColor?: string; - defaultColor?: string; - dictionaryRequestColor?: string; - dossierTemplateId?: string; - manualRedactionColor?: string; - notRedacted?: string; - previewColor?: string; - requestAdd?: string; - requestRemove?: string; - updatedColor?: string; -} diff --git a/libs/red-ui-http/src/lib/model/idRemoval.ts b/libs/red-ui-http/src/lib/model/idRemoval.ts deleted file mode 100644 index 6dd15c329..000000000 --- a/libs/red-ui-http/src/lib/model/idRemoval.ts +++ /dev/null @@ -1,31 +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 IdRemoval { - annotationId?: string; - fileId?: string; - processedDate?: string; - removeFromDictionary?: boolean; - requestDate?: string; - softDeletedTime?: string; - status?: IdRemoval.StatusEnum; - user?: string; -} - -export namespace IdRemoval { - 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/imageRecategorizationRequest.ts b/libs/red-ui-http/src/lib/model/imageRecategorizationRequest.ts deleted file mode 100644 index 11931772e..000000000 --- a/libs/red-ui-http/src/lib/model/imageRecategorizationRequest.ts +++ /dev/null @@ -1,17 +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 ImageRecategorizationRequest { - annotationId?: string; - comment?: string; - type?: string; -} diff --git a/libs/red-ui-http/src/lib/model/models.ts b/libs/red-ui-http/src/lib/model/models.ts deleted file mode 100644 index 90719d284..000000000 --- a/libs/red-ui-http/src/lib/model/models.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './approveRequest'; -export * from './categoryModel'; -export * from './colors'; -export * from './idRemoval'; -export * from './imageRecategorizationRequest'; -export * from './placeholdersResponse'; -export * from './rules'; -export * from './watermarkModel'; diff --git a/libs/red-ui-http/src/lib/model/placeholdersResponse.ts b/libs/red-ui-http/src/lib/model/placeholdersResponse.ts deleted file mode 100644 index a5fa97016..000000000 --- a/libs/red-ui-http/src/lib/model/placeholdersResponse.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. - */ - -/** - * Object containing available placeholders. - */ -export interface PlaceholdersResponse { - dossierAttributePlaceholders?: Array; - fileAttributePlaceholders?: Array; - generalPlaceholders?: Array; -} diff --git a/libs/red-ui-http/src/lib/model/rules.ts b/libs/red-ui-http/src/lib/model/rules.ts deleted file mode 100644 index 95f0514da..000000000 --- a/libs/red-ui-http/src/lib/model/rules.ts +++ /dev/null @@ -1,25 +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. - */ - -/** - * Object containing a string of Drools rules. - */ -export interface Rules { - /** - * The DossierTemplate Id for these rules - */ - dossierTemplateId?: string; - /** - * The actual string of rules. - */ - rules?: string; -} diff --git a/libs/red-ui-http/src/lib/red-types.ts b/libs/red-ui-http/src/lib/red-types.ts deleted file mode 100644 index 114f10ebc..000000000 --- a/libs/red-ui-http/src/lib/red-types.ts +++ /dev/null @@ -1 +0,0 @@ -export type List = readonly T[]; diff --git a/libs/red-ui-http/tsconfig.json b/libs/red-ui-http/tsconfig.json deleted file mode 100644 index 62ebbd946..000000000 --- a/libs/red-ui-http/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - }, - { - "path": "./tsconfig.spec.json" - } - ] -} diff --git a/libs/red-ui-http/tsconfig.lib.json b/libs/red-ui-http/tsconfig.lib.json deleted file mode 100644 index 6d38c126a..000000000 --- a/libs/red-ui-http/tsconfig.lib.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "target": "es2015", - "declaration": true, - "inlineSources": true, - "types": [], - "lib": ["dom", "es2018"] - }, - "angularCompilerOptions": { - "skipTemplateCodegen": true, - "strictMetadataEmit": true, - "enableResourceInlining": true - }, - "exclude": ["src/test-setup.ts", "**/*.spec.ts"], - "include": ["**/*.ts"] -} diff --git a/nx.json b/nx.json index ada799fd1..4d8d0e89b 100644 --- a/nx.json +++ b/nx.json @@ -30,9 +30,6 @@ }, "red-ui": { "tags": [] - }, - "red-ui-http": { - "tags": [] } }, "targetDependencies": { diff --git a/package.json b/package.json index e30cab44e..0eb487e84 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "license": "MIT", "scripts": { "build": "nx build", - "build-lint-all": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix && ng build --project=red-ui --configuration production --base-href /ui/", + "build-lint-all": "ng lint --project=red-ui --fix && ng lint --project=common-ui --fix && ng build --project=red-ui --configuration production --base-href /ui/", "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r libs/common-ui/src/assets/font dist/paligo-styles/fonts", "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", "postinstall": "ngcc --properties es2015 browser module main", - "lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix", + "lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix", "nx": "nx", "start": "nx serve", "test": "nx test", @@ -19,7 +19,7 @@ }, "husky": { "hooks": { - "pre-commit": "pretty-quick --staged && ng lint --project=red-ui-http && ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix" + "pre-commit": "pretty-quick --staged && ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix" } }, "dependencies": { diff --git a/tsconfig.base.json b/tsconfig.base.json index 1c98f9731..6fc38e69f 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -24,7 +24,6 @@ "@iqser/common-ui": ["libs/common-ui/src/index.ts"], "@models/*": ["apps/red-ui/src/app/models/*"], "@redaction/red-cache": ["libs/red-cache/src/index.ts"], - "@redaction/red-ui-http": ["libs/red-ui-http/src/index.ts"], "@services/*": ["apps/red-ui/src/app/services/*"], "@shared/*": ["apps/red-ui/src/app/modules/shared/*"], "@state/*": ["apps/red-ui/src/app/state/*"],