From bfc4b2b7201a97ebd480ec18a269002d2493d8da Mon Sep 17 00:00:00 2001 From: audric Date: Thu, 22 Jul 2021 16:34:17 +1000 Subject: [PATCH] lint --- .../conversation/ConversationHeader.tsx | 2 +- .../conversation/SessionConversation.tsx | 2 +- .../conversation/SessionMessagesList.tsx | 6 +-- .../SessionMessagesListContainer.tsx | 6 +-- .../conversation/SessionMessagesTypes.tsx | 8 ++-- ts/hooks/useEncryptedFileFetch.ts | 4 +- ts/models/conversation.ts | 3 +- ts/models/message.ts | 7 ++-- ts/session/utils/Performance.ts | 2 + ts/state/ducks/conversations.ts | 2 + ts/state/smart/SessionConversation.ts | 2 +- .../unit/attachments/attachments_test.ts | 3 ++ tslint.json | 39 ------------------- 13 files changed, 27 insertions(+), 59 deletions(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 3b44d4728..d9cc42b81 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -24,10 +24,10 @@ import { useMembersAvatars } from '../../hooks/useMembersAvatar'; import { deleteMessagesById } from '../../interactions/conversationInteractions'; import { closeMessageDetailsView, + NotificationForConvoOption, openRightPanel, resetSelectedMessageIds, } from '../../state/ducks/conversations'; -import { NotificationForConvoOption } from '../../state/ducks/conversations'; export interface TimerOption { name: string; diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index 2bb281164..7ee8ef445 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -33,8 +33,8 @@ import { getPubkeysInPublicConversation } from '../../../data/data'; import autoBind from 'auto-bind'; import { useSelector } from 'react-redux'; import { - isFirstUnreadMessageIdAbove, getFirstUnreadMessageId, + isFirstUnreadMessageIdAbove, } from '../../../state/selectors/conversations'; interface State { diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx index 8456132e9..1350f8dee 100644 --- a/ts/components/session/conversation/SessionMessagesList.tsx +++ b/ts/components/session/conversation/SessionMessagesList.tsx @@ -4,11 +4,11 @@ import { QuoteClickOptions } from '../../../models/messageType'; import { SortedMessageModelProps } from '../../../state/ducks/conversations'; import { getSortedMessagesOfSelectedConversation } from '../../../state/selectors/conversations'; import { - GroupUpdateItem, - GroupInvitationItem, DataExtractionNotificationItem, - TimerNotificationItem, GenericMessageItem, + GroupInvitationItem, + GroupUpdateItem, + TimerNotificationItem, } from './SessionMessagesTypes'; export const SessionMessagesList = (props: { diff --git a/ts/components/session/conversation/SessionMessagesListContainer.tsx b/ts/components/session/conversation/SessionMessagesListContainer.tsx index f01693140..c7514d497 100644 --- a/ts/components/session/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/session/conversation/SessionMessagesListContainer.tsx @@ -23,12 +23,12 @@ import { ConversationTypeEnum } from '../../../models/conversation'; import { StateType } from '../../../state/reducer'; import { connect } from 'react-redux'; import { - getSortedMessagesOfSelectedConversation, + areMoreMessagesBeingFetched, getQuotedMessageToAnimate, getSelectedConversation, getSelectedConversationKey, getShowScrollButton, - areMoreMessagesBeingFetched, + getSortedMessagesOfSelectedConversation, } from '../../../state/selectors/conversations'; import { isElectronWindowFocused } from '../../../session/utils/WindowUtils'; import { SessionMessagesList } from './SessionMessagesList'; @@ -306,12 +306,10 @@ class SessionMessagesListContainerInner extends React.Component { if (conversation.unreadCount < messagesProps.length) { // if we loaded all unread messages, scroll to the first one unread const firstUnread = Math.max(conversation.unreadCount, 0); - messagesProps[firstUnread].propsForMessage.id; this.scrollToMessage(messagesProps[firstUnread].propsForMessage.id); } else { // if we did not load all unread messages, just scroll to the middle of the loaded messages list. so the user can choose to go up or down from there const middle = Math.floor(messagesProps.length / 2); - messagesProps[middle].propsForMessage.id; this.scrollToMessage(messagesProps[middle].propsForMessage.id); } } diff --git a/ts/components/session/conversation/SessionMessagesTypes.tsx b/ts/components/session/conversation/SessionMessagesTypes.tsx index f6e5180b5..64aae3e33 100644 --- a/ts/components/session/conversation/SessionMessagesTypes.tsx +++ b/ts/components/session/conversation/SessionMessagesTypes.tsx @@ -1,20 +1,20 @@ import React from 'react'; import { useSelector } from 'react-redux'; import { + MessageRenderingProps, PropsForDataExtractionNotification, QuoteClickOptions, - MessageRenderingProps, } from '../../../models/messageType'; import { - PropsForGroupUpdate, - PropsForGroupInvitation, PropsForExpirationTimer, + PropsForGroupInvitation, + PropsForGroupUpdate, SortedMessageModelProps, } from '../../../state/ducks/conversations'; import { getFirstUnreadMessageId, - isMessageSelectionMode, getNextMessageToPlayIndex, + isMessageSelectionMode, } from '../../../state/selectors/conversations'; import { DataExtractionNotification } from '../../conversation/DataExtractionNotification'; import { GroupInvitation } from '../../conversation/GroupInvitation'; diff --git a/ts/hooks/useEncryptedFileFetch.ts b/ts/hooks/useEncryptedFileFetch.ts index 6c212429b..0b3162980 100644 --- a/ts/hooks/useEncryptedFileFetch.ts +++ b/ts/hooks/useEncryptedFileFetch.ts @@ -21,7 +21,9 @@ export const useEncryptedFileFetch = (url: string, contentType: string) => { useEffect(() => { void fetchUrl(); - () => (mountedRef.current = false); + return () => { + mountedRef.current = false; + }; }, [url]); return { urlToLoad, loading }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 0bae96abd..2bfb47f22 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -26,8 +26,8 @@ import { conversationChanged, LastMessageStatusType, MessageModelProps, - ReduxConversationType, NotificationForConvoOption, + ReduxConversationType, } from '../state/ducks/conversations'; import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage'; @@ -199,6 +199,7 @@ export class ConversationModel extends Backbone.Model { this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000, trailing: true }); //start right away the function is called, and wait 1sec before calling it again const markReadDebounced = _.debounce(this.markReadBouncy, 1000, { leading: true }); + // tslint:disable-next-line: no-async-without-await this.markRead = async (newestUnreadDate: number) => { const lastReadTimestamp = this.lastReadTimestamp; if (newestUnreadDate > lastReadTimestamp) { diff --git a/ts/models/message.ts b/ts/models/message.ts index 4fd58e680..b5fd0c501 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -100,10 +100,6 @@ export class MessageModel extends Backbone.Model { return messageProps; } - private dispatchMessageUpdate() { - window.inboxStore?.dispatch(conversationActions.messageChanged(this.getProps())); - } - public idForLogging() { return `${this.get('source')} ${this.get('sent_at')}`; } @@ -1181,6 +1177,9 @@ export class MessageModel extends Backbone.Model { return false; } } + private dispatchMessageUpdate() { + window.inboxStore?.dispatch(conversationActions.messageChanged(this.getProps())); + } } export class MessageCollection extends Backbone.Collection {} diff --git a/ts/session/utils/Performance.ts b/ts/session/utils/Performance.ts index 1efee9696..b3226833b 100644 --- a/ts/session/utils/Performance.ts +++ b/ts/session/utils/Performance.ts @@ -1,10 +1,12 @@ export function perfStart(prefix: string) { + // tslint:disable-next-line: no-typeof-undefined if (typeof performance !== 'undefined') { performance?.mark(`${prefix}-start`); } } export function perfEnd(prefix: string, measureName: string) { + // tslint:disable-next-line: no-typeof-undefined if (typeof performance !== 'undefined') { performance?.mark(`${prefix}-end`); performance?.measure(measureName, `${prefix}-start`, `${prefix}-end`); diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 8f31e6341..af5c3d219 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -315,9 +315,11 @@ export const fetchMessagesForConversation = createAsyncThunk( count: number; }): Promise => { const beforeTimestamp = Date.now(); + // tslint:disable-next-line: no-console console.time('fetchMessagesForConversation'); const messagesProps = await getMessages(conversationKey, count); const afterTimestamp = Date.now(); + // tslint:disable-next-line: no-console console.timeEnd('fetchMessagesForConversation'); const time = afterTimestamp - beforeTimestamp; diff --git a/ts/state/smart/SessionConversation.ts b/ts/state/smart/SessionConversation.ts index 7e2c40881..93c52c0b2 100644 --- a/ts/state/smart/SessionConversation.ts +++ b/ts/state/smart/SessionConversation.ts @@ -5,10 +5,10 @@ import { StateType } from '../reducer'; import { getTheme } from '../selectors/theme'; import { getLightBoxOptions, - getSortedMessagesOfSelectedConversation, getSelectedConversation, getSelectedConversationKey, getSelectedMessageIds, + getSortedMessagesOfSelectedConversation, isMessageDetailView, isRightPanelShowing, } from '../selectors/conversations'; diff --git a/ts/test/session/unit/attachments/attachments_test.ts b/ts/test/session/unit/attachments/attachments_test.ts index deb602f38..3bdc59be6 100644 --- a/ts/test/session/unit/attachments/attachments_test.ts +++ b/ts/test/session/unit/attachments/attachments_test.ts @@ -24,6 +24,9 @@ describe('Attachments', () => { get: () => '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef', }, }); + + // TestUtils.stubWindow('callWorker', {}), + // }); }); after(async () => { diff --git a/tslint.json b/tslint.json index e74f971d7..3fae74307 100644 --- a/tslint.json +++ b/tslint.json @@ -3,37 +3,26 @@ "extends": ["tslint:recommended", "tslint-react", "tslint-microsoft-contrib"], "jsRules": {}, "rules": { - // prettier is handling this "align": false, "newline-per-chained-call": false, "array-type": [true, "generic"], - // Preferred by Prettier: "arrow-parens": [true, "ban-single-arg-parens"], "import-spacing": false, "indent": [true, "spaces", 2], "interface-name": [true, "never-prefix"], - // Allows us to write inline `style`s. Revisit when we have a more sophisticated - // CSS-in-JS solution: "jsx-no-multiline-js": false, - // We'll make tradeoffs where appropriate "jsx-no-lambda": false, "react-this-binding-issue": false, "linebreak-style": [true, "LF"], - // Prettier handles this for us "max-line-length": false, "mocha-avoid-only": true, - // Disabled until we can allow dynamically generated tests: - // https://github.com/Microsoft/tslint-microsoft-contrib/issues/85#issuecomment-371749352 "mocha-no-side-effect-code": false, "mocha-unneeded-done": true, - // We always want 'as Type' "no-angle-bracket-type-assertion": true, "no-consecutive-blank-lines": [true, 2], "object-literal-key-quotes": [true, "as-needed"], "object-literal-sort-keys": false, "no-async-without-await": true, - // Ignore import sources order until we can specify that we want ordering - // based on import name vs module name: "ordered-imports": [ true, { @@ -42,9 +31,7 @@ } ], "quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"], - // Preferred by Prettier: "semicolon": [true, "always", "ignore-bound-class-methods"], - // Preferred by Prettier: "trailing-comma": [ true, { @@ -58,9 +45,6 @@ "esSpecCompliant": true } ], - // Disabling a large set of Microsoft-recommended rules - // Modifying: - // React components and namespaces are Pascal case "variable-name": [true, "check-format", "allow-leading-underscore", "allow-pascal-case"], "function-name": [ true, @@ -72,46 +56,25 @@ "static-method-regex": "^[a-zA-Z][\\w\\d]+$" } ], - // Adding select dev dependencies here for now, may turn on all in the future "no-implicit-dependencies": [true, ["electron"]], - // Maybe will turn on: - // We're not trying to be comprehensive with JSDoc right now. We have the style guide. "completed-docs": false, - // Today we have files with a single named export which isn't the filename. Eventually. "export-name": false, - // We have a lot of 'any' in our code today "no-any": false, - // We use this today, could get rid of it "no-increment-decrement": false, - // This seems to detect false positives: any multi-level object literal, for example "no-object-literal-type-assertion": false, - // I like relative references to the current dir, or absolute. Maybe can do this? "no-relative-imports": false, - // We have a lot of 'any' in our code today "no-unsafe-any": false, - // Not everything needs to be typed right now "typedef": false, - // Probably won't turn on: "possible-timing-attack": false, - // We use null "no-null-keyword": false, - // We want to import a capitalized React, for example "import-name": false, - // We have the styleguide for better docs "missing-jsdoc": false, - // 'type' and 'number' are just too common "no-reserved-keywords": false, - // The style guide needs JSDoc-style block comments to extract proptype documentation "no-single-line-block-comment": false, - // Out-of-order functions can improve readability "no-use-before-declare": false, - // We use Array syntax "prefer-array-literal": false, - // We prefer key: () => void syntax, because it suggests an object instead of a class "prefer-method-signature": false, - // 'as' is nicer than angle brackets. "prefer-type-cast": false, - // We use || and && shortcutting because we're javascript programmers "strict-boolean-expressions": false, "no-promise-as-boolean": true, "await-promise": true, @@ -130,8 +93,6 @@ "comment": "Usage has been approved by Maxim on 13 Dec 2019" } ], - // Reasonable functions can exceed the default of 100 lines - // due to auto-formatting "max-func-body-length": [true, 150] }, "rulesDirectory": ["node_modules/tslint-microsoft-contrib"]