Merge pull request #6577 from TheThingsNetwork/fix/purge-bug

Fix purge is not purging
TheThingsNetwork · Sep 28, 2023 · 55ebc0f · 55ebc0f
2 parents 1daa35a + 2b7031d
commit 55ebc0f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/webui/account/containers/oauth-client-edit/index.js b/pkg/webui/account/containers/oauth-client-edit/index.js
@@ -112,7 +112,7 @@ const ClientAdd = props => {
       setError(undefined)
 
       try {
-        await dispatch(attachPromise(deleteClient(clientId, shouldPurge)))
+        await dispatch(attachPromise(deleteClient(clientId, { purge: shouldPurge || false })))
         navigate('/oauth-clients')
         toast({
           title: clientId,

diff --git a/pkg/webui/console/containers/application-general-settings/index.js b/pkg/webui/console/containers/application-general-settings/index.js
@@ -169,7 +169,7 @@ const ApplicationGeneralSettingsContainer = ({ appId }) => {
       setError(undefined)
 
       try {
-        await dispatch(attachPromise(deleteApplication(appId, shouldPurge)))
+        await dispatch(attachPromise(deleteApplication(appId, { purge: shouldPurge || false })))
         toast({
           title: appId,
           message: m.deleteSuccess,

diff --git a/pkg/webui/console/containers/organization-form/update.js b/pkg/webui/console/containers/organization-form/update.js
@@ -97,7 +97,7 @@ const OrganizationUpdateForm = ({ onDeleteSuccess }) => {
   const handleDelete = useCallback(
     async shouldPurge => {
       try {
-        await dispatch(attachPromise(deleteOrganization(orgId, { purge: shouldPurge })))
+        await dispatch(attachPromise(deleteOrganization(orgId, { purge: shouldPurge || false })))
         toast({
           title: orgId,
           message: m.deleteSuccess,

diff --git a/pkg/webui/console/views/gateway-general-settings/index.js b/pkg/webui/console/views/gateway-general-settings/index.js
@@ -104,7 +104,7 @@ const GatewayGeneralSettingsInner = () => {
   const handleDelete = useCallback(
     async shouldPurge => {
       try {
-        await dispatch(attachPromise(deleteGateway(gtwId, shouldPurge || false)))
+        await dispatch(attachPromise(deleteGateway(gtwId, { purge: shouldPurge || false })))
         navigate('/gateways')
         toast({
           title: gtwId,