user array errors

src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxyIntegrationCard.jsx

@@ -23,7 +23,7 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
       </div>
 
       <div className="text-center w-25">
-        {props.isSlackScopeSet && (
+        {!props.errors.includes(false) && (
         <div className="mt-5">
           <p className="text-success small">
             <i className="fa fa-check mr-1" />
@@ -32,7 +32,7 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
           <hr className="align-self-center admin-border-success border-success"></hr>
         </div>
           )}
-        {!props.isSlackScopeSet && (
+        {props.errors.includes(false) && (
         <div className="mt-4">
           <small
             className="text-secondary m-0"
@@ -57,7 +57,8 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
 CustomBotWithoutProxyIntegrationCard.propTypes = {
   siteName: PropTypes.string.isRequired,
   slackWSNameInWithoutProxy: PropTypes.string,
-  isSlackScopeSet: PropTypes.bool.isRequired,
+  // isSlackScopeSet: PropTypes.bool.isRequired,
+  errors: PropTypes.array,
 };
 
 export default CustomBotWithoutProxyIntegrationCard;

src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -10,7 +10,7 @@ import CustomBotWithoutProxyIntegrationCard from './CustomBotWithoutProxyIntegra
 import DeleteSlackBotSettingsModal from './DeleteSlackBotSettingsModal';
 
 const CustomBotWithoutProxySettings = (props) => {
-  const { appContainer, isSlackScopeSet, isSetupSlackBot } = props;
+  const { appContainer, errors } = props;
   const { t } = useTranslation();
 
   const [siteName, setSiteName] = useState('');
@@ -23,11 +23,11 @@ const CustomBotWithoutProxySettings = (props) => {
     }
   };
 
-  const onSetIsSlackScopeSet = () => {
-    if (props.onSetIsSlackScopeSet != null) {
-      props.onSetIsSlackScopeSet();
-    }
-  };
+  // const onSetIsSlackScopeSet = () => {
+  //   if (props.onSetIsSlackScopeSet != null) {
+  //     props.onSetIsSlackScopeSet();
+  //   }
+  // };
 
   const deleteSlackCredentialsHandler = async() => {
     try {
@@ -37,7 +37,7 @@ const CustomBotWithoutProxySettings = (props) => {
         currentBotType: '',
       });
       onSetIsSetupSlackBot(false);
-      onSetIsSlackScopeSet(false);
+      // onSetIsSlackScopeSet(false);
       toastSuccess('success');
     }
     catch (err) {
@@ -57,13 +57,14 @@ const CustomBotWithoutProxySettings = (props) => {
       <CustomBotWithoutProxyIntegrationCard
         siteName={siteName}
         slackWSNameInWithoutProxy={props.slackWSNameInWithoutProxy}
-        isSlackScopeSet={props.isSlackScopeSet}
-        isSetupSlackBot={props.isSetupSlackBot}
+        errors={errors}
+        // isSlackScopeSet={errors.isSlackScopeSet}
+        // isSetupSlackBot={errors.isSetupSlackBot}
       />
 
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
 
-      {isSetupSlackBot && isSlackScopeSet && (
+      {!errors.includes(false) && (
       <button
         className="pull-right btn text-danger border-danger"
         type="button"
@@ -98,8 +99,9 @@ CustomBotWithoutProxySettings.propTypes = {
   slackBotTokenEnv: PropTypes.string,
   isRgisterSlackCredentials: PropTypes.bool,
   isConnectedToSlack: PropTypes.bool,
-  isSlackScopeSet: PropTypes.bool,
-  isSetupSlackBot: PropTypes.bool,
+  // isSlackScopeSet: PropTypes.bool,
+  // isSetupSlackBot: PropTypes.bool,
+  errors: PropTypes.array,
   slackWSNameInWithoutProxy: PropTypes.string,
   onSetIsSetupSlackBot: PropTypes.func,
   onSetIsSlackScopeSet: PropTypes.func,

src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -28,6 +28,8 @@ const SlackIntegration = (props) => {
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   const [isSlackScopeSet, setIsSlackScopeSet] = useState(false);
+  const errors = [isSetupSlackBot, isSlackScopeSet];
+
 
   const fetchSlackWorkSpaceNameInWithoutProxy = useCallback(async() => {
     if (!isConnectedToSlack || !isSetupSlackBot) {
@@ -139,8 +141,9 @@ const SlackIntegration = (props) => {
           isSendTestMessage={isSendTestMessage}
           isRegisterSlackCredentials={isRegisterSlackCredentials}
           isConnectedToSlack={isConnectedToSlack}
-          isSetupSlackBot={isSetupSlackBot}
-          isSlackScopeSet={isSlackScopeSet}
+          // isSetupSlackBot={isSetupSlackBot}
+          // isSlackScopeSet={isSlackScopeSet}
+          errors={errors}
           slackBotTokenEnv={slackBotTokenEnv}
           slackBotToken={slackBotToken}
           slackSigningSecretEnv={slackSigningSecretEnv}