Auto-load modules on launch

electron-app/src/api.ts

@@ -1,5 +1,5 @@
 type Event = unknown;
-type Query = Record<string, unknown>;
+export type Query = Record<string, unknown>;
 
 export type TerminalAPI = {
   sendData: (data: string) => void;

nodemapper/src/api.ts

@@ -1,5 +1,5 @@
 type Event = unknown;
-type Query = Record<string, unknown>;
+export type Query = Record<string, unknown>;
 
 export type TerminalAPI = {
   sendData: (data: string) => void;

nodemapper/src/gui/App.tsx

@@ -2,22 +2,26 @@ import React from 'react';
 
 import { ThemeOptions, ThemeProvider, createTheme } from '@mui/material/styles';
 import { ErrorBoundary } from 'react-error-boundary';
-import { settingsReadStoreConfig } from 'redux/actions';
+import { ReadStoreConfig } from 'redux/middleware/settings';
+import { builderGetRemoteModules } from 'redux/actions';
 import { useAppDispatch, useAppSelector } from 'redux/store/hooks';
 import { errorHandler } from './ErrorHandling/Error';
 
 import Navigation from './Navigation';
 
 // Startup
 let started = false;
-const startup = () => {
+const startup = (dispatch) => {
   started = true;
-  const dispatch = useAppDispatch();
-  dispatch(settingsReadStoreConfig());
+  ReadStoreConfig(dispatch).finally(() => {
+    // Runs irrespective of return status of store read, but must wait for it to complete
+    dispatch(builderGetRemoteModules());
+  });
 };
 
 const App = () => {
-  if (!started) startup();
+  const dispatch = useAppDispatch();
+  if (!started) startup(dispatch);
   const dark_mode = useAppSelector((state) => state.settings.dark_mode);
 
   const themeOptions: ThemeOptions = {

nodemapper/src/gui/Builder/components/Flow.tsx

@@ -45,6 +45,7 @@ import Button from '@mui/material/Button';
 import 'reactflow/dist/style.css';
 import ContextMenu from './ContextMenu';
 import './flow.css';
+import { Query } from 'api';
 import * as styles from './flow.module.css';
 
 import dagre from 'dagre';
@@ -92,7 +93,6 @@ const getLayoutedElements = (nodes: Node[], edges: Edge[], direction = 'LR') =>
 };
 
 const builderAPI = window.builderAPI;
-type Query = Record<string, unknown>;
 
 const proOptions = {
   hideAttribution: true,

nodemapper/src/gui/Builder/components/RepoBrowser.tsx

@@ -9,6 +9,7 @@ import BuilderEngine from './BuilderEngine';
 
 import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import RefreshIcon from '@mui/icons-material/Refresh';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import CircularProgress from '@mui/material/CircularProgress';
@@ -155,17 +156,8 @@ const RepoBrowser = () => {
     >
       <Stack direction="column" sx={{ height: '100%' }}>
         <Paper sx={{ p: 1 }}>
-          <Button
-            id="btnBuilderGetModuleList"
-            className="btn"
-            onClick={btnGetModuleList}
-            variant="outlined"
-            fullWidth
-          >
-            LOAD MODULES
-          </Button>
           <Grid container spacing={0}>
-            <Grid item xs={10}>
+            <Grid item xs={8}>
               <TextField
                 id="repo-filter-freetext"
                 name="repo-filter-freetext"
@@ -187,6 +179,17 @@ const RepoBrowser = () => {
                 <FontAwesomeIcon icon={faEllipsisVertical} />
               </Button>
             </Grid>
+            <Grid item xs={2}>
+              <Button
+                id="btnBuilderGetModuleList"
+                variant="outlined"
+                sx={{ height: '100%', minWidth: '5px' }}
+                onClick={btnGetModuleList}
+                fullWidth
+              >
+                <RefreshIcon />
+              </Button>
+            </Grid>
           </Grid>
           {showSearchOptions && (
             <Box

nodemapper/src/gui/Builder/components/TrayItemWidget.tsx

@@ -1,10 +1,9 @@
 import styled from '@emotion/styled';
 import * as React from 'react';
+import { Query } from 'api';
 import { IModulesListEntry } from 'redux/reducers/builder';
 import { wranglename } from './Flow';
 
-type Query = Record<string, unknown>;
-
 export interface TrayItemWidgetProps {
   model: IModulesListEntry;
   color?: string;

nodemapper/src/redux/middleware/builder.ts

@@ -25,11 +25,10 @@ import {
 } from 'gui/Builder/components/Flow';
 import { Edge } from 'reactflow';
 
+import { Query } from 'api';
 import { IModulesList } from 'redux/reducers/builder';
 import { IRepo } from 'redux/reducers/settings';
 
-type Query = Record<string, unknown>;
-
 const builderAPI = window.builderAPI;
 const runnerAPI = window.runnerAPI;
 
@@ -710,6 +709,11 @@ const GetRemoteModules = async ({
   dispatchModulesList,
   repo,
 }: IGetRemoteModules) => {
+  // Backend check
+  if (builderAPI === undefined) {
+    console.error('builderAPI is undefined');
+    return;
+  }
   // Get list of remote modules
   dispatchString(builderUpdateStatusText('Loading modules...'));
   dispatchBool(builderSetModulesLoading(true));

nodemapper/src/redux/middleware/newmodule.ts

@@ -1,7 +1,7 @@
 import { newmoduleEnvCondaSearchUpdatePackageList, newmoduleUpdateResult } from 'redux/actions';
 import { IState } from 'redux/reducers';
+import { Query } from 'api';
 
-type Query = Record<string, unknown>;
 const newmoduleAPI = window.newmoduleAPI;
 
 export const newmoduleMiddleware = ({ getState, dispatch }) => {

nodemapper/src/redux/middleware/runner.ts

@@ -1,10 +1,9 @@
 import { displayGetFolderInfo } from 'redux/actions';
 import { IState } from 'redux/reducers';
+import { Query } from 'api';
 
 import { runnerUpdateStatusText } from 'redux/actions';
 
-type Query = Record<string, unknown>;
-
 const runnerAPI = window.runnerAPI;
 
 export const runnerMiddleware = ({ getState, dispatch }) => {

nodemapper/src/redux/middleware/settings.ts

@@ -1,5 +1,6 @@
 import { settingsUpdateSettings } from 'redux/actions';
 import { IState } from 'redux/reducers';
+import { Query } from 'api';
 
 const settingsAPI = window.settingsAPI;
 
@@ -26,8 +27,6 @@ export const settingsMiddleware = ({ getState, dispatch }) => {
   };
 };
 
-type Query = Record<string, unknown>;
-
 interface IPayloadRecord {
   payload: Query;
   type: string;
@@ -51,7 +50,7 @@ const WriteStoreConfig = async (state) => {
 };
 
 // Read persistent state from electron frontend
-const ReadStoreConfig = async (dispatch: TPayloadRecord) => {
+export const ReadStoreConfig = async (dispatch: TPayloadRecord): Promise<void> => {
   if (settingsAPI === undefined) return;
   let local_config = {};
   try {