From bf1963144727fcef22ae90f3f4c7d60b42b10020 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Thu, 20 Jan 2022 13:59:34 +0100
Subject: [PATCH] fix: custom info request delete

---
 lib/new-admin/services/customInfoRequests.js                | 6 +++++-
 .../pages/Triggers/CustomInfoRequests/CustomInfoRequests.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/new-admin/services/customInfoRequests.js b/lib/new-admin/services/customInfoRequests.js
index c19c112a..04ff6c44 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 => {