Merge pull request #2496 from RedisInsight/feature/RI-3807_Slowlog_change_ms_to_msec

#RI-3807 - SlowLog - set milliseconds by default

Author: vlad-dargel

redisinsight/api/src/modules/slow-log/slow-log-analytics.service.ts

@@ -37,8 +37,9 @@ export class SlowLogAnalyticsService extends TelemetryBaseService {
       TelemetryEvents.SlowlogSetLogSlowerThan,
       {
         databaseId,
-        previousValue,
-        currentValue,
+        // convert microseconds to milliseconds
+        previousValueInMSeconds: previousValue / 1_000,
+        currentValueInMSeconds: currentValue / 1_000,
       },
     );
   }

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.spec.tsx

@@ -56,7 +56,7 @@ describe('QueryCardHeader', () => {
     })
     await waitForEuiToolTipVisible()
 
-    expect(screen.getByTestId('execution-time-tooltip')).toHaveTextContent('12 345 678.91 ms')
+    expect(screen.getByTestId('execution-time-tooltip')).toHaveTextContent('12 345 678.91 msec')
   })
 
   it('should render disabled copy button', async () => {

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -76,14 +76,14 @@ export interface Props {
 
 const getExecutionTimeString = (value: number): string => {
   if (value < 1) {
-    return '0.001 ms'
+    return '0.001 msec'
   }
-  return `${numberWithSpaces((parseFloat((value / 1000).toFixed(3))))} ms`
+  return `${numberWithSpaces((parseFloat((value / 1000).toFixed(3))))} msec`
 }
 
 const getTruncatedExecutionTimeString = (value: number): string => {
   if (value < 1) {
-    return '0.001 ms'
+    return '0.001 msec'
   }
 
   return truncateMilliseconds(parseFloat((value / 1000).toFixed(3)))

redisinsight/ui/src/constants/durationUnits.tsx

@@ -2,7 +2,8 @@ import { EuiSuperSelectOption } from '@elastic/eui'
 
 export enum DurationUnits {
   microSeconds = 'µs',
-  milliSeconds = 'ms'
+  milliSeconds = 'ms',
+  mSeconds = 'msec',
 }
 
 export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [
@@ -12,15 +13,15 @@ export const DURATION_UNITS: EuiSuperSelectOption<DurationUnits>[] = [
     'data-test-subj': 'unit-micro-second',
   },
   {
-    inputDisplay: DurationUnits.milliSeconds,
+    inputDisplay: 'msec',
     value: DurationUnits.milliSeconds,
     'data-test-subj': 'unit-milli-second',
   },
 ]
 
 export const MINUS_ONE = -1
 export const DEFAULT_SLOWLOG_MAX_LEN = 128
-export const DEFAULT_SLOWLOG_SLOWER_THAN = 10_000
-export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.microSeconds
+export const DEFAULT_SLOWLOG_SLOWER_THAN = 10
+export const DEFAULT_SLOWLOG_DURATION_UNIT = DurationUnits.milliSeconds
 
 export default DURATION_UNITS

redisinsight/ui/src/mocks/data/oauth.ts

@@ -0,0 +1,9 @@
+export const OAUTH_CLOUD_CAPI_KEYS_DATA = [
+  {
+    id: '1',
+    name: 'RedisInsight-f4868252-a128-4a02-af75-bd3c99898267-2020-11-01T-123',
+    createdAt: '2023-08-02T09:07:41.680Z',
+    lastUsed: '2023-08-02T09:07:41.680Z',
+    valid: true,
+  }
+]

redisinsight/ui/src/mocks/handlers/index.ts

@@ -6,6 +6,7 @@ import analytics from './analytics'
 import browser from './browser'
 import recommendations from './recommendations'
 import triggeredFunctions from './triggeredFunctions'
+import cloud from './oauth'
 
 // @ts-ignore
 export const handlers: RestHandler<MockedRequest>[] = [].concat(
@@ -16,4 +17,5 @@ export const handlers: RestHandler<MockedRequest>[] = [].concat(
   browser,
   recommendations,
   triggeredFunctions,
+  cloud,
 )

redisinsight/ui/src/mocks/handlers/oauth/cloud.ts

@@ -0,0 +1,17 @@
+import { rest, RestHandler } from 'msw'
+import { getMswURL } from 'uiSrc/utils/test-utils'
+import { ApiEndpoints } from 'uiSrc/constants'
+import { OAUTH_CLOUD_CAPI_KEYS_DATA } from 'uiSrc/mocks/data/oauth'
+
+const handlers: RestHandler[] = [
+  // fetch cloud capi keys
+  rest.get(
+    getMswURL(ApiEndpoints.CLOUD_CAPI_KEYS),
+    async (_req, res, ctx) => res(
+      ctx.status(200),
+      ctx.json(OAUTH_CLOUD_CAPI_KEYS_DATA),
+    )
+  ),
+]
+
+export default handlers

redisinsight/ui/src/mocks/handlers/oauth/index.ts

@@ -0,0 +1,6 @@
+import { DefaultBodyType, MockedRequest, RestHandler } from 'msw'
+
+import cloud from './cloud'
+
+const handlers: RestHandler<MockedRequest<DefaultBodyType>>[] = [].concat(cloud)
+export default handlers

redisinsight/ui/src/pages/browser/components/stream-details/consumers-view/ConsumersViewWrapper.tsx

@@ -138,7 +138,7 @@ const ConsumersViewWrapper = (props: Props) => {
     },
     {
       id: 'idle',
-      label: 'Idle Time, ms',
+      label: 'Idle Time, msec',
       minWidth: 140,
       maxWidth: 140,
       absoluteWidth: 140,

redisinsight/ui/src/pages/browser/components/stream-details/messages-view/MessageClaimPopover/MessageClaimPopover.tsx

@@ -212,7 +212,7 @@ const MessageClaimPopover = (props: Props) => {
                 placeholder="0"
                 className={styles.fieldWithAppend}
                 value={formik.values.minIdleTime}
-                append="ms"
+                append="msec"
                 onChange={(e: ChangeEvent<HTMLInputElement>) => {
                   formik.setFieldValue(
                     e.target.name,
@@ -238,7 +238,7 @@ const MessageClaimPopover = (props: Props) => {
                     placeholder="0"
                     className={styles.fieldWithAppend}
                     value={formik.values.timeCount}
-                    append="ms"
+                    append="msec"
                     onChange={(e: ChangeEvent<HTMLInputElement>) => {
                       formik.setFieldValue(
                         e.target.name,