allow to hide calling setting and feedback (#617)

* allow to hide calling setting and feedback

* update show audio

Author: embbnux

src/components/SettingsPanel/index.js

@@ -57,6 +57,7 @@ export default function SettingsPanel({
   isCallQueueMember,
   showPresenceSettings,
   showAudioSettings,
+  showFeedback,
   additional,
   supportedLocales,
   savedLocale,
@@ -105,6 +106,14 @@ export default function SettingsPanel({
       </LinkLine>
     )
     : null;
+  const feedback = showFeedback
+    ? (
+      <LinkLine
+        onClick={onFeedbackSettingsLinkClick} >
+        {i18n.getString('feedback', currentLocale)}
+      </LinkLine>
+    )
+    : null;
   const presenceSetting = (dndStatus && userStatus) ?
     (
       <PresenceSettingSection
@@ -195,10 +204,7 @@ export default function SettingsPanel({
         {autoLogSMS}
         {clickToDial}
         {additional}
-        <LinkLine
-          onClick={onFeedbackSettingsLinkClick} >
-          {i18n.getString('feedback', currentLocale)}
-        </LinkLine>
+        {feedback}
         <section className={styles.section}>
           <Line>
             <EulaRenderer
@@ -265,6 +271,7 @@ SettingsPanel.propTypes = {
   toggleAcceptCallQueueCalls: PropTypes.func,
   showPresenceSettings: PropTypes.bool,
   showAudioSettings: PropTypes.bool,
+  showFeedback: PropTypes.bool,
   additional: PropTypes.node,
   supportedLocales: PropTypes.arrayOf(PropTypes.string),
   savedLocale: PropTypes.string,
@@ -305,4 +312,5 @@ SettingsPanel.defaultProps = {
   supportedLocales: undefined,
   savedLocale: undefined,
   saveLocale: undefined,
+  showFeedback: true,
 };

src/containers/SettingsPage/index.js

@@ -19,6 +19,10 @@ function mapToProps(_, {
     rolesAndPermissions,
     detailedPresence,
   },
+  showRegion = true,
+  showCalling = true,
+  showAudio = true,
+  showFeedback = true,
   params,
 }) {
   let loginNumber = '';
@@ -46,18 +50,24 @@ function mapToProps(_, {
       extensionInfo.ready &&
       locale.ready &&
       regionSettings.ready &&
-      callingSettings.ready &&
+      (!callingSettings || callingSettings.ready) &&
       rolesAndPermissions.ready &&
       (!detailedPresence || detailedPresence.ready) &&
       (!localeSettings || localeSettings.ready)
     ),
-    showCalling: rolesAndPermissions.callingEnabled,
-    showAudio: rolesAndPermissions.callingEnabled,
-    showRegion: loggedIn && brand.id === '1210' && (
-      regionSettings.availableCountries.length > 1 ||
-      !!regionSettings.availableCountries.find(c => c.isoCode === 'US') ||
-      !!regionSettings.availableCountries.find(c => c.isoCode === 'CA')
-    ) && rolesAndPermissions.callingEnabled,
+    showFeedback,
+    showCalling: showCalling && callingSettings && rolesAndPermissions.callingEnabled,
+    showAudio: showAudio && rolesAndPermissions.callingEnabled,
+    showRegion:
+      loggedIn &&
+      brand.id === '1210' &&
+      (
+        regionSettings.availableCountries.length > 1 ||
+        !!regionSettings.availableCountries.find(c => c.isoCode === 'US') ||
+        !!regionSettings.availableCountries.find(c => c.isoCode === 'CA')
+      ) &&
+      rolesAndPermissions.callingEnabled &&
+      showRegion,
     loginNumber,
     version,
     currentLocale: locale.currentLocale,