Merge pull request #1415 from RedisInsight/fe/bugfix/RI-3749

#RI-3749 - fix last field deletion context for list, zset, set data types

Author: AlenaSY

redisinsight/ui/src/pages/browser/components/key-details-remove-items/remove-list-elements/RemoveListElements.tsx

@@ -40,7 +40,8 @@ import {
 import styles from '../styles.module.scss'
 
 export interface Props {
-  onCancel: () => void;
+  onCancel: () => void
+  onRemoveKey: () => void
 }
 
 const optionsDestinations: EuiSuperSelectOption<string>[] = [
@@ -55,7 +56,7 @@ const optionsDestinations: EuiSuperSelectOption<string>[] = [
 ]
 
 const RemoveListElements = (props: Props) => {
-  const { onCancel } = props
+  const { onCancel, onRemoveKey } = props
 
   const [count, setCount] = useState<string>('')
   const [destination, setDestination] = useState<ListElementDestination>(TAIL_DESTINATION)
@@ -119,7 +120,8 @@ const RemoveListElements = (props: Props) => {
     setIsPopoverOpen(false)
   }
 
-  const onSuccessRemoved = () => {
+  const onSuccessRemoved = (newTotal: number) => {
+    if (newTotal <= 0) onRemoveKey()
     onCancel()
     sendEventTelemetry({
       event: getBasedOnViewTypeEvent(

redisinsight/ui/src/pages/browser/components/key-details/KeyDetails/KeyDetails.tsx

@@ -123,8 +123,8 @@ const KeyDetails = ({ ...props }: Props) => {
   }
 
   const TypeDetails: any = {
-    [KeyTypes.ZSet]: <ZSetDetails isFooterOpen={isAddItemPanelOpen} />,
-    [KeyTypes.Set]: <SetDetails isFooterOpen={isAddItemPanelOpen} />,
+    [KeyTypes.ZSet]: <ZSetDetails isFooterOpen={isAddItemPanelOpen} onRemoveKey={onRemoveKey} />,
+    [KeyTypes.Set]: <SetDetails isFooterOpen={isAddItemPanelOpen} onRemoveKey={onRemoveKey} />,
     [KeyTypes.String]: (
       <StringDetails
         isEditItem={editItem}
@@ -224,7 +224,7 @@ const KeyDetails = ({ ...props }: Props) => {
                 {isRemoveItemPanelOpen && (
                   <div className={cx('formFooterBar', styles.contentActive)}>
                     {selectedKeyType === KeyTypes.List && (
-                      <RemoveListElements onCancel={closeRemoveItemPanel} />
+                      <RemoveListElements onCancel={closeRemoveItemPanel} onRemoveKey={onRemoveKey} />
                     )}
                   </div>
                 )}

redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx

@@ -51,10 +51,11 @@ const cellCache = new CellMeasurerCache({
 
 export interface Props {
   isFooterOpen: boolean
+  onRemoveKey: () => void
 }
 
 const SetDetails = (props: Props) => {
-  const { isFooterOpen } = props
+  const { isFooterOpen, onRemoveKey } = props
 
   const { loading } = useSelector(setSelector)
   const { members: loadedMembers, total, nextCursor } = useSelector(setDataSelector)
@@ -100,7 +101,8 @@ const SetDetails = (props: Props) => {
     setDeleting(`${member + suffix}`)
   }
 
-  const onSuccessRemoved = () => {
+  const onSuccessRemoved = (newTotal: number) => {
+    newTotal === 0 && onRemoveKey()
     sendEventTelemetry({
       event: getBasedOnViewTypeEvent(
         viewType,

redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx

@@ -61,10 +61,11 @@ interface IZsetMember extends ZsetMember {
 
 export interface Props {
   isFooterOpen: boolean
+  onRemoveKey: () => void
 }
 
 const ZSetDetails = (props: Props) => {
-  const { isFooterOpen } = props
+  const { isFooterOpen, onRemoveKey } = props
 
   const { loading, searching } = useSelector(zsetSelector)
   const { loading: updateLoading } = useSelector(updateZsetScoreStateSelector)
@@ -119,7 +120,8 @@ const ZSetDetails = (props: Props) => {
     setDeleting(`${member + suffix}`)
   }, [])
 
-  const onSuccessRemoved = () => {
+  const onSuccessRemoved = (newTotal: number) => {
+    newTotal === 0 && onRemoveKey()
     sendEventTelemetry({
       event: getBasedOnViewTypeEvent(
         viewType,

redisinsight/ui/src/slices/browser/list.ts

@@ -429,7 +429,7 @@ export function insertListElementsAction(
 // Asynchronous thunk action
 export function deleteListElementsAction(
   data: DeleteListElementsDto,
-  onSuccessAction?: () => void,
+  onSuccessAction?: (newTotal: number) => void,
   onFailAction?: () => void
 ) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
@@ -445,9 +445,11 @@ export function deleteListElementsAction(
         { data, params: { encoding } },
       )
       if (isStatusSuccessful(status)) {
-        onSuccessAction?.()
+        const newTotal = state.browser.list.data?.total - data.count
+
+        onSuccessAction?.(newTotal)
         dispatch(deleteListElementsSuccess())
-        if (state.browser.list.data?.total - data.count > 0) {
+        if (newTotal > 0) {
           dispatch<any>(fetchKeyInfo(data.keyName))
           dispatch(addMessageNotification(
             successMessages.REMOVED_LIST_ELEMENTS(

redisinsight/ui/src/slices/browser/set.ts

@@ -310,7 +310,7 @@ export function addSetMembersAction(
 export function deleteSetMembers(
   key: RedisResponseBuffer,
   members: RedisResponseBuffer[],
-  onSuccessAction?: () => void,
+  onSuccessAction?: (newTotal: number) => void,
 ) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
     dispatch(removeSetMembers())
@@ -333,8 +333,9 @@ export function deleteSetMembers(
       )
 
       if (isStatusSuccessful(status)) {
-        onSuccessAction?.()
         const newTotalValue = state.browser.set.data.total - data.affected
+
+        onSuccessAction?.(newTotalValue)
         dispatch(removeSetMembersSuccess())
         dispatch(removeMembersFromList(members))
         if (newTotalValue > 0) {

redisinsight/ui/src/slices/browser/zset.ts

@@ -351,7 +351,7 @@ export function fetchAddZSetMembers(
 export function deleteZSetMembers(
   key: RedisResponseBuffer,
   members: RedisResponseBuffer[],
-  onSuccessAction?: () => void,
+  onSuccessAction?: (newTotal: number) => void,
 ) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
     dispatch(removeZsetMembers())
@@ -372,8 +372,9 @@ export function deleteZSetMembers(
         }
       )
       if (isStatusSuccessful(status)) {
-        onSuccessAction?.()
         const newTotalValue = state.browser.zset.data.total - data.affected
+
+        onSuccessAction?.(newTotalValue)
         dispatch(removeZsetMembersSuccess())
         dispatch(removeMembersFromList(members))
         if (newTotalValue > 0) {