Prettier support

2021-03-10 21:14:32 -06:00
parent c51b527707
commit 0924490a6f
99 changed files with 5504 additions and 3979 deletions
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import './App.css';
 import Box from './components/UI/Box/Box';
 import Configuration from './containers/Configuration/Configuration';
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
 import DependencyList from './components/DependencyList/DependencyList';
 import DownloadProgress from './components/DownloadProgress/DownloadProgress';
 import ErrorDetails from './components/ErrorDetails/ErrorDetails';
@@ -11,17 +11,17 @@ import InfoDetails from './components/InfoDetails/InfoDetails';
 import IPCContainer from './containers/IPCContainer/IPCContainer';
 import Loading from './components/UI/Loading/Loading';
 import MountItems from './containers/MountItems/MountItems';
-import NewReleases from './components/NewReleases/NewReleases';
-import {notifyError} from './redux/actions/error_actions';
+import NewReleases from './components/NewReleases/NewReleases.jsx';
+import { notifyError } from './redux/actions/error_actions';
 import Reboot from './components/Reboot/Reboot';
 import {
  setDismissNewReleasesAvailable,
-  setNewReleasesAvailable
+  setNewReleasesAvailable,
 } from './redux/actions/release_version_actions';
 import ReleaseVersionDisplay from './components/ReleaseVersionDisplay/ReleaseVersionDisplay';
 import {
  displaySelectAppPlatform,
-  saveState
+  saveState,
 } from './redux/actions/common_actions';
 import SelectAppPlatform from './containers/SelectAppPlatform/SelectAppPlatform';
 import Text from './components/UI/Text/Text';
@@ -29,10 +29,10 @@ import UpgradeIcon from './components/UpgradeIcon/UpgradeIcon';
 import UpgradeUI from './components/UpgradeUI/UpgradeUI';
 import {
  loadReleases,
-  setDismissUIUpgrade
+  setDismissUIUpgrade,
 } from './redux/actions/release_version_actions';
 import YesNo from './components/YesNo/YesNo';
-import {createModalConditionally} from './utils';
+import { createModalConditionally } from './utils.jsx';
 import SkynetImport from './containers/SkynetImport/SkynetImport';
 import ApplicationBusy from './components/ApplicationBusy/ApplicationBusy';
 import SkynetExport from './containers/SkynetExport/SkynetExport';
@@ -59,13 +59,17 @@ class App extends IPCContainer {
  }

  componentDidUpdate(prevProps) {
-    if ((prevProps.Release !== this.props.Release) ||
-      (prevProps.ReleaseVersion !== this.props.ReleaseVersion) ||
-      (prevProps.VersionLookup !== this.props.VersionLookup)) {
+    if (
+      prevProps.Release !== this.props.Release ||
+      prevProps.ReleaseVersion !== this.props.ReleaseVersion ||
+      prevProps.VersionLookup !== this.props.VersionLookup
+    ) {
      this.props.saveState();
-    } else if (Object.keys(this.props.ProviderState).filter(k => {
-      return this.props.ProviderState[k] !== prevProps.ProviderState[k];
-    }).length > 0) {
+    } else if (
+      Object.keys(this.props.ProviderState).filter((k) => {
+        return this.props.ProviderState[k] !== prevProps.ProviderState[k];
+      }).length > 0
+    ) {
      this.props.saveState();
    }
  }
@@ -76,14 +80,16 @@ class App extends IPCContainer {
  }

  getSelectedVersion = () => {
-    return (this.props.ReleaseVersion === -1) ?
-      'unavailable' :
-      this.props.VersionLookup[Constants.RELEASE_TYPES[this.props.Release]][this.props.ReleaseVersion];
+    return this.props.ReleaseVersion === -1
+      ? 'unavailable'
+      : this.props.VersionLookup[Constants.RELEASE_TYPES[this.props.Release]][
+          this.props.ReleaseVersion
+        ];
  };

  handleUpgradeIconClicked = () => {
    if (this.props.UpgradeAvailable) {
-      this.props.setDismissUIUpgrade(false)
+      this.props.setDismissUIUpgrade(false);
    } else if (this.props.NewReleasesAvailable2.length > 0) {
      this.props.setNewReleasesAvailable(this.props.NewReleasesAvailable2);
      this.props.setDismissNewReleasesAvailable(false);
@@ -93,44 +99,54 @@ class App extends IPCContainer {
  render() {
    const selectedVersion = this.getSelectedVersion();

-    const downloadEnabled = this.props.AllowDownload &&
+    const downloadEnabled =
+      this.props.AllowDownload &&
      !this.props.MountsBusy &&
      !this.props.DownloadActive &&
-      (selectedVersion !== 'unavailable') &&
-      (selectedVersion !== this.props.InstalledVersion);
-    const missingDependencies = (this.props.MissingDependencies.length > 0) &&
-      this.props.AllowMount;
+      selectedVersion !== 'unavailable' &&
+      selectedVersion !== this.props.InstalledVersion;
+    const missingDependencies =
+      this.props.MissingDependencies.length > 0 && this.props.AllowMount;

-    const allowMount = this.props.AllowMount &&
+    const allowMount =
+      this.props.AllowMount &&
      this.props.InstalledVersion !== 'none' &&
      !missingDependencies &&
      !this.props.InstallActive;

-    const remoteSupported = this.props.LocationsLookup[selectedVersion] &&
+    const remoteSupported =
+      this.props.LocationsLookup[selectedVersion] &&
      this.props.LocationsLookup[selectedVersion].supports_remote;

-    const s3Supported = this.props.LocationsLookup[selectedVersion] &&
+    const s3Supported =
+      this.props.LocationsLookup[selectedVersion] &&
      this.props.LocationsLookup[selectedVersion].s3_support;

-    const skynetSupported = this.props.LocationsLookup[selectedVersion] &&
+    const skynetSupported =
+      this.props.LocationsLookup[selectedVersion] &&
      this.props.LocationsLookup[selectedVersion].skynet_support;

-    const scPrimeSupported = this.props.LocationsLookup[selectedVersion] &&
+    const scPrimeSupported =
+      this.props.LocationsLookup[selectedVersion] &&
      this.props.LocationsLookup[selectedVersion].siaprime_support;

-    const siaSupported = this.props.LocationsLookup[selectedVersion] &&
+    const siaSupported =
+      this.props.LocationsLookup[selectedVersion] &&
      this.props.LocationsLookup[selectedVersion].sia_support;

-    const showConfig = !missingDependencies &&
+    const showConfig =
+      !missingDependencies &&
      !this.props.DisplayPinnedManager &&
      this.props.DisplayConfiguration &&
      !this.props.RebootRequired;

-    const showPinnedManager = !missingDependencies &&
+    const showPinnedManager =
+      !missingDependencies &&
      !this.props.RebootRequired &&
      this.props.DisplayPinnedManager;

-    const showUpgrade = this.props.UpgradeAvailable &&
+    const showUpgrade =
+      this.props.UpgradeAvailable &&
      !this.props.DisplayError &&
      !showConfig &&
      !this.props.DownloadActive &&
@@ -138,14 +154,16 @@ class App extends IPCContainer {
      !this.props.InstallActive &&
      !this.props.RebootRequired;

-    const showDependencies = !showUpgrade &&
+    const showDependencies =
+      !showUpgrade &&
      missingDependencies &&
      !this.props.DownloadActive &&
      !this.props.RebootRequired &&
      !this.props.DismissDependencies &&
      this.props.AllowMount;

-    const showNewReleases = !showConfig &&
+    const showNewReleases =
+      !showConfig &&
      !this.props.DisplayConfirmYesNo &&
      !showDependencies &&
      !this.props.DownloadActive &&
@@ -156,9 +174,10 @@ class App extends IPCContainer {
      !this.props.DisplaySelectAppPlatform &&
      !showUpgrade &&
      !this.props.DismissNewReleasesAvailable &&
-      (this.props.NewReleasesAvailable.length > 0);
+      this.props.NewReleasesAvailable.length > 0;

-    const showSkynetImport = !showConfig &&
+    const showSkynetImport =
+      !showConfig &&
      !showDependencies &&
      !this.props.DownloadActive &&
      !showNewReleases &&
@@ -167,7 +186,8 @@ class App extends IPCContainer {
      !showUpgrade &&
      this.props.DisplayImport;

-    const showSkynetExport = !showConfig &&
+    const showSkynetExport =
+      !showConfig &&
      !showDependencies &&
      !this.props.DownloadActive &&
      !showNewReleases &&
@@ -176,66 +196,123 @@ class App extends IPCContainer {
      !showUpgrade &&
      this.props.DisplayExport;

-    const configDisplay = createModalConditionally(showConfig, <Configuration
-      version={selectedVersion}
-      s3Supported={s3Supported}
-      remoteSupported={remoteSupported}/>);
-    const pinnedManagerDisplay = createModalConditionally(showPinnedManager, <PinnedManager
-      version={selectedVersion}/>)
-    const confirmDisplay = createModalConditionally(this.props.DisplayConfirmYesNo, <YesNo/>);
-    const dependencyDisplay = createModalConditionally(showDependencies,
-      <DependencyList/>, false, this.props.InstallActive);
-    const downloadDisplay = createModalConditionally(this.props.DownloadActive,
-      <DownloadProgress/>, false, true);
-    const errorDisplay = createModalConditionally(this.props.DisplayError, <ErrorDetails/>, true);
-    const infoDisplay = createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true);
-    const newReleasesDisplay = createModalConditionally(showNewReleases, <NewReleases/>);
-    const rebootDisplay = createModalConditionally(this.props.RebootRequired, <Reboot/>);
-    const selectAppPlatformDisplay = createModalConditionally(this.props.DisplaySelectAppPlatform,
-      <SelectAppPlatform/>);
-    const upgradeDisplay = createModalConditionally(showUpgrade, <UpgradeUI/>);
-    const importDisplay = createModalConditionally(showSkynetImport, <SkynetImport
-      version={selectedVersion}/>);
-    const exportDisplay = createModalConditionally(showSkynetExport, <SkynetExport
-      version={selectedVersion}/>)
-    const appBusyDisplay = createModalConditionally(this.props.AppBusy,
-      <ApplicationBusy/>, false, true, this.props.AppBusyTransparent);
+    const configDisplay = createModalConditionally(
+      showConfig,
+      <Configuration
+        version={selectedVersion}
+        s3Supported={s3Supported}
+        remoteSupported={remoteSupported}
+      />
+    );
+    const pinnedManagerDisplay = createModalConditionally(
+      showPinnedManager,
+      <PinnedManager version={selectedVersion} />
+    );
+    const confirmDisplay = createModalConditionally(
+      this.props.DisplayConfirmYesNo,
+      <YesNo />
+    );
+    const dependencyDisplay = createModalConditionally(
+      showDependencies,
+      <DependencyList />,
+      false,
+      this.props.InstallActive
+    );
+    const downloadDisplay = createModalConditionally(
+      this.props.DownloadActive,
+      <DownloadProgress />,
+      false,
+      true
+    );
+    const errorDisplay = createModalConditionally(
+      this.props.DisplayError,
+      <ErrorDetails />,
+      true
+    );
+    const infoDisplay = createModalConditionally(
+      this.props.DisplayInfo,
+      <InfoDetails />,
+      true
+    );
+    const newReleasesDisplay = createModalConditionally(
+      showNewReleases,
+      <NewReleases />
+    );
+    const rebootDisplay = createModalConditionally(
+      this.props.RebootRequired,
+      <Reboot />
+    );
+    const selectAppPlatformDisplay = createModalConditionally(
+      this.props.DisplaySelectAppPlatform,
+      <SelectAppPlatform />
+    );
+    const upgradeDisplay = createModalConditionally(showUpgrade, <UpgradeUI />);
+    const importDisplay = createModalConditionally(
+      showSkynetImport,
+      <SkynetImport version={selectedVersion} />
+    );
+    const exportDisplay = createModalConditionally(
+      showSkynetExport,
+      <SkynetExport version={selectedVersion} />
+    );
+    const appBusyDisplay = createModalConditionally(
+      this.props.AppBusy,
+      <ApplicationBusy />,
+      false,
+      true,
+      this.props.AppBusyTransparent
+    );

    let mainContent = [];
    if (this.props.DisplaySelectAppPlatform || !this.props.AppReady) {
      mainContent = (
-        <Box dxStyle={{height: '100%'}}>
-          <Loading/>
-        </Box>);
+        <Box dxStyle={{ height: '100%' }}>
+          <Loading />
+        </Box>
+      );
    } else {
      let key = 0;
-      mainContent.push((
-        <Box key={'md_' + key++}
-             dxStyle={{padding: 'var(--default_spacing)', height: 'auto'}}>
-          <ReleaseVersionDisplay downloadDisabled={!downloadEnabled}
-                                 version={selectedVersion}/>
+      mainContent.push(
+        <Box
+          key={'md_' + key++}
+          dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}
+        >
+          <ReleaseVersionDisplay
+            downloadDisabled={!downloadEnabled}
+            version={selectedVersion}
+          />
        </Box>
-      ));
-      mainContent.push(<div key={'md_' + key++}
-                            style={{paddingTop: 'var(--default_spacing)'}}/>);
+      );
+      mainContent.push(
+        <div
+          key={'md_' + key++}
+          style={{ paddingTop: 'var(--default_spacing)' }}
+        />
+      );
      if (allowMount) {
-        mainContent.push((
-          <Box dxStyle={{padding: 'var(--default_spacing)', height: 'auto'}}
-               key={'md_' + key++}>
-            <MountItems s3Supported={s3Supported}
-                        remoteSupported={remoteSupported}
-                        scPrimeSupported={scPrimeSupported}
-                        siaSupported={siaSupported}
-                        skynetSupported={skynetSupported}/>
+        mainContent.push(
+          <Box
+            dxStyle={{ padding: 'var(--default_spacing)', height: 'auto' }}
+            key={'md_' + key++}
+          >
+            <MountItems
+              s3Supported={s3Supported}
+              remoteSupported={remoteSupported}
+              scPrimeSupported={scPrimeSupported}
+              siaSupported={siaSupported}
+              skynetSupported={skynetSupported}
+            />
          </Box>
-        ));
-      } else if (!downloadEnabled && (selectedVersion !== 'unavailable')) {
-        mainContent.push((
-          <Box dxStyle={{padding: 'var(--default_spacing)', height: '170px'}}
-               key={'md_' + key++}>
-            <Loading/>
+        );
+      } else if (!downloadEnabled && selectedVersion !== 'unavailable') {
+        mainContent.push(
+          <Box
+            dxStyle={{ padding: 'var(--default_spacing)', height: '170px' }}
+            key={'md_' + key++}
+          >
+            <Loading />
          </Box>
-        ));
+        );
      }
    }

@@ -245,27 +322,36 @@ class App extends IPCContainer {
          <div className={'AppHeader'}>
            <Box>
              <Grid>
-                <Text col={0}
-                      colSpan={'remain'}
-                      row={0}
-                      rowSpan={'remain'}
-                      text={'Repertory UI v' + this.props.Version}
-                      textAlign={'center'}
-                      type={'Heading1'}/>
+                <Text
+                  col={0}
+                  colSpan={'remain'}
+                  row={0}
+                  rowSpan={'remain'}
+                  text={'Repertory UI v' + this.props.Version}
+                  textAlign={'center'}
+                  type={'Heading1'}
+                />
                <UpgradeIcon
-                  available={!missingDependencies && (this.props.UpgradeAvailable || (this.props.NewReleasesAvailable2.length > 0))}
-                  newReleases={!missingDependencies && (!this.props.UpgradeAvailable && (this.props.NewReleasesAvailable2.length > 0))}
+                  available={
+                    !missingDependencies &&
+                    (this.props.UpgradeAvailable ||
+                      this.props.NewReleasesAvailable2.length > 0)
+                  }
+                  newReleases={
+                    !missingDependencies &&
+                    !this.props.UpgradeAvailable &&
+                    this.props.NewReleasesAvailable2.length > 0
+                  }
                  clicked={this.handleUpgradeIconClicked}
-                  col={dimensions => dimensions.columns - 6}
+                  col={(dimensions) => dimensions.columns - 6}
                  colSpan={5}
                  row={1}
-                  rowSpan={remain => remain - 1}/>
+                  rowSpan={(remain) => remain - 1}
+                />
              </Grid>
            </Box>
          </div>
-          <div className={'AppContent'}>
-            {mainContent}
-          </div>
+          <div className={'AppContent'}>{mainContent}</div>
        </div>
        {importDisplay}
        {exportDisplay}
@@ -286,7 +372,7 @@ class App extends IPCContainer {
  }
 }

-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
  return {
    AllowDownload: state.download.AllowDownload,
    AllowMount: state.common.AllowMount,
@@ -324,15 +410,19 @@ const mapStateToProps = state => {
  };
 };

-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
  return {
-    displaySelectAppPlatform: display => dispatch(displaySelectAppPlatform(display)),
+    displaySelectAppPlatform: (display) =>
+      dispatch(displaySelectAppPlatform(display)),
    loadReleases: () => dispatch(loadReleases()),
-    notifyError: (msg, critical, callback) => dispatch(notifyError(msg, critical, callback)),
+    notifyError: (msg, critical, callback) =>
+      dispatch(notifyError(msg, critical, callback)),
    saveState: () => dispatch(saveState()),
-    setDismissNewReleasesAvailable: dismiss => dispatch(setDismissNewReleasesAvailable(dismiss)),
-    setNewReleasesAvailable: items => dispatch(setNewReleasesAvailable(items)),
-    setDismissUIUpgrade: dismiss => dispatch(setDismissUIUpgrade(dismiss)),
+    setDismissNewReleasesAvailable: (dismiss) =>
+      dispatch(setDismissNewReleasesAvailable(dismiss)),
+    setNewReleasesAvailable: (items) =>
+      dispatch(setNewReleasesAvailable(items)),
+    setDismissUIUpgrade: (dismiss) => dispatch(setDismissUIUpgrade(dismiss)),
  };
 };