#RI-4538 - update telemetry fields names (#2115)

AmirAllayarovSofteq · web-flow · commit f4c55b1d3fb3 · 2023-05-18T13:39:42.000+03:00
diff --git a/redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts b/redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts
@@ -52,7 +52,7 @@ const mockSummaryWithErrors = Object.assign(new BulkActionSummary(), {
 const mockImportResult: IBulkActionOverview = {
   id: 'empty',
   databaseId: mockClientMetadata.databaseId,
-  type: BulkActionType.Import,
+  type: BulkActionType.Upload,
   summary: mockSummary.getOverview(),
   progress: null,
   filter: null,
@@ -63,7 +63,7 @@ const mockImportResult: IBulkActionOverview = {
 const mockEmptyImportResult: IBulkActionOverview = {
   id: 'empty',
   databaseId: mockClientMetadata.databaseId,
-  type: BulkActionType.Import,
+  type: BulkActionType.Upload,
   summary: mockEmptySummary.getOverview(),
   progress: null,
   filter: null,
diff --git a/redisinsight/api/src/modules/bulk-actions/bulk-import.service.ts b/redisinsight/api/src/modules/bulk-actions/bulk-import.service.ts
@@ -70,7 +70,7 @@ export class BulkImportService {
     const result: IBulkActionOverview = {
       id: 'empty',
       databaseId: clientMetadata.databaseId,
-      type: BulkActionType.Import,
+      type: BulkActionType.Upload,
       summary: {
         processed: 0,
         succeed: 0,
diff --git a/redisinsight/api/src/modules/bulk-actions/constants/index.ts b/redisinsight/api/src/modules/bulk-actions/constants/index.ts
@@ -6,7 +6,7 @@ export enum BulkActionsServerEvents {
 
 export enum BulkActionType {
   Delete = 'delete',
-  Import = 'import',
+  Upload = 'upload',
 }
 
 export enum BulkActionStatus {
diff --git a/redisinsight/ui/src/constants/bulkActions.ts b/redisinsight/ui/src/constants/bulkActions.ts
@@ -8,7 +8,7 @@ export enum BulkActionsServerEvent {
 
 export enum BulkActionsType {
   Delete = 'delete',
-  Import = 'import',
+  Upload = 'upload',
 }
 
 export enum BulkActionsStatus {
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActions.spec.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActions.spec.tsx
@@ -112,7 +112,7 @@ describe('BulkActions', () => {
       fireEvent.click(screen.getByTestId('bulk-action-tab-upload'))
     })
 
-    const expectedActions = [setBulkActionType(BulkActionsType.Import)]
+    const expectedActions = [setBulkActionType(BulkActionsType.Upload)]
     expect(store.getActions()).toEqual(expectedActions)
   })
 
@@ -139,8 +139,10 @@ describe('BulkActions', () => {
         event: TelemetryEvent.BULK_ACTIONS_OPENED,
         eventData: {
           databaseId: 'instanceId',
-          match: '*',
-          filterType: 'hash',
+          filter: {
+            match: '*',
+            filter: 'hash',
+          },
           action: 'delete'
         }
       });
@@ -154,8 +156,10 @@ describe('BulkActions', () => {
         eventData: {
           databaseId: 'instanceId',
           action: BulkActionsType.Delete,
-          match: '*',
-          filterType: 'hash'
+          filter: {
+            match: '*',
+            filterType: 'hash'
+          }
         }
       })
     })
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActions.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActions.tsx
@@ -46,8 +46,10 @@ const BulkActions = (props: Props) => {
       event: TelemetryEvent.BULK_ACTIONS_OPENED,
       eventData: {
         databaseId: instanceId,
-        filterType: filter,
-        match: (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH,
+        filter: {
+          filter,
+          match: (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH,
+        },
         action: type
       }
     })
@@ -69,8 +71,10 @@ const BulkActions = (props: Props) => {
     }
 
     if (type === BulkActionsType.Delete) {
-      eventData.match = (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH
-      eventData.filterType = filter
+      eventData.filter = {
+        match: (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH,
+        type: filter,
+      }
     }
 
     sendEventTelemetry({
@@ -125,7 +129,7 @@ const BulkActions = (props: Props) => {
         <div className="eui-yScroll">
           <div className={styles.contentActions} data-testid="bulk-actions-content">
             <BulkActionsTabs onChangeType={handleChangeType} />
-            {type === BulkActionsType.Import && (<BulkUpload onCancel={closePanel} />)}
+            {type === BulkActionsType.Upload && (<BulkUpload onCancel={closePanel} />)}
             {type === BulkActionsType.Delete && (<BulkDelete onCancel={closePanel} />)}
           </div>
         </div>
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionsTabs/BulkActionsTabs.spec.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionsTabs/BulkActionsTabs.spec.tsx
@@ -47,7 +47,7 @@ describe('BulkActionsTabs', () => {
       event: TelemetryEvent.BULK_ACTIONS_OPENED,
       eventData: {
         databaseId: '',
-        action: BulkActionsType.Import,
+        action: BulkActionsType.Upload,
       }
     });
 
@@ -60,8 +60,10 @@ describe('BulkActionsTabs', () => {
       eventData: {
         databaseId: '',
         action: BulkActionsType.Delete,
-        match: 'PATTERN',
-        filterType: 'set'
+        filter: {
+          match: 'PATTERN',
+          filter: 'set'
+        }
       }
     });
 
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionsTabs/BulkActionsTabs.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionsTabs/BulkActionsTabs.tsx
@@ -30,8 +30,10 @@ const BulkActionsTabs = (props: Props) => {
     }
 
     if (id === BulkActionsType.Delete) {
-      eventData.match = (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH
-      eventData.filterType = filter
+      eventData.filter = {
+        match: (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH,
+        type: filter,
+      }
     }
 
     sendEventTelemetry({
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkDelete/BulkDeleteFooter/BulkDeleteFooter.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkDelete/BulkDeleteFooter/BulkDeleteFooter.tsx
@@ -53,12 +53,16 @@ const BulkDeleteFooter = (props: Props) => {
     sendEventTelemetry({
       event: TelemetryEvent.BULK_ACTIONS_WARNING,
       eventData: {
-        filterType: filter,
-        match: matchValue,
-        scanned,
-        scannedRange: getRangeForNumber(scanned, BULK_THRESHOLD_BREAKPOINTS),
-        total,
-        totalRange: getRangeForNumber(total, BULK_THRESHOLD_BREAKPOINTS),
+        filter: {
+          match: matchValue,
+          type: filter,
+        },
+        progress: {
+          scanned,
+          scannedRange: getRangeForNumber(scanned, BULK_THRESHOLD_BREAKPOINTS),
+          total,
+          totalRange: getRangeForNumber(total, BULK_THRESHOLD_BREAKPOINTS),
+        },
         databaseId: instanceId,
         action: BulkActionsType.Delete
       }
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.spec.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.spec.tsx
@@ -131,7 +131,7 @@ describe('BulkUpload', () => {
     expect(sendEventTelemetry).toBeCalledWith({
       event: TelemetryEvent.BULK_ACTIONS_WARNING,
       eventData: {
-        action: BulkActionsType.Import,
+        action: BulkActionsType.Upload,
         databaseId: ''
       }
     })
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/BulkUpload/BulkUpload.tsx
@@ -65,7 +65,7 @@ const BulkUpload = (props: Props) => {
       event: TelemetryEvent.BULK_ACTIONS_WARNING,
       eventData: {
         databaseId: instanceId,
-        action: BulkActionsType.Import
+        action: BulkActionsType.Upload
       }
     })
   }
@@ -135,7 +135,7 @@ const BulkUpload = (props: Props) => {
           subTitle={(<div className="truncateText" style={{ paddingTop: 6 }}>{fileName}</div>)}
         >
           <BulkActionSummary
-            type={BulkActionsType.Import}
+            type={BulkActionsType.Upload}
             succeed={succeed}
             processed={processed}
             failed={failed}
diff --git a/redisinsight/ui/src/pages/browser/components/bulk-actions/constants/bulk-type-options.tsx b/redisinsight/ui/src/pages/browser/components/bulk-actions/constants/bulk-type-options.tsx
@@ -15,7 +15,7 @@ export const bulkActionsTypeTabs: BulkActionsTabs[] = [
     label: <><EuiIcon type="trash" />Delete Keys</>,
   },
   {
-    id: BulkActionsType.Import,
+    id: BulkActionsType.Upload,
     label: <><EuiIcon type={BulkUpload} />Upload Data</>,
   },
 ]

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export enum BulkActionsServerEvents {`
`6`	`6`
`7`	`7`	`export enum BulkActionType {`
`8`	`8`	`Delete = 'delete',`
`9`		`- Import = 'import',`
	`9`	`+ Upload = 'upload',`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`export enum BulkActionStatus {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export enum BulkActionsServerEvent {`
`8`	`8`
`9`	`9`	`export enum BulkActionsType {`
`10`	`10`	`Delete = 'delete',`
`11`		`- Import = 'import',`
	`11`	`+ Upload = 'upload',`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`export enum BulkActionsStatus {`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,10 @@ const BulkActionsTabs = (props: Props) => {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if (id === BulkActionsType.Delete) {`
`33`		`- eventData.match = (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH`
`34`		`- eventData.filterType = filter`
	`33`	`+ eventData.filter = {`
	`34`	`+ match: (search && search !== DEFAULT_SEARCH_MATCH) ? getMatchType(search) : DEFAULT_SEARCH_MATCH,`
	`35`	`+ type: filter,`
	`36`	`+ }`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`sendEventTelemetry({`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ describe('BulkUpload', () => {`
`131`	`131`	`expect(sendEventTelemetry).toBeCalledWith({`
`132`	`132`	`event: TelemetryEvent.BULK_ACTIONS_WARNING,`
`133`	`133`	`eventData: {`
`134`		`- action: BulkActionsType.Import,`
	`134`	`+ action: BulkActionsType.Upload,`
`135`	`135`	`databaseId: ''`
`136`	`136`	`}`
`137`	`137`	`})`