lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: custom info request delete

Browse source
This commit is contained in:
Nikola Ubavic 2022-01-20 13:59:34 +01:00
parent c825842944
commit bf19631447
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/new-admin/services/customInfoRequests.js
View file

@ -2,6 +2,7 @@ const db = require('../../db')
const uuid = require('uuid') const uuid = require('uuid')
const _ = require('lodash/fp') const _ = require('lodash/fp')
const pgp = require('pg-promise')() const pgp = require('pg-promise')()
const { loadLatestConfigOrNone, saveConfig } = require('../../../lib/new-settings-loader')
const getCustomInfoRequests = (onlyEnabled = false) => { const getCustomInfoRequests = (onlyEnabled = false) => {
const sql = onlyEnabled const sql = onlyEnabled
@ -23,7 +24,10 @@ const addCustomInfoRequest = (customRequest) => {
} }
const removeCustomInfoRequest = (id) => { 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) => { const editCustomInfoRequest = (id, customRequest) => {

4
new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js
View file

@ -93,7 +93,7 @@ const CustomInfoRequests = ({
setToBeEdited(null) setToBeEdited(null)
toggleWizard() toggleWizard()
}, },
refetchQueries: () => ['customInfoRequests'] refetchQueries: () => ['getData', 'customInfoRequests']
}) })
const [removeEntry] = useMutation(REMOVE_ROW, { const [removeEntry] = useMutation(REMOVE_ROW, {
@ -105,7 +105,7 @@ const CustomInfoRequests = ({
setDeleteDialog(false) setDeleteDialog(false)
setHasError(false) setHasError(false)
}, },
refetchQueries: () => ['customInfoRequests'] refetchQueries: () => ['getData', 'customInfoRequests']
}) })
const handleDelete = id => { const handleDelete = id => {