From c3eceae912eb956da2f6a9b379629e5592a56ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Garc=C3=ADa?= Date: Fri, 21 May 2021 09:17:22 +0200 Subject: [PATCH] add acs as feature flag if no settings provided (#251) --- .../home/components/chatBubble/chatBubble.js | 2 +- .../ClientApp/src/pages/home/home.js | 15 ++++++++++++--- .../ClientApp/src/services/configService.js | 6 ++++++ TailwindTraders.Website/Source/docker-compose.yml | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/pages/home/components/chatBubble/chatBubble.js b/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/pages/home/components/chatBubble/chatBubble.js index a31e34b3..e0dd8cce 100644 --- a/TailwindTraders.Website/Source/Tailwind.Traders.Web/ClientApp/src/pages/home/components/chatBubble/chatBubble.js +++ b/TailwindTraders.Website/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 index 3e51cd64..f3437f33 100644 --- 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 (
- {loggedIn && } - + {loggedIn && } + { customerSupportEnabled && }
); }; 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 index e63c15b0..41ac8722 100644 --- 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 index cd63d2ae..f73d3f4b 100644 --- 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=