minor stuff, error handling + cleanup

Author: IDCs

src/controls/DynDiv.tsx

@@ -5,6 +5,8 @@ import { extend } from '../util/ExtensionProvider';
 import * as React from 'react';
 import { IExtensibleProps } from '../types/IExtensionProvider';
 
+import ErrorBoundary from '../controls/ErrorBoundary';
+
 interface IDynDivDefinition {
   component: React.ComponentClass<any>;
   options: IDynDivOptions;
@@ -41,9 +43,11 @@ class DynDiv extends React.Component<IProps, {}> {
     }
 
     return (
-      <div id={group} className={classes.join(' ')}>
-        {visible.map((comp, idx) => this.renderComponent(comp, idx))}
-      </div>
+      <ErrorBoundary key={`dynamic-div-${group}`}>
+        <div id={group} className={classes.join(' ')}>
+          {visible.map((comp, idx) => this.renderComponent(comp, idx))}
+        </div>
+      </ErrorBoundary>
     );
   }
 

src/extensions/mod_management/util/deploy.ts

@@ -1,7 +1,6 @@
 import { startActivity, stopActivity } from '../../../actions/session';
 import { IDeployedFile, IDeploymentMethod, IExtensionApi } from '../../../types/IExtensionContext';
 import { IGame } from '../../../types/IGame';
-import { INotification } from '../../../types/INotification';
 import { IProfile } from '../../../types/IState';
 import { ProcessCanceled, TemporaryError } from '../../../util/CustomErrors';
 import { log } from '../../../util/log';
@@ -10,7 +9,7 @@ import { getSafe } from '../../../util/storeHelper';
 import { truthy } from '../../../util/util';
 import { IModType } from '../../gamemode_management/types/IModType';
 import { getGame } from '../../gamemode_management/util/getGame';
-import { installPath, installPathForGame } from '../selectors';
+import { installPathForGame } from '../selectors';
 import { IMod } from '../types/IMod';
 import { fallbackPurgeType, getManifest, loadActivation, saveActivation, withActivationLock } from './activationStore';
 import { getActivator, getCurrentActivator } from './deploymentMethods';

src/extensions/mod_management/views/ExternalChangeDialog.tsx

@@ -231,7 +231,7 @@ class ExternalChangeDialog extends ComponentEx<IProps, IComponentState> {
     return (
       <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column' }}>
         {text}
-        <p>{actions.map(action => (
+        <div>{actions.map(action => (
           <div key={action.key}>
             <a
               key={action.key}
@@ -241,7 +241,7 @@ class ExternalChangeDialog extends ComponentEx<IProps, IComponentState> {
             </a><span className='link-action-seperator'>&nbsp; | &nbsp;</span>
           </div>
         ))
-        }</p>
+        }</div>
         <div style={{ overflowY: 'auto', flex: '1 1 0' }}>
           <Table
             tableId={`external-change-${type}`}

src/extensions/mod_management/views/ModList.tsx

@@ -1076,7 +1076,13 @@ class ModList extends ComponentEx<IProps, IComponentState> {
   }
 
   private updateModGrouping(modsWithState) {
-    const modList = Object.keys(modsWithState).map(key => modsWithState[key]);
+    const modList = Object.keys(modsWithState).reduce((accum, key) => {
+      const mod = modsWithState[key];
+      if (mod) {
+        accum.push(mod);
+      }
+      return accum;
+    }, []);
     const grouped = groupMods(modList, { groupBy: 'file', multipleEnabled: false });
 
     const groupedMods = grouped.reduce((prev: { [id: string]: IModWithState[] }, value) => {