@geode/opengeodeweb-front 10.12.0-rc.1 → 10.12.0-rc.10

package/app/components/Launcher.vue

@@ -22,7 +22,7 @@ if (infraStore.app_mode !== appMode.CLOUD) {
   <v-container class="justify">
     <v-row align-content="center" align="center">
       <v-col
-        v-if="!infraStore.status == Status.NOT_CREATED"
+        v-if="infraStore.status === Status.NOT_CREATED"
         class="align"
         cols="12"
         align-self="center"
@@ -30,7 +30,7 @@ if (infraStore.app_mode !== appMode.CLOUD) {
       >
         <Recaptcha :button_color="'secondary'" />
       </v-col>
-      <v-col v-else-if="infraStore.status == Status.CREATING">
+      <v-col v-else-if="infraStore.status === Status.CREATING">
         <Loading :logo="logo" />
       </v-col>
     </v-row>

package/app/utils/local/microservices.js

@@ -45,15 +45,6 @@ async function runScript(
   child.stdout.on("data", (data) => console.log(`[${execName}] ${data.toString()}`));
   child.stderr.on("data", (data) => console.log(`[${execName}] ${data.toString()}`));
 
-  child.on("error", async (error) => {
-    const electron = await import("electron");
-    electron.dialog.showMessageBox({
-      title: "Title",
-      type: "warning",
-      message: `Error occured.\r\n${error}`,
-    });
-  });
-
   child.on("close", (code) => console.log(`[${execName}] exited with code ${code}`));
   child.on("kill", () => {
     console.log(`[${execName}] process killed`);

package/nuxt.config.js

@@ -5,6 +5,7 @@ import path from "node:path";
 import package_json from "./package.json";
 
 const __dirname = import.meta.dirname;
+const oneMinute = 60_000;
 
 export default defineNuxtConfig({
   runtimeConfig: {
@@ -37,6 +38,12 @@ export default defineNuxtConfig({
     transpile: ["vuetify"],
   },
 
+  nitro: {
+    routeRules: {
+      "/api/**": { timeout: oneMinute },
+    },
+  },
+
   vuetify: {
     vuetifyOptions: {
       defaults: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.12.0-rc.1",
+  "version": "10.12.0-rc.10",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -84,9 +84,6 @@
     "vitest-environment-nuxt": "1.0.1",
     "vitest-indexeddb": "0.0.1"
   },
-  "peerDependencies": {
-    "electron": "36.4.0"
-  },
   "overrides": {
     "vue": "latest"
   }

package/server/api/app/run_cloud.js

@@ -21,6 +21,7 @@ export default defineEventHandler(async (event) => {
     const location = "europe-west9";
     const projectId = process.env.GOOGLE_CLOUD_PROJECT;
     const parent = `projects/${projectId}/locations/${location}`;
+    console.log({ parent });
     const auth = new GoogleAuth({
       credentials,
       scopes: ["https://www.googleapis.com/auth/cloud-platform"],
@@ -28,6 +29,7 @@ export default defineEventHandler(async (event) => {
     const authClient = await auth.getClient();
     const [routerImage, backImage, viewerImage] = await artifactImages(parent, authClient);
     const request = requestConfig(parent, routerImage, backImage, viewerImage);
+    console.log({ request });
     const runClient = new ServicesClient({ authClient });
     const [operation] = await runClient.createService(request);
     const [response] = await operation.promise();

package/server/utils/cloud.js

@@ -11,13 +11,15 @@ function checkRecaptchaParams(name, email, launch) {
 }
 
 async function artifactImage(registry, parent, repo) {
-  const branch = process.env.BRANCH;
+  const branch = process.env.NETLIFY_BRANCH;
   const [_, projectId] = parent.split("/");
   const repository = `${parent}/repositories/ghcr/packages/geode-solutions%2F`;
-  const artifactRegistry = `europe-west9-docker.pkg.dev/${projectId}/ghcr/geode-solutions`;
+  const name = `${repository}${repo}/tags/${branch}`;
+  console.log({ name });
   const response = await registry.projects.locations.repositories.packages.tags.get({
-    name: `${repository}${repo}/tags/${branch}`,
+    name,
   });
+  const artifactRegistry = `europe-west9-docker.pkg.dev/${projectId}/ghcr/geode-solutions`;
   const digest = response.data.version.split("/").pop();
   const image = `${artifactRegistry}/${repo}@${digest}`;
   console.log("Found image for", repo, image);
@@ -76,6 +78,20 @@ function requestConfig(parent, routerImage, backImage, viewerImage) {
               },
             ],
             resources,
+            env: [
+              {
+                name: "PARENT",
+                value: parent,
+              },
+            ],
+            startupProbe: {
+              httpGet: {
+                port: 80,
+                path: "/viewer/healthcheck",
+              },
+              periodSeconds: 1,
+              failureThreshold: 30,
+            },
           },
           {
             image: backImage,