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

Pull request #250: manual redaction fixes

Browse Source 
Merge in RED/ui from minor-fixes to master

* commit 'b8df7ab452ffffe533feebd7a51b61b65887f2d4':
  manual redaction fixes
This commit is contained in:
Timo Bejan 2021-07-23 08:14:53 +02:00
commit a3ac2743dd
6 changed files with 31 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/red-ui/src/app/modules/dossier/components/needs-work-badge/needs-work-badge.component.ts
View File

@ -12,10 +12,7 @@ import { DossierWrapper } from '@state/model/dossier.wrapper';
export class NeedsWorkBadgeComponent { export class NeedsWorkBadgeComponent {
@Input() needsWorkInput: FileStatusWrapper | DossierWrapper; @Input() needsWorkInput: FileStatusWrapper | DossierWrapper;
constructor( constructor(private readonly _appStateService: AppStateService, private readonly _permissionsService: PermissionsService) {}
private readonly _appStateService: AppStateService,
private readonly _permissionsService: PermissionsService
) {}
get suggestionColor() { get suggestionColor() {
return this._getDictionaryColor('suggestion'); return this._getDictionaryColor('suggestion');
@ -50,10 +47,7 @@ export class NeedsWorkBadgeComponent {
} }
get hasAnnotationComments(): boolean { get hasAnnotationComments(): boolean {
return ( return this.needsWorkInput instanceof FileStatusWrapper && (<any>this.needsWorkInput).hasAnnotationComments;
this.needsWorkInput instanceof FileStatusWrapper &&
(<any>this.needsWorkInput).hasAnnotationComments
);
} }
reanalysisRequired() { reanalysisRequired() {
@ -65,11 +59,6 @@ export class NeedsWorkBadgeComponent {
} }
private _getDictionaryColor(type: string) { private _getDictionaryColor(type: string) {
let dossierTemplateId = null; return this._appStateService.getDictionaryColor(type);
if (this.needsWorkInput instanceof DossierWrapper) {
dossierTemplateId = this.needsWorkInput.dossierTemplateId;
}
return this._appStateService.getDictionaryColor(type, dossierTemplateId);
} }
} }

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

@ -583,7 +583,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribeComponent impleme
/* Get the documentElement (<html>) to display the page in fullscreen */ /* Get the documentElement (<html>) to display the page in fullscreen */
private _cleanupAndRedrawManualAnnotations() { private _cleanupAndRedrawManualAnnotations() {
this._fileDownloadService.loadActiveFileRedactionLogPreview().subscribe(redactionLogPreview => { this._fileDownloadService.loadActiveFileRedactionLog().subscribe(redactionLogPreview => {
this.fileData.redactionLog = redactionLogPreview; this.fileData.redactionLog = redactionLogPreview;
this._annotationDrawService.drawAnnotations( this._annotationDrawService.drawAnnotations(
this._instance, this._instance,
@ -599,7 +599,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribeComponent impleme
const currentPageAnnotationIds = currentPageAnnotations.map(a => a.id); const currentPageAnnotationIds = currentPageAnnotations.map(a => a.id);
this.fileData.fileStatus = await this.appStateService.reloadActiveFile(); this.fileData.fileStatus = await this.appStateService.reloadActiveFile();
this._fileDownloadService.loadActiveFileRedactionLogPreview().subscribe(redactionLogPreview => { this._fileDownloadService.loadActiveFileRedactionLog().subscribe(redactionLogPreview => {
this.fileData.redactionLog = redactionLogPreview; this.fileData.redactionLog = redactionLogPreview;
this.rebuildFilters(); this.rebuildFilters();
if (this.viewMode === 'STANDARD') { if (this.viewMode === 'STANDARD') {

13
apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
View File

@ -23,8 +23,8 @@ export class PdfViewerDataService {
private readonly _viewedPagesControllerService: ViewedPagesControllerService private readonly _viewedPagesControllerService: ViewedPagesControllerService
) {} ) {}
loadActiveFileRedactionLogPreview() { loadActiveFileRedactionLog() {
return this._redactionLogControllerService.getRedactionLogPreview( return this._redactionLogControllerService.getRedactionLog(
this._appStateService.activeDossierId, this._appStateService.activeDossierId,
this._appStateService.activeFileId this._appStateService.activeFileId
); );
@ -37,9 +37,7 @@ export class PdfViewerDataService {
this._man.getManualRedaction(dossierId, fileId).subscribe(); this._man.getManualRedaction(dossierId, fileId).subscribe();
const file$ = this.downloadOriginalFile(this._appStateService.activeFile); const file$ = this.downloadOriginalFile(this._appStateService.activeFile);
const reactionLog$ = this._redactionLogControllerService const reactionLog$ = this._redactionLogControllerService.getRedactionLog(dossierId, fileId).pipe(catchError(() => of({})));
.getRedactionLogPreview(dossierId, fileId)
.pipe(catchError(() => of({})));
const redactionChangeLog$ = this._redactionLogControllerService const redactionChangeLog$ = this._redactionLogControllerService
.getRedactionChangeLog(dossierId, fileId) .getRedactionChangeLog(dossierId, fileId)
.pipe(catchError(() => of({}))); .pipe(catchError(() => of({})));
@ -53,10 +51,7 @@ export class PdfViewerDataService {
getViewedPagesForActiveFile() { getViewedPagesForActiveFile() {
if (this._permissionsService.canMarkPagesAsViewed()) { if (this._permissionsService.canMarkPagesAsViewed()) {
return this._viewedPagesControllerService return this._viewedPagesControllerService
.getViewedPages( .getViewedPages(this._appStateService.activeDossierId, this._appStateService.activeFileId)
this._appStateService.activeDossierId,
this._appStateService.activeFileId
)
.pipe(catchError(() => of({ pages: [] }))); .pipe(catchError(() => of({ pages: [] })));
} }
return of({ pages: [] }); return of({ pages: [] });

2
apps/red-ui/src/app/state/app-state.service.ts
View File

@ -174,7 +174,7 @@ export class AppStateService {
dossierTemplateId = this.dossierTemplates[0]?.dossierTemplateId; dossierTemplateId = this.dossierTemplates[0]?.dossierTemplateId;
} }
if (!dossierTemplateId) { if (!dossierTemplateId) {
return undefined; return '#cccccc';
} }
const color = this._dictionaryData[dossierTemplateId][type]?.hexColor; const color = this._dictionaryData[dossierTemplateId][type]?.hexColor;
return color ?? this._dictionaryData[dossierTemplateId]['default'].hexColor; return color ?? this._dictionaryData[dossierTemplateId]['default'].hexColor;

4
apps/red-ui/src/assets/config/config.json
View File

@ -1,6 +1,6 @@
{ {
"OAUTH_URL": "https://red-staging.iqser.cloud/auth/realms/redaction", "OAUTH_URL": "https://dev-06.iqser.cloud/auth/realms/redaction",
"API_URL": "https://red-staging.iqser.cloud/redaction-gateway-v1", "API_URL": "https://dev-06.iqser.cloud/redaction-gateway-v1",
"OAUTH_CLIENT_ID": "redaction", "OAUTH_CLIENT_ID": "redaction",
"BACKEND_APP_VERSION": "4.4.40", "BACKEND_APP_VERSION": "4.4.40",
"FRONTEND_APP_VERSION": "1.1", "FRONTEND_APP_VERSION": "1.1",

161
libs/red-ui-http/src/lib/api/redactionLogController.service.ts
View File

@ -78,15 +78,11 @@ export class RedactionLogControllerService {
reportProgress: boolean = false reportProgress: boolean = false
): Observable<any> { ): Observable<any> {
if (dossierId === null || dossierId === undefined) { if (dossierId === null || dossierId === undefined) {
throw new Error( throw new Error('Required parameter dossierId was null or undefined when calling getRedactionLog.');
'Required parameter dossierId was null or undefined when calling getRedactionLog.'
);
} }
if (fileId === null || fileId === undefined) { if (fileId === null || fileId === undefined) {
throw new Error( throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog.');
'Required parameter fileId was null or undefined when calling getRedactionLog.'
);
} }
let headers = this.defaultHeaders; let headers = this.defaultHeaders;
@ -94,25 +90,20 @@ export class RedactionLogControllerService {
// authentication (RED-OAUTH) required // authentication (RED-OAUTH) required
if (this.configuration.accessToken) { if (this.configuration.accessToken) {
const accessToken = const accessToken =
typeof this.configuration.accessToken === 'function' typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
? this.configuration.accessToken()
: this.configuration.accessToken;
headers = headers.set('Authorization', 'Bearer ' + accessToken); headers = headers.set('Authorization', 'Bearer ' + accessToken);
} }
// to determine the Accept header // to determine the Accept header
const httpHeaderAccepts: string[] = ['application/json']; const httpHeaderAccepts: string[] = ['application/json'];
const httpHeaderAcceptSelected: string | undefined = const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected !== undefined) { if (httpHeaderAcceptSelected !== undefined) {
headers = headers.set('Accept', httpHeaderAcceptSelected); headers = headers.set('Accept', httpHeaderAcceptSelected);
} }
return this.httpClient.request<RedactionChangeLog>( return this.httpClient.request<RedactionChangeLog>(
'get', 'get',
`${this.basePath}/redactionChnageLog/${encodeURIComponent( `${this.basePath}/redactionChnageLog/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`,
String(dossierId)
)}/${encodeURIComponent(String(fileId))}`,
{ {
withCredentials: this.configuration.withCredentials, withCredentials: this.configuration.withCredentials,
headers: headers, headers: headers,
@ -130,12 +121,7 @@ export class RedactionLogControllerService {
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @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 reportProgress flag to report request and response progress.
*/ */
public getRedactionLog( public getRedactionLog(dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<RedactionLog>;
dossierId: string,
fileId: string,
observe?: 'body',
reportProgress?: boolean
): Observable<RedactionLog>;
public getRedactionLog( public getRedactionLog(
dossierId: string, dossierId: string,
@ -151,22 +137,13 @@ export class RedactionLogControllerService {
reportProgress?: boolean reportProgress?: boolean
): Observable<HttpEvent<RedactionLog>>; ): Observable<HttpEvent<RedactionLog>>;
public getRedactionLog( public getRedactionLog(dossierId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
dossierId: string,
fileId: string,
observe: any = 'body',
reportProgress: boolean = false
): Observable<any> {
if (dossierId === null || dossierId === undefined) { if (dossierId === null || dossierId === undefined) {
throw new Error( throw new Error('Required parameter dossierId was null or undefined when calling getRedactionLog1.');
'Required parameter dossierId was null or undefined when calling getRedactionLog1.'
);
} }
if (fileId === null || fileId === undefined) { if (fileId === null || fileId === undefined) {
throw new Error( throw new Error('Required parameter fileId was null or undefined when calling getRedactionLog1.');
'Required parameter fileId was null or undefined when calling getRedactionLog1.'
);
} }
let headers = this.defaultHeaders; let headers = this.defaultHeaders;
@ -174,101 +151,20 @@ export class RedactionLogControllerService {
// authentication (RED-OAUTH) required // authentication (RED-OAUTH) required
if (this.configuration.accessToken) { if (this.configuration.accessToken) {
const accessToken = const accessToken =
typeof this.configuration.accessToken === 'function' typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
? this.configuration.accessToken()
: this.configuration.accessToken;
headers = headers.set('Authorization', 'Bearer ' + accessToken); headers = headers.set('Authorization', 'Bearer ' + accessToken);
} }
// to determine the Accept header // to determine the Accept header
const httpHeaderAccepts: string[] = ['application/json']; const httpHeaderAccepts: string[] = ['application/json'];
const httpHeaderAcceptSelected: string | undefined = const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected !== undefined) { if (httpHeaderAcceptSelected !== undefined) {
headers = headers.set('Accept', httpHeaderAcceptSelected); headers = headers.set('Accept', httpHeaderAcceptSelected);
} }
return this.httpClient.request<RedactionLog>( return this.httpClient.request<RedactionLog>(
'get', 'get',
`${this.basePath}/redactionLog/${encodeURIComponent( `${this.basePath}/redactionLog/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`,
String(dossierId)
)}/${encodeURIComponent(String(fileId))}`,
{
withCredentials: this.configuration.withCredentials,
headers: headers,
observe: observe,
reportProgress: reportProgress
}
);
}
/**
* Gets the redaction log preview
* 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 getRedactionLogPreview(
dossierId: string,
fileId: string,
observe?: 'body',
reportProgress?: boolean
): Observable<RedactionLog>;
public getRedactionLogPreview(
dossierId: string,
fileId: string,
observe?: 'response',
reportProgress?: boolean
): Observable<HttpResponse<RedactionLog>>;
public getRedactionLogPreview(
dossierId: string,
fileId: string,
observe?: 'events',
reportProgress?: boolean
): Observable<HttpEvent<RedactionLog>>;
public getRedactionLogPreview(
dossierId: string,
fileId: string,
observe: any = 'body',
reportProgress: boolean = false
): Observable<any> {
if (dossierId === null || dossierId === undefined) {
throw new Error(
'Required parameter dossierId was null or undefined when calling getRedactionLogPreview.'
);
}
if (fileId === null || fileId === undefined) {
throw new Error(
'Required parameter fileId was null or undefined when calling getRedactionLogPreview.'
);
}
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<RedactionLog>(
'get',
`${this.basePath}/sectionGrid/${encodeURIComponent(
String(dossierId)
)}/${encodeURIComponent(String(fileId))}/preview`,
{ {
withCredentials: this.configuration.withCredentials, withCredentials: this.configuration.withCredentials,
headers: headers, headers: headers,
@ -286,12 +182,7 @@ export class RedactionLogControllerService {
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @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 reportProgress flag to report request and response progress.
*/ */
public getSectionGrid( public getSectionGrid(dossierId: string, fileId: string, observe?: 'body', reportProgress?: boolean): Observable<SectionGrid>;
dossierId: string,
fileId: string,
observe?: 'body',
reportProgress?: boolean
): Observable<SectionGrid>;
public getSectionGrid( public getSectionGrid(
dossierId: string, dossierId: string,
@ -307,22 +198,13 @@ export class RedactionLogControllerService {
reportProgress?: boolean reportProgress?: boolean
): Observable<HttpEvent<SectionGrid>>; ): Observable<HttpEvent<SectionGrid>>;
public getSectionGrid( public getSectionGrid(dossierId: string, fileId: string, observe: any = 'body', reportProgress: boolean = false): Observable<any> {
dossierId: string,
fileId: string,
observe: any = 'body',
reportProgress: boolean = false
): Observable<any> {
if (dossierId === null || dossierId === undefined) { if (dossierId === null || dossierId === undefined) {
throw new Error( throw new Error('Required parameter dossierId was null or undefined when calling getSectionGrid.');
'Required parameter dossierId was null or undefined when calling getSectionGrid.'
);
} }
if (fileId === null || fileId === undefined) { if (fileId === null || fileId === undefined) {
throw new Error( throw new Error('Required parameter fileId was null or undefined when calling getSectionGrid.');
'Required parameter fileId was null or undefined when calling getSectionGrid.'
);
} }
let headers = this.defaultHeaders; let headers = this.defaultHeaders;
@ -330,25 +212,20 @@ export class RedactionLogControllerService {
// authentication (RED-OAUTH) required // authentication (RED-OAUTH) required
if (this.configuration.accessToken) { if (this.configuration.accessToken) {
const accessToken = const accessToken =
typeof this.configuration.accessToken === 'function' typeof this.configuration.accessToken === 'function' ? this.configuration.accessToken() : this.configuration.accessToken;
? this.configuration.accessToken()
: this.configuration.accessToken;
headers = headers.set('Authorization', 'Bearer ' + accessToken); headers = headers.set('Authorization', 'Bearer ' + accessToken);
} }
// to determine the Accept header // to determine the Accept header
const httpHeaderAccepts: string[] = ['application/json']; const httpHeaderAccepts: string[] = ['application/json'];
const httpHeaderAcceptSelected: string | undefined = const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected !== undefined) { if (httpHeaderAcceptSelected !== undefined) {
headers = headers.set('Accept', httpHeaderAcceptSelected); headers = headers.set('Accept', httpHeaderAcceptSelected);
} }
return this.httpClient.request<SectionGrid>( return this.httpClient.request<SectionGrid>(
'get', 'get',
`${this.basePath}/sectionGrid/${encodeURIComponent( `${this.basePath}/sectionGrid/${encodeURIComponent(String(dossierId))}/${encodeURIComponent(String(fileId))}`,
String(dossierId)
)}/${encodeURIComponent(String(fileId))}`,
{ {
withCredentials: this.configuration.withCredentials, withCredentials: this.configuration.withCredentials,
headers: headers, headers: headers,