Merge pull request #449 from dot-mike/fix/bug-fixes

Various minor bug fixes

Author: colin969

lang/en.json

@@ -198,7 +198,8 @@
     "noLauncherUpdateReady": "Metadata update requires a newer Launcher version, but the software update is not currently available.",
     "deleteView": "Delete Search View",
     "deleteOnlyBrowseView": "Delete Search View (Must have another custom view)",
-    "createNewView": "Create new search view"
+    "createNewView": "Create new search view",
+    "errorLoadingServices": "An error occurred while loading services. Please check the logs for more details."
   },
   "filter": {
     "dateAdded": "Date Added",

src/back/GameLauncher.ts

@@ -187,7 +187,6 @@ export namespace GameLauncher {
         // Handle middleware
         if (launchInfo.activeConfig) {
           log.info(logSource, `Using Game Configuration: ${launchInfo.activeConfig.name}`);
-          console.log(JSON.stringify(launchInfo.activeConfig, undefined, 2));
           for (const middlewareConfig of launchInfo.activeConfig.middleware) {
             // Find middleware in registry
             const middleware = opts.state.registry.middlewares.get(middlewareConfig.middlewareId);

src/back/index.ts

@@ -816,8 +816,9 @@ async function initialize() {
         state.config,
         error => { log.info(SERVICES_SOURCE, error.toString()); }
       );
-    } catch (error) {
-      console.log('Error loading services - ' + error);
+    } catch (error: any) {
+      log.error('Back', 'Error loading services - ' + error.toString());
+      state.socketServer.broadcast(BackOut.OPEN_ALERT, state.languageContainer.app.errorLoadingServices);
     }
     if (state.serviceInfo) {
       // Run start commands

src/back/responses.ts

@@ -1359,7 +1359,6 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
   });
 
   state.socketServer.register(BackIn.GET_PLAYLISTS, async () => {
-    console.log('finding playlists?');
     return filterPlaylists(state.playlists, state.preferences.browsePageShowExtreme);
   });
 

src/back/util/search.ts

@@ -29,7 +29,6 @@ export function createSearchFilter(query: QueryData, preferences: AppPreferences
       break;
   }
 
-  console.log(`Order by: ${orderBy}`);
   if (advancedFilter.playlistOrder && playlist !== undefined) {
     search.order.column = GameSearchSortable.CUSTOM;
   } else {
@@ -112,7 +111,6 @@ export function createSearchFilter(query: QueryData, preferences: AppPreferences
     newFilter.matchAny = false;
     newFilter.subfilters = [inner, playlistFilter];
     search.filter = newFilter;
-    console.log(JSON.stringify(search, undefined, 2));
   }
 
   return {

src/renderer/components/DropdownInputField.tsx

@@ -16,6 +16,8 @@ export type DropdownInputFieldProps = InputFieldProps & {
   onItemSelect?: (text: string, index: number) => void;
   /** Function for getting a reference to the input element. Called whenever the reference could change. */
   inputRef?: RefFunc<InputElement>;
+  /** Called when the drop-down content is expanded or collapsed. */
+  onExpand?: (expanded: boolean) => void;
 };
 
 type DropdownInputFieldState = {
@@ -204,7 +206,12 @@ export class DropdownInputField extends React.Component<DropdownInputFieldProps,
 
   onExpandButtonMouseDown = (): void => {
     if (!this.props.disabled) {
-      this.setState({ expanded: !this.state.expanded });
+      const newExpandedState = !this.state.expanded;
+      this.setState({ expanded: newExpandedState }, () => {
+        if (this.props.onExpand) {
+          this.props.onExpand(newExpandedState);
+        }
+      });
     }
   };
 

src/renderer/components/Footer.tsx

@@ -132,13 +132,13 @@ export class Footer extends React.Component<FooterProps> {
   onGlobalKeydown = (event: KeyboardEvent): void => {
     const scaleDif = 0.1; // How much the scale should change per increase/decrease
     // Increase Game Scale (CTRL PLUS)
-    if (event.ctrlKey && event.key === '+') {
+    if (event.ctrlKey && (event.keyCode === 187 || event.keyCode === 61 || event.keyCode === 171)) {
       const scale = this.props.preferencesData.browsePageGameScale;
       this.setScaleSliderValue(scale + scaleDif);
       event.preventDefault();
     }
     // Decrease Game Scale (CTRL MINUS)
-    else if (event.ctrlKey && event.key === '-') {
+    else if (event.ctrlKey && (event.keyCode === 189 || event.keyCode === 173)) {
       const scale = this.props.preferencesData.browsePageGameScale;
       this.setScaleSliderValue(scale - scaleDif);
       event.preventDefault();
@@ -152,8 +152,9 @@ export class Footer extends React.Component<FooterProps> {
    */
   setScaleSliderValue(scale: number): void {
     if (this.scaleSliderRef.current) {
-      const value = Math.min(Math.max(0, scale), 1) * Footer.scaleSliderMax;
-      this.scaleSliderRef.current.value = value + '';
+      if (scale < 0) { scale = 0; }
+      else if (scale > 1) { scale = 1; }
+      this.scaleSliderRef.current.value = (Math.min(Math.max(0, scale), 1) * Footer.scaleSliderMax).toFixed(1).toString();
       updatePreferencesData({ browsePageGameScale: scale });
     }
   }

src/renderer/components/RightBrowseSidebar.tsx

@@ -852,6 +852,7 @@ export class RightBrowseSidebar extends React.Component<RightBrowseSidebarProps,
                     text={game.legacyApplicationPath}
                     placeholder={strings.noApplicationPath}
                     onChange={this.onApplicationPathChange}
+                    onExpand={this.onApplicationPathExpand}
                     editable={editable}
                     items={suggestions && filterSuggestions(suggestions.applicationPath) || []}
                     onItemSelect={text => this.props.onEditGame({ legacyApplicationPath: text })} />
@@ -969,6 +970,15 @@ export class RightBrowseSidebar extends React.Component<RightBrowseSidebarProps,
     }
   }
 
+  onApplicationPathExpand = () => {
+    if (this.state.middleScrollRef.current) {
+      this.state.middleScrollRef.current.scrollTo({
+        top: this.state.middleScrollRef.current.scrollHeight,
+        behavior: 'smooth'
+      });
+    }
+  }
+
   renderDeleteGameButton({ confirm, extra }: ConfirmElementArgs<LangContainer['browse']>): JSX.Element {
     return (
       <div

src/renderer/components/app.tsx

@@ -259,10 +259,8 @@ export class App extends React.Component<AppProps> {
   }
 
   onDatabaseLoaded() {
-    console.log('db load');
     window.Shared.back.request(BackIn.GET_PLAYLISTS)
     .then(data => {
-      console.log('got playlists');
       if (data) {
         this.props.mainActions.addLoaded([BackInit.PLAYLISTS]);
         this.props.setMainState({ playlists: data });
@@ -316,7 +314,6 @@ export class App extends React.Component<AppProps> {
       }
 
       this.props.setTagCategories(data.tagCategories);
-      console.log('navigating to ' + this.props.preferencesData.defaultOpeningPage);
       this.props.history.push(this.props.preferencesData.defaultOpeningPage);
     })
     .then(() => {

src/renderer/components/pages/ConfigPage.tsx

@@ -723,8 +723,6 @@ export class ConfigPage extends React.Component<ConfigPageProps, ConfigPageState
   renderExtensionsMemo = memoizeOne((extensions: IExtensionDescription[], strings: LangContainer['config'], fpfssConsents: Record<string, boolean | undefined>): JSX.Element[] => {
     const allStrings = this.context;
     return extensions.map((ext) => {
-      console.log(fpfssConsents);
-
       const fpfssConsent = fpfssConsents[ext.id];
 
       const shortContribs = [];