From c8b894aef1ca7852ef30e0c19b689c7c9b790ad8 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Thu, 22 Oct 2020 17:56:31 +0200 Subject: [PATCH] code tweaks --- app/src/components/v-upload/v-upload.vue | 8 ++---- .../_system/tfa-setup/tfa-setup.vue | 12 --------- app/src/interfaces/file/file.vue | 25 ++++++++++--------- app/src/interfaces/image/image.vue | 5 +--- .../interfaces/many-to-one/many-to-one.vue | 5 ++-- .../interfaces/one-to-many/one-to-many.vue | 6 ++--- .../notification-dialogs.vue | 6 ----- 7 files changed, 20 insertions(+), 47 deletions(-) diff --git a/app/src/components/v-upload/v-upload.vue b/app/src/components/v-upload/v-upload.vue index f3c85f1576..82607a41e8 100644 --- a/app/src/components/v-upload/v-upload.vue +++ b/app/src/components/v-upload/v-upload.vue @@ -115,7 +115,7 @@ export default defineComponent({ }, }, setup(props, { emit }) { - const { uploading, progress, error, upload, onBrowseSelect, done, numberOfFiles } = useUpload(); + const { uploading, progress, upload, onBrowseSelect, done, numberOfFiles } = useUpload(); const { onDragEnter, onDragLeave, onDrop, dragging } = useDragging(); const { url, isValidURL, loading: urlLoading, error: urlError, importFromURL } = useURLImport(); const { setSelection } = useSelection(); @@ -125,7 +125,6 @@ export default defineComponent({ return { uploading, progress, - error, onDragEnter, onDragLeave, onDrop, @@ -146,14 +145,12 @@ export default defineComponent({ const progress = ref(0); const numberOfFiles = ref(0); const done = ref(0); - const error = ref(null); - return { uploading, progress, error, upload, onBrowseSelect, numberOfFiles, done }; + return { uploading, progress, upload, onBrowseSelect, numberOfFiles, done }; async function upload(files: FileList) { uploading.value = true; progress.value = 0; - error.value = null; try { numberOfFiles.value = files.length; @@ -171,7 +168,6 @@ export default defineComponent({ } } catch (err) { console.error(err); - error.value = err; } finally { uploading.value = false; done.value = 0; diff --git a/app/src/interfaces/_system/tfa-setup/tfa-setup.vue b/app/src/interfaces/_system/tfa-setup/tfa-setup.vue index 825b8bb360..1b3370778b 100644 --- a/app/src/interfaces/_system/tfa-setup/tfa-setup.vue +++ b/app/src/interfaces/_system/tfa-setup/tfa-setup.vue @@ -136,12 +136,6 @@ export default defineComponent({ error.value = null; } catch (err) { error.value = err; - notify.add({ - title: i18n.t('unexpected_error'), - type: 'error', - dialog: true, - error: err, - }); } finally { loading.value = false; } @@ -157,12 +151,6 @@ export default defineComponent({ disableActive.value = false; } catch (err) { error.value = err; - notify.add({ - title: i18n.t('unexpected_error'), - type: 'error', - dialog: true, - error: err, - }); } finally { loading.value = false; } diff --git a/app/src/interfaces/file/file.vue b/app/src/interfaces/file/file.vue index 74307f90bb..b395031bf9 100644 --- a/app/src/interfaces/file/file.vue +++ b/app/src/interfaces/file/file.vue @@ -140,7 +140,7 @@ export default defineComponent({ setup(props, { emit }) { const notify = useNotificationsStore(); const activeDialog = ref<'upload' | 'choose' | 'url' | null>(null); - const { loading, error, file, fetchFile } = useFile(); + const { loading, file, fetchFile } = useFile(); watch(() => props.value, fetchFile, { immediate: true }); @@ -158,20 +158,18 @@ export default defineComponent({ return assetURL.value + `?key=system-small-cover`; }); - const { url, isValidURL, loading: urlLoading, error: urlError, importFromURL } = useURLImport(); + const { url, isValidURL, loading: urlLoading, importFromURL } = useURLImport(); return { activeDialog, setSelection, loading, - error, file, fileExtension, imageThumbnail, onUpload, url, urlLoading, - urlError, importFromURL, isValidURL, assetURL, @@ -179,16 +177,14 @@ export default defineComponent({ function useFile() { const loading = ref(false); - const error = ref(null); const file = ref(null); - return { loading, error, file, fetchFile }; + return { loading, file, fetchFile }; async function fetchFile() { if (props.value === null) { file.value = null; loading.value = false; - error.value = null; return; } @@ -203,9 +199,9 @@ export default defineComponent({ file.value = response.data.data; } catch (err) { - error.value = err; + console.error(err); notify.add({ - title: i18n.t('unexpected_error'), + title: i18n.t('could_not_load_file'), type: 'error', dialog: true, error: err, @@ -233,7 +229,6 @@ export default defineComponent({ function useURLImport() { const url = ref(''); const loading = ref(false); - const error = ref(null); const isValidURL = computed(() => { try { @@ -244,7 +239,7 @@ export default defineComponent({ } }); - return { url, loading, error, isValidURL, importFromURL }; + return { url, loading, isValidURL, importFromURL }; async function importFromURL() { loading.value = true; @@ -260,7 +255,13 @@ export default defineComponent({ url.value = ''; emit('input', file.value?.id); } catch (err) { - error.value = err; + console.error(err); + notify.add({ + title: i18n.t('no_file_from_url'), + type: 'error', + dialog: true, + error: err, + }); } finally { loading.value = false; } diff --git a/app/src/interfaces/image/image.vue b/app/src/interfaces/image/image.vue index b12f5c89e1..ee42480061 100644 --- a/app/src/interfaces/image/image.vue +++ b/app/src/interfaces/image/image.vue @@ -85,7 +85,6 @@ export default defineComponent({ const notify = useNotificationsStore(); const loading = ref(false); const image = ref(null); - const error = ref(null); const lightboxActive = ref(false); const editorActive = ref(false); @@ -137,7 +136,6 @@ export default defineComponent({ return { loading, image, - error, src, meta, lightboxActive, @@ -160,7 +158,7 @@ export default defineComponent({ image.value = response.data.data; } catch (err) { - error.value = err; + console.error(err); notify.add({ title: i18n.t('unexpected_error'), type: 'error', @@ -186,7 +184,6 @@ export default defineComponent({ loading.value = false; image.value = null; - error.value = null; lightboxActive.value = false; editorActive.value = false; } diff --git a/app/src/interfaces/many-to-one/many-to-one.vue b/app/src/interfaces/many-to-one/many-to-one.vue index 5379a9350f..dcd238b241 100644 --- a/app/src/interfaces/many-to-one/many-to-one.vue +++ b/app/src/interfaces/many-to-one/many-to-one.vue @@ -194,7 +194,6 @@ export default defineComponent({ function useCurrent() { const currentItem = ref | null>(null); const loading = ref(false); - const error = ref(null); watch( () => props.value, @@ -264,7 +263,7 @@ export default defineComponent({ currentItem.value = response.data.data; } catch (err) { - error.value = err; + console.error(err); notify.add({ title: i18n.t('unexpected_error'), type: 'error', @@ -316,7 +315,7 @@ export default defineComponent({ items.value = response.data.data; } catch (err) { - error.value = err; + console.error(err); notify.add({ title: i18n.t('unexpected_error'), type: 'error', diff --git a/app/src/interfaces/one-to-many/one-to-many.vue b/app/src/interfaces/one-to-many/one-to-many.vue index 9c22626010..de0a55d2ed 100644 --- a/app/src/interfaces/one-to-many/one-to-many.vue +++ b/app/src/interfaces/one-to-many/one-to-many.vue @@ -115,7 +115,7 @@ export default defineComponent({ const notify = useNotificationsStore(); const { relation, relatedCollection, relatedPrimaryKeyField } = useRelation(); - const { tableHeaders, items, loading, error } = useTable(); + const { tableHeaders, items, loading } = useTable(); const { currentlyEditing, editItem, editsAtStart, stageEdits, cancelEdit } = useEdits(); const { stageSelection, selectModalActive, selectionFilters } = useSelection(); const { sort, sortItems, sortedItems } = useSort(); @@ -263,7 +263,6 @@ export default defineComponent({ const tableHeaders = ref([]); const loading = ref(false); const items = ref[]>([]); - const error = ref(null); watch( () => props.value, @@ -311,7 +310,6 @@ export default defineComponent({ }) .concat(...newItems); } catch (err) { - error.value = err; notify.add({ title: i18n.t('unexpected_error'), type: 'error', @@ -359,7 +357,7 @@ export default defineComponent({ { immediate: true } ); - return { tableHeaders, items, loading, error }; + return { tableHeaders, items, loading }; } function useEdits() { diff --git a/app/src/views/private/components/notification-dialogs/notification-dialogs.vue b/app/src/views/private/components/notification-dialogs/notification-dialogs.vue index 8bc157d376..032c7a7836 100644 --- a/app/src/views/private/components/notification-dialogs/notification-dialogs.vue +++ b/app/src/views/private/components/notification-dialogs/notification-dialogs.vue @@ -50,12 +50,6 @@ Node: ${parsedInfo.value?.node.version} Name: ${notify.error?.name || notify.error || 'none'} Message: ${notify.error?.message || 'none'} -Action: ${notify.text || 'none'} -
- Error Stack - - ${notify.error?.stack?.replace(/^/gm, ' ').replace(' ', '')} -
`; return `https://github.com/directus/next/issues/new?body=${encodeURIComponent(debugInfo)}`;