Merge pull request #7312 from weseek/imprv/reverse-skipped-denied

imprv: Reverse skipped denied

packages/app/public/static/locales/en_US/translation.json

@@ -815,15 +815,14 @@
     "thank_you_for_answering": "Thank you for answering",
     "additional_feedback": "Send us additional feedback from here.",
     "dont_show_again": "Don`t show again",
-    "skip": "Skip",
+    "deny": "No answer",
     "agree": "Agree",
     "disagree": "Disagree",
     "answer": "Answer",
     "no_answer": "No answer",
     "settings": "Questionnaire settings",
     "failed_to_send": "Failed to send feedback",
-    "failed_to_skip": "Failed to skip questionnaire",
-    "skipped": "The questionnaire was skipped and won't be shown again",
+    "denied": "The questionnaire won't be shown again",
     "title": "GROWI questionnaire for service improvement",
     "successfully_submit": "Your survey has been submitted.",
     "thanks_for_answer": "Thank you very much for taking the time to complete the survey.",

packages/app/public/static/locales/ja_JP/translation.json

@@ -814,15 +814,14 @@
     "thank_you_for_answering": "ご回答ありがとうございます",
     "additional_feedback": "その他ご意見ご要望はこちらからお願い致します。",
     "dont_show_again": "今後このアンケートを表示しない",
-    "skip": "スキップ",
+    "deny": "回答しない",
     "agree": "そう思う",
     "disagree": "そう思わない",
     "answer": "回答する",
     "no_answer": "無回答",
     "settings": "アンケート設定",
     "failed_to_send": "回答送信に失敗しました",
-    "failed_to_skip": "アンケートのスキップに失敗しました",
-    "skipped": "このアンケートはスキップされたため、今後表示されません",
+    "denied": "このアンケートは今後表示されません",
     "title": "GROWI サービス改善のためのアンケート",
     "successfully_submit": "アンケートの送信が完了しました。",
     "thanks_for_answer": "アンケートのご回答誠にありがとうございました。",

packages/app/src/components/Questionnaire/QuestionnaireModal.tsx

@@ -68,16 +68,15 @@ const QuestionnaireModal = ({ questionnaireOrder }: QuestionnaireModalProps): JS
     closeQuestionnaireModal();
   }, [closeQuestionnaireModal, questionnaireOrder.questions, sendAnswer]);
 
-  const skipBtnClickHandler = useCallback(async() => {
+  const denyBtnClickHandler = useCallback(async() => {
     try {
-      apiv3Put('/questionnaire/skip', {
+      apiv3Put('/questionnaire/deny', {
         questionnaireOrderId: questionnaireOrder._id,
       });
-      toastSuccess(t('questionnaire.skipped'));
+      toastSuccess(t('questionnaire.denied'));
     }
     catch (e) {
       logger.error(e);
-      toastError(t('questionnaire.failed_to_skip'));
     }
     closeQuestionnaireModal();
   }, [closeQuestionnaireModal, questionnaireOrder._id, t]);
@@ -87,7 +86,7 @@ const QuestionnaireModal = ({ questionnaireOrder }: QuestionnaireModalProps): JS
     closeQuestionnaireModal();
 
     try {
-      await apiv3Put('/questionnaire/deny', {
+      await apiv3Put('/questionnaire/skip', {
         questionnaireOrderId: questionnaireOrder._id,
       });
     }
@@ -130,7 +129,7 @@ const QuestionnaireModal = ({ questionnaireOrder }: QuestionnaireModalProps): JS
         {currentUser?.admin
         && <a href="" className="mr-auto d-flex align-items-center"><i className="material-icons mr-1">settings</i>{t('questionnaire.settings')}</a>}
         <>
-          <button type="button" className="btn btn-outline-secondary mr-3" onClick={skipBtnClickHandler}>{t('questionnaire.dont_show_again')}</button>
+          <button type="button" className="btn btn-outline-secondary mr-3" onClick={denyBtnClickHandler}>{t('questionnaire.dont_show_again')}</button>
           <button type="submit" className="btn btn-primary">{t('questionnaire.answer')}</button>
         </>
       </ModalFooter>

packages/app/src/components/Questionnaire/QuestionnaireToast.tsx

@@ -29,19 +29,18 @@ const QuestionnaireToast = ({ questionnaireOrder }: QuestionnaireToastProps): JS
     openQuestionnaireModal(questionnaireOrder._id);
   }, [openQuestionnaireModal, questionnaireOrder._id]);
 
-  const skipBtnClickHandler = useCallback(async() => {
+  const denyBtnClickHandler = useCallback(async() => {
     // Immediately close
     setIsOpen(false);
 
     try {
-      await apiv3Put('/questionnaire/skip', {
+      await apiv3Put('/questionnaire/deny', {
         questionnaireOrderId: questionnaireOrder._id,
       });
-      toastSuccess(t('questionnaire.skipped'));
+      toastSuccess(t('questionnaire.denied'));
     }
     catch (e) {
       logger.error(e);
-      toastError(t('questionnaire.failed_to_skip'));
     }
   }, [questionnaireOrder._id, t]);
 
@@ -50,7 +49,7 @@ const QuestionnaireToast = ({ questionnaireOrder }: QuestionnaireToastProps): JS
     setIsOpen(false);
 
     try {
-      await apiv3Put('/questionnaire/deny', {
+      await apiv3Put('/questionnaire/skip', {
         questionnaireOrderId: questionnaireOrder._id,
       });
     }
@@ -62,7 +61,7 @@ const QuestionnaireToast = ({ questionnaireOrder }: QuestionnaireToastProps): JS
   const questionnaireOrderShortTitle = lang === 'en_US' ? questionnaireOrder.shortTitle.en_US : questionnaireOrder.shortTitle.ja_JP;
 
   return <div className={`toast ${isOpen ? 'show' : 'hide'}`}>
-    <div className="toast-header bg-info">
+    <div className="toast-header bg-primary">
       <strong className="mr-auto text-light">{questionnaireOrderShortTitle}</strong>
       <button type="button" className="ml-2 mb-1 close" onClick={closeBtnClickHandler}>
         <span aria-hidden="true" className="text-light">&times;</span>
@@ -70,7 +69,7 @@ const QuestionnaireToast = ({ questionnaireOrder }: QuestionnaireToastProps): JS
     </div>
     <div className="toast-body bg-light d-flex justify-content-end">
       <button type="button" className="btn btn-secondary mr-3" onClick={answerBtnClickHandler}>{t('questionnaire.answer')}</button>
-      <button type="button" className="btn btn-secondary" onClick={skipBtnClickHandler}>{t('questionnaire.skip')}</button>
+      <button type="button" className="btn btn-secondary" onClick={denyBtnClickHandler}>{t('questionnaire.deny')}</button>
     </div>
   </div>;
 };