From 8e812c1e720af23a4fa50a492981940cddd4f7f3 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 6 Jul 2021 16:23:44 -0300 Subject: [PATCH] 17782: Fixes 'no-mixed-operators' compile warnings. Reference: https://eslint.org/docs/rules/no-mixed-operators Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- src/services/services.ts | 2 +- src/store/process-logs-panel/process-logs-panel-actions.ts | 2 +- src/views-components/details-panel/collection-details.tsx | 4 ++-- src/views-components/login-form/login-form.tsx | 2 +- src/views/collection-panel/collection-panel.tsx | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index a887717c..b9118981 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -80,7 +80,7 @@ export const createServices = (config: Config, actions: ApiActions, useApiClient const ancestorsService = new AncestorService(groupsService, userService); - const idleTimeout = config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout || '0s'; + const idleTimeout = (config && config.clusterConfig && config.clusterConfig.Workbench.IdleTimeout) || '0s'; const authService = new AuthService(apiClient, config.rootUrl, actions, (parse(idleTimeout, 's') || 0) > 0); diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts index de6528d9..ecbd030b 100644 --- a/src/store/process-logs-panel/process-logs-panel-actions.ts +++ b/src/store/process-logs-panel/process-logs-panel-actions.ts @@ -51,7 +51,7 @@ export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: st if (process) { const { containerRequest, container } = process; if (message.objectUuid === containerRequest.uuid - || container && message.objectUuid === container.uuid) { + || (container && message.objectUuid === container.uuid)) { dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({ logType: SUMMARIZED_FILTER_TYPE, log: message.properties.text diff --git a/src/views-components/details-panel/collection-details.tsx b/src/views-components/details-panel/collection-details.tsx index 9f03f38a..0e747fed 100644 --- a/src/views-components/details-panel/collection-details.tsx +++ b/src/views-components/details-panel/collection-details.tsx @@ -70,10 +70,10 @@ interface CollectionVersionBrowserDispatchProps { const mapStateToProps = (state: RootState): CollectionVersionBrowserProps => { const currentCollection = getResource(state.detailsPanel.resourceUuid)(state.resources); - const versions = currentCollection + const versions = (currentCollection && filterResources(rsc => (rsc as CollectionResource).currentVersionUuid === currentCollection.currentVersionUuid)(state.resources) - .sort((a: CollectionResource, b: CollectionResource) => b.version - a.version) as CollectionResource[] + .sort((a: CollectionResource, b: CollectionResource) => b.version - a.version) as CollectionResource[]) || []; return { currentCollection, versions }; }; diff --git a/src/views-components/login-form/login-form.tsx b/src/views-components/login-form/login-form.tsx index e4ede79b..aac13642 100644 --- a/src/views-components/login-form/login-form.tsx +++ b/src/views-components/login-form/login-form.tsx @@ -98,7 +98,7 @@ export const LoginForm = withStyles(styles)( .catch((err) => { setError(true); setSubmitting(false); - setHelperText(`${err.response && err.response.data && err.response.data.errors[0] || 'Error logging in: '+err}`); + setHelperText(`${(err.response && err.response.data && err.response.data.errors[0]) || 'Error logging in: '+err}`); setFocus(); }); }; diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx index 4d0211e6..94a5af33 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -126,8 +126,8 @@ export const CollectionPanel = withStyles(styles)( } } const loadingFilesIndicator = getProgressIndicator(COLLECTION_PANEL_LOAD_FILES)(state.progressIndicator); - const isLoadingFiles = loadingFilesIndicator && loadingFilesIndicator!.working || false; - const tooManyFiles = !state.collectionPanel.loadBigCollections && item && item.fileCount > COLLECTION_PANEL_LOAD_FILES_THRESHOLD || false; + const isLoadingFiles = (loadingFilesIndicator && loadingFilesIndicator!.working) || false; + const tooManyFiles = (!state.collectionPanel.loadBigCollections && item && item.fileCount > COLLECTION_PANEL_LOAD_FILES_THRESHOLD) || false; return { item, isWritable, isOldVersion, isLoadingFiles, tooManyFiles }; })( class extends React.Component { -- 2.30.2