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

package/app/components/Viewer/ContextMenu/InfoCard.vue

@@ -23,28 +23,24 @@ const menuStore = useMenuStore();
 const dataStore = useDataStore();
 
 const componentName = ref("");
+const componentItem = ref(undefined);
 
 watch(
   () => menuStore.current_meta_data,
   async (newMeta) => {
     componentName.value = "";
+    componentItem.value = undefined;
     if (!newMeta) {
       return;
     }
 
-    if (newMeta.viewer_type === "model_component" && newMeta.modelId && newMeta.pickedComponentId) {
-      try {
-        const comp = await dataStore.getComponentByViewerId(
-          newMeta.modelId,
-          newMeta.pickedComponentId,
-        );
-        if (comp && comp.name) {
-          componentName.value = comp.name;
-        } else {
-          componentName.value = newMeta.pickedComponentId;
-        }
-      } catch {
-        componentName.value = newMeta.pickedComponentId;
+    const modelId = newMeta.modelId || newMeta.id;
+    if (newMeta.pickedComponentId && modelId) {
+      const components = await dataStore.getAllMeshComponents(modelId);
+      const comp = components.find((component) => component.id === newMeta.pickedComponentId);
+      if (comp) {
+        componentName.value = comp.title;
+        componentItem.value = comp;
       }
     }
   },
@@ -56,7 +52,7 @@ const cleanName = computed(() => {
   if (!meta) {
     return "Unnamed Object";
   }
-  if (componentName.value) {
+  if (componentName.value && meta.viewer_type === "model_component") {
     return componentName.value;
   }
   return meta.name || "Unnamed Object";
@@ -70,6 +66,18 @@ const displayTitle = computed(() => {
   return middleTruncate(name, TRUNCATE_MAX_LENGTH, TRUNCATE_START_CHARS, TRUNCATE_END_CHARS);
 });
 
+const displayComponentTitle = computed(() => {
+  if (!componentItem.value) {
+    return "";
+  }
+  return middleTruncate(
+    componentItem.value.title,
+    TRUNCATE_MAX_LENGTH,
+    TRUNCATE_START_CHARS,
+    TRUNCATE_END_CHARS,
+  );
+});
+
 const copied = ref(false);
 async function copyId(targetId) {
   if (!targetId) {
@@ -86,16 +94,17 @@ async function copyId(targetId) {
   }
 }
 
-const formattedId = computed(() => {
-  const metaId = metaData?.id;
-  if (!metaId) {
+function formatId(id) {
+  if (!id) {
     return "";
   }
-  if (metaId.length <= MAX_SHORT_ID_LENGTH) {
-    return metaId;
+  if (id.length <= MAX_SHORT_ID_LENGTH) {
+    return id;
   }
-  return `${metaId.slice(0, ID_SLICE_START)}...${metaId.slice(metaId.length - ID_SLICE_END_OFFSET)}`;
-});
+  return `${id.slice(0, ID_SLICE_START)}...${id.slice(id.length - ID_SLICE_END_OFFSET)}`;
+}
+
+const formattedId = computed(() => formatId(metaData?.id));
 </script>
 
 <template>
@@ -138,6 +147,32 @@ const formattedId = computed(() => {
               class="ml-1"
             />
           </v-col>
+
+          <template v-if="componentItem">
+            <v-divider class="w-100 my-2" opacity="0.2" />
+            <v-col
+              class="text-subtitle-2 font-weight-bold text-truncate text-white w-100 pa-0"
+              cols="auto"
+              style="line-height: 1.3"
+            >
+              {{ displayComponentTitle }}
+            </v-col>
+            <v-col
+              class="text-caption font-weight-black text-uppercase text-secondary pa-0"
+              style="font-size: 0.68rem; line-height: 1.2"
+            >
+              {{ componentItem.category }}
+            </v-col>
+            <v-col
+              class="id-badge-container mt-1 d-inline-flex align-center px-2 py-0.5"
+              @click.stop="copyId(componentItem.id)"
+            >
+              <span class="id-text">
+                {{ formatId(componentItem.id) }}
+              </span>
+              <v-icon icon="mdi-content-copy" size="10" color="white" class="ml-1" />
+            </v-col>
+          </template>
         </v-row>
       </GlassCard>
     </v-sheet>

package/app/components/Viewer/Generic/Model/BlocksOptions.vue

@@ -19,7 +19,7 @@ const hybridViewerStore = useHybridViewerStore();
 const blocksVisibility = computed({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Block"),
   set: async (newValue) => {
-    await dataStyleStore.setModelComponentTypeVisibility(modelId, "Block", newValue);
+    await dataStyleStore.setModelBlocksVisibility(modelId, targetBlockIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
@@ -36,7 +36,7 @@ const blockVisibility = computed({
 const blocksColor = computed({
   get: () => dataStyleStore.modelComponentTypeColor(modelId, "Block"),
   set: async (color) => {
-    await dataStyleStore.setModelComponentTypeColor(modelId, "Block", color);
+    await dataStyleStore.setModelBlocksColor(modelId, targetBlockIds, color);
     hybridViewerStore.remoteRender();
   },
 });
@@ -52,7 +52,7 @@ const blockColor = computed({
 const blocksActiveColoring = computed({
   get: () => dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Block"),
   set: async (coloringType) => {
-    await dataStyleStore.setModelComponentTypeActiveColoring(modelId, "Block", coloringType);
+    await dataStyleStore.setModelBlocksActiveColoring(modelId, targetBlockIds, coloringType);
     hybridViewerStore.remoteRender();
   },
 });

package/app/components/Viewer/Generic/Model/CornersOptions.vue

@@ -13,14 +13,13 @@ const { modelId, cornerId, targetCornerIds } = defineProps({
 });
 
 const dataStyleStore = useDataStyleStore();
-console.log("CornersOptions setup!");
 const hybridViewerStore = useHybridViewerStore();
 
 // Visibility
 const cornersVisibility = computed({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Corner"),
   set: async (newValue) => {
-    await dataStyleStore.setModelComponentTypeVisibility(modelId, "Corner", newValue);
+    await dataStyleStore.setModelCornersVisibility(modelId, targetCornerIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
@@ -37,7 +36,7 @@ const cornerVisibility = computed({
 const cornersColor = computed({
   get: () => dataStyleStore.modelComponentTypeColor(modelId, "Corner"),
   set: async (color) => {
-    await dataStyleStore.setModelComponentTypeColor(modelId, "Corner", color);
+    await dataStyleStore.setModelCornersColor(modelId, targetCornerIds, color);
     hybridViewerStore.remoteRender();
   },
 });
@@ -53,7 +52,7 @@ const cornerColor = computed({
 const cornersActiveColoring = computed({
   get: () => dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Corner"),
   set: async (coloringType) => {
-    await dataStyleStore.setModelComponentTypeActiveColoring(modelId, "Corner", coloringType);
+    await dataStyleStore.setModelCornersActiveColoring(modelId, targetCornerIds, coloringType);
     hybridViewerStore.remoteRender();
   },
 });

package/app/components/Viewer/Generic/Model/LinesOptions.vue

@@ -19,7 +19,7 @@ const hybridViewerStore = useHybridViewerStore();
 const linesVisibility = computed({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Line"),
   set: async (newValue) => {
-    await dataStyleStore.setModelComponentTypeVisibility(modelId, "Line", newValue);
+    await dataStyleStore.setModelLinesVisibility(modelId, targetLineIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
@@ -36,7 +36,7 @@ const lineVisibility = computed({
 const linesColor = computed({
   get: () => dataStyleStore.modelComponentTypeColor(modelId, "Line"),
   set: async (color) => {
-    await dataStyleStore.setModelComponentTypeColor(modelId, "Line", color);
+    await dataStyleStore.setModelLinesColor(modelId, targetLineIds, color);
     hybridViewerStore.remoteRender();
   },
 });
@@ -52,7 +52,7 @@ const lineColor = computed({
 const linesActiveColoring = computed({
   get: () => dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Line"),
   set: async (coloringType) => {
-    await dataStyleStore.setModelComponentTypeActiveColoring(modelId, "Line", coloringType);
+    await dataStyleStore.setModelLinesActiveColoring(modelId, targetLineIds, coloringType);
     hybridViewerStore.remoteRender();
   },
 });

package/app/components/Viewer/Generic/Model/ModelStyleCard.vue

@@ -63,9 +63,13 @@ watch(
 
 const targetComponentIds = ref([]);
 watch(
-  () => [modelId.value, componentType.value],
+  () => [modelId.value, componentType.value, itemProps.meta_data.targetComponentIds],
   async () => {
     targetComponentIds.value = [];
+    if (itemProps.meta_data.targetComponentIds) {
+      targetComponentIds.value = itemProps.meta_data.targetComponentIds;
+      return;
+    }
     if (componentType.value && modelId.value) {
       const currentModelId = modelId.value;
       const currentType = componentType.value;

package/app/components/Viewer/Generic/Model/SurfacesOptions.vue

@@ -19,7 +19,7 @@ const hybridViewerStore = useHybridViewerStore();
 const surfacesVisibility = computed({
   get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Surface"),
   set: async (newValue) => {
-    await dataStyleStore.setModelComponentTypeVisibility(modelId, "Surface", newValue);
+    await dataStyleStore.setModelSurfacesVisibility(modelId, targetSurfaceIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
@@ -36,7 +36,7 @@ const surfaceVisibility = computed({
 const surfacesColor = computed({
   get: () => dataStyleStore.modelComponentTypeColor(modelId, "Surface"),
   set: async (color) => {
-    await dataStyleStore.setModelComponentTypeColor(modelId, "Surface", color);
+    await dataStyleStore.setModelSurfacesColor(modelId, targetSurfaceIds, color);
     hybridViewerStore.remoteRender();
   },
 });
@@ -52,7 +52,7 @@ const surfaceColor = computed({
 const surfacesActiveColoring = computed({
   get: () => dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Surface"),
   set: async (coloringType) => {
-    await dataStyleStore.setModelComponentTypeActiveColoring(modelId, "Surface", coloringType);
+    await dataStyleStore.setModelSurfacesActiveColoring(modelId, targetSurfaceIds, coloringType);
     hybridViewerStore.remoteRender();
   },
 });

package/app/components/Viewer/ObjectTree/Views/ModelComponents.vue

@@ -79,7 +79,7 @@ const itemsForTreeView = computed(() => {
   for (const category of filteredCategories.value) {
     result.push({
       ...category,
-      children: sortAndFormatItems(componentsCache.value?.[category.id], sortType.value),
+      children: sortAndFormatItems(componentsCache.value[category.id], sortType.value),
     });
   }
   return result;
@@ -87,12 +87,16 @@ const itemsForTreeView = computed(() => {
 
 function showContextMenu(event, item) {
   const actualItem = item.raw || item;
+  const typeId = actualItem.category || actualItem.id;
+  const typeItem = itemsForTreeView.value.find((type) => type.id === typeId);
+  const targetComponentIds = typeItem ? typeItem.children.map((child) => child.id) : undefined;
   emit("show-menu", {
     event,
     itemId: actualItem.category ? actualItem.id : id,
     context_type: actualItem.category ? "model_component" : "model_component_type",
     modelId: id,
     modelComponentType: actualItem.category ? undefined : actualItem.id,
+    targetComponentIds,
   });
 }
 
@@ -108,7 +112,7 @@ function handleHoverEnter({ item, immediate = false }) {
     () =>
       actualItem.category
         ? [actualItem.viewer_id]
-        : actualItem.children?.map((child) => child.viewer_id) || [],
+        : actualItem.children.map((child) => child.viewer_id),
     "model",
     immediate,
   );

package/app/components/Viewer/Options/ColorMapList.vue

@@ -78,7 +78,8 @@ watch(filteredPresets, drawAllCanvases);
 <template>
   <GlassCard width="320" variant="panel" padding="pa-3" rounded="lg" class="overflow-hidden">
     <v-overlay
-      v-model="loading"
+      v-if="loading"
+      data-testid="colorMapListLoading"
       contained
       persistent
       class="align-center justify-center"
@@ -87,9 +88,9 @@ watch(filteredPresets, drawAllCanvases);
     >
       <v-progress-circular indeterminate color="primary" />
     </v-overlay>
-
     <v-text-field
       v-model="filterText"
+      data-testid="colorMapListFilter"
       placeholder="Search presets..."
       density="compact"
       hide-details

package/app/stores/app.js

@@ -196,7 +196,7 @@ export const useAppStore = defineStore("app", () => {
   }
 
   function upload(file, callbacks = {}) {
-    const route = "/api/extensions/upload";
+    const route = "/api/microservice/extensions/upload";
     const store = useAppStore();
     return upload_file(
       store,
@@ -244,7 +244,7 @@ export const useAppStore = defineStore("app", () => {
   function createProjectFolder() {
     const { PROJECT } = useRuntimeConfig().public;
     const schema = {
-      $id: "/api/app/project_folder_path",
+      $id: "/api/local/project_folder_path",
       methods: ["POST"],
       type: "object",
       properties: { PROJECT: { type: "string" } },

package/app/stores/back.js

@@ -81,7 +81,7 @@ export const useBackStore = defineStore("back", {
       const appStore = useAppStore();
       const { COMMAND_BACK, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = {
-        $id: "/api/app/run_back",
+        $id: "/api/local/run_back",
         methods: ["POST"],
         type: "object",
         properties: {

package/app/stores/cloud.js

@@ -12,7 +12,7 @@ export const useCloudStore = defineStore("cloud", {
       this.status = Status.CONNECTING;
       console.log("[CLOUD] Launching cloud backend...");
       const schema = {
-        $id: "/api/app/run_cloud",
+        $id: "/api/serverless/run_cloud",
         methods: ["POST"],
         type: "object",
         properties: {

package/app/stores/menu.js

@@ -83,7 +83,7 @@ const Section_menu = [ModelEdgesOptions, ModelPointsOptions, ModelStyleOptions];
 
 const StructuralModel_menu = [ModelEdgesOptions, ModelPointsOptions, ModelStyleOptions];
 
-const ModelComponent_menu = [ModelStyleOptions];
+const ModelComponent_menu = [ModelEdgesOptions, ModelPointsOptions, ModelStyleOptions];
 
 const menusData = {
   mesh: {

package/app/stores/viewer.js

@@ -133,7 +133,7 @@ export const useViewerStore = defineStore(
 
       const { COMMAND_VIEWER, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = {
-        $id: "/api/app/run_viewer",
+        $id: "/api/local/run_viewer",
         methods: ["POST"],
         type: "object",
         properties: { COMMAND_VIEWER: { type: "string" }, NUXT_ROOT_PATH: { type: "string" } },

package/app/utils/extension.js

@@ -81,7 +81,7 @@ function runExtensions() {
   const params = { projectFolderPath, projectName };
 
   const schema = {
-    $id: "/api/extensions/run",
+    $id: "/api/microservice/extensions/run",
     methods: ["POST"],
     type: "object",
     properties: {
@@ -104,7 +104,7 @@ function killExtension(extensionId) {
   console.log(`[AppStore] Killing extension: ${extensionId}`, { params });
 
   const schema = {
-    $id: "/api/extensions/kill",
+    $id: "/api/microservice/extensions/kill",
     methods: ["POST"],
     type: "object",
     properties: {

package/app/utils/local/microservices.js

@@ -13,6 +13,7 @@ import { executablePath } from "./path.js";
 
 const MILLISECONDS_PER_SECOND = 1000;
 const DEFAULT_TIMEOUT_SECONDS = 45;
+const MAX_PORT_RETRIES = 1;
 
 async function runScript(
   execPath,
@@ -51,7 +52,11 @@ async function runScript(
   }
 }
 
-async function runBack(execName, execPath, args = {}) {
+function isPortInUseError(errorMessage) {
+  return /EADDRINUSE|address already in use|port already in use/iu.test(errorMessage);
+}
+
+async function runBack(execName, execPath, args = {}, attempts = 0) {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
@@ -60,44 +65,68 @@ async function runBack(execName, execPath, args = {}) {
   if (!uploadFolderPath) {
     uploadFolderPath = path.join(projectFolderPath, "uploads");
   }
-  const port = await getAvailablePort();
-  const backArgs = [
-    "--port",
-    String(port),
-    "--project_folder_path",
-    projectFolderPath,
-    "--upload_folder_path",
-    uploadFolderPath,
-    "--allowed_origins",
-    "http://localhost:*",
-    "--timeout",
-    "0",
-  ];
-  if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
-    backArgs.push("--debug");
+  try {
+    const port = await getAvailablePort();
+    const backArgs = [
+      "--port",
+      String(port),
+      "--project_folder_path",
+      projectFolderPath,
+      "--upload_folder_path",
+      uploadFolderPath,
+      "--allowed_origins",
+      "http://localhost:*",
+      "--timeout",
+      "0",
+    ];
+    if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+      backArgs.push("--debug");
+    }
+    console.log("runBack", execPath, execName, backArgs);
+    await runScript(execPath, execName, backArgs, "Serving Flask app");
+    return port;
+  } catch (error) {
+    if (!isPortInUseError(error)) {
+      console.log("runBack error", error);
+      throw error;
+    }
+    if (attempts <= MAX_PORT_RETRIES) {
+      console.log("Retrying runBack on conflicting port", port);
+      const port = await runBack(execName, execPath, args, attempts + 1);
+      return port;
+    }
   }
-  console.log("runBack", execPath, execName, backArgs);
-  await runScript(execPath, execName, backArgs, "Serving Flask app");
-  return port;
 }
 
-async function runViewer(execName, execPath, args = {}) {
+async function runViewer(execName, execPath, args = {}, attempts = 0) {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
   }
-  const port = await getAvailablePort();
-  const viewerArgs = [
-    "--port",
-    String(port),
-    "--project_folder_path",
-    projectFolderPath,
-    "--timeout",
-    "0",
-  ];
-  console.log("runViewer", execPath, execName, viewerArgs);
-  await runScript(execPath, execName, viewerArgs, "Starting factory");
-  return port;
+  try {
+    const port = await getAvailablePort();
+    const viewerArgs = [
+      "--port",
+      String(port),
+      "--project_folder_path",
+      projectFolderPath,
+      "--timeout",
+      "0",
+    ];
+    console.log("runViewer", execPath, execName, viewerArgs);
+    await runScript(execPath, execName, viewerArgs, "Starting factory");
+    return port;
+  } catch (error) {
+    if (!isPortInUseError(error)) {
+      console.log("runBack error", error);
+      throw error;
+    }
+    if (attempts <= MAX_PORT_RETRIES) {
+      console.log("Retrying runViewer on conflicting port", port);
+      const port = await runViewer(execName, execPath, args, attempts + 1);
+      return port;
+    }
+  }
 }
 
 function addMicroserviceMetadatas(projectFolderPath, serviceObj) {

package/nuxt.config.js

@@ -22,6 +22,8 @@ export default defineNuxtConfig({
     scan: false,
   },
 
+  ssr: false,
+
   alias: {
     "@ogw_front": path.resolve(__dirname, "app"),
     "@ogw_internal": path.resolve(__dirname, "internal"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.29.0-rc.1",
+  "version": "10.29.0-rc.10",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/server/api/{app → serverless}/run_cloud.js

@@ -6,7 +6,7 @@ import { GoogleAuth } from "google-auth-library";
 import { ServicesClient } from "@google-cloud/run";
 
 // Local imports
-import { artifactImages, requestConfig } from "@ogw_server/utils/cloud";
+import { artifactImage, requestConfig } from "@ogw_server/utils/cloud";
 
 export default defineEventHandler(async (event) => {
   try {
@@ -23,8 +23,8 @@ export default defineEventHandler(async (event) => {
       scopes: ["https://www.googleapis.com/auth/cloud-platform"],
     });
     const authClient = await auth.getClient();
-    const [routerImage, backImage, viewerImage] = await artifactImages(parent, authClient);
-    const request = requestConfig(parent, routerImage, backImage, viewerImage, email, projectName);
+    const image = await artifactImage(parent, authClient);
+    const request = requestConfig(parent, image, email, projectName);
     console.log({ request });
     const runClient = new ServicesClient({ authClient });
     const [operation] = await runClient.createService(request);

package/server/utils/cloud.js

@@ -5,11 +5,16 @@ import { google } from "googleapis";
 
 // Local imports
 
-async function artifactImage(registry, parent, repo) {
+async function artifactImage(parent, authClient) {
+  const projectName = process.env.PROJECT;
+  const registry = google.artifactregistry({
+    version: "v1",
+    auth: authClient,
+  });
   const branch = process.env.NETLIFY_BRANCH;
   const [_, projectId] = parent.split("/");
   const repository = `${parent}/repositories/github/packages/`;
-  const name = `${repository}${repo}/tags/${branch}`;
+  const name = `${repository}${projectName}/tags/${branch}`;
   console.log({ name });
   const response = await registry.projects.locations.repositories.packages.tags.get({
     name,
@@ -17,24 +22,11 @@ async function artifactImage(registry, parent, repo) {
   console.log({ response });
   const digest = response.data.version.split("/").pop();
   const artifactRegistry = `europe-west9-docker.pkg.dev/${projectId}/github`;
-  const image = `${artifactRegistry}/${repo}@${digest}`;
-  console.log("Found image for", repo, image);
+  const image = `${artifactRegistry}/${projectName}@${digest}`;
+  console.log("Found image for", projectName, image);
   return image;
 }
 
-function artifactImages(parent, authClient) {
-  const projectName = process.env.PROJECT;
-  const registry = google.artifactregistry({
-    version: "v1",
-    auth: authClient,
-  });
-  return Promise.all([
-    artifactImage(registry, parent, "opengeodeweb-router"),
-    artifactImage(registry, parent, `${projectName}-back`),
-    artifactImage(registry, parent, `${projectName}-viewer`),
-  ]);
-}
-
 function sanitizeLabelValue(label) {
   console.log("label", label);
   const maxLabelLength = 63;
@@ -44,47 +36,35 @@ function sanitizeLabelValue(label) {
     .slice(0, maxLabelLength);
 }
 
-// oxlint-disable-next-line max-lines-per-function
-function requestConfig(parent, routerImage, backImage, viewerImage, email, projectName) {
+function requestConfig(parent, image, email, projectName) {
   const resources = {
     limits: {
-      cpu: "1000m",
-      memory: "1Gi",
+      cpu: "2000m",
+      memory: "3Gi",
     },
+    cpuIdle: false,
+    startup_cpu_boost: true,
   };
-  const volumeMounts = {
-    name: "project",
-    mountPath: "/project",
+  const labels = {
+    user: sanitizeLabelValue(email),
+    project: sanitizeLabelValue(projectName),
   };
   return {
     parent,
     service: {
       ingress: "INGRESS_TRAFFIC_ALL",
       invokerIamDisabled: true,
-      labels: {
-        user: sanitizeLabelValue(email),
-        project: sanitizeLabelValue(projectName),
-      },
+      labels,
       scaling: {
         scalingMode: "MANUAL",
         manualInstanceCount: 1,
       },
       template: {
-        labels: {
-          user: sanitizeLabelValue(email),
-          project: sanitizeLabelValue(projectId),
-        },
-        volumes: [
-          {
-            name: "project",
-            emptyDir: {
-              medium: "MEMORY",
-            },
-          },
-        ],
+        labels,
+        timeout: { seconds: 3600 },
         containers: [
           {
-            image: routerImage,
+            image,
             ports: [
               {
                 containerPort: 80,
@@ -106,20 +86,10 @@ function requestConfig(parent, routerImage, backImage, viewerImage, email, proje
               failureThreshold: 30,
             },
           },
-          {
-            image: backImage,
-            resources,
-            volumeMounts: [volumeMounts],
-          },
-          {
-            image: viewerImage,
-            resources,
-            volumeMounts: [volumeMounts],
-          },
         ],
       },
     },
   };
 }
 
-export { artifactImages, requestConfig };
+export { artifactImage, requestConfig };

package/tests/unit/stores/cloud.nuxt.test.js

@@ -38,7 +38,7 @@ describe("cloud store", () => {
         const cloudStore = useCloudStore();
         const feedbackStore = useFeedbackStore();
 
-        registerEndpoint("/api/app/run_cloud", {
+        registerEndpoint("/api/serverless/run_cloud", {
           method: "POST",
           handler: postFakeCall,
         });
@@ -58,7 +58,7 @@ describe("cloud store", () => {
         const cloudStore = useCloudStore();
         const feedbackStore = useFeedbackStore();
 
-        registerEndpoint("/api/app/run_cloud", {
+        registerEndpoint("/api/serverless/run_cloud", {
           method: "POST",
           handler: postFakeCall,
         });

package/tests/unit/stores/infra.nuxt.test.js

@@ -291,7 +291,7 @@ describe("infra store", () => {
 
       infraStore.app_mode = appMode.CLOUD;
       const url = "test.com";
-      registerEndpoint("/api/app/run_cloud", {
+      registerEndpoint("/api/serverless/run_cloud", {
         method: "POST",
         handler: () => ({ url }),
       });