move remaining files, remove red-ui-http

.eslintrc.json

@@ -11,7 +11,6 @@
           {
             "enforceBuildableLibDependency": true,
             "allow": [
-              "@redaction/red-ui-http",
               "@redaction/red-cache",
               "@services/**",
               "@components/**",

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"
-        }
-      }
     }
   }
 }

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<EditColorDialogComponent>,
         @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;

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<ListItem> 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,

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 =>

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';

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<IAudit> {
@@ -10,8 +9,8 @@ export class AuditService extends GenericService<IAudit> {
         super(_injector, 'audit');
     }
 
-    getCategories(): Observable<CategoryModel[]> {
-        return super.getAll<CategoryModel[]>(`${this._defaultModelPath}/categories`);
+    getCategories(): Observable<ICategory[]> {
+        return super.getAll<ICategory[]>(`${this._defaultModelPath}/categories`);
     }
 
     @Validate()

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<Rules> {
+export class RulesService extends GenericService<IRules> {
     constructor(protected readonly _injector: Injector) {
         super(_injector, 'rules');
     }
@@ -14,7 +14,7 @@ export class RulesService extends GenericService<Rules> {
     }
 
     @Validate()
-    uploadRules(@RequiredParam() body: Rules) {
+    uploadRules(@RequiredParam() body: IRules) {
         return this._post<unknown>(body);
     }
 }

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<IWatermark> {

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<IManualAddResponse> {
@@ -221,7 +227,7 @@ export class ManualAnnotationService extends GenericService<IManualAddResponse>
 
     @Validate()
     recategorizeImage(
-        @RequiredParam() body: ImageRecategorizationRequest,
+        @RequiredParam() body: IImageRecategorizationRequest,
         @RequiredParam() dossierId: string,
         @RequiredParam() fileId: string,
     ) {
@@ -231,7 +237,7 @@ export class ManualAnnotationService extends GenericService<IManualAddResponse>
 
     @Validate()
     requestImageRecategorization(
-        @RequiredParam() body: ImageRecategorizationRequest,
+        @RequiredParam() body: IImageRecategorizationRequest,
         @RequiredParam() dossierId: string,
         @RequiredParam() fileId: string,
     ) {
@@ -267,7 +273,7 @@ export class ManualAnnotationService extends GenericService<IManualAddResponse>
 
     @Validate()
     approveRequest(
-        @RequiredParam() body: ApproveRequest,
+        @RequiredParam() body: IApproveRequest,
         @RequiredParam() annotationId: string,
         @RequiredParam() dossierId: string,
         @RequiredParam() fileId: string,

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<Dictionary, IDictionary>
      */
     @Validate()
     getColors(@RequiredParam() dossierTemplateId: string) {
-        return this._getOne<Colors>([dossierTemplateId], 'color');
+        return this._getOne<IColors>([dossierTemplateId], 'color');
     }
 
     /**
@@ -71,7 +70,7 @@ export class DictionaryService extends EntitiesService<Dictionary, IDictionary>
      * 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}`);
     }
 

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<unknown> {
 
     @Validate()
     getAvailablePlaceholders(@RequiredParam() dossierTemplateId: string) {
-        return this._getOne<PlaceholdersResponse>([dossierTemplateId], 'placeholders');
+        return this._getOne<IPlaceholdersResponse>([dossierTemplateId], 'placeholders');
     }
 
     downloadReportTemplate(dossierTemplateId: string, templateId: string, observe: 'response'): Observable<HttpResponse<Blob>>;

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),
             ),
         );
     }

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;

libs/red-domain/src/lib/audit/category.ts

@@ -0,0 +1,4 @@
+export interface ICategory {
+    category?: string;
+    recordCount?: number;
+}

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';

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;
+}

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';

libs/red-domain/src/lib/redaction-log/approve-request.ts

@@ -0,0 +1,3 @@
+export interface IApproveRequest {
+    addOrRemoveFromDictionary?: boolean;
+}

libs/red-domain/src/lib/redaction-log/image-recategorization.request.ts

@@ -0,0 +1,5 @@
+export interface IImageRecategorizationRequest {
+    annotationId?: string;
+    comment?: string;
+    type?: string;
+}

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';

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';

libs/red-domain/src/lib/reports/placeholders-response.ts

@@ -0,0 +1,8 @@
+/**
+ * Object containing available placeholders.
+ */
+export interface IPlaceholdersResponse {
+    dossierAttributePlaceholders?: Array<string>;
+    fileAttributePlaceholders?: Array<string>;
+    generalPlaceholders?: Array<string>;
+}

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';

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;
+}

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;

libs/red-ui-http/.eslintrc.json

@@ -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": {}
-    }
-  ]
-}

libs/red-ui-http/jest.config.js

@@ -1,20 +0,0 @@
-module.exports = {
-    preset: '../../jest.preset.js',
-    setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-    globals: {
-        'ts-jest': {
-            stringifyContentPathRegex: '\\.(html|svg)$',
-
-            tsconfig: '<rootDir>/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' }
-};

libs/red-ui-http/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/libs/red-ui-http",
-  "lib": {
-    "entryFile": "src/index.ts"
-  }
-}

libs/red-ui-http/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@redaction/red-ui-http",
-  "version": "1.1",
-  "peerDependencies": {
-    "@angular/common": "^7.2.0",
-    "@angular/core": "^7.2.0"
-  }
-}

libs/red-ui-http/src/index.ts

@@ -1 +0,0 @@
-export * from './lib/index';

libs/red-ui-http/src/lib/index.ts

@@ -1 +0,0 @@
-export * from './model/models';

libs/red-ui-http/src/lib/model/approveRequest.ts

@@ -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;
-}

libs/red-ui-http/src/lib/model/categoryModel.ts

@@ -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;
-}

libs/red-ui-http/src/lib/model/colors.ts

@@ -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;
-}

libs/red-ui-http/src/lib/model/idRemoval.ts

@@ -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,
-    };
-}

libs/red-ui-http/src/lib/model/imageRecategorizationRequest.ts

@@ -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;
-}

libs/red-ui-http/src/lib/model/models.ts

@@ -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';

libs/red-ui-http/src/lib/model/placeholdersResponse.ts

@@ -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<string>;
-    fileAttributePlaceholders?: Array<string>;
-    generalPlaceholders?: Array<string>;
-}

libs/red-ui-http/src/lib/model/rules.ts

@@ -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;
-}

libs/red-ui-http/src/lib/red-types.ts

@@ -1 +0,0 @@
-export type List<T = string> = readonly T[];

libs/red-ui-http/tsconfig.json

@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

libs/red-ui-http/tsconfig.lib.json

@@ -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"]
-}

nx.json

@@ -30,9 +30,6 @@
     },
     "red-ui": {
       "tags": []
-    },
-    "red-ui-http": {
-      "tags": []
     }
   },
   "targetDependencies": {

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": {

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/*"],