@geode/opengeodeweb-front 10.28.0-rc.1 → 10.28.0-rc.3

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/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.28.0-rc.1",
+  "version": "10.28.0-rc.3",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/server/api/app/run_cloud.js

@@ -23,7 +23,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);
+    const request = requestConfig(parent, routerImage, backImage, viewerImage, email);
     console.log({ request });
     const runClient = new ServicesClient({ authClient });
     const [operation] = await runClient.createService(request);

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

@@ -35,8 +35,16 @@ function artifactImages(parent, authClient) {
   ]);
 }
 
+function sanitizeLabelValue(label) {
+  const maxLabelLength = 63;
+  return label
+    .toLowerCase()
+    .replaceAll(/[^a-z0-9_-]/gu, "_")
+    .slice(0, maxLabelLength);
+}
+
 // oxlint-disable-next-line max-lines-per-function
-function requestConfig(parent, routerImage, backImage, viewerImage) {
+function requestConfig(parent, routerImage, backImage, viewerImage, email, projectId) {
   const resources = {
     limits: {
       cpu: "1000m",
@@ -52,11 +60,19 @@ function requestConfig(parent, routerImage, backImage, viewerImage) {
     service: {
       ingress: "INGRESS_TRAFFIC_ALL",
       invokerIamDisabled: true,
+      labels: {
+        user: sanitizeLabelValue(email),
+        project: sanitizeLabelValue(projectId),
+      },
       scaling: {
         scalingMode: "MANUAL",
         manualInstanceCount: 1,
       },
       template: {
+        labels: {
+          user: sanitizeLabelValue(email),
+          project: sanitizeLabelValue(projectId),
+        },
         volumes: [
           {
             name: "project",

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();