Merge branch 'main' into task/RPE-38/FE-Target-power-thermal-spec-input-UI

Author: shivaahir158

.github/workflows/rpe_test.yml

@@ -93,10 +93,11 @@ jobs:
         if: ${{ matrix.os != 'ubuntu-22.04' }}
         run: npm test
 
-      - name: E2E Playwright tests on Linux latest & MacOS
+      - name: E2E Playwright tests on Linux latest
         if: ${{ matrix.os == 'ubuntu-latest' }}     
         run: |
-            cp -rf Raptor/etc backend
+            cp -rvf Raptor/etc backend
+            ls -l backend/etc/device.xml
             npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test
 
       - name: cat RPE log

main.js

@@ -10,6 +10,7 @@ const log = require('electron-log');
 const config = require('./rpe.config.json');
 const { kill } = require('./cleanup');
 const { openProjectRequest, saveProjectRequest } = require('./projectFile');
+const now = new Date(); 
 
 const logFormat = '[{h}:{i}:{s}.{ms}] [{level}] {text}';
 log.transports.console.format = logFormat;
@@ -154,6 +155,13 @@ if (!isDev) {
   });
   log.transports.console.level = false; // silent console
 }
+
+console.log(`
+  =================================================
+    RPE - Session Start at ${now.toLocaleString()} 
+  =================================================
+  `);  
+
 const template = [
   {
     label: 'File',
@@ -218,14 +226,30 @@ const template = [
           await shell.openExternal('https://rapidpowerestimator.readthedocs.io/en/latest/');
         },
       },
+      {
+        label: 'About',
+        click: () => {
+          // dynamically reading package.json
+          const packagePath = path.join(__dirname, 'package.json');
+          const packageData = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+      
+          const message = `${packageData.build.productName}\nVersion: ${packageData.version}\nAuthor: ${packageData.author}\nCopyright: ${packageData.build.copyright}`;
+      
+          dialog.showMessageBox(mainWindow, {
+            type: 'info',
+            title: packageData.build.productName,
+            message: message,
+          });
+        },
+      },
     ],
-  },
+  },  
 ];
 
 const startFlaskServer = () => {
   let apiServer;
   const RestAPIscript = path.join(__dirname, 'backend/restapi_server.py');
-  const restAPIexe = path.join(app.getAppPath(), '..', '..', 'backend', 'restapi_server.exe');
+  const restAPIexe = path.join(app.getAppPath(), '..', '..', 'backend', 'restapi_server.exe', 'restapi_server.exe');
 
   const args = [
     '--port', store.get('port'),
@@ -291,7 +315,7 @@ const createWindow = () => {
     store.set('device_xml', arg.device_xml);
     store.set('useDefaultFile', arg.useDefaultFile);
 
-    serverProcess.kill();
+    kill(serverProcess);
 
     app.relaunch();
     app.quit();
@@ -324,5 +348,10 @@ app.on("before-quit", function () {
 })
 
 app.on('window-all-closed', () => {
+  console.log(`
+    =================================================
+      RPE - Session closed at ${now.toLocaleString()} 
+    =================================================
+    `);  
   if (process.platform !== 'darwin') app.quit();
 });

package.json

@@ -13,7 +13,7 @@
     "test:playwright": "npx playwright test",
     "postinstall": "electron-builder install-app-deps",
     "pack": "electron-builder --dir",
-    "dist": "pyinstaller --distpath backend --workpath dist -y --clean -n restapi_server.exe --onefile backend/restapi_server.py && webpack --mode production && electron-builder -p never"
+    "dist": "pyinstaller --distpath backend --workpath dist -y --clean -n restapi_server.exe backend/restapi_server.py && webpack --mode development && electron-builder -p never"
   },
   "build": {
     "appId": "org.rapidsilicon.rapid_power_estimator",
@@ -94,6 +94,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
+    "@playwright/test": "^1.48.1",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^14.3.1",
     "@testing-library/user-event": "^14.5.2",
@@ -114,7 +115,6 @@
     "react-test-renderer": "^18.3.1",
     "style-loader": "^3.3.4",
     "webpack": "^5.90.1",
-    "@playwright/test": "^1.48.1",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
@@ -136,4 +136,4 @@
     "type": "git",
     "url": "https://github.com/os-fpga/rapid_power_estimator.git"
   }
-}
+}

webpack.config.js

@@ -39,5 +39,9 @@ module.exports = (env, argv) => {
       path: path.resolve(__dirname, 'build'),
       clean: true,
     },
+    // optimization: {
+    //   minimize: false,
+    //  usedExports: false,
+    // },
   };
 };