add acs as feature flag if no settings provided (#251)

microsoft · May 21, 2021 · c3eceae · c3eceae
1 parent 3d7aecd
commit c3eceae
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/.../Source/Tailwind.Traders.Web/ClientApp/src/pages/home/components/chatBubble/chatBubble.js b/.../Source/Tailwind.Traders.Web/ClientApp/src/pages/home/components/chatBubble/chatBubble.js
@@ -33,7 +33,7 @@ class ChatBubble extends Component {
           summary: "Customer support",
           text: "Customer support",
           userPhone: "",
-          webAppMeetingDomain: "tailwindtradersacs.azurewebsites.net",
+          webAppMeetingDomain: new URL(window.location.href).host,
           isVideoCall: isVideo.toString(),
         }
       )

diff --git a/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/pages/home/home.js b/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/pages/home/home.js
@@ -1,16 +1,25 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 
 import { Hero, Recommended, Getapp, Popular } from "./components";
 import ChatBubble from './components/chatBubble/chatBubble';
+import { ConfigService } from './../../services'
 
 const Home = ({ recommendedProducts, popularProducts, loggedIn }) => {
+    const [customerSupportEnabled, setCustomerSupportEnabled] = useState(false);
+    useEffect(() => {
+        async function loadSettings() {
+            await ConfigService.loadSettings();
+            setCustomerSupportEnabled(ConfigService._customerSupportEnabled);
+        }
+        loadSettings();
+    },[])
     return (
         <div className="home">
             <Hero />
             <Recommended recommendedProductsData={recommendedProducts} loggedIn={loggedIn} />
             <Getapp />
-            {loggedIn && <Popular popularProductsData={popularProducts} />}
-            <ChatBubble />
+            {loggedIn && <Popular popularProductsData={popularProducts} />} 
+            { customerSupportEnabled && <ChatBubble />}
         </div>
     );
 };

diff --git a/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/services/configService.js b/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/services/configService.js
@@ -33,6 +33,7 @@ const ConfigService = {
   _acsResource: "",
   _logicAppUrl: "",
   _email: "",
+  _customerSupportEnabled: false,
 
   async loadSettings() {
     if (this._needLoadSettings) {
@@ -77,6 +78,11 @@ const ConfigService = {
       this._acsResource = settingsResponse.data.acs.resource;
       this._logicAppUrl = settingsResponse.data.logicAppUrl;
       this._email = settingsResponse.data.email;
+      this._customerSupportEnabled = 
+            settingsResponse.data.email
+            && settingsResponse.data.acs.resource
+            && settingsResponse.data.acs.connectionString
+            && settingsResponse.data.logicAppUrl;
     }
   },
 

diff --git a/TailwindTraders.Website/Source/docker-compose.yml b/TailwindTraders.Website/Source/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - B2CAuth:ClientId=
       - B2CAuth:Authority=
       - B2CAuth:Scopes=
-      - Acs__ConnectionString=endpoint=
+      - Acs__ConnectionString=
       - Acs__Resource=
       - Email=
       - LogicAppUrl=