Merge branch 'fix-static-analysis-visual_review_toolbar' into 'master'

Exclude preexisting lint issues for i18n

Closes #63223

See merge request gitlab-org/gitlab-ce!29649

4 files changed, 8 insertions, 0 deletions

diff --git a/app/assets/javascripts/visual_review_toolbar/components/comment.js b/app/assets/javascripts/visual_review_toolbar/components/comment.js
index 3ad99732c4c..2fec96d1435 100644
--- a/app/assets/javascripts/visual_review_toolbar/components/comment.js
+++ b/app/assets/javascripts/visual_review_toolbar/components/comment.js
@@ -18,6 +18,7 @@ const resetCommentBox = () => {
   const commentBox = selectCommentBox();
   const commentButton = selectCommentButton();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Send feedback';
   commentButton.classList.replace('gitlab-button-secondary', 'gitlab-button-success');
   commentButton.style.opacity = 1;
@@ -43,7 +44,9 @@ const confirmAndClear = mergeRequestId => {
   const commentButton = selectCommentButton();
   const currentNote = selectNote();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Feedback sent';
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   currentNote.innerText = `Your comment was successfully posted to merge request #${mergeRequestId}`;
   setTimeout(resetComment, 2000);
 };
@@ -52,6 +55,7 @@ const setInProgressState = () => {
   const commentButton = selectCommentButton();
   const commentBox = selectCommentBox();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Sending feedback';
   commentButton.classList.replace('gitlab-button-success', 'gitlab-button-secondary');
   commentButton.style.opacity = 0.5;
@@ -79,6 +83,7 @@ const postComment = ({
   const commentText = selectCommentBox().value.trim();
 
   if (!commentText) {
+    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
     postError('Your comment appears to be empty.', COMMENT_BOX);
     resetCommentBox();
     return;
diff --git a/app/assets/javascripts/visual_review_toolbar/components/login.js b/app/assets/javascripts/visual_review_toolbar/components/login.js
index a2fb905aca7..ce713cdc520 100644
--- a/app/assets/javascripts/visual_review_toolbar/components/login.js
+++ b/app/assets/javascripts/visual_review_toolbar/components/login.js
@@ -40,6 +40,7 @@ const authorizeUser = state => {
   const token = selectToken().value;
 
   if (!token) {
+    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
     postError('Please enter your token.', TOKEN_BOX);
     return;
   }
diff --git a/app/assets/javascripts/visual_review_toolbar/components/utils.js b/app/assets/javascripts/visual_review_toolbar/components/utils.js
index 5938441cd8c..7bc2e5a905b 100644
--- a/app/assets/javascripts/visual_review_toolbar/components/utils.js
+++ b/app/assets/javascripts/visual_review_toolbar/components/utils.js
@@ -12,6 +12,7 @@ import {
 } from './constants';
 
 // this style must be applied inline in a handful of components
+/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
 const buttonClearStyles = `
   -webkit-appearance: none;
 `;
diff --git a/app/assets/javascripts/visual_review_toolbar/store/state.js b/app/assets/javascripts/visual_review_toolbar/store/state.js
index b4e239a9586..f5ede6e85b2 100644
--- a/app/assets/javascripts/visual_review_toolbar/store/state.js
+++ b/app/assets/javascripts/visual_review_toolbar/store/state.js
@@ -15,6 +15,7 @@ const state = {
 
 // adapted from https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator#Example_2_Browser_detect_and_return_an_index
 const getBrowserId = sUsrAg => {
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   const aKeys = ['MSIE', 'Edge', 'Firefox', 'Safari', 'Chrome', 'Opera'];
   let nIdx = aKeys.length - 1;