diff --git a/app/stores/app.js b/app/stores/app.js index c1e26a40..e0cc86ed 100644 --- a/app/stores/app.js +++ b/app/stores/app.js @@ -245,25 +245,22 @@ export const useAppStore = defineStore("app", () => { const projectFolderPath = ref(""); function createProjectFolder() { + const { PROJECT } = useRuntimeConfig().public; const schema = { $id: "/api/app/project_folder_path", methods: ["POST"], type: "object", - properties: {}, - required: [], + properties: { PROJECT: { type: "string" } }, + required: ["PROJECT"], additionalProperties: true, }; - - return request( - schema, - {}, - { - response_function: (response) => { - console.log(`[APP] ${response.projectFolderPath} created`); - projectFolderPath.value = response.projectFolderPath; - }, + const params = { PROJECT }; + return request(schema, params, { + response_function: (response) => { + console.log(`[APP] ${response.projectFolderPath} created`); + projectFolderPath.value = response.projectFolderPath; }, - ); + }); } return { diff --git a/app/stores/geode.js b/app/stores/geode.js index 8ff74308..2fa75e29 100644 --- a/app/stores/geode.js +++ b/app/stores/geode.js @@ -81,16 +81,19 @@ export const useGeodeStore = defineStore("geode", { launch(args) { console.log("[GEODE] Launching back microservice...", { args }); const appStore = useAppStore(); + const { COMMAND_BACK, NUXT_ROOT_PATH } = useRuntimeConfig().public; const schema = { $id: "/api/app/run_back", methods: ["POST"], type: "object", - properties: {}, - required: [], + properties: { + COMMAND_BACK: { type: "string" }, + NUXT_ROOT_PATH: { type: "string" }, + }, + required: ["COMMAND_BACK", "NUXT_ROOT_PATH"], additionalProperties: true, }; - - const params = { args }; + const params = { COMMAND_BACK, NUXT_ROOT_PATH, args }; console.log("[GEODE] params", params); return appStore.request(schema, params, { diff --git a/app/stores/viewer.js b/app/stores/viewer.js index e4bff481..990b7a94 100644 --- a/app/stores/viewer.js +++ b/app/stores/viewer.js @@ -132,16 +132,18 @@ export const useViewerStore = defineStore( function launch(args = ({ projectFolderPath } = {})) { console.log("[VIEWER] Launching viewer microservice...", { args }); const appStore = useAppStore(); + + const { COMMAND_VIEWER, NUXT_ROOT_PATH } = useRuntimeConfig().public; const schema = { $id: "/api/app/run_viewer", methods: ["POST"], type: "object", - properties: {}, - required: [], + properties: { COMMAND_VIEWER: { type: "string" }, NUXT_ROOT_PATH: { type: "string" } }, + required: ["COMMAND_VIEWER", "NUXT_ROOT_PATH"], additionalProperties: true, }; - const params = { args }; + const params = { COMMAND_VIEWER, NUXT_ROOT_PATH, args }; console.log("[VIEWER] params", params); return appStore.request(schema, params, { diff --git a/server/api/app/project_folder_path.post.js b/server/api/app/project_folder_path.post.js index cebcbb94..7de3d949 100644 --- a/server/api/app/project_folder_path.post.js +++ b/server/api/app/project_folder_path.post.js @@ -1,7 +1,7 @@ // Node imports // Third party imports -import { createError, defineEventHandler } from "h3"; +import { createError, defineEventHandler, readBody } from "h3"; // Local imports import { @@ -9,12 +9,9 @@ import { generateProjectFolderPath, } from "@geode/opengeodeweb-front/app/utils/local/path.js"; -import { useRuntimeConfig } from "nitropack/runtime"; - export default defineEventHandler(async (event) => { try { - const config = useRuntimeConfig(event).public; - const { PROJECT } = config; + const { PROJECT } = await readBody(event); const projectFolderPath = generateProjectFolderPath(PROJECT); await createPath(projectFolderPath); diff --git a/server/api/app/run_back.post.js b/server/api/app/run_back.post.js index 7586b309..f0e8ee80 100644 --- a/server/api/app/run_back.post.js +++ b/server/api/app/run_back.post.js @@ -9,13 +9,9 @@ import { runBack, } from "@geode/opengeodeweb-front/app/utils/local/microservices.js"; -import { useRuntimeConfig } from "nitropack/runtime"; - export default defineEventHandler(async (event) => { try { - const config = useRuntimeConfig(event).public; - const { COMMAND_BACK, NUXT_ROOT_PATH } = config; - const { args } = await readBody(event); + const { COMMAND_BACK, NUXT_ROOT_PATH, args } = await readBody(event); const port = await runBack(COMMAND_BACK, NUXT_ROOT_PATH, args); await addMicroserviceMetadatas(args.projectFolderPath, { type: "back", diff --git a/server/api/app/run_viewer.post.js b/server/api/app/run_viewer.post.js index 6a6d04a6..acd040bc 100644 --- a/server/api/app/run_viewer.post.js +++ b/server/api/app/run_viewer.post.js @@ -9,13 +9,9 @@ import { runViewer, } from "@geode/opengeodeweb-front/app/utils/local/microservices.js"; -import { useRuntimeConfig } from "nitropack/runtime"; - export default defineEventHandler(async (event) => { try { - const config = useRuntimeConfig(event).public; - const { COMMAND_VIEWER, NUXT_ROOT_PATH } = config; - const { args } = await readBody(event); + const { COMMAND_VIEWER, NUXT_ROOT_PATH, args } = await readBody(event); const port = await runViewer(COMMAND_VIEWER, NUXT_ROOT_PATH, args); await addMicroserviceMetadatas(args.projectFolderPath, { type: "viewer",