@geode/opengeodeweb-front 10.29.0-rc.2 → 10.29.0-rc.4

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/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/package.json

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