From 7bdc70ed282d420a3fec111a7a550298669f9556 Mon Sep 17 00:00:00 2001
From: Romaric Mourgues <rmourgues@linagora.com>
Date: Fri, 30 Sep 2022 12:18:21 +0200
Subject: [PATCH 1/3] Update knowledge graph

---
 .../core/platform/services/knowledge-graph/api-client.ts  | 3 +++
 .../src/core/platform/services/knowledge-graph/index.ts   | 8 ++++++--
 .../src/app/features/users/hooks/use-notifications.ts     | 3 ---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts b/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
index 67c1e4646f..5e99b90651 100644
--- a/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
+++ b/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
@@ -104,6 +104,7 @@ export default class KnowledgeGraphAPIClient {
               channel_name: channel.name,
               channel_owner: channel.owner,
               workspace_id: channel.workspace_id,
+              company_id: channel.company_id,
             },
           },
         },
@@ -134,6 +135,8 @@ export default class KnowledgeGraphAPIClient {
               message_updated_at: message.updated_at.toLocaleString(),
               user_id: message.user_id,
               channel_id: channelId,
+              workspace_id: message.cache?.workspace_id,
+              company_id: message.cache?.company_id,
             },
           },
         },
diff --git a/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts b/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
index fb8012b437..73b2976213 100644
--- a/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
+++ b/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
@@ -135,12 +135,16 @@ export default class KnowledgeGraphService
     const user = userId ? await gr.services.users.get({ id: userId }) : null;
     const forwardedCompanies = this.getConfigurationEntry<string[]>("forwarded_companies");
     const isCompanyForwarded = !!(companyIds || []).find(v => forwardedCompanies.includes(v));
-    return (!userId || (user && user.preferences.knowledge_graph !== "nothing")) &&
+    if (user?.preferences && !user.preferences.knowledge_graph)
+      user.preferences.knowledge_graph = "metadata";
+    return (!userId || (user && user.preferences?.knowledge_graph !== "nothing")) &&
       (!companyIds ||
         companyIds.length === 0 ||
         isCompanyForwarded ||
         forwardedCompanies.length === 0)
-      ? (user.preferences.knowledge_graph as "all" | "metadata")
+      ? user
+        ? (user.preferences.knowledge_graph as "all" | "metadata")
+        : "all"
       : false;
   }
 
diff --git a/twake/frontend/src/app/features/users/hooks/use-notifications.ts b/twake/frontend/src/app/features/users/hooks/use-notifications.ts
index e314887208..0a53358b0b 100644
--- a/twake/frontend/src/app/features/users/hooks/use-notifications.ts
+++ b/twake/frontend/src/app/features/users/hooks/use-notifications.ts
@@ -85,9 +85,6 @@ export const useNotifications = () => {
           'id',
         );
         setBadges(list);
-        list.map(notification => {
-          userNotificationApiClient.acknowledge(notification);
-        });
       },
     [setBadges, badges],
   );

From 112d6361395c99931986cfc8faafb9953edc0653 Mon Sep 17 00:00:00 2001
From: Romaric Mourgues <rmourgues@linagora.com>
Date: Fri, 30 Sep 2022 12:24:20 +0200
Subject: [PATCH 2/3] Fix #2546

---
 .../channels-bar/Parts/Channel/Channel.tsx    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/twake/frontend/src/app/views/client/channels-bar/Parts/Channel/Channel.tsx b/twake/frontend/src/app/views/client/channels-bar/Parts/Channel/Channel.tsx
index 5551b4b323..fc53faa6ca 100755
--- a/twake/frontend/src/app/views/client/channels-bar/Parts/Channel/Channel.tsx
+++ b/twake/frontend/src/app/views/client/channels-bar/Parts/Channel/Channel.tsx
@@ -116,22 +116,23 @@ export default (props: Props) => {
               <Beacon tag="channel_bar_component" />
             </div>
           )}
-          {Math.max(props.mentions + props.replies, props.unreadMessages) > 0 && (
-            <div
-              className={
-                'text-xs font-medium h-5 px-1.5 flex items-center justify-center text-sm rounded-full ml-1' +
-                (props.notificationLevel === 'all' ||
-                (props.mentions + props.replies > 0 && props.notificationLevel !== 'none')
-                  ? blueBadgeClassName
-                  : grayBadgeClassName)
-              }
-            >
-              {Math.min(
-                99,
-                Math.max(1, Math.max(props.mentions + props.replies, props.unreadMessages)),
-              )}
-            </div>
-          )}
+          {!(props.visibility === 'direct' && props.mentions + props.replies === 0) &&
+            Math.max(props.mentions + props.replies, props.unreadMessages) > 0 && (
+              <div
+                className={
+                  'text-xs font-medium h-5 px-1.5 flex items-center justify-center text-sm rounded-full ml-1' +
+                  (props.notificationLevel === 'all' ||
+                  (props.mentions + props.replies > 0 && props.notificationLevel !== 'none')
+                    ? blueBadgeClassName
+                    : grayBadgeClassName)
+                }
+              >
+                {Math.min(
+                  99,
+                  Math.max(1, Math.max(props.mentions + props.replies, props.unreadMessages)),
+                )}
+              </div>
+            )}
           {props.menu}
         </div>
       </div>

From 8156ed73bff7f56b9b2d6c058a41eda4d794883b Mon Sep 17 00:00:00 2001
From: Romaric Mourgues <rmourgues@linagora.com>
Date: Fri, 30 Sep 2022 12:31:06 +0200
Subject: [PATCH 3/3] Fix #2527

---
 .../src/app/features/global/framework/api-service.ts      | 8 ++++----
 .../app/features/global/framework/requests-api-service.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/twake/frontend/src/app/features/global/framework/api-service.ts b/twake/frontend/src/app/features/global/framework/api-service.ts
index 6f2df49fb3..d268520adb 100755
--- a/twake/frontend/src/app/features/global/framework/api-service.ts
+++ b/twake/frontend/src/app/features/global/framework/api-service.ts
@@ -127,12 +127,12 @@ export default class Api {
       disableJWTAuthentication?: boolean;
     } = {},
   ): Promise<Response> {
-    return Api.request(route, {}, callback, raw, { ...options, requestType: 'delete' });
+    return Api.request(route, null, callback, raw, { ...options, requestType: 'delete' });
   }
 
   static request<Request extends { _grouped?: unknown }, Response>(
     route: string,
-    data: Request,
+    data: Request | null,
     callback: any = false,
     raw = false,
     options: {
@@ -140,7 +140,7 @@ export default class Api {
       requestType?: 'post' | 'get' | 'put' | 'delete';
     } = {},
   ): Promise<Response> {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       if (data && data._grouped && route === 'core/collections/init') {
         GroupedQueryApiInstance.post(route, data, callback);
         return;
@@ -149,7 +149,7 @@ export default class Api {
       Requests.request(
         options.requestType ? options.requestType : 'post',
         new URL(route, Globals.api_root_url).toString(),
-        JSON.stringify(data),
+        data === null ? '' : JSON.stringify(data),
         (resp: any) => {
           if (raw) {
             resolve(resp);
diff --git a/twake/frontend/src/app/features/global/framework/requests-api-service.ts b/twake/frontend/src/app/features/global/framework/requests-api-service.ts
index f34ef0b5b9..673b54e8a9 100755
--- a/twake/frontend/src/app/features/global/framework/requests-api-service.ts
+++ b/twake/frontend/src/app/features/global/framework/requests-api-service.ts
@@ -22,7 +22,7 @@ class Requests {
         method: type,
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
+          ...(data ? { 'Content-Type': 'application/json' } : {}),
           Authorization: JWTStorage.getAutorizationHeader(),
         },
         body: type === 'post' ? data || '{}' : undefined,