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

DM-473 no line breaks or hyphens removal needed

Browse Source
This commit is contained in:
Dan Percic 2023-09-15 18:06:42 +03:00
parent 1c61989cfb
commit 6affd59ca9
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
View File

@ -9,7 +9,6 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { JustificationsService } from '@services/entity-services/justifications.service';
import { Roles } from '@users/roles';
import { removeHyphensAndSpecialChars } from '@utils/functions';
import { firstValueFrom } from 'rxjs';
import { ManualRedactionService } from '../../services/manual-redaction.service';
@ -186,7 +185,6 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
addRedactionRequest.value = addRedactionRequest.rectangle
? this.form.get('classification').value
: this.form.get('selectedText').value;
addRedactionRequest.value = removeHyphensAndSpecialChars(addRedactionRequest.value);
}
#selectReason() {

3
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -52,7 +52,7 @@ import JSZip from 'jszip';
import { NGXLogger } from 'ngx-logger';
import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
import { byId, byPage, download, handleFilterDelta, hasChanges, removeHyphensAndSpecialChars } from '../../utils';
import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
@ -533,7 +533,6 @@ export class FilePreviewScreenComponent
}
const hint = manualRedactionEntryWrapper.type === ManualRedactionEntryTypes.HINT;
result.redaction.value = removeHyphensAndSpecialChars(result.redaction.value);
const add$ = this._manualRedactionService.addAnnotation([result.redaction], this.dossierId, this.fileId, {
hint,
dictionaryLabel: result.dictionary?.label,

8
apps/red-ui/src/app/utils/functions.ts
View File

@ -133,11 +133,3 @@ export function calcTextWidthInPixels(text: string): number {
return width;
}
export function removeHyphensAndSpecialChars(text: string): string {
return text?.replace(
// eslint-disable-next-line no-control-regex,max-len
/([^\s\d-]{2,})[-\u00AD]\u000A\u000D|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
'$1',
);
}