refactoring, renaming

Author: glasstiger

packages/web-console/src/components/TopBar/toolbar.tsx

@@ -21,7 +21,7 @@ import { PopperHover, Placement } from "../"
 import { useTheme } from "styled-components"
 import { TelemetryTable } from "../../consts";
 import { TelemetryConfigShape } from "../../store/Telemetry/types";
-import { sendEntTelemetry } from "../../utils/telemetry";
+import { sendServerInfoTelemetry } from "../../utils/telemetry";
 
 const EnvIconWrapper = styled.div<{ $background?: string }>`
   display: flex;
@@ -423,8 +423,8 @@ export const Toolbar = () => {
 
         const response = await quest.query<TelemetryConfigShape>(`${TelemetryTable.CONFIG} limit -1`)
         if (response.type === QuestDB.Type.DQL && response.count === 1) {
-          const config = response.data[0] as TelemetryConfigShape
-          sendEntTelemetry(config)
+          const serverInfo = response.data[0] as TelemetryConfigShape
+          sendServerInfoTelemetry(serverInfo)
         }
         return
       }

packages/web-console/src/store/Telemetry/epics.ts

@@ -36,19 +36,18 @@ import {
   TelemetryAction,
   TelemetryAT,
   TelemetryConfigShape,
-  TelemetryRemoteConfigShape,
 } from "../../types"
 
 import { fromFetch } from "../../utils"
 import * as QuestDB from "../../utils/questdb"
 import { getValue } from "../../utils/localStorage"
 import { StoreKey } from "../../utils/localStorage/types"
 import { AuthPayload } from "../../modules/OAuth2/types"
-import { sendEntTelemetry } from "../../utils/telemetry";
+import { sendServerInfoTelemetry, getTelemetryTimestamp } from "../../utils/telemetry";
 
 const quest = new QuestDB.Client()
 
-export const getConfig: Epic<StoreAction, TelemetryAction, StoreShape> = (
+export const getServerInfo: Epic<StoreAction, TelemetryAction, StoreShape> = (
   action$,
 ) =>
   action$.pipe(
@@ -92,31 +91,19 @@ export const getConfig: Epic<StoreAction, TelemetryAction, StoreShape> = (
     }),
   )
 
-export const getRemoteConfig: Epic<StoreAction, TelemetryAction, StoreShape> = (
+export const getLatestTelemetryTimestamp: Epic<StoreAction, TelemetryAction, StoreShape> = (
   action$,
   state$,
 ) =>
   action$.pipe(
     ofType<StoreAction, SetTelemetryConfigAction>(TelemetryAT.SET_CONFIG),
     withLatestFrom(state$),
     switchMap(([_, state]) => {
-      const config = selectors.telemetry.getConfig(state)
-      if (config) {
-          sendEntTelemetry(config)
-      }
-
-      if (config?.enabled) {
-        return fromFetch<Partial<TelemetryRemoteConfigShape>>(
-          `${API}/config`,
-          {
-            method: "POST",
-            body: JSON.stringify(config),
-          },
-          false,
-        )
+      const serverInfo = selectors.telemetry.getConfig(state)
+      if (serverInfo) {
+          sendServerInfoTelemetry(serverInfo)
       }
-
-      return NEVER
+      return getTelemetryTimestamp(serverInfo)
     }),
     switchMap((response) => {
       if (response.error) {
@@ -224,4 +211,4 @@ export const startTelemetry: Epic<StoreAction, TelemetryAction, StoreShape> = (
     }),
   )
 
-export default [getConfig, getRemoteConfig, startTelemetry]
+export default [getServerInfo, getLatestTelemetryTimestamp, startTelemetry]

packages/web-console/src/utils/telemetry.ts

@@ -1,18 +1,34 @@
 import { getValue } from "./localStorage";
 import { StoreKey } from "./localStorage/types";
 import { API } from "../consts";
-import { TelemetryConfigShape } from "../store/Telemetry/types";
+import { TelemetryConfigShape, TelemetryRemoteConfigShape } from "../store/Telemetry/types";
+import { fromFetch } from "./fromFetch";
+import { NEVER } from "rxjs"
 
-export const sendEntTelemetry = (config: Readonly<TelemetryConfigShape>) => {
+export const sendServerInfoTelemetry = (serverInfo: Readonly<TelemetryConfigShape>) => {
   const releaseType = getValue(StoreKey.RELEASE_TYPE);
-  if (releaseType === "EE" || config?.enabled) {
+  if (releaseType === "EE" || serverInfo?.enabled) {
     fetch(`${API}/add-ent`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify({...config, releaseType}),
+      body: JSON.stringify({...serverInfo, releaseType}),
     }).catch(() => {
     })
   }
 }
+
+export const getTelemetryTimestamp = (serverInfo: Readonly<TelemetryConfigShape> | undefined) => {
+  if (serverInfo?.enabled) {
+    return fromFetch<Partial<TelemetryRemoteConfigShape>>(
+      `${API}/config`,
+      {
+        method: "POST",
+        body: JSON.stringify(serverInfo),
+      },
+      false,
+    )
+  }
+  return NEVER
+}