Merge pull request #6491 from TheThingsNetwork/issue/6314-console-del…

…ete-collaborator Update handleDelete of Collaborators in Console
TheThingsNetwork · Sep 1, 2023 · cd6c67d · cd6c67d
2 parents 8af1a0e + fc7792b
commit cd6c67d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 23 deletions.
diff --git a/pkg/webui/containers/collaborator-form/hooks.js b/pkg/webui/containers/collaborator-form/hooks.js
@@ -77,8 +77,9 @@ const useCollaboratorData = (entity, entityId, collaboratorId, tts) => {
   const currentUserId = useSelector(selectUserId)
   const isCurrentUser = isUser && currentUserId === collaboratorId
   const updateCollaborator = patch => tts[sdkServices[entity]].Collaborators.update(entityId, patch)
-  const removeCollaborator = collaboratorIds =>
-    tts[sdkServices[entity]].Collaborators.remove(entityId, collaboratorIds)
+  const removeCollaborator = (isUser, collaboratorIds) => {
+    tts[sdkServices[entity]].Collaborators.remove(isUser, entityId, collaboratorIds)
+  }
 
   return {
     collaborator,

diff --git a/pkg/webui/containers/collaborator-form/index.js b/pkg/webui/containers/collaborator-form/index.js
@@ -90,8 +90,6 @@ const CollaboratorForm = props => {
     removeCollaborator,
   } = useCollaboratorData(entity, entityId, collaboratorId, tts)
 
-  const collaboratorType = isCollaboratorUser ? 'user' : 'organization'
-
   const [submitError, setSubmitError] = useState(undefined)
   const navigate = useNavigate()
   const error = submitError || passedError
@@ -127,18 +125,10 @@ const CollaboratorForm = props => {
     [navigate, update, updateCollaborator],
   )
   const handleDelete = useCallback(async () => {
-    const collaborator_ids = {
-      [`${collaboratorType}_ids`]: {
-        [`${collaboratorType}_id`]: collaboratorId,
-      },
-    }
-    const updatedCollaborator = {
-      ids: collaborator_ids,
-    }
     setSubmitError(undefined)
 
     try {
-      await removeCollaborator(updatedCollaborator)
+      await removeCollaborator(isCollaboratorUser, collaboratorId)
       toast({
         message: sharedMessages.collaboratorDeleteSuccess,
         type: toast.types.SUCCESS,
@@ -147,7 +137,7 @@ const CollaboratorForm = props => {
     } catch (error) {
       setSubmitError(error)
     }
-  }, [collaboratorId, collaboratorType, navigate, removeCollaborator])
+  }, [collaboratorId, isCollaboratorUser, navigate, removeCollaborator])
 
   const initialValues = React.useMemo(() => {
     if (!collaborator) {

diff --git a/pkg/webui/lib/store/actions/collaborators.js b/pkg/webui/lib/store/actions/collaborators.js
@@ -64,9 +64,11 @@ export const [
   },
 ] = createRequestActions(
   DELETE_COLLABORATOR_BASE,
-  (parentType, parentId) => ({
+  (parentType, parentId, collaboratorId, isUser) => ({
     parentType,
     parentId,
+    collaboratorId,
+    isUser,
   }),
-  (parentType, parentId, selector) => ({ selector }),
+  (parentType, parentId, collaboratorId, isUser, selector) => ({ selector }),
 )
diff --git a/pkg/webui/lib/store/middleware/collaborators.js b/pkg/webui/lib/store/middleware/collaborators.js
@@ -73,11 +73,12 @@ export default tts => {
   const deleteCollaboratorLogic = createRequestLogic({
     type: collaborators.DELETE_COLLABORATOR,
     process: async ({ action }) => {
-      const { parentType, parentId } = action.payload
-
-      const result = await tts.Clients.Collaborators.update(parentType, parentId)
-
-      return result
+      const { parentType, parentId, collaboratorId, isUser } = action.payload
+      return await tts[entitySdkServiceMap[parentType]].Collaborators.remove(
+        isUser,
+        parentId,
+        collaboratorId,
+      )
     },
   })
 

diff --git a/sdk/js/src/service/applications.js b/sdk/js/src/service/applications.js
@@ -61,6 +61,7 @@ class Applications {
         get: 'application_ids.application_id',
         list: 'application_ids.application_id',
         set: 'application_ids.application_id',
+        delete: 'application_ids.application_id',
       },
     })
     this.Webhooks = new Webhooks(api.ApplicationWebhookRegistry)

diff --git a/sdk/js/src/service/clients.js b/sdk/js/src/service/clients.js
@@ -27,6 +27,7 @@ class Clients {
         get: 'client_ids.client_id',
         list: 'client_ids.client_id',
         set: 'client_ids.client_id',
+        delete: 'client_ids.client_id',
       },
     })
 

diff --git a/sdk/js/src/service/collaborators.js b/sdk/js/src/service/collaborators.js
@@ -77,8 +77,20 @@ class Collaborators {
     return await this.add(entityId, data)
   }
 
-  async remove(entityId, data) {
-    return await this.add(entityId, { ...data, rights: [] })
+  async remove(isUser, entityId, collaboratorId) {
+    const entityIdRoute = this._parentRoutes.delete
+    const collaboratorIdRoute = isUser
+      ? 'collaborator_ids.user_ids.user_id'
+      : 'collaborator_ids.organization_ids.organization_id'
+
+    const result = await this._api.DeleteCollaborator({
+      routeParams: {
+        [entityIdRoute]: entityId,
+        [collaboratorIdRoute]: collaboratorId,
+      },
+    })
+
+    return Marshaler.payloadSingleResponse(result)
   }
 }
 

diff --git a/sdk/js/src/service/gateways.js b/sdk/js/src/service/gateways.js
@@ -39,6 +39,7 @@ class Gateways {
         get: 'gateway_ids.gateway_id',
         list: 'gateway_ids.gateway_id',
         set: 'gateway_ids.gateway_id',
+        delete: 'gateway_ids.gateway_id',
       },
     })
     autoBind(this)

diff --git a/sdk/js/src/service/organizations.js b/sdk/js/src/service/organizations.js
@@ -36,6 +36,7 @@ class Organizations {
         get: 'organization_ids.organization_id',
         list: 'organization_ids.organization_id',
         set: 'organization_ids.organization_id',
+        delete: 'organization_ids.organization_id',
       },
     })
     autoBind(this)