#RI-5378 - fix telemetry events

Author: rsergeenko

redisinsight/ui/src/pages/browser/modules/key-details/components/hash-details/HashDetails.tsx

@@ -31,9 +31,11 @@ const HashDetails = (props: Props) => {
     onOpenAddItemPanel()
   }
 
-  const closeAddItemPanel = () => {
+  const closeAddItemPanel = (isCancelled?: boolean) => {
     setIsAddItemPanelOpen(false)
-    onCloseAddItemPanel()
+    if (isCancelled) {
+      onCloseAddItemPanel()
+    }
   }
 
   const Actions = ({ width }: { width: number }) => (

redisinsight/ui/src/pages/browser/modules/key-details/components/hash-details/add-hash-fields/AddHashFields.tsx

@@ -23,10 +23,9 @@ import AddItemsActions from 'uiSrc/pages/browser/components/add-items-actions/Ad
 
 import { stringToBuffer } from 'uiSrc/utils'
 import { AddFieldsToHashDto } from 'apiSrc/modules/browser/dto/hash.dto'
-import styles from '../styles.module.scss'
 
 export interface Props {
-  onCancel: (isCancelled?: boolean) => void;
+  onCancel: (isCancelled?: boolean) => void
 }
 
 export interface IHashFieldState {

redisinsight/ui/src/pages/browser/modules/key-details/components/list-details/ListDetails.tsx

@@ -36,9 +36,11 @@ const ListDetails = (props: Props) => {
     onOpenAddItemPanel()
   }
 
-  const closeAddItemPanel = () => {
+  const closeAddItemPanel = (isCancelled?: boolean) => {
     setIsAddItemPanelOpen(false)
-    onCloseAddItemPanel()
+    if (isCancelled) {
+      onCloseAddItemPanel()
+    }
   }
 
   const closeRemoveItemPanel = () => {

redisinsight/ui/src/pages/browser/modules/key-details/components/list-details/add-list-elements/AddListElements.tsx

@@ -25,7 +25,7 @@ import { PushElementToListDto } from 'apiSrc/modules/browser/dto'
 import styles from '../styles.module.scss'
 
 export interface Props {
-  onCancel: (isCancelled?: boolean) => void;
+  onCancel: (isCancelled?: boolean) => void
 }
 
 export enum ListElementDestination {

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

@@ -40,7 +40,7 @@ import {
 import styles from './styles.module.scss'
 
 export interface Props {
-  onCancel: () => void
+  onCancel: (isCancelled?: boolean) => void
   onRemoveKey: () => void
 }
 
@@ -278,7 +278,7 @@ const RemoveListElements = (props: Props) => {
         <EuiFlexGroup justifyContent="flexEnd" gutterSize="l">
           <EuiFlexItem grow={false}>
             <div>
-              <EuiButton color="secondary" onClick={() => onCancel()} data-testid="cancel-elements-btn">
+              <EuiButton color="secondary" onClick={() => onCancel(true)} data-testid="cancel-elements-btn">
                 <EuiTextColor color="default">Cancel</EuiTextColor>
               </EuiButton>
             </div>

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

@@ -31,9 +31,11 @@ const SetDetails = (props: Props) => {
     onOpenAddItemPanel()
   }
 
-  const closeAddItemPanel = () => {
+  const closeAddItemPanel = (isCancelled?: boolean) => {
     setIsAddItemPanelOpen(false)
-    onCloseAddItemPanel()
+    if (isCancelled) {
+      onCloseAddItemPanel()
+    }
   }
 
   const Actions = ({ width }: { width: number }) => (

redisinsight/ui/src/pages/browser/modules/key-details/components/set-details/add-set-members/AddSetMembers.tsx

@@ -22,7 +22,7 @@ import AddItemsActions from 'uiSrc/pages/browser/components/add-items-actions/Ad
 import { AddZsetFormConfig as config } from 'uiSrc/pages/browser/components/add-key/constants/fields-config'
 
 export interface Props {
-  onCancel: (isCancelled?: boolean) => void;
+  onCancel: (isCancelled?: boolean) => void
 }
 
 export interface ISetMemberState {
@@ -154,7 +154,6 @@ const AddSetMembers = (props: Props) => {
                 length={members.length}
                 addItem={addMember}
                 removeItem={removeMember}
-                removeCanClear
                 clearIsDisabled={isClearDisabled(item)}
                 clearItemValues={clearMemberValues}
                 loading={loading}

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

@@ -31,9 +31,12 @@ const ZSetDetails = (props: Props) => {
     onOpenAddItemPanel()
   }
 
-  const closeAddItemPanel = () => {
+  const closeAddItemPanel = (isCancelled?: boolean) => {
     setIsAddItemPanelOpen(false)
-    onCloseAddItemPanel()
+
+    if (isCancelled) {
+      onCloseAddItemPanel()
+    }
   }
 
   const Actions = ({ width }: { width: number }) => (

redisinsight/ui/src/pages/browser/modules/key-details/components/zset-details/add-zset-members/AddZsetMembers.tsx

@@ -25,13 +25,13 @@ import { AddZsetFormConfig as config } from 'uiSrc/pages/browser/components/add-
 import AddItemsActions from 'uiSrc/pages/browser/components/add-items-actions/AddItemsActions'
 
 export interface Props {
-  onCancel: (isCancelled?: boolean) => void;
+  onCancel: (isCancelled?: boolean) => void
 }
 
 export interface IZsetMemberState {
-  name: string;
-  score: string;
-  id: number;
+  name: string
+  score: string
+  id: number
 }
 
 export const INITIAL_ZSET_MEMBER_STATE: IZsetMemberState = {
@@ -222,7 +222,6 @@ const AddZsetMembers = (props: Props) => {
                 length={members.length}
                 addItem={addMember}
                 removeItem={removeMember}
-                removeCanClear
                 clearIsDisabled={isClearDisabled(item)}
                 addItemIsDisabled={members.some((item) => !item.score.length)}
                 clearItemValues={clearMemberValues}