diff --git a/lib/new-admin/services/customInfoRequests.js b/lib/new-admin/services/customInfoRequests.js index 7c703443..590dd48b 100644 --- a/lib/new-admin/services/customInfoRequests.js +++ b/lib/new-admin/services/customInfoRequests.js @@ -2,6 +2,7 @@ const db = require('../../db') const uuid = require('uuid') const _ = require('lodash/fp') const pgp = require('pg-promise')() +const { loadLatestConfigOrNone, saveConfig } = require('../../../lib/new-settings-loader') const getCustomInfoRequests = (onlyEnabled = false) => { const sql = onlyEnabled @@ -23,7 +24,10 @@ const addCustomInfoRequest = (customRequest) => { } const removeCustomInfoRequest = (id) => { - return db.none('UPDATE custom_info_requests SET enabled = false WHERE id = $1', [id]).then(() => ({ id })) + return loadLatestConfigOrNone() + .then(cfg => saveConfig({triggers: _.remove(x => x.customInfoRequestId === id, cfg.triggers ?? [])})) + .then(() => db.none('UPDATE custom_info_requests SET enabled = false WHERE id = $1', [id])) + .then(() => ({ id })); } const editCustomInfoRequest = (id, customRequest) => { diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js index 2a020a02..1ec5324c 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js @@ -93,7 +93,7 @@ const CustomInfoRequests = ({ setToBeEdited(null) toggleWizard() }, - refetchQueries: () => ['customInfoRequests'] + refetchQueries: () => ['getData', 'customInfoRequests'] }) const [removeEntry] = useMutation(REMOVE_ROW, { @@ -105,7 +105,7 @@ const CustomInfoRequests = ({ setDeleteDialog(false) setHasError(false) }, - refetchQueries: () => ['customInfoRequests'] + refetchQueries: () => ['getData', 'customInfoRequests'] }) const handleDelete = id => {