Merge branch 'next' into fix/0

Author: BotellaA

app/pages/index.vue

@@ -26,6 +26,24 @@
   import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
   import Status from "@ogw_f/utils/status.js"
 
+  const query = useRoute().query
+  if (query.geode_port) {
+    console.log(
+      "Modifying geode port from query parameters to",
+      query.geode_port,
+    )
+    const geodeStore = useGeodeStore()
+    geodeStore.$patch({ default_local_port: query.geode_port })
+  }
+  if (query.viewer_port) {
+    console.log(
+      "Modifying viewer port from query parameters to",
+      query.viewer_port,
+    )
+    const viewerStore = useViewerStore()
+    viewerStore.$patch({ default_local_port: query.viewer_port })
+  }
+
   const infra_store = useInfraStore()
   const viewer_store = useViewerStore()
   const menuStore = useMenuStore()

electron/main.js

@@ -8,6 +8,7 @@ import {
   executable_name,
   kill_back,
   kill_viewer,
+  get_available_port,
   run_back,
   run_viewer,
   delete_folder_recursive,
@@ -27,25 +28,23 @@ let mainWindow = null
 let back_port = 0
 let viewer_port = 0
 
-ipcMain.handle("run_back", async (_event, ...args) => {
+ipcMain.handle("run_back", async (_event) => {
   const back_command = path.join(
     executable_path(path.join("microservices", "back")),
     executable_name("vease-back"),
   )
   back_port = await run_back(back_command, {
-    port: args[0],
-    data_folder_path: project_folder_path,
+    project_folder_path: project_folder_path,
   })
   return back_port
 })
-ipcMain.handle("run_viewer", async (_event, ...args) => {
+ipcMain.handle("run_viewer", async (_event) => {
   const viewer_command = path.join(
     executable_path(path.join("microservices", "viewer")),
     executable_name("vease-viewer"),
   )
   viewer_port = await run_viewer(viewer_command, {
-    port: args[0],
-    data_folder_path: project_folder_path,
+    project_folder_path: project_folder_path,
   })
   return viewer_port
 })

electron/preload.js

@@ -1,12 +1,12 @@
 const { contextBridge, ipcRenderer } = require("electron")
 
 contextBridge.exposeInMainWorld("electronAPI", {
-  run_back: async (port) => {
-    const result = await ipcRenderer.invoke("run_back", port)
+  run_back: async () => {
+    const result = await ipcRenderer.invoke("run_back")
     return result
   },
-  run_viewer: async (port) => {
-    const result = await ipcRenderer.invoke("run_viewer", port)
+  run_viewer: async () => {
+    const result = await ipcRenderer.invoke("run_viewer")
     return result
   },
   new_window: async (args) => {

microservices/back/requirements.txt

@@ -5,3 +5,4 @@
 #    pip-compile --output-file=microservices/back/requirements.txt microservices/back/requirements.in
 #
 
+vease-back==1.*,>=1.6.5rc1

microservices/viewer/requirements.txt

@@ -5,3 +5,4 @@
 #    pip-compile --output-file=microservices/viewer/requirements.txt microservices/viewer/requirements.in
 #
 
+vease-viewer==2.*,>=2.3.18rc1

nuxt.config.js

@@ -127,7 +127,8 @@ export default defineNuxtConfig({
 
   router: {
     options: {
-      hashMode: true,
+      hashMode:
+        process.env.BROWSER && process.env.BROWSER == "true" ? false : true,
     },
   },
 

package.json

@@ -28,7 +28,6 @@
     "build:viewer": "node node_scripts/run_script_file.js viewer/build",
     "build:microservices": "concurrently \"npm run build:back\" \"npm run build:viewer\"",
     "package": "npm run build && electron-builder build --publish=never",
-    "internal:browser": "node node_scripts/browser.js preview:browser",
     "test:e2e:browser": "npx playwright test --config ./tests/e2e/browser/playwright.config.js",
     "test:e2e:desktop": "npx playwright test --config ./tests/e2e/desktop/playwright.config.js"
   },

tests/e2e/browser/browser.test.js

@@ -8,10 +8,14 @@ import { isWindows } from "std-env"
 import { run_browser_wrapper } from "../../../utils/local"
 
 test.beforeEach(async ({ page }) => {
-  const NUXT_PORT = await run_browser_wrapper(`internal:browser`)
-  console.log("NUXT_PORT", NUXT_PORT)
-  await page.goto(`http://localhost:${NUXT_PORT}/`)
-  console.log("setViewportSize")
+  const ports = await run_browser_wrapper(`preview:browser`)
+  console.log("ports", ports)
+  const { geode_port, viewer_port, nuxt_port } = ports
+  page.on("console", (msg) => console.log(`Browser console: ${msg.text()}`))
+  await page.goto(
+    `http://localhost:${nuxt_port}?geode_port=${geode_port}&viewer_port=${viewer_port}`,
+  )
+  console.log("Navigated to", page.url())
   await page.setViewportSize({ width: 1200, height: 800 })
 })
 

tests/e2e/browser/playwright.config.js

@@ -13,7 +13,7 @@ export default defineConfig({
   testDir: "./",
   timeout: (isWindows ? 60 : 30) * 1000,
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */

tests/e2e/desktop/playwright.config.js

@@ -12,7 +12,7 @@ export default defineConfig({
   testDir: "./",
   timeout: (isWindows ? 60 : 30) * 1000,
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */