Procházet zdrojové kódy

add errors and fix name

zahmis před 4 roky
rodič
revize
b9e6a9c2b7

+ 3 - 3
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxyIntegrationCard.jsx

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

+ 6 - 6
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -10,7 +10,7 @@ import CustomBotWithoutProxyIntegrationCard from './CustomBotWithoutProxyIntegra
 import DeleteSlackBotSettingsModal from './DeleteSlackBotSettingsModal';
 import DeleteSlackBotSettingsModal from './DeleteSlackBotSettingsModal';
 
 
 const CustomBotWithoutProxySettings = (props) => {
 const CustomBotWithoutProxySettings = (props) => {
-  const { appContainer, slackSettingErrors } = props;
+  const { appContainer, slackSettingsErrors } = props;
   const { t } = useTranslation();
   const { t } = useTranslation();
 
 
   const [siteName, setSiteName] = useState('');
   const [siteName, setSiteName] = useState('');
@@ -57,14 +57,14 @@ const CustomBotWithoutProxySettings = (props) => {
       <CustomBotWithoutProxyIntegrationCard
       <CustomBotWithoutProxyIntegrationCard
         siteName={siteName}
         siteName={siteName}
         slackWSNameInWithoutProxy={props.slackWSNameInWithoutProxy}
         slackWSNameInWithoutProxy={props.slackWSNameInWithoutProxy}
-        slackSettingErrors={slackSettingErrors}
-        // isSlackScopeSet={slackSettingErrors.isSlackScopeSet}
-        // isSetupSlackBot={slackSettingErrors.isSetupSlackBot}
+        slackSettingsErrors={slackSettingsErrors}
+        // isSlackScopeSet={slackSettingsErrors.isSlackScopeSet}
+        // isSetupSlackBot={slackSettingsErrors.isSetupSlackBot}
       />
       />
 
 
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
 
 
-      {!slackSettingErrors.includes(false) && (
+      {!slackSettingsErrors.includes(false) && (
       <button
       <button
         className="pull-right btn text-danger border-danger"
         className="pull-right btn text-danger border-danger"
         type="button"
         type="button"
@@ -101,7 +101,7 @@ CustomBotWithoutProxySettings.propTypes = {
   // isConnectedToSlack: PropTypes.bool,
   // isConnectedToSlack: PropTypes.bool,
   // isSlackScopeSet: PropTypes.bool,
   // isSlackScopeSet: PropTypes.bool,
   // isSetupSlackBot: PropTypes.bool,
   // isSetupSlackBot: PropTypes.bool,
-  slackSettingErrors: PropTypes.array,
+  slackSettingsErrors: PropTypes.array,
   slackWSNameInWithoutProxy: PropTypes.string,
   slackWSNameInWithoutProxy: PropTypes.string,
   onSetIsSetupSlackBot: PropTypes.func,
   onSetIsSetupSlackBot: PropTypes.func,
   onSetIsSlackScopeSet: PropTypes.func,
   onSetIsSlackScopeSet: PropTypes.func,

+ 2 - 2
src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -28,7 +28,7 @@ const SlackIntegration = (props) => {
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   const [isSlackScopeSet, setIsSlackScopeSet] = useState(false);
   const [isSlackScopeSet, setIsSlackScopeSet] = useState(false);
-  const slackSettingErrors = [isSetupSlackBot, isConnectedToSlack, isSlackScopeSet];
+  const slackSettingsErrors = [isSetupSlackBot, isConnectedToSlack, isSlackScopeSet];
 
 
 
 
   const fetchSlackWorkSpaceNameInWithoutProxy = useCallback(async() => {
   const fetchSlackWorkSpaceNameInWithoutProxy = useCallback(async() => {
@@ -142,7 +142,7 @@ const SlackIntegration = (props) => {
           // isConnectedToSlack={isConnectedToSlack}
           // isConnectedToSlack={isConnectedToSlack}
           // isSetupSlackBot={isSetupSlackBot}
           // isSetupSlackBot={isSetupSlackBot}
           // isSlackScopeSet={isSlackScopeSet}
           // isSlackScopeSet={isSlackScopeSet}
-          slackSettingErrors={slackSettingErrors}
+          slackSettingsErrors={slackSettingsErrors}
           slackBotTokenEnv={slackBotTokenEnv}
           slackBotTokenEnv={slackBotTokenEnv}
           slackBotToken={slackBotToken}
           slackBotToken={slackBotToken}
           slackSigningSecretEnv={slackSigningSecretEnv}
           slackSigningSecretEnv={slackSigningSecretEnv}