diff options
Diffstat (limited to 'app/assets/javascripts/snippets/utils')
-rw-r--r-- | app/assets/javascripts/snippets/utils/blob.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/snippets/utils/error.js | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app/assets/javascripts/snippets/utils/blob.js b/app/assets/javascripts/snippets/utils/blob.js index a47418323f2..2a3f590a803 100644 --- a/app/assets/javascripts/snippets/utils/blob.js +++ b/app/assets/javascripts/snippets/utils/blob.js @@ -1,4 +1,6 @@ import { uniqueId } from 'lodash'; +import { SNIPPET_MARK_BLOBS_CONTENT, SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; +import { performanceMarkAndMeasure } from '~/performance/utils'; import { SNIPPET_BLOB_ACTION_CREATE, SNIPPET_BLOB_ACTION_UPDATE, @@ -7,8 +9,6 @@ import { SNIPPET_LEVELS_MAP, SNIPPET_VISIBILITY, } from '../constants'; -import { performanceMarkAndMeasure } from '~/performance/utils'; -import { SNIPPET_MARK_BLOBS_CONTENT, SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; const createLocalId = () => uniqueId('blob_local_'); diff --git a/app/assets/javascripts/snippets/utils/error.js b/app/assets/javascripts/snippets/utils/error.js new file mode 100644 index 00000000000..2d5c2a64038 --- /dev/null +++ b/app/assets/javascripts/snippets/utils/error.js @@ -0,0 +1,15 @@ +import { isString } from 'lodash'; +import { __ } from '~/locale'; + +export const UNEXPECTED_ERROR = __('Unexpected error'); + +export const getErrorMessage = (e) => { + if (!e) { + return UNEXPECTED_ERROR; + } + if (isString(e)) { + return e; + } + + return e.message || e.networkError || UNEXPECTED_ERROR; +}; |