Merge branch 'main' into bug-2292

microsoftgraph · Jul 14, 2023 · 19e7416 · 19e7416
2 parents f19d134 + bd17195
commit 19e7416
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/packages/mgt-components/src/components/mgt-person/mgt-person.ts b/packages/mgt-components/src/components/mgt-person/mgt-person.ts
@@ -746,25 +746,30 @@ export class MgtPerson extends MgtTemplatedComponent {
     switch (availability) {
       case 'Available':
         switch (activity) {
-          case 'Available':
-            presenceIcon = getSvg(SvgIcon.PresenceAvailable);
-            break;
           case 'OutOfOffice':
             presenceIcon = getSvg(SvgIcon.PresenceOofAvailable);
             break;
+          // OutOfOffice and Uknowns
+          case 'Available':
+          default:
+            presenceIcon = getSvg(SvgIcon.PresenceAvailable);
+            break;
         }
         break;
       case 'Busy':
         switch (activity) {
+          case 'OutOfOffice':
+          case 'OnACall':
+            presenceIcon = getSvg(SvgIcon.PresenceOofBusy);
+            break;
+          // Busy,InACall,InAConferenceCall,InAMeeting, Unknown
           case 'Busy':
           case 'InACall':
           case 'InAMeeting':
+          case 'InAConferenceCall':
+          default:
             presenceIcon = getSvg(SvgIcon.PresenceBusy);
             break;
-          case 'OutOfOffice':
-          case 'OnACall':
-            presenceIcon = getSvg(SvgIcon.PresenceOofBusy);
-            break;
         }
         break;
       case 'DoNotDisturb':

diff --git a/stories/components/peoplePicker/peoplePicker.style.js b/stories/components/peoplePicker/peoplePicker.style.js
@@ -15,7 +15,7 @@ export default {
 };
 
 export const customCSSProperties = () => html`
-<mgt-people-picker></mgt-people-picker>
+<mgt-people-picker class="people-picker"></mgt-people-picker>
 <style>
   .people-picker {
     --people-picker-selected-option-background-color: orange;

diff --git a/stories/overview.stories.mdx b/stories/overview.stories.mdx
@@ -62,26 +62,23 @@ The components are also available as [React components](https://learn.microsoft.
 
 Additionaly the following components are available as preview components. These components are not yet ready for production use and are subject to change.
 
-| Preview Component                                                                | Description                                                                                                                                      |
-| -------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [Search Box](?path=/story/preview-mgt-search-box--search-box)                    | An input box for search scenarios.                                                                                                               |
-| [Seach Results](?path=/story/preview-mgt-search-results--search-results)         | A component for executing search queries and displaying search results.                                                                          |
+| Preview Component                                                        | Description                                                             |
+| ------------------------------------------------------------------------ | ----------------------------------------------------------------------- |
+| [Search Box](?path=/story/preview-mgt-search-box--search-box)            | An input box for search scenarios.                                      |
+| [Seach Results](?path=/story/preview-mgt-search-results--search-results) | A component for executing search queries and displaying search results. |
 
 #### Providers
 
 [Providers](https://learn.microsoft.com/graph/toolkit/providers/providers) enable authentication and provide the implementation for acquiring access tokens on various platforms and expose a Microsoft Graph client for calling the Microsoft Graph APIs. The components work best when used with a provider, but the providers can be used on their own.
 
-| Providers                                                                      | Description                                                                                                                                |
-| ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------ |
-| [MSAL](https://learn.microsoft.com/graph/toolkit/providers/msal)               | Uses msal.js to sign in users and acquire tokens to use with Microsoft Graph.                                                              |
-| [MSAL2](https://learn.microsoft.com/graph/toolkit/providers/msal2)             | Uses msal-browser to sign in users and acquire tokens to use with Microsoft Graph.                                                         |
-| [SharePoint](https://learn.microsoft.com/graph/toolkit/providers/sharepoint)   | Authenticates and provides Microsoft Graph access to components inside of SharePoint web parts.                                            |
-| [Teams](https://learn.microsoft.com/graph/toolkit/providers/teams)             | Uses msal.js to sign in users and acquire tokens on the client in Microsoft Teams tabs.                                                    |
-| [Teams MSAL2](https://learn.microsoft.com/graph/toolkit/providers/teams-msal2) | Uses msal-browser to sign in users and acquire tokens in Microsoft Teams tabs. Supports Single Sign-On with custom backend.                |
-| [TeamsFx](https://learn.microsoft.com/graph/toolkit/providers/teamsfx)         | Use the TeamsFx provider inside your Microsoft Teams applications to provide Microsoft Graph Toolkit components access to Microsoft Graph. |
-| [Electron](https://learn.microsoft.com/graph/toolkit/providers/electron)       | Authenticates and provides Microsoft Graph access to components inside of Electron apps                                                    |
-| [Proxy](https://learn.microsoft.com/graph/toolkit/providers/proxy)             | Allows the use of backend authentication by routing all calls to Microsoft Graph through your backend.                                     |
-| [Custom](https://learn.microsoft.com/graph/toolkit/providers/custom)           | Create a custom provider to enable authentication and access to Microsoft Graph with your application's existing authentication code.      |
+| Providers                                                                    | Description                                                                                                                                |
+| ---------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| [MSAL2](https://learn.microsoft.com/graph/toolkit/providers/msal2)           | Uses msal-browser to sign in users and acquire tokens to use with Microsoft Graph.                                                         |
+| [SharePoint](https://learn.microsoft.com/graph/toolkit/providers/sharepoint) | Authenticates and provides Microsoft Graph access to components inside of SharePoint web parts.                                            |
+| [TeamsFx](https://learn.microsoft.com/graph/toolkit/providers/teamsfx)       | Use the TeamsFx provider inside your Microsoft Teams applications to provide Microsoft Graph Toolkit components access to Microsoft Graph. |
+| [Electron](https://learn.microsoft.com/graph/toolkit/providers/electron)     | Authenticates and provides Microsoft Graph access to components inside of Electron apps                                                    |
+| [Proxy](https://learn.microsoft.com/graph/toolkit/providers/proxy)           | Allows the use of backend authentication by routing all calls to Microsoft Graph through your backend.                                     |
+| [Custom](https://learn.microsoft.com/graph/toolkit/providers/custom)         | Create a custom provider to enable authentication and access to Microsoft Graph with your application's existing authentication code.      |
 
 ### Who should use it?
 
@@ -107,4 +104,4 @@ The Microsoft Graph Toolkit is supported in the following browsers.
 - [Get started](https://learn.microsoft.com/graph/toolkit/get-started/overview) with the Microsoft Graph Toolkit.
 - Check out the Microsoft Graph Toolkit on [GitHub](https://aka.ms/mgt).
 
-<TableNamer names={['Microsoft Graph Toolkit Components', 'Components in preview', 'Microsoft Graph Toolkit Providers', 'Supported browsers']}/>
+<TableNamer names={['Microsoft Graph Toolkit Components', 'Components in preview', 'Microsoft Graph Toolkit Providers', 'Supported browsers']}/>