Merge pull request #65 from ConductionNL/feature/REGISTERS-54/modal-r…

…emove-timeout

added a timeout clear to all modals where necessary

src/modals/object/DeleteObject.vue

@@ -67,11 +67,13 @@ export default {
 			success: null,
 			loading: false,
 			error: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeDialog() {
 			navigationStore.setDialog(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -84,7 +86,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeDialog, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeDialog, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while deleting the object'

src/modals/object/EditObject.vue

@@ -140,6 +140,7 @@ export default {
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	mounted() {
@@ -220,6 +221,7 @@ export default {
 		},
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -241,7 +243,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeModal, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while saving the object'

src/modals/register/DeleteRegister.vue

@@ -67,11 +67,13 @@ export default {
 			success: false,
 			loading: false,
 			error: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeDialog() {
 			navigationStore.setDialog(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = false
 			this.loading = false
 			this.error = false
@@ -84,7 +86,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeDialog, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeDialog, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'Er is een fout opgetreden bij het verwijderen van het register'

src/modals/register/EditRegister.vue

@@ -107,6 +107,7 @@ export default {
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	mounted() {
@@ -193,6 +194,7 @@ export default {
 		},
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -217,7 +219,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeModal, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while saving the register'

src/modals/register/UploadRegister.vue

@@ -78,24 +78,26 @@ export default {
 		return {
 			register: {
 				json: '{}',
-				url: ''
+				url: '',
 			},
 			success: false,
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
 			this.hasUpdated = false
 			this.register = {
 				json: '{}',
-				url: ''
+				url: '',
 			}
 		},
 		async uploadRegister() {
@@ -104,7 +106,7 @@ export default {
 			registerStore.uploadRegister(this.register).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeModal, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while uploading the register'

src/modals/schema/DeleteSchema.vue

@@ -67,11 +67,13 @@ export default {
 			success: false,
 			loading: false,
 			error: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeDialog() {
 			navigationStore.setDialog(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = false
 			this.loading = false
 			this.error = false
@@ -84,7 +86,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeDialog, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeDialog, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while deleting the schema'

src/modals/schema/DeleteSchemaProperty.vue

@@ -24,7 +24,7 @@ import { navigationStore, schemaStore } from '../../store/store.js'
 		</p>
 
 		<template #actions>
-			<NcButton :disabled="loading" icon="" @click="navigationStore.setModal(null)">
+			<NcButton :disabled="loading" icon="" @click="closeModal">
 				<template #icon>
 					<Cancel :size="20" />
 				</template>
@@ -68,9 +68,17 @@ export default {
 			loading: false,
 			success: null,
 			error: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
+		closeModal() {
+			navigationStore.setModal(null)
+			schemaStore.setSchemaPropertyKey(null)
+			clearTimeout(this.closeModalTimeout)
+			this.success = null
+			this.error = false
+		},
 		DeleteProperty() {
 			this.loading = true
 
@@ -88,12 +96,7 @@ export default {
 					this.success = response.ok
 
 					// Wait for the user to read the feedback then close the modal
-					const self = this
-					setTimeout(function() {
-						self.success = null
-						navigationStore.setModal(null)
-						schemaStore.setSchemaPropertyKey(null)
-					}, 2000)
+					this.closeModalTimeout = setTimeout(this.closeModal, 2000)
 				})
 				.catch((err) => {
 					this.error = err

src/modals/schema/EditSchema.vue

@@ -102,6 +102,7 @@ export default {
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	mounted() {
@@ -127,6 +128,7 @@ export default {
 		},
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -170,7 +172,7 @@ export default {
 				} else {
 					this.success = response.ok
 					this.error = false
-					response.ok && setTimeout(this.closeModal, 2000)
+					response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 				}
 
 			}).catch((error) => {

src/modals/schema/EditSchemaProperty.vue

@@ -329,6 +329,7 @@ export default {
 			success: null,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	computed: {
@@ -388,6 +389,7 @@ export default {
 		closeModal() {
 			navigationStore.setModal(false)
 			schemaStore.setSchemaPropertyKey(null)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.hasUpdated = false
 			this.properties = {
@@ -444,7 +446,7 @@ export default {
 				.then(({ response }) => {
 					this.success = response.ok
 
-					setTimeout(this.closeModal, 2000)
+					this.closeModalTimeout = setTimeout(this.closeModal, 2000)
 				}).catch((err) => {
 					this.success = false
 					this.error = err

src/modals/schema/UploadSchema.vue

@@ -96,11 +96,13 @@ export default {
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -124,7 +126,7 @@ export default {
 			schemaStore.uploadSchema(newSchema).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeModal, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while uploading the schema'

src/modals/source/DeleteSource.vue

@@ -67,11 +67,13 @@ export default {
 			success: false,
 			loading: false,
 			error: false,
+			closeModalTimeout: null,
 		}
 	},
 	methods: {
 		closeDialog() {
 			navigationStore.setDialog(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = false
 			this.loading = false
 			this.error = false
@@ -84,7 +86,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeDialog, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeDialog, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while deleting the source'

src/modals/source/EditSource.vue

@@ -101,6 +101,7 @@ export default {
 			loading: false,
 			error: false,
 			hasUpdated: false,
+			closeModalTimeout: null,
 		}
 	},
 	mounted() {
@@ -125,6 +126,7 @@ export default {
 		},
 		closeModal() {
 			navigationStore.setModal(false)
+			clearTimeout(this.closeModalTimeout)
 			this.success = null
 			this.loading = false
 			this.error = false
@@ -147,7 +149,7 @@ export default {
 			}).then(({ response }) => {
 				this.success = response.ok
 				this.error = false
-				response.ok && setTimeout(this.closeModal, 2000)
+				response.ok && (this.closeModalTimeout = setTimeout(this.closeModal, 2000))
 			}).catch((error) => {
 				this.success = false
 				this.error = error.message || 'An error occurred while saving the source'