From 7f0581018b66975fecf6b348fc98cf076ec36683 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 6 Dec 2019 21:38:58 -0500 Subject: [PATCH] New: Enforce Indent after Logical for UI --- frontend/.eslintrc | 2 +- .../AddNewMovie/AddNewMovieSearchResult.js | 44 +++--- frontend/src/App/AppRoutes.js | 26 ++-- frontend/src/Calendar/CalendarPage.js | 6 +- .../Movie/History/MovieHistoryTableContent.js | 30 ++-- .../Movie/Titles/MovieTitlesTableContent.js | 28 ++-- .../src/Settings/General/ProxySettings.js | 142 +++++++++--------- .../src/Settings/General/SecuritySettings.js | 40 ++--- .../src/Settings/General/UpdateSettings.js | 82 +++++----- .../src/Settings/Indexers/Indexers/Indexer.js | 12 +- .../MediaManagement/MediaManagement.js | 6 +- .../Settings/NetImport/NetImport/NetImport.js | 12 +- .../Notifications/Notification.js | 6 +- frontend/src/System/Events/LogsTable.js | 60 ++++---- .../src/System/Tasks/Queued/QueuedTasks.js | 34 ++--- .../System/Tasks/Scheduled/ScheduledTasks.js | 34 ++--- frontend/src/System/Updates/Updates.js | 16 +- 17 files changed, 290 insertions(+), 290 deletions(-) diff --git a/frontend/.eslintrc b/frontend/.eslintrc index 8593e9f61..21ef60f75 100644 --- a/frontend/.eslintrc +++ b/frontend/.eslintrc @@ -268,7 +268,7 @@ "react/jsx-curly-spacing": [2, "never"], "react/jsx-equals-spacing": [2, "never"], "react/jsx-indent-props": [2, 2], - "react/jsx-indent": [2, 2], + "react/jsx-indent": [2, 2, { "indentLogicalExpressions": true }], "react/jsx-key": 2, "react/jsx-no-bind": [2, { "allowArrowFunctions": true }], "react/jsx-no-duplicate-props": [2, { "ignoreCase": true }], diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js index 0c18c644b..019885ce5 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js @@ -88,27 +88,27 @@ class AddNewMovieSearchResult extends Component { { !title.contains(year) && !!year && - ({year}) + ({year}) } { isExistingMovie && - + } { isExclusionMovie && - + } @@ -122,19 +122,19 @@ class AddNewMovieSearchResult extends Component { { !!studio && - + } { status === 'ended' && - + } diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js index ce0ba11a3..d3052ed9e 100644 --- a/frontend/src/App/AppRoutes.js +++ b/frontend/src/App/AppRoutes.js @@ -53,19 +53,19 @@ function AppRoutes(props) { { window.Radarr.urlBase && - { - return ( - - ); - }} - /> + { + return ( + + ); + }} + /> } { movieError && -
- {getErrorMessage(movieError, 'Failed to load movie from API')} -
+
+ {getErrorMessage(movieError, 'Failed to load movie from API')} +
} { diff --git a/frontend/src/Movie/History/MovieHistoryTableContent.js b/frontend/src/Movie/History/MovieHistoryTableContent.js index 0f2e44769..2a914dcbf 100644 --- a/frontend/src/Movie/History/MovieHistoryTableContent.js +++ b/frontend/src/Movie/History/MovieHistoryTableContent.js @@ -78,21 +78,21 @@ class MovieHistoryTableContent extends Component { { isPopulated && hasItems && !error && - - - { - items.reverse().map((item) => { - return ( - - ); - }) - } - -
+ + + { + items.reverse().map((item) => { + return ( + + ); + }) + } + +
} ); diff --git a/frontend/src/Movie/Titles/MovieTitlesTableContent.js b/frontend/src/Movie/Titles/MovieTitlesTableContent.js index 6854c1f05..1d00035f8 100644 --- a/frontend/src/Movie/Titles/MovieTitlesTableContent.js +++ b/frontend/src/Movie/Titles/MovieTitlesTableContent.js @@ -51,20 +51,20 @@ class MovieTitlesTableContent extends Component { { isPopulated && hasItems && !error && - - - { - items.reverse().map((item) => { - return ( - - ); - }) - } - -
+ + + { + items.reverse().map((item) => { + return ( + + ); + }) + } + +
} ); diff --git a/frontend/src/Settings/General/ProxySettings.js b/frontend/src/Settings/General/ProxySettings.js index 238cf3a30..5667abd0c 100644 --- a/frontend/src/Settings/General/ProxySettings.js +++ b/frontend/src/Settings/General/ProxySettings.js @@ -44,91 +44,91 @@ function ProxySettings(props) { { proxyEnabled.value && -
- - Proxy Type +
+ + Proxy Type - - + + - - Hostname + + Hostname - - + onChange={onInputChange} + {...proxyHostname} + /> + - - Port + + Port - - + + - - Username + + Username - - + + - - Password + + Password - - + + - - Ignored Addresses + + Ignored Addresses - - + + - - Bypass Proxy for Local Addresses + + Bypass Proxy for Local Addresses - - -
+ +
+
} ); diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js index cacd000ab..6a5204230 100644 --- a/frontend/src/Settings/General/SecuritySettings.js +++ b/frontend/src/Settings/General/SecuritySettings.js @@ -93,32 +93,32 @@ class SecuritySettings extends Component { { authenticationEnabled && - - Username + + Username - - + + } { authenticationEnabled && - - Password + + Password - - + + } diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js index ea5af62f2..f50ff1a7c 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -50,58 +50,58 @@ function UpdateSettings(props) { { !isWindows && -
- - Automatic +
+ + Automatic - - + + - - Mechanism - - - - - { - updateMechanism.value === 'script' && - Script Path + Mechanism - } -
+ + { + updateMechanism.value === 'script' && + + Script Path + + + + } +
} ); diff --git a/frontend/src/Settings/Indexers/Indexers/Indexer.js b/frontend/src/Settings/Indexers/Indexers/Indexer.js index 9269f8532..8d7e5719d 100644 --- a/frontend/src/Settings/Indexers/Indexers/Indexer.js +++ b/frontend/src/Settings/Indexers/Indexers/Indexer.js @@ -96,12 +96,12 @@ class Indexer extends Component { { !enableRss && !enableAutomaticSearch && !enableInteractiveSearch && - + } diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js index e4794631d..a52082635 100644 --- a/frontend/src/Settings/MediaManagement/MediaManagement.js +++ b/frontend/src/Settings/MediaManagement/MediaManagement.js @@ -64,9 +64,9 @@ class MediaManagement extends Component { { !isFetching && error && -
-
Unable to load Media Management settings
-
+
+
Unable to load Media Management settings
+
} { diff --git a/frontend/src/Settings/NetImport/NetImport/NetImport.js b/frontend/src/Settings/NetImport/NetImport/NetImport.js index 0969d72c7..3816a17bb 100644 --- a/frontend/src/Settings/NetImport/NetImport/NetImport.js +++ b/frontend/src/Settings/NetImport/NetImport/NetImport.js @@ -86,12 +86,12 @@ class NetImport extends Component { { !enabled && !enableAuto && - + } diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js index c1db80cc5..0c326668c 100644 --- a/frontend/src/Settings/Notifications/Notifications/Notification.js +++ b/frontend/src/Settings/Notifications/Notifications/Notification.js @@ -106,9 +106,9 @@ class Notification extends Component { { supportsOnHealthIssue && onHealthIssue && - + } { diff --git a/frontend/src/System/Events/LogsTable.js b/frontend/src/System/Events/LogsTable.js index ce6d0c995..b089d4b19 100644 --- a/frontend/src/System/Events/LogsTable.js +++ b/frontend/src/System/Events/LogsTable.js @@ -76,45 +76,45 @@ function LogsTable(props) { { isFetching && !isPopulated && - + } { isPopulated && !error && !items.length && -
- No logs found -
+
+ No logs found +
} { isPopulated && !error && !!items.length && -
- - - { - items.map((item) => { - return ( - - ); - }) - } - -
+
+ + + { + items.map((item) => { + return ( + + ); + }) + } + +
- -
+ +
}
diff --git a/frontend/src/System/Tasks/Queued/QueuedTasks.js b/frontend/src/System/Tasks/Queued/QueuedTasks.js index a2fd526fa..e856df532 100644 --- a/frontend/src/System/Tasks/Queued/QueuedTasks.js +++ b/frontend/src/System/Tasks/Queued/QueuedTasks.js @@ -54,27 +54,27 @@ function QueuedTasks(props) {
{ isFetching && !isPopulated && - + } { isPopulated && - - - { - items.map((item) => { - return ( - - ); - }) - } - -
+ + + { + items.map((item) => { + return ( + + ); + }) + } + +
}
); diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js index 7c6fe8a32..9dbb72f4d 100644 --- a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js +++ b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js @@ -44,27 +44,27 @@ function ScheduledTasks(props) {
{ isFetching && !isPopulated && - + } { isPopulated && - - - { - items.map((item) => { - return ( - - ); - }) - } - -
+ + + { + items.map((item) => { + return ( + + ); + }) + } + +
}
); diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js index 05623f64d..2e872eb68 100644 --- a/frontend/src/System/Updates/Updates.js +++ b/frontend/src/System/Updates/Updates.js @@ -55,14 +55,14 @@ class Updates extends Component {
{ !isDocker && - - Install Latest - + + Install Latest + } {