- Pin Electron to v35.4.0 as the v36 is not working on many OS.

- Pin html-to-image to v1.11.11 as latest version breaks ERD image downloads.

Author: adityatoshniwal

Make.bat

@@ -284,6 +284,7 @@ REM Main build sequence Ends
 
     REM WGET
     FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
+    SET ELECTRON_VERSION="35.4.0"
     :GET_NW
         wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
         IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

pkg/linux/build-functions.sh

@@ -140,6 +140,8 @@ _build_runtime() {
     fi
 
     ELECTRON_VERSION="$(npm info electron version)"
+    # Can't use the latest as it is not compatible with few OS versions.
+    ELECTRON_VERSION="35.4.0"
 
     pushd "${BUILDROOT}" > /dev/null || exit
         while true;do

pkg/mac/build-functions.sh

@@ -34,6 +34,7 @@ _build_runtime() {
     fi
 
     ELECTRON_VERSION="$(npm info electron version)"
+    ELECTRON_VERSION="35.4.0"
 
     pushd "${BUILD_ROOT}" > /dev/null || exit
         while true;do

runtime/src/js/pgadmin.js

@@ -410,6 +410,7 @@ ipcMain.on('log', (_e, text) => ()=>{
   misc.writeServerLog(text);
 });
 ipcMain.on('focus', (e) => {
+  app.focus({steal: true});
   const callerWindow = BrowserWindow.fromWebContents(e.sender)
   if (callerWindow) {
     if (callerWindow.isMinimized()) callerWindow.restore();

web/package.json

@@ -109,7 +109,7 @@
     "date-fns": "^4.1.0",
     "diff-arrays-of-objects": "^1.1.8",
     "hotkeys-js": "^3.13.3",
-    "html-to-image": "1.11.13",
+    "html-to-image": "1.11.11",
     "immutability-helper": "^3.0.0",
     "insert-if": "^1.1.0",
     "ip-address": "^10.0.1",

web/pgadmin/static/js/components/SelectThemes.jsx

@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 import gettext from 'sources/gettext';
-import { Grid, FormHelperText } from '@mui/material';
+import { FormHelperText, Box } from '@mui/material';
 import React, { useMemo } from 'react';
 import {InputSelect } from './FormComponents';
 import PropTypes from 'prop-types';
@@ -17,22 +17,21 @@ import HTMLReactParse from 'html-react-parser';
 
 
 export default function SelectThemes({onChange, helpMessage, ...props}) {
-
   const previewSrc = useMemo(()=>(props.options?.find((o)=>o.value==props.value)?.preview_src), [props.value]);
   const cid =  _.uniqueId('c');
   const helpid = `h${cid}`;
   return (
-    <Grid container direction="column" spacing={0.5}>
-      <Grid size={{ lg: 12, md: 12, sm: 12, xs: 12 }}>
+    <>
+      <Box>
         <InputSelect ref={props.inputRef} onChange={onChange} {...props} />
-      </Grid>
-      <Grid sx={{paddingTop: 10}} size={{ lg: 12, md: 12, sm: 12, xs: 12 }}>
+      </Box>
+      <Box>
         { previewSrc && <>
           <FormHelperText id={helpid} variant="outlined">{HTMLReactParse(helpMessage || '')}</FormHelperText>
-          <img className='img-fluid mx-auto d-block border' src={previewSrc} alt={gettext('Preview not available...')} />
+          <img style={{display: 'block', margin: 'auto', paddingTop: '4px'}} src={previewSrc} alt={gettext('Preview not available...')} />
         </> }
-      </Grid>
-    </Grid>
+      </Box>
+    </>
   );
 }
 

web/pgadmin/tools/erd/static/js/erd_tool/links/OneToManyLink.jsx

@@ -168,8 +168,8 @@ function NotationForType({itype, width, rotation}) {
   if(itype == 'many') {
     return (
       <>
-        <circle className={['OneToMany-svgLink','OneToMany-svgLinkCircle'].join(' ')} cx="0" cy="16" r={width*2.5} strokeWidth={width} />
-        <polyline className='OneToMany-svgLink' points="-8,0 0,15 0,0 0,30 0,15 8,0" fill="none" strokeWidth={width} />
+        <circle className={['OneToMany-svgLink','OneToMany-svgLinkCircle'].join(' ')} cx="0" cy="16" r={width*2.5} />
+        <polyline className='OneToMany-svgLink' points="-8,0 0,15 0,0 0,30 0,15 8,0" fill="none" />
       </>
     );
   } else if (itype == 'one') {
@@ -354,14 +354,12 @@ export class OneToManyLinkWidget extends RightAngleLinkWidget {
   }
 }
 
-const LinkSegment = forwardRef(({model, selected, path, ...props}, ref)=>{
+const LinkSegment = forwardRef(({selected, path, ...props}, ref)=>{
 
   return (
     <path
       ref={ref}
       className={['OneToMany-svgLink','OneToMany-svgLinkPath', (selected ? 'OneToMany-svgLinkSelected' : '')].join(' ')}
-      stroke={model.getOptions().color}
-      strokeWidth={model.getOptions().width}
       selected={selected}
       d={path}
       {...props}

web/yarn.lock

@@ -8374,10 +8374,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-to-image@npm:1.11.13":
-  version: 1.11.13
-  resolution: "html-to-image@npm:1.11.13"
-  checksum: 18da77cf6c1e7f821f320dc6941642ee292df136f38c548ecb77aa04718b979df63ba4ea56e53d1939b9dbe8e23ca10c44b55319a885bfe7f5f5023c1b5698fe
+"html-to-image@npm:1.11.11":
+  version: 1.11.11
+  resolution: "html-to-image@npm:1.11.11"
+  checksum: b453beca72a697bf06fae4945e5460d1d9b1751e8569a0d721dda9485df1dde093938cc9bd9172b8df5fc23133a53a4d619777b3d22f7211cd8a67e3197ab4e8
   languageName: node
   linkType: hard
 
@@ -13667,7 +13667,7 @@ __metadata:
     globals: ^16.1.0
     hotkeys-js: ^3.13.3
     html-react-parser: ^5.2.0
-    html-to-image: 1.11.13
+    html-to-image: 1.11.11
     image-minimizer-webpack-plugin: ^4.0.2
     imagemin: ^9.0.0
     imagemin-mozjpeg: ^10.0.0