Merge pull request #1753 from sbenmoussati/bugfix/presence-meeting

SDA-4069 Meeting status displayed in sys tray

src/app/presence-status-handler.ts

@@ -139,10 +139,21 @@ class PresenceStatus {
         visible: isMana,
         enabled: false,
       },
+      {
+        label: i18n.t(
+          EPresenceStatusCategory.IN_A_MEETING,
+          presenceNamespace,
+        )(),
+        type: 'checkbox',
+        visible:
+          isMana && presence.statusGroup === EPresenceStatusGroup.MEETING,
+        checked: presence.statusGroup === EPresenceStatusGroup.MEETING,
+      },
       {
         label: i18n.t(EPresenceStatusCategory.AVAILABLE, presenceNamespace)(),
         type: 'checkbox',
-        visible: isMana,
+        visible:
+          isMana && presence.statusGroup !== EPresenceStatusGroup.MEETING,
         checked: presence.statusGroup === EPresenceStatusGroup.ONLINE,
         click: () => {
           this.handlePresenceChange(

src/app/window-utils.ts

@@ -18,11 +18,7 @@ import * as filesize from 'filesize';
 import * as fs from 'fs';
 import * as path from 'path';
 import { format, parse } from 'url';
-import {
-  apiName,
-  EPresenceStatusGroup,
-  // IStatusBadge,
-} from '../common/api-interface';
+import { apiName, EPresenceStatusGroup } from '../common/api-interface';
 
 import { isDevEnv, isLinux, isMac, isWindowsOS } from '../common/env';
 import { i18n, LocaleType } from '../common/i18n';
@@ -284,11 +280,11 @@ export const showBadgeCount = (count: number): void => {
 
   // get badge img from renderer process, will return
   // img dataUrl in setDataUrl func.
-  if (count > 0) {
+  const status = presenceStatusStore.getPresence();
+  if (count > 0 && status.statusGroup !== EPresenceStatusGroup.OFFLINE) {
     mainWebContents.send('create-badge-data-url', { count });
     return;
   } else {
-    const status = presenceStatusStore.getPresence();
     const backgroundImage = presenceStatusStore.generateImagePath(
       status.statusGroup,
       'taskbar',

src/locale/en-US.json

@@ -249,7 +249,8 @@
     "BUSY": "Busy",
     "AVAILABLE": "Available",
     "OUT_OF_OFFICE": "Out of office",
-    "BE_RIGHT_BACK": "Be right back"
+    "BE_RIGHT_BACK": "Be right back",
+    "IN_A_MEETING": "In a meeting"
   },
   "Status": "Status"
 }

src/locale/en.json

@@ -249,7 +249,8 @@
     "BUSY": "Busy",
     "AVAILABLE": "Available",
     "OUT_OF_OFFICE": "Out of office",
-    "BE_RIGHT_BACK": "Be right back"
+    "BE_RIGHT_BACK": "Be right back",
+    "IN_A_MEETING": "In a meeting"
   },
   "Status": "Status"
 }