✨ Added record version to app logs

kloudlite · Mar 14, 2024 · fb3d244 · fb3d244
1 parent 49f42e9
commit fb3d244
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 29 deletions.
diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
@@ -945,6 +945,7 @@ mutation consoleDeleteApp($projectName: String!, $envName: String!, $appName: St
 query consoleGetApp($projectName: String!, $envName: String!, $name: String!) {
   core_getApp(projectName: $projectName, envName: $envName, name: $name) {
     id
+    recordVersion
     createdBy {
       userEmail
       userId

diff --git a/lib/client/components/logger/index.tsx b/lib/client/components/logger/index.tsx
@@ -71,6 +71,7 @@ export interface IuseLog {
   account: string;
   cluster: string;
   trackingId: string;
+  recordVersion?: number;
 }
 
 const hoverClass = `hover:bg-[#ddd]`;

diff --git a/lib/client/helpers/socket/useSockLogs.tsx b/lib/client/helpers/socket/useSockLogs.tsx
@@ -7,19 +7,28 @@ interface IuseLog {
   account: string;
   cluster: string;
   trackingId: string;
+  recordVersion?: number;
 }
 
-export const useSocketLogs = ({ account, cluster, trackingId }: IuseLog) => {
+export const useSocketLogs = ({
+  account,
+  cluster,
+  trackingId,
+  recordVersion,
+}: IuseLog) => {
   const [logs, setLogs] = useState<ISocketResp<ILog>[]>([]);
   const { responses, infos, subscribed, errors } = useSubscribe(
     {
       for: 'logs',
       data: {
         id: `${account}.${cluster}.${trackingId}`,
         spec: {
-          account,
-          cluster,
-          trackingId,
+          ...{
+            account,
+            cluster,
+            trackingId,
+            recordVersion,
+          },
         },
       },
     },

diff --git a/...nsole/routes/_main+/$account+/$project+/$environment+/app+/$app+/logs-n-metrics/route.tsx b/...nsole/routes/_main+/$account+/$project+/$environment+/app+/$app+/logs-n-metrics/route.tsx
@@ -243,6 +243,7 @@ const LogsAndMetrics = () => {
               account: parseName(account),
               cluster: project.clusterName || '',
               trackingId: app.id,
+              recordVersion: app.recordVersion,
             },
           }}
         />

diff --git a/src/apps/console/routes/test2/_index.tsx b/src/apps/console/routes/test2/_index.tsx
diff --git a/src/apps/console/server/gql/queries/app-queries.ts b/src/apps/console/server/gql/queries/app-queries.ts
@@ -34,7 +34,7 @@ export const appQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleRestartAppQuery) => data.core_restartApp,
-      vars: (_: ConsoleRestartAppQueryVariables) => { },
+      vars: (_: ConsoleRestartAppQueryVariables) => {},
     }
   ),
   createApp: executor(
@@ -55,7 +55,7 @@ export const appQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleCreateAppMutation) => data.core_createApp,
-      vars(_: ConsoleCreateAppMutationVariables) { },
+      vars(_: ConsoleCreateAppMutationVariables) {},
     }
   ),
 
@@ -79,7 +79,7 @@ export const appQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleUpdateAppMutation) => {
         return data.core_updateApp;
       },
-      vars(_: ConsoleUpdateAppMutationVariables) { },
+      vars(_: ConsoleUpdateAppMutationVariables) {},
     }
   ),
   interceptApp: executor(
@@ -103,7 +103,7 @@ export const appQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleInterceptAppMutation) =>
         data.core_interceptApp,
-      vars(_: ConsoleInterceptAppMutationVariables) { },
+      vars(_: ConsoleInterceptAppMutationVariables) {},
     }
   ),
   deleteApp: executor(
@@ -122,7 +122,7 @@ export const appQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleDeleteAppMutation) => data.core_deleteApp,
-      vars(_: ConsoleDeleteAppMutationVariables) { },
+      vars(_: ConsoleDeleteAppMutationVariables) {},
     }
   ),
   getApp: executor(
@@ -134,6 +134,7 @@ export const appQueries = (executor: IExecutor) => ({
       ) {
         core_getApp(projectName: $projectName, envName: $envName, name: $name) {
           id
+          recordVersion
           createdBy {
             userEmail
             userId
@@ -274,7 +275,7 @@ export const appQueries = (executor: IExecutor) => ({
       transformer(data: ConsoleGetAppQuery) {
         return data.core_getApp;
       },
-      vars(_: ConsoleGetAppQueryVariables) { },
+      vars(_: ConsoleGetAppQueryVariables) {},
     }
   ),
   listApps: executor(
@@ -424,7 +425,7 @@ export const appQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleListAppsQuery) => data.core_listApps,
-      vars(_: ConsoleListAppsQueryVariables) { },
+      vars(_: ConsoleListAppsQueryVariables) {},
     }
   ),
 });
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
@@ -2438,6 +2438,7 @@ export type ConsoleGetAppQueryVariables = Exact<{
 export type ConsoleGetAppQuery = {
   core_getApp?: {
     id: string;
+    recordVersion: number;
     creationTime: any;
     displayName: string;
     enabled?: boolean;