From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 30 Jul 2021 10:54:54 +0200 Subject: chore: migrate from tslint to @typescript-eslint (#1706) - update .eslintrc to work for .js and .ts - update devDependencies - lint properly both root /src and nested /packages - update webhint recommended setting for tsconfig.json to shrink output - Manage all eslint rules from the repo root - escape single quotes in scripts to please windows build Co-authored-by: Vijay A --- .../settings/services/EditServiceForm.js | 2 +- .../settings/services/ServicesDashboard.js | 4 ++-- .../settings/settings/EditSettingsForm.js | 23 +++++++++++----------- .../settings/supportFerdi/SupportFerdiDashboard.js | 18 ++++++++--------- src/components/settings/user/EditUserForm.js | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 56e5f9c94..5e424fdd5 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -266,7 +266,7 @@ export default @observer class EditServiceForm extends Component {
-
this.submit(e)} id="form"> + this.submit(e)} id="form">
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index a05af5da0..11d3eaa79 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -96,7 +96,7 @@ export default @observer class ServicesDashboard extends Component { {(services.length !== 0 || searchNeedle) && !isLoading && ( filterServices({ needle })} + onChange={(needle) => filterServices({ needle })} onReset={() => resetFilter()} autoFocus /> @@ -163,7 +163,7 @@ export default @observer class ServicesDashboard extends Component { ) : ( - {services.map(service => ( + {services.map((service) => (
this.submit(e)} - onChange={e => this.submit(e)} + onSubmit={(e) => this.submit(e)} + onChange={(e) => this.submit(e)} id="form" > {/* Titles */} @@ -367,7 +367,7 @@ export default @observer class EditSettingsForm extends Component {
this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('customTodoServer')} />

this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('scheduledDNDStart')} type="time" /> @@ -413,7 +413,7 @@ export default @observer class EditSettingsForm extends Component { > this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('scheduledDNDEnd')} type="time" /> @@ -480,7 +480,7 @@ export default @observer class EditSettingsForm extends Component { this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('accentColor')} />

@@ -515,7 +515,7 @@ export default @observer class EditSettingsForm extends Component { this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('lockedPassword')} type="password" scorePassword @@ -527,7 +527,7 @@ export default @observer class EditSettingsForm extends Component { this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('inactivityLock')} autoFocus /> @@ -570,6 +570,7 @@ export default @observer class EditSettingsForm extends Component { href={FRANZ_TRANSLATION} target="_blank" className="link" + rel="noreferrer" > {intl.formatMessage(messages.translationHelp)} {' '} @@ -588,7 +589,7 @@ export default @observer class EditSettingsForm extends Component { this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('userAgentPref')} />

{intl.formatMessage(globalMessages.userAgentHelp)}

@@ -674,12 +675,12 @@ export default @observer class EditSettingsForm extends Component { Ferdi is based on {' '} - Franz + Franz , a project published under the {' '} - Apache-2.0 License + Apache-2.0 License
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js index 36c126565..b84e06739 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js @@ -94,10 +94,10 @@ class SupportFerdiDashboard extends Component {

{intl.formatMessage(messages.title)}

- GitHub Stars - Twitter Follow - Open Collective backers - Open Collective sponsors + GitHub Stars + Twitter Follow + Open Collective backers + Open Collective sponsors


@@ -109,7 +109,7 @@ class SupportFerdiDashboard extends Component {

{intl.formatMessage(messages.textListContributors)} - + {' '} {intl.formatMessage(messages.textListContributorsHere)} @@ -122,7 +122,7 @@ class SupportFerdiDashboard extends Component {

{intl.formatMessage(messages.textSupportWelcome)} - + {' '} {intl.formatMessage(messages.textSupportWelcomeHere)} @@ -130,7 +130,7 @@ class SupportFerdiDashboard extends Component {

{intl.formatMessage(messages.textExpenses)} - + {' '} {intl.formatMessage(messages.textOpenCollective)} @@ -138,14 +138,14 @@ class SupportFerdiDashboard extends Component {

{intl.formatMessage(messages.textDonation)} - + {' '} {intl.formatMessage(messages.textOpenCollective)} {' '} {intl.formatMessage(messages.textDonationAnd)} - + {' '} {intl.formatMessage(messages.textGitHubSponsors)} diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index a1a353e57..db78acb69 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -84,7 +84,7 @@ export default @observer class EditUserForm extends Component {

- this.submit(e)} id="form"> + this.submit(e)} id="form"> {status.length > 0 && status.includes('data-updated') && (