@geode/opengeodeweb-front 10.27.1 → 10.28.0-rc.2

package/app/components/Launcher.vue

@@ -5,39 +5,67 @@ import { Status } from "@ogw_front/utils/status";
 import { appMode } from "@ogw_front/utils/local/app_mode";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-const { logo, appName } = defineProps({
-  logo: {
-    type: String,
-    required: false,
-    default: "",
-  },
-  appName: {
-    type: String,
-    required: true,
-  },
+const { appName, email, isUserAuthenticated, logo } = defineProps({
+  appName: { type: String, required: true },
+  email: { type: String, default: undefined },
+  isUserAuthenticated: { type: Boolean, default: false },
+  logo: { type: String, required: false, default: "" },
 });
 
 const infraStore = useInfraStore();
 if (infraStore.app_mode !== appMode.CLOUD) {
   infraStore.create_backend();
 }
+
+function cloudCreateBackend() {
+  return infraStore.create_backend(email);
+}
 </script>
 
 <template>
-  <v-container class="justify">
-    <v-row align-content="center" align="center">
-      <v-col
-        v-if="infraStore.status === Status.NOT_CREATED"
-        class="align"
+  <VContainer class="justify">
+    <VRow align-content="center" align="center" justify="center">
+      <VCol cols="12" align-self="center">
+        <slot name="auth" />
+      </VCol>
+      <VCol
+        v-if="isUserAuthenticated && infraStore.status === Status.NOT_CREATED"
+        class="d-flex justify-center align-center"
         cols="12"
         align-self="center"
         z-index="4"
       >
-        <Recaptcha :button_color="'secondary'" />
-      </v-col>
-      <v-col v-else-if="infraStore.status === Status.CREATING">
+        <VBtn
+          data-testid="loadAppButton"
+          class="load-btn"
+          text="Load the app"
+          size="x-large"
+          color="white"
+          @click="cloudCreateBackend"
+        />
+      </VCol>
+      <VCol v-else-if="infraStore.status === Status.CREATING">
         <Loading :logo="logo" :app-name="appName" />
-      </v-col>
-    </v-row>
-  </v-container>
+      </VCol>
+    </VRow>
+  </VContainer>
 </template>
+
+<style scoped>
+.load-btn {
+  padding: 0 40px !important;
+  height: 50px !important;
+  border-radius: 8px;
+  text-transform: none !important;
+  font-weight: 600;
+  letter-spacing: 0.5px;
+  transition:
+    transform 0.2s ease,
+    box-shadow 0.2s ease !important;
+}
+
+.load-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;
+}
+</style>

package/app/composables/run_function_when_microservices_connected.js

@@ -1,17 +1,20 @@
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-export function run_function_when_microservices_connected(function_to_run) {
+export function runFunctionWhenMicroservicesConnected(functionToRun) {
   const infraStore = useInfraStore();
   const { microservices_connected } = storeToRefs(infraStore);
   console.log("inside microservices_connected", microservices_connected.value);
   if (microservices_connected.value) {
-    function_to_run();
-  } else {
-    watch(microservices_connected, (value) => {
+    functionToRun();
+  }
+  watch(
+    microservices_connected,
+    (value) => {
       if (value) {
         console.log("watch microservices_connected", value);
-        function_to_run();
+        functionToRun();
       }
-    });
-  }
+    },
+    { once: true },
+  );
 }

package/app/stores/cloud.js

@@ -8,7 +8,7 @@ export const useCloudStore = defineStore("cloud", {
     status: Status.NOT_CONNECTED,
   }),
   actions: {
-    launch(name, email, launch) {
+    launch(email) {
       this.status = Status.CONNECTING;
       console.log("[CLOUD] Launching cloud backend...");
       const schema = {
@@ -16,18 +16,12 @@ export const useCloudStore = defineStore("cloud", {
         methods: ["POST"],
         type: "object",
         properties: {
-          name: { type: "string" },
           email: { type: "string" },
-          launch: { type: "boolean" },
         },
-        required: ["name", "email", "launch"],
+        required: ["email"],
         additionalProperties: true,
       };
-      const params = {
-        name,
-        email,
-        launch,
-      };
+      const params = { email };
       console.log("[CLOUD] params", params);
       const appStore = useAppStore();
       const feedbackStore = useFeedbackStore();

package/app/stores/infra.js

@@ -37,7 +37,7 @@ export const useInfraStore = defineStore("infra", {
       );
       console.log("[INFRA] Microservice unregistered:", microserviceId);
     },
-    create_backend(name, email, launch) {
+    create_backend(email) {
       console.log("[INFRA] Starting create_backend - Mode:", this.app_mode);
       console.log(
         "[INFRA] Registered microservices:",
@@ -54,7 +54,7 @@ export const useInfraStore = defineStore("infra", {
         console.log("[INFRA] Lock granted for create_backend");
         if (this.app_mode === appMode.CLOUD) {
           const cloudStore = useCloudStore();
-          await cloudStore.launch(name, email, launch);
+          await cloudStore.launch(email);
         } else {
           const appStore = useAppStore();
           await appStore.createProjectFolder();

package/app/utils/config.js

@@ -27,14 +27,14 @@ function extensionsConf(projectName) {
   return extensionsConfig;
 }
 
-function addExtensionToConf(projectName, { extensionID, extensionPath }) {
+function addExtensionToConf(projectName, { extensionId, extensionPath }) {
   const projectConfig = projectConf(projectName);
-  projectConfig.set(`extensions.${extensionID}.path`, extensionPath);
+  projectConfig.set(`extensions.${extensionId}.path`, extensionPath);
 }
 
-async function removeExtensionFromConf(projectName, extensionID) {
+async function removeExtensionFromConf(projectName, extensionId) {
   const projectConfig = projectConf(projectName);
-  const extensionArchivePath = extensionPathFromConf(projectName, extensionID);
+  const extensionArchivePath = extensionPathFromConf(projectName, extensionId);
 
   await unlink(extensionArchivePath, (error) => {
     if (error) {
@@ -42,13 +42,13 @@ async function removeExtensionFromConf(projectName, extensionID) {
     }
     console.log(`${extensionArchivePath} was deleted`);
   });
-  projectConfig.delete(`extensions.${extensionID}`);
-  console.log(`${extensionID} was deleted from ${projectName} config`);
+  projectConfig.delete(`extensions.${extensionId}`);
+  console.log(`${extensionId} was deleted from ${projectName} config`);
 }
 
-function extensionPathFromConf(projectName, extensionID) {
+function extensionPathFromConf(projectName, extensionId) {
   const projectConfig = projectConf(projectName);
-  return projectConfig.get(`extensions.${extensionID}.path`);
+  return projectConfig.get(`extensions.${extensionId}.path`);
 }
 
 export {

package/app/utils/local/path.js

@@ -55,8 +55,8 @@ function generateProjectFolderPath(projectName) {
   return path.join(os.tmpdir(), projectName.replaceAll("/", "_"), uuidv4());
 }
 
-function extensionFolderPath(projectFolderPath, extensionID) {
-  return path.join(projectFolderPath, "extensions", extensionID);
+function extensionFolderPath(projectFolderPath, extensionId) {
+  return path.join(projectFolderPath, "extensions", extensionId);
 }
 
 async function lookForLocalExtensionDistPath(rootPath, extentionRepoName, frontendFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.27.1",
+  "version": "10.28.0-rc.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -34,8 +34,8 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",

package/server/api/app/run_cloud.js

@@ -6,17 +6,12 @@ import { GoogleAuth } from "google-auth-library";
 import { ServicesClient } from "@google-cloud/run";
 
 // Local imports
-import { artifactImages, checkRecaptchaParams, requestConfig } from "@ogw_server/utils/cloud";
+import { artifactImages, requestConfig } from "@ogw_server/utils/cloud";
 
 export default defineEventHandler(async (event) => {
   try {
-    const { name, email, launch } = await readBody(event);
-    if (!checkRecaptchaParams(name, email, launch)) {
-      return {
-        statusCode: 500,
-        body: JSON.stringify({ message: "INTERNAL_ERROR" }),
-      };
-    }
+    const { email } = await readBody(event);
+    console.log("[RUN CLOUD] Received request to create backend for email:", email);
     const credentials = JSON.parse(process.env.GOOGLE_CLOUD_KEY);
     const location = "europe-west9";
     const projectId = process.env.GOOGLE_CLOUD_PROJECT;

package/server/api/extensions/run.post.js

@@ -25,11 +25,11 @@ export default defineEventHandler(async (event) => {
     const extensionsConfig = extensionsConf(projectName);
 
     const extensionsArray = await Promise.all(
-      Object.keys(extensionsConfig).map(async (extensionID) => {
-        const extensionPath = extensionsConfig[extensionID].path;
+      Object.keys(extensionsConfig).map(async (extensionId) => {
+        const extensionPath = extensionsConfig[extensionId].path;
         const unzippedExtensionPath = await unzipFile(
           extensionPath,
-          extensionFolderPath(projectFolderPath, extensionID),
+          extensionFolderPath(projectFolderPath, extensionId),
         );
         const metadataPath = path.join(unzippedExtensionPath, "metadata.json");
         const metadataContent = await fs.promises.readFile(metadataPath, "utf8");

package/server/api/extensions/upload.put.js

@@ -83,7 +83,7 @@ export default defineEventHandler(async (event) => {
       const metadata = JSON.parse(metadataJson);
       const { id } = metadata;
       await addExtensionToConf(projectName, {
-        extensionID: id,
+        extensionId: id,
         extensionPath: file,
       });
     }),

package/server/utils/cloud.js

@@ -5,11 +5,6 @@ import { google } from "googleapis";
 
 // Local imports
 
-function checkRecaptchaParams(name, email, launch) {
-  console.log("check_recaptcha_params", { name, email, launch });
-  return name === "" && email === "" && launch === false;
-}
-
 async function artifactImage(registry, parent, repo) {
   const branch = process.env.NETLIFY_BRANCH;
   const [_, projectId] = parent.split("/");
@@ -110,4 +105,4 @@ function requestConfig(parent, routerImage, backImage, viewerImage) {
   };
 }
 
-export { checkRecaptchaParams, artifactImages, requestConfig };
+export { artifactImages, requestConfig };

package/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js

@@ -4,7 +4,7 @@ import { flushPromises } from "@vue/test-utils";
 
 // Local imports
 import { Status } from "@ogw_front/utils/status";
-import { run_function_when_microservices_connected } from "@ogw_front/composables/run_function_when_microservices_connected";
+import { runFunctionWhenMicroservicesConnected } from "@ogw_front/composables/run_function_when_microservices_connected";
 import { setupActivePinia } from "@ogw_tests/utils";
 import { useBackStore } from "@ogw_front/stores/back";
 import { useInfraStore } from "@ogw_front/stores/infra";
@@ -40,7 +40,7 @@ describe("when_microservices_connected_run_function", () => {
 
   test("microservices not connected", () => {
     const spy = vi.spyOn(dumb_obj, "dumb_method");
-    run_function_when_microservices_connected(dumb_obj.dumb_method);
+    runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method);
     backStore.$patch({ status: Status.NOT_CONNECTED });
     viewerStore.$patch({ status: Status.NOT_CONNECTED });
     expect(spy).not.toHaveBeenCalled();
@@ -48,7 +48,7 @@ describe("when_microservices_connected_run_function", () => {
 
   test("microservices connected", async () => {
     const spy = vi.spyOn(dumb_obj, "dumb_method");
-    run_function_when_microservices_connected(dumb_obj.dumb_method);
+    runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method);
     backStore.$patch({ status: Status.CONNECTED });
     viewerStore.$patch({ status: Status.CONNECTED });
     await flushPromises();