PendingCommandsList fix multiple command cancel

plgd-dev · Aug 9, 2024 · 2f8ebfc · 2f8ebfc
1 parent 5e8bb9f
commit 2f8ebfc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/http-gateway/web/src/containers/PendingCommands/PendingCommandsList/PendingCommandsList.tsx b/http-gateway/web/src/containers/PendingCommands/PendingCommandsList/PendingCommandsList.tsx
@@ -138,8 +138,8 @@ const PendingCommandsList = forwardRef<PendingCommandsListRefType, Props>((props
         try {
             setCanceling(true)
 
-            const results = selected.map((selectedHref: string) => {
-                const item = data.find((item: any) => item.resourceId.href === selectedHref)
+            const results = selected.map((selectedItem: string) => {
+                const item = data.find((item: any) => item.auditContext.correlationId === selectedItem)
                 const {
                     resourceId: { href, deviceId },
                     auditContext: { correlationId },
@@ -211,7 +211,7 @@ const PendingCommandsList = forwardRef<PendingCommandsListRefType, Props>((props
                     setSelected(selection)
                 }}
                 paginationPortalTargetId={isPage ? 'paginationPortalTarget' : undefined}
-                primaryAttribute='resourceId.href'
+                primaryAttribute='auditContext.correlationId'
                 rowHeight={!isPage ? 40 : 54}
                 unselectRowsToken={unselectRowsToken}
             />

diff --git a/...ay/web/src/containers/PendingCommands/PendingCommandsListPage/PendingCommandsListPage.tsx b/...ay/web/src/containers/PendingCommands/PendingCommandsListPage/PendingCommandsListPage.tsx
@@ -116,7 +116,7 @@ const PendingCommandsListPage = () => {
             {
                 Header: _(t.initiator),
                 accessor: 'auditContext.userId',
-                Cell: ({ value }: { value: any }) => value,
+                Cell: ({ value }: { value: any }) => <span className='no-wrap-text'>{value}</span>,
             },
 
             {