From 6e79a320de0a009eb7c51b7a40575b68d9902062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Finn=20Mi=C3=9Ffeldt?= <56537019+finnmissfeldt@users.noreply.github.com> Date: Mon, 16 Dec 2019 18:40:55 +0100 Subject: [PATCH] TSK-931: collected thrown errors in errors.ts --- .../task-query/task-query.component.ts | 2 + web/src/app/services/general-modal/errors.ts | 314 +++++++++++++++++- web/src/typings.d.ts | 4 + 3 files changed, 319 insertions(+), 1 deletion(-) diff --git a/web/src/app/history/task-query/task-query.component.ts b/web/src/app/history/task-query/task-query.component.ts index 6b39637f5..46a631691 100644 --- a/web/src/app/history/task-query/task-query.component.ts +++ b/web/src/app/history/task-query/task-query.component.ts @@ -129,6 +129,7 @@ export class TaskQueryComponent implements OnInit { return false; } + // TODO: but why? search() { this.performRequest(); } @@ -142,6 +143,7 @@ export class TaskQueryComponent implements OnInit { } } + // TODO: Global? openDetails(key: string, val: string) { this.generalModalService.triggerMessage( new MessageModal( diff --git a/web/src/app/services/general-modal/errors.ts b/web/src/app/services/general-modal/errors.ts index cf58152c4..9b2a4417e 100644 --- a/web/src/app/services/general-modal/errors.ts +++ b/web/src/app/services/general-modal/errors.ts @@ -3,12 +3,72 @@ import {Pair} from '../../models/pair'; export enum ERROR_TYPES { + DELETE_ERR_2, + FETCH_ERR_7, + NONE, + + // Mock Errors NO_AUTH, EXP_AUTH, NO_ACCESS, + // Real Errors + FETCH_ERR, + FETCH_ERR_2, + DELETE_ERR, + CREATE_ERR, + REMOVE_ERR, + SAVE_ERR, + SELECT_ERR, + FILE_ERR, + IMPORT_ERR_1, + IMPORT_ERR_2, + IMPORT_ERR_3, + IMPORT_ERR_4, + UPLOAD_ERR, + FETCH_ERR_3, + CREATE_ERR_2, + SAVE_ERR_4, + REMOVE_ERR_2, + SAVE_ERR_3, + SAVE_ERR_2, + FETCH_ERR_4, + TIMEOUT_ERR, + GENERAL_ERR, + HANDLE_ERR, + FETCH_ERR_6, + FETCH_ERR_5, + MARK_ERR, + } + +export enum ALERT_TYPES { + INFO_ALERT_2, + DANGER_ALERT_2, + SUCCESS_ALERT_14, + SUCCESS_ALERT_13, + WARNING_ALERT_2, + SUCCESS_ALERT_12, + SUCCESS_ALERT_11, + SUCCESS_ALERT_10, + SUCCESS_ALERT_9, + + // TODO: check all alert models + SUCCESS_ALERT, + INFO_ALERT, + WARNING_ALERT, + DANGER_ALERT, + SUCCESS_ALERT_8, + SUCCESS_ALERT_7, + SUCCESS_ALERT_6, + SUCCESS_ALERT_5, + SUCCESS_ALERT_4, + SUCCESS_ALERT_3, + SUCCESS_ALERT_2, + +} + // TODO: funktioniert unser Pair hierfür? -> Konstruktor checken! -export const errors = new Map ([ +export const errors = new Map ([ [ERROR_TYPES.NO_AUTH, new Pair( 'Authentication required', 'You need to be logged in to perform this action.' @@ -21,4 +81,256 @@ export const errors = new Map ([ 'Access denied', 'You have no permission to perform this action.' )], + // access-items-management.component.ts + [ERROR_TYPES.FETCH_ERR, new Pair( + '', + 'There was error while retrieving your access ids with groups.' + )], + // access-items-management.component.ts + [ERROR_TYPES.FETCH_ERR_2, new Pair( + '', + 'There was error while retrieving your access items ' + )], + // access-items-management.component.ts + [ERROR_TYPES.DELETE_ERR, new Pair( + '', + 'You can\'t delete a group' + )], + // classification-details.component + [ERROR_TYPES.CREATE_ERR, new Pair( + '', + 'There was an error creating a classification' + )], + // classification-details.component + [ERROR_TYPES.REMOVE_ERR, new Pair( + '', + 'There was error while removing your classification' + )], + // classification-details.component + [ERROR_TYPES.SAVE_ERR, new Pair( + '', + 'There was error while saving your classification' + )], + // classification-details.component + [ERROR_TYPES.SELECT_ERR, new Pair( + 'There is no classification selected', + 'Please check if you are creating a classification' + )], + // import-export.component + [ERROR_TYPES.FILE_ERR, new Pair( + '', + 'This file format is not allowed! Please use a .json file.' + )], + // import-export.component + [ERROR_TYPES.IMPORT_ERR_1, new Pair( + '', + 'Import was not successful, you have no access to apply this operation.' + )], + // import-export.component + [ERROR_TYPES.IMPORT_ERR_2, new Pair( + '', + 'Import was not successful, operation was not found.' + )], + // import-export.component + [ERROR_TYPES.IMPORT_ERR_3, new Pair( + '', + 'Import was not successful, operation has some conflicts.' + )], + // import-export.component + [ERROR_TYPES.IMPORT_ERR_4, new Pair( + '', + 'Import was not successful, maximum file size exceeded.' + )], + // import-export.component + [ERROR_TYPES.UPLOAD_ERR, new Pair( + 'Upload failed', + 'The upload didn\'t proceed sucessfully. \ + \n Probably the uploaded file exceeded the maximum file size of 10 MB' + )], + // taskdetails.component + [ERROR_TYPES.FETCH_ERR_3, new Pair( + '', + 'An error occurred while fetching the task' + )], + // workbasket-details.component + [ERROR_TYPES.FETCH_ERR_4, new Pair( + '', + 'An error occurred while fetching the workbasket' + )], + // access-items.component + [ERROR_TYPES.SAVE_ERR_2, new Pair( + '', + 'There was error while saving your workbasket\'s access items' + )], + // workbaskets-distribution-targets.component + [ERROR_TYPES.SAVE_ERR_3, new Pair( + '', + 'There was error while saving your workbasket\'s distribution targets' + )], + // workbasket-information.component + [ERROR_TYPES.REMOVE_ERR_2, new Pair( + '', + 'There was an error removing distribution target for ${this.workbasket.workbasketId}.' + )], + // workbasket-information.component + [ERROR_TYPES.SAVE_ERR_4, new Pair( + '', + 'There was error while saving your workbasket' + )], + // workbasket-information.component + [ERROR_TYPES.CREATE_ERR_2, new Pair( + '', + 'There was an error creating a workbasket' + )], + // workbasket-information.component + [ERROR_TYPES.MARK_ERR, new Pair( + 'There was an error marking workbasket for deletion', + 'It not possible to mark the workbasket for deletion, It has been deleted.' + )], + // domain.guard + [ERROR_TYPES.FETCH_ERR_5, new Pair( + 'There was an error, please contact with your administrator', + 'There was an error getting Domains' + )], + // history.guard + [ERROR_TYPES.FETCH_ERR_6, new Pair( + 'There was an error, please contact with your administrator', + 'There was an error getting history provider' + )], + // http-client-interceptor.component + [ERROR_TYPES.HANDLE_ERR, new Pair( + 'You have no access to this resource ', + '' + )], + // http-client-interceptor.component + [ERROR_TYPES.GENERAL_ERR, new Pair( + 'There was error, please contact with your administrator', + '' + )], + // http-client-interceptor.component + [ERROR_TYPES.NONE, new Pair( + 'Error wird ignoriert, keine Message geworfen', + '' + )], + // spinner.component + [ERROR_TYPES.TIMEOUT_ERR, new Pair( + 'There was an error with your request, please make sure you have internet connection', + 'Request time execeed' + )], + // taskdetails.component + [ERROR_TYPES.FETCH_ERR_7, new Pair( + 'An error occurred while fetching the task', + '' + )], + // taskdetails.component + [ERROR_TYPES.DELETE_ERR_2, new Pair( + 'An error occurred while deleting the task', + '' + )], + + // ALERTS + + // access-items-management.component + [ALERT_TYPES.SUCCESS_ALERT, new Pair( + '${this.accessIdSelected} was removed successfully', + '' + )], + // classification-details.component + [ALERT_TYPES.SUCCESS_ALERT_2, new Pair( + 'Classification ${classification.key} was saved successfully', + '' + )], + // classification-details.component + [ALERT_TYPES.SUCCESS_ALERT_3, new Pair( + 'Classification ${this.classification.key} was saved successfully', + '' + )], + // classification-details.component + // access-items.component + // distribution-targets.component + // workbasket-information.component + [ALERT_TYPES.INFO_ALERT, new Pair( + 'Reset edited fields', + '' + )], + // classification-details.component + [ALERT_TYPES.SUCCESS_ALERT_4, new Pair( + 'Classification ${key} was removed successfully', + '' + )], + // classification-list.component + [ALERT_TYPES.SUCCESS_ALERT_5, new Pair( + 'Classification ${key} was saved successfully', + '' + )], + // import-export.component + [ALERT_TYPES.SUCCESS_ALERT_6, new Pair( + 'Import was successful', + '' + )], + // access-items.component + [ALERT_TYPES.SUCCESS_ALERT_7, new Pair( + 'Workbasket ${component.workbasket.key} Access items were saved successfully', + '' + )], + // distribution-targets.component + [ALERT_TYPES.SUCCESS_ALERT_8, new Pair( + 'Workbasket ${this.workbasket.name} : Distribution targets were saved successfully', + '' + )], + // workbasket-information.component + [ALERT_TYPES.SUCCESS_ALERT_9, new Pair( + 'DistributionTarget for workbasketID: ${this.workbasket.workbasketId} was removed successfully', + '' + )], + // workbasket-information.component + [ALERT_TYPES.SUCCESS_ALERT_10, new Pair( + 'Workbasket ${workbasketUpdated.key} was saved successfully', + '' + )], + // workbasket-information.component + [ALERT_TYPES.SUCCESS_ALERT_11, new Pair( + 'Workbasket ${workbasketUpdated.key} was created successfully', + '' + )], + // workbasket-information.component + [ALERT_TYPES.SUCCESS_ALERT_12, new Pair( + 'The Workbasket ${this.workbasket.workbasketId} has been marked for deletion', + '' + )], + // forms-validator.service + [ALERT_TYPES.WARNING_ALERT, new Pair( + 'There are some empty fields which are required.', + '' + )], + // forms-validator.service x2 + [ALERT_TYPES.WARNING_ALERT_2, new Pair( + 'The ${responseOwner.field} introduced is not valid.', + '' + )], + // taskdetails.component TODO: is dis error + [ALERT_TYPES.DANGER_ALERT, new Pair( + 'There was an error while updating.', + '' + )], + // taskdetails.component + [ALERT_TYPES.SUCCESS_ALERT_13, new Pair( + 'Task ${this.currentId} was created successfully.', + '' + )], + // taskdetails.component + [ALERT_TYPES.SUCCESS_ALERT_14, new Pair( + 'Updating was successful.', + '' + )], + // taskdetails.component + [ALERT_TYPES.DANGER_ALERT_2, new Pair( + 'There was an error while creating a new task.', + '' + )], + // task-master.component + [ALERT_TYPES.INFO_ALERT_2, new Pair( + 'The selected Workbasket is empty!', + '' + )], ]); diff --git a/web/src/typings.d.ts b/web/src/typings.d.ts index d639bbf2b..b09b1ee6e 100644 --- a/web/src/typings.d.ts +++ b/web/src/typings.d.ts @@ -2,3 +2,7 @@ interface NodeModule { id: string; } +declare module '*.json' { + const value: any; + export default value; +}