MM-22155 Re-enable comma-dangle rule (mattermost#5535)

* MM-22155 Re-enable comma-dangle rule

* Re-enable comma-dangle for TS files

.eslintrc.json

@@ -21,7 +21,6 @@
  },
  "rules": {
  "import/no-unresolved": 2,
- "comma-dangle": 0,
  "import/order": [
  "error",
  {
@@ -70,7 +69,6 @@
  "plugin:@typescript-eslint/recommended"
  ],
  "rules": {
- "comma-dangle": 0,
  "@typescript-eslint/no-non-null-assertion": 0,
  "@typescript-eslint/no-var-requires": 0,
  "@typescript-eslint/no-empty-function": 0,

actions/channel_actions.test.js

@@ -40,7 +40,7 @@ const initialState = {
  type: '0',
  total_msg_count: 0,
  team_id: 'team_id',
- }
+ },
  },
  channelsInTeam: {
  'team-id': ['current_channel_id'],
@@ -280,11 +280,11 @@ describe('Actions.Channel', () => {
 
  const expectedActions = [{
  type: 'MOCK_CREATE_GROUP_CHANNEL',
- args: [['testuserid1', 'testuserid2']]
+ args: [['testuserid1', 'testuserid2']],
  }];
 
  const fakeData = {
- userIds: ['testuserid1', 'testuserid2']
+ userIds: ['testuserid1', 'testuserid2'],
  };
 
  await testStore.dispatch(Actions.openGroupChannelToUserIds(fakeData.userIds));

actions/emoji_actions.mock.test.js

@@ -14,7 +14,7 @@ const initialState = {
  general: {
  config: {EnableCustomEmoji: 'true'},
  },
- }
+ },
 };
 
 jest.mock('selectors/emojis', () => ({
@@ -23,7 +23,7 @@ jest.mock('selectors/emojis', () => ({
 }));
 
 jest.mock('mattermost-redux/actions/emojis', () => ({
- getCustomEmojiByName: (...args) => ({type: 'MOCK_GET_CUSTOM_EMOJI_BY_NAME', args})
+ getCustomEmojiByName: (...args) => ({type: 'MOCK_GET_CUSTOM_EMOJI_BY_NAME', args}),
 }));
 
 describe('loadRecentlyUsedCustomEmojis', () => {

actions/global_actions.jsx

@@ -100,7 +100,7 @@ export function emitChannelClickEvent(channel) {
  },
  () => {
  browserHistory.push('/' + this.state.currentTeam.name);
- }
+ },
  );
  } else {
  switchToChannel(channel);

actions/invite_actions.test.js

@@ -7,7 +7,7 @@ import {sendMembersInvites, sendGuestsInvites} from 'actions/invite_actions.jsx'
 
 jest.mock('actions/team_actions', () => ({
  addUsersToTeam: () => ({ // since we are using addUsersToTeamGracefully, this call will always succeed
- type: 'MOCK_RECEIVED_ME'
+ type: 'MOCK_RECEIVED_ME',
  }),
 }));
 
@@ -372,29 +372,29 @@ describe('actions/invite_actions', () => {
  {
  user: {
  id: 'guest1',
- roles: 'system_guest'
+ roles: 'system_guest',
  },
  reason: {
  id: 'invite.guests.new-member',
  message: 'This guest has been added to the team and {count, plural, one {channel} other {channels}}.',
  values: {
- count: 1
- }
- }
+ count: 1,
+ },
+ },
  },
  {
  user: {
  id: 'other-guest',
- roles: 'system_guest'
+ roles: 'system_guest',
  },
  reason: {
  id: 'invite.guests.new-member',
  message: 'This guest has been added to the team and {count, plural, one {channel} other {channels}}.',
  values: {
- count: 1
- }
- }
- }
+ count: 1,
+ },
+ },
+ },
  ],
  notSent: [
  {

actions/notification_actions.jsx

@@ -168,7 +168,7 @@ const notifyMe = (title, body, channel, teamId, silent) => (dispatch, getState)
  silent,
  },
  },
- window.location.origin
+ window.location.origin,
  );
  } else {
  showNotification({

actions/post_actions.jsx

@@ -296,6 +296,6 @@ export function resetEmbedVisibility() {
 export function emitShortcutReactToLastPostFrom(emittedFrom) {
  return {
  type: ActionTypes.EMITTED_SHORTCUT_REACT_TO_LAST_POST,
- payload: emittedFrom
+ payload: emittedFrom,
  };
 }

actions/post_actions.test.js

@@ -196,8 +196,8 @@ describe('Actions.Posts', () => {
  data: {
  id: 'other_channel_idundefined',
  now: POST_CREATED_TIME,
- userId: newPost.user_id}
- }
+ userId: newPost.user_id},
+ },
  ],
  type: 'BATCHING_REDUCER.BATCH',
  },
@@ -211,7 +211,7 @@ describe('Actions.Posts', () => {
  expect(data).toEqual(true);
 
  expect(testStore.getActions()).toEqual(
- [{data: {commentCount: 0, isRHS: false, postId: 'latest_post_id', refocusId: 'test', title: 'title'}, type: ActionTypes.SHOW_EDIT_POST_MODAL}]
+ [{data: {commentCount: 0, isRHS: false, postId: 'latest_post_id', refocusId: 'test', title: 'title'}, type: ActionTypes.SHOW_EDIT_POST_MODAL}],
  );
 
  const general = {
@@ -227,7 +227,7 @@ describe('Actions.Posts', () => {
  const {data: withLicenseData} = await testStore.dispatch(Actions.setEditingPost('latest_post_id', 0, 'test', 'title'));
  expect(withLicenseData).toEqual(true);
  expect(testStore.getActions()).toEqual(
- [{data: {commentCount: 0, isRHS: false, postId: 'latest_post_id', refocusId: 'test', title: 'title'}, type: ActionTypes.SHOW_EDIT_POST_MODAL}]
+ [{data: {commentCount: 0, isRHS: false, postId: 'latest_post_id', refocusId: 'test', title: 'title'}, type: ActionTypes.SHOW_EDIT_POST_MODAL}],
  );
 
  // should not allow edit for pending post

actions/status_actions.jsx

@@ -95,7 +95,7 @@ export function startPeriodicStatusUpdates() {
  () => {
  store.dispatch(loadStatusesForChannelAndSidebar());
  },
- Constants.STATUS_INTERVAL
+ Constants.STATUS_INTERVAL,
  );
 }
 

actions/storage.test.js

@@ -61,12 +61,12 @@ describe('Actions.Storage', () => {
 
  store.dispatch(Actions.actionOnGlobalItemsWithPrefix(
  'prefix',
- (key, value) => touchedPairs.push([key, value])
+ (key, value) => touchedPairs.push([key, value]),
  ));
 
  assert.deepEqual(
  touchedPairs,
- [['prefix_test1', 1], ['prefix_test2', 2]]
+ [['prefix_test1', 1], ['prefix_test2', 2]],
  );
  });
 
@@ -78,12 +78,12 @@ describe('Actions.Storage', () => {
  const touchedPairs = [];
  store.dispatch(Actions.actionOnItemsWithPrefix(
  'prefix',
- (key, value) => touchedPairs.push([key, value])
+ (key, value) => touchedPairs.push([key, value]),
  ));
 
  assert.deepEqual(
  touchedPairs,
- [['prefix_test1', 1], ['prefix_test2', 2]]
+ [['prefix_test1', 1], ['prefix_test2', 2]],
  );
  });
 

actions/user_actions.jsx

@@ -12,7 +12,7 @@ import {
  getCurrentChannelId,
  getMyChannels,
  getMyChannelMember,
- getChannelMembersInChannels
+ getChannelMembersInChannels,
 } from 'mattermost-redux/selectors/entities/channels';
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeamId, getTeamMember} from 'mattermost-redux/selectors/entities/teams';
@@ -49,7 +49,7 @@ export function loadProfilesAndReloadTeamMembers(page, perPage, teamId, options
  if (data) {
  await Promise.all([
  doDispatch(loadTeamMembersForProfilesList(data, newTeamId, true)),
- doDispatch(loadStatusesForProfilesList(data))
+ doDispatch(loadStatusesForProfilesList(data)),
  ]);
  }
 
@@ -64,7 +64,7 @@ export function loadProfilesAndReloadChannelMembers(page, perPage, channelId, so
  if (data) {
  await Promise.all([
  doDispatch(loadChannelMembersForProfilesList(data, newChannelId, true)),
- doDispatch(loadStatusesForProfilesList(data))
+ doDispatch(loadStatusesForProfilesList(data)),
  ]);
  }
 
@@ -92,7 +92,7 @@ export function searchProfilesAndTeamMembers(term = '', options = {}) {
  if (data) {
  await Promise.all([
  doDispatch(loadTeamMembersForProfilesList(data, newTeamId)),
- doDispatch(loadStatusesForProfilesList(data))
+ doDispatch(loadStatusesForProfilesList(data)),
  ]);
  }
 
@@ -107,7 +107,7 @@ export function searchProfilesAndChannelMembers(term, options = {}) {
  if (data) {
  await Promise.all([
  doDispatch(loadChannelMembersForProfilesList(data, newChannelId)),
- doDispatch(loadStatusesForProfilesList(data))
+ doDispatch(loadStatusesForProfilesList(data)),
  ]);
  }
 

actions/views/channel.test.js

@@ -526,7 +526,7 @@ describe('channel view actions', () => {
 
  expect(store.getActions()).toEqual([{
  data: true,
- type: 'UPDATE_TOAST_STATUS'
+ type: 'UPDATE_TOAST_STATUS',
  }]);
  });
  });

actions/views/channel_sidebar.test.ts

@@ -16,8 +16,8 @@ describe('setCategoryCollapsed', () => {
  currentUserId: 'user1',
  profiles: {
  user1: {},
- }
- }
+ },
+ },
  };
 
  const store = await configureStore(initialState);

actions/views/create_comment.test.jsx

@@ -196,7 +196,7 @@ describe('rhs view actions', () => {
  testStore.dispatch(moveHistoryIndexBack(Posts.MESSAGE_TYPES.COMMENT));
 
  expect(store.getActions()).toEqual(
- expect.arrayContaining(testStore.getActions())
+ expect.arrayContaining(testStore.getActions()),
  );
  });
 
@@ -210,7 +210,7 @@ describe('rhs view actions', () => {
  testStore.dispatch(updateCommentDraft(rootId, {message: 'test message', fileInfos: [], uploadsInProgress: []}));
 
  expect(store.getActions()).toEqual(
- expect.arrayContaining(testStore.getActions())
+ expect.arrayContaining(testStore.getActions()),
  );
  });
  });
@@ -234,7 +234,7 @@ describe('rhs view actions', () => {
  expect(PostActions.createPost).toHaveBeenCalled();
 
  expect(lastCall(PostActions.createPost.mock.calls)[0]).toEqual(
- expect.objectContaining(post)
+ expect.objectContaining(post),
  );
 
  expect(lastCall(PostActions.createPost.mock.calls)[1]).toBe(draft.fileInfos);
@@ -327,7 +327,7 @@ describe('rhs view actions', () => {
  testStore.dispatch(addMessageIntoHistory(''));
 
  expect(store.getActions()).toEqual(
- expect.arrayContaining(testStore.getActions())
+ expect.arrayContaining(testStore.getActions()),
  );
  });
 
@@ -338,7 +338,7 @@ describe('rhs view actions', () => {
  testStore.dispatch(updateCommentDraft(rootId, null));
 
  expect(store.getActions()).toEqual(
- expect.arrayContaining(testStore.getActions())
+ expect.arrayContaining(testStore.getActions()),
  );
  });
 
@@ -365,7 +365,7 @@ describe('rhs view actions', () => {
  testStore.dispatch(submitReaction(latestPostId, '+', 'smile'));
 
  expect(store.getActions()).toEqual(
- expect.arrayContaining(testStore.getActions())
+ expect.arrayContaining(testStore.getActions()),
  );
  });
 
@@ -467,7 +467,7 @@ describe('rhs view actions', () => {
  0,
  'reply_textbox',
  'Comment',
- true
+ true,
  ),
  ]);
  });

actions/views/rhs.test.js

@@ -94,7 +94,7 @@ describe('rhs view actions', () => {
  posts: {
  posts: {
  [previousSelectedPost.id]: previousSelectedPost,
- }
+ },
  },
  preferences: {myPreferences: {}},
  },

actions/websocket_actions.jsx

@@ -207,7 +207,7 @@ export function startPeriodicSync() {
  reconnect(false);
  }
  },
- SYNC_INTERVAL_MILLISECONDS
+ SYNC_INTERVAL_MILLISECONDS,
  );
 }
 
@@ -599,7 +599,7 @@ export function handlePostUnreadEvent(msg) {
  msgCount: msg.data.msg_count,
  mentionCount: msg.data.mention_count,
  },
- }
+ },
  );
 }
 
@@ -1160,27 +1160,27 @@ function handleGroupUpdatedEvent(msg) {
 function handleGroupAssociatedToTeamEvent(msg) {
  store.dispatch({
  type: GroupTypes.RECEIVED_GROUP_ASSOCIATED_TO_TEAM,
- data: {teamID: msg.broadcast.team_id, groups: [{id: msg.data.group_id}]}
+ data: {teamID: msg.broadcast.team_id, groups: [{id: msg.data.group_id}]},
  });
 }
 
 function handleGroupNotAssociatedToTeamEvent(msg) {
  store.dispatch({
  type: GroupTypes.RECEIVED_GROUP_NOT_ASSOCIATED_TO_TEAM,
- data: {teamID: msg.broadcast.team_id, groups: [{id: msg.data.group_id}]}
+ data: {teamID: msg.broadcast.team_id, groups: [{id: msg.data.group_id}]},
  });
 }
 
 function handleGroupAssociatedToChannelEvent(msg) {
  store.dispatch({
  type: GroupTypes.RECEIVED_GROUP_ASSOCIATED_TO_CHANNEL,
- data: {channelID: msg.broadcast.channel_id, groups: [{id: msg.data.group_id}]}
+ data: {channelID: msg.broadcast.channel_id, groups: [{id: msg.data.group_id}]},
  });
 }
 
 function handleGroupNotAssociatedToChannelEvent(msg) {
  store.dispatch({
  type: GroupTypes.RECEIVED_GROUP_NOT_ASSOCIATED_TO_CHANNEL,
- data: {channelID: msg.broadcast.channel_id, groups: [{id: msg.data.group_id}]}
+ data: {channelID: msg.broadcast.channel_id, groups: [{id: msg.data.group_id}]},
  });
 }