Update dependencies, clean up util imports

Author: Christian Guy

.eslintrc

@@ -15,7 +15,6 @@
     "compat/compat": 2,
     "consistent-return": "off",
     "comma-dangle": "off",
-    "flowtype-errors/show-errors": 2,
     "generator-star-spacing": "off",
     "import/no-unresolved": ["error", { "ignore": ["electron", "atom"] }],
     "import/no-extraneous-dependencies": "off",
@@ -45,8 +44,6 @@
     "react/sort-comp": "off"
   },
   "plugins": [
-    "flowtype",
-    "flowtype-errors",
     "import",
     "promise",
     "compat",

.flowconfig

@@ -1,7 +1,7 @@
 'use babel';
 'use strict';
 
-import StreamsUtils from './util/streams-utils';
+import { StreamsUtils } from './util';
 
 export default class LintHandler {
   linter = null;

lib/LintHandler.js

@@ -51,13 +51,15 @@ import {
   refreshToolkits,
   setFormDataField,
 } from '../actions';
-import StateSelector from '../util/state-selectors';
-import ResponseSelector from '../util/rest-v5-response-selector';
-import StreamsRestUtils from '../util/streams-rest-v5';
-import SourceArchiveUtils from '../util/source-archive-utils';
-import StatusUtils from '../util/status-utils';
-import StreamsToolkitUtils from '../util/streams-toolkits-utils';
-import KeychainUtils from '../util/keychain-utils';
+import {
+  StateSelector,
+  ResponseSelector,
+  StreamsRestUtils,
+  SourceArchiveUtils,
+  StatusUtils,
+  StreamsToolkitsUtils,
+  KeychainUtils
+} from '../util';
 import MessageHandlerRegistry from '../message-handler-registry';
 
 
@@ -424,14 +426,14 @@ const refreshToolkitsEpic = (action, state) => action.pipe(
   mergeMap(([a, s]) => StreamsRestUtils.toolkit.getToolkits(s).pipe(
     tap(() => MessageHandlerRegistry.getDefault().handleInfo('Initializing toolkit index cache')),
     map(toolkitsResponse => ResponseSelector.getToolkits(toolkitsResponse)),
-    map(toolkits => StreamsToolkitUtils.getToolkitsToCache(s, toolkits)),
+    map(toolkits => StreamsToolkitsUtils.getToolkitsToCache(s, toolkits)),
     mergeMap(toolkitsToCache => forkJoin(from(toolkitsToCache).pipe(
       mergeMap(toolkitToCache => StreamsRestUtils.toolkit.getToolkitIndex(s, toolkitToCache.id).pipe(
-        map(toolkitIndexResponse => StreamsToolkitUtils.cacheToolkitIndex(s, toolkitToCache, toolkitIndexResponse.body))
+        map(toolkitIndexResponse => StreamsToolkitsUtils.cacheToolkitIndex(s, toolkitToCache, toolkitIndexResponse.body))
       )),
       defaultIfEmpty('empty')
     ))),
-    tap(() => StreamsToolkitUtils.refreshLspToolkits(s, MessageHandlerRegistry.sendLspNotification)),
+    tap(() => StreamsToolkitsUtils.refreshLspToolkits(s, MessageHandlerRegistry.sendLspNotification)),
     map(() => ({ type: actions.POST_REFRESH_TOOLKITS })),
     tap(() => MessageHandlerRegistry.getDefault().handleSuccess('Toolkit indexes cached successfully', { notificationAutoDismiss: true })),
     catchError(error => of(handleError(a, error)))

lib/epics/index.js

@@ -13,11 +13,15 @@ import LintHandler from './LintHandler';
 import LintHandlerRegistry from './lint-handler-registry';
 import { SplBuilder } from './spl-build-common';
 import MainCompositePickerView from './views/MainCompositePickerView';
+import Icp4dAuthenticationView from './views/icp4dAuth/Icp4dAuthenticationView';
 
-import KeychainUtils from './util/keychain-utils';
-import StreamsUtils from './util/streams-utils';
-import SourceArchiveUtils from './util/source-archive-utils';
-import StreamsToolkitUtils from './util/streams-toolkits-utils';
+import {
+  StateSelector,
+  KeychainUtils,
+  StreamsUtils,
+  SourceArchiveUtils,
+  StreamsToolkitsUtils
+} from './util';
 import {
   setIcp4dUrl,
   queueAction,
@@ -36,12 +40,9 @@ import {
   checkIcp4dHostExists
 } from './actions';
 import getStore from './redux-store/configure-store';
-import StateSelector from './util/state-selectors';
 
 import { version } from '../package.json';
 
-import Icp4dAuthenticationView from './views/icp4dAuth/Icp4dAuthenticationView';
-
 const CONF_TOOLKITS_PATH = 'ide-ibmstreams.toolkitsPath';
 const CONF_STREAMING_ANALYTICS_CREDENTIALS = 'build-ibmstreams.streamingAnalyticsCredentials';
 const CONF_ICP4D_URL = 'build-ibmstreams.icp4dUrl';
@@ -807,7 +808,7 @@ export default {
         if (StateSelector.hasAuthenticatedToStreamsInstance(getStore().getState())) {
           getStore().dispatch(refreshToolkits());
         }
-        const toolkitInitOptions = StreamsToolkitUtils.getLangServerOptionForInitToolkits(StateSelector.getToolkitsCacheDir(getStore().getState()), StateSelector.getToolkitsPathSetting(getStore().getState()));
+        const toolkitInitOptions = StreamsToolkitsUtils.getLangServerOptionForInitToolkits(StateSelector.getToolkitsCacheDir(getStore().getState()), StateSelector.getToolkitsPathSetting(getStore().getState()));
         MessageHandlerRegistry.sendLspNotification(toolkitInitOptions);
       }
     }

lib/spl-build.js

@@ -0,0 +1,8 @@
+export { default as ResponseSelector } from './rest-v5-response-selector';
+export { default as StateSelector } from './state-selectors';
+export { default as SourceArchiveUtils } from './source-archive-utils';
+export { default as StatusUtils } from './status-utils';
+export { default as StreamsRestUtils } from './streams-rest-v5';
+export { default as StreamsToolkitsUtils } from './streams-toolkits-utils';
+export { default as StreamsUtils } from './streams-utils';
+export { default as KeychainUtils } from './keychain-utils';

lib/util/index.js

@@ -29,7 +29,7 @@ const baseRequestOptions = {
 const baseRequest = request.defaults(baseRequestOptions);
 
 /**
- *  StreamsRestUtil.build
+ *  StreamsRestUtils.build
  */
 
 function getAll(state) {
@@ -172,7 +172,7 @@ function getSnapshots(state) {
 }
 
 /**
- *  StreamsRestUtil.artifact
+ *  StreamsRestUtils.artifact
  */
 
 function getArtifacts(state, buildId) {
@@ -268,7 +268,7 @@ function submitJob(
 }
 
 /**
- *  StreamsRestUtil.toolkit
+ *  StreamsRestUtils.toolkit
  */
 
 function getToolkits(state) {
@@ -445,11 +445,11 @@ const icp4d = {
   getStreamsAuthToken
 };
 
-const StreamsRestUtil = {
+const StreamsRestUtils = {
   build,
   artifact,
   toolkit,
   icp4d
 };
 
-export default StreamsRestUtil;
+export default StreamsRestUtils;

lib/util/streams-rest-v5.js

@@ -13,7 +13,7 @@ import {
   setFormDataField,
   setIcp4dAuthError
 } from '../../../actions';
-import StateSelector from '../../../util/state-selectors';
+import { StateSelector } from '../../../util';
 import MessageHandlerRegistry from '../../../message-handler-registry';
 
 const errorInputStyle = {

lib/views/icp4dAuth/components/Step1.js

@@ -8,7 +8,7 @@ import { ReactLoading } from 'react-loading';
 import Select from 'react-select';
 import { connect } from 'react-redux';
 import { setSelectedInstance, setCurrentLoginStep } from '../../../actions';
-import StateSelector from '../../../util/state-selectors';
+import { StateSelector } from '../../../util';
 
 const buttonBarStyle = {
   display: 'flex',

lib/views/icp4dAuth/components/Step2.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import * as React from 'react';
 import { Button, ButtonToolbar, Alert } from 'react-bootstrap';
 import { connect } from 'react-redux';
-import StateSelector from '../../../util/state-selectors';
+import { StateSelector } from '../../../util';
 import { setCurrentLoginStep } from '../../../actions';
 
 const buttonContainerStyle = {