Merge branch 'master' into fix/test-cases

glific · Oct 17, 2024 · bcdfb2a · bcdfb2a
2 parents a542cd6 + 9632222
commit bcdfb2a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "glific-frontend",
-  "version": "6.1.8",
+  "version": "6.1.9",
   "private": true,
   "type": "module",
   "dependencies": {

diff --git a/src/config/apolloclient.ts b/src/config/apolloclient.ts
@@ -105,7 +105,7 @@ const gqlClient = (navigate: any) => {
       // @ts-ignore
       switch (networkError.statusCode) {
         case 401:
-          setLogs(`Error 401: logging user out`, 'error');
+          setLogs(`Error 401: logging user out,  ${JSON.stringify(networkError)}`, 'error');
           navigate('/logout/session');
           break;
         default:

diff --git a/src/config/logs.ts b/src/config/logs.ts
@@ -1,8 +1,12 @@
 import pino from 'pino';
 import { createPinoBrowserSend, createWriteStream } from 'pino-logflare';
 import { LOGFLARE_API, LOGFLARE_SOURCE } from '.';
+import { getUserSession } from 'services/AuthService';
 
 const setLogs = (message: any, type: string) => {
+  const orgId = getUserSession('organizationId');
+  const userId = getUserSession('id');
+
   let logger: any;
 
   if (LOGFLARE_API && LOGFLARE_SOURCE) {
@@ -33,11 +37,13 @@ const setLogs = (message: any, type: string) => {
       stream
     );
 
-    let logMessage = message;
+    let logMessage;
     if (typeof message === 'object') {
-      logMessage = JSON.stringify(message);
+      message = JSON.stringify(message);
     }
 
+    logMessage = `org_id: ${orgId} user_id: ${userId} [${type}] ${message}`;
+
     // log some events
     switch (type) {
       case 'info':

diff --git a/src/containers/Chat/ChatMessages/ConversationHeader/ConversationHeader.tsx b/src/containers/Chat/ChatMessages/ConversationHeader/ConversationHeader.tsx
@@ -473,8 +473,8 @@ export const ConversationHeader = ({
     options = (
       <>
         {viewDetails}
-        {addMember}
         {flowButton}
+        {addMember}
       </>
     );
   } else {