@geode/opengeodeweb-front 10.25.0-rc.7 → 10.25.0

package/internal/stores/data_style/state.js

@@ -157,12 +157,12 @@ export function useDataStyleState() {
 
   function getComponentStyle(id_model, id_component) {
     const key = `${id_model}_${id_component}`;
-    return componentStyles.value[key] || {};
+    return componentStyles.value[key] || { coloring: {} };
   }
 
   function getModelComponentTypeStyle(id_model, type) {
     const key = `${id_model}_${type}`;
-    return modelComponentTypeStyles.value[key] || {};
+    return modelComponentTypeStyles.value[key] || { coloring: {} };
   }
 
   function clear() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.25.0-rc.7",
+  "version": "10.25.0",
   "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": "next",
-    "@geode/opengeodeweb-viewer": "next",
+    "@geode/opengeodeweb-back": "latest",
+    "@geode/opengeodeweb-viewer": "latest",
     "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",

package/tests/integration/stores/data_style/mesh/cells.nuxt.test.js

@@ -121,7 +121,7 @@ describe("mesh cells", () => {
     test("coloring color", async () => {
       const dataStyleStore = useDataStyleStore();
       const viewerStore = useViewerStore();
-      const coloringName = "color";
+      const coloringName = "constant";
       const result = dataStyleStore.setMeshCellsActiveColoring(id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;

package/tests/integration/stores/data_style/mesh/edges.nuxt.test.js

@@ -109,7 +109,7 @@ describe("mesh edges", () => {
     test("coloring color", async () => {
       const dataStyleStore = useDataStyleStore();
       const viewerStore = useViewerStore();
-      const coloringName = "color";
+      const coloringName = "constant";
       const result = dataStyleStore.setMeshEdgesActiveColoring(id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;

package/tests/integration/stores/data_style/mesh/points.nuxt.test.js

@@ -76,7 +76,7 @@ describe("mesh points", () => {
     test("coloring color", async () => {
       const dataStyleStore = useDataStyleStore();
       const viewerStore = useViewerStore();
-      const coloringName = "color";
+      const coloringName = "constant";
       const result = dataStyleStore.setMeshPointsActiveColoring(id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;

package/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js

@@ -119,7 +119,7 @@ describe("mesh polygons", () => {
     test("coloring color", async () => {
       const dataStyleStore = useDataStyleStore();
       const viewerStore = useViewerStore();
-      const coloringName = "color";
+      const coloringName = "constant";
       const result = dataStyleStore.setMeshPolygonsActiveColoring(id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;

package/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js

@@ -73,7 +73,7 @@ describe("mesh polyhedra", () => {
     test("coloring color", async () => {
       const dataStyleStore = useDataStyleStore();
       const viewerStore = useViewerStore();
-      const coloringName = "color";
+      const coloringName = "constant";
       const result = dataStyleStore.setMeshPolyhedraActiveColoring(id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;

package/tests/integration/stores/data_style/model/blocks.nuxt.test.js

@@ -180,11 +180,11 @@ describe("model blocks", () => {
       const dataStore = useDataStore();
       const block_ids = await dataStore.getBlocksGeodeIds(id);
       const [block_id] = block_ids;
-      const coloringName = "color";
-      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      const coloringName = "constant";
+      const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(dataStyleStore.modelBlockActiveColoring(id, block_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -196,10 +196,10 @@ describe("model blocks", () => {
       const [block_id] = block_ids;
       await dataStyleStore.setModelBlocksVertexAttributeName(id, [block_id], "points");
       const coloringName = "vertex";
-      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(dataStyleStore.modelBlockActiveColoring(id, block_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -211,10 +211,10 @@ describe("model blocks", () => {
       const [block_id] = block_ids;
       await dataStyleStore.setModelBlocksPolyhedronAttributeName(id, [block_id], "test_attribute");
       const coloringName = "polyhedron";
-      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, block_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(dataStyleStore.modelBlockActiveColoring(id, block_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });

package/tests/integration/stores/data_style/model/corners.nuxt.test.js

@@ -145,11 +145,11 @@ describe("model corners", () => {
       const dataStore = useDataStore();
       const corner_ids = await dataStore.getCornersGeodeIds(id);
       const [corner_id] = corner_ids;
-      const coloringName = "color";
-      const result = dataStyleStore.setModelComponentColorMode(id, corner_id, coloringName);
+      const coloringName = "constant";
+      const result = dataStyleStore.setModelComponentActiveColoring(id, corner_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelCornerColorMode(id, corner_id)).toBe(coloringName);
+      expect(dataStyleStore.modelCornerActiveColoring(id, corner_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -161,10 +161,10 @@ describe("model corners", () => {
       const [corner_id] = corner_ids;
       await dataStyleStore.setModelCornersVertexAttributeName(id, [corner_id], "points");
       const coloringName = "vertex";
-      const result = dataStyleStore.setModelComponentColorMode(id, corner_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, corner_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelCornerColorMode(id, corner_id)).toBe(coloringName);
+      expect(dataStyleStore.modelCornerActiveColoring(id, corner_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });

package/tests/integration/stores/data_style/model/index.nuxt.test.js

@@ -6,6 +6,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
+import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
@@ -58,4 +59,34 @@ describe("model", () => {
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });
+
+  describe("model color inheritance", () => {
+    test("inheritance workflow model > surfaces > surface", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const dataStore = useDataStore();
+
+      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+      const [surface_id] = surface_ids;
+
+      const red = { red: 255, green: 0, blue: 0, alpha: 1 };
+      const green = { red: 0, green: 255, blue: 0, alpha: 1 };
+      const blue = { red: 0, green: 0, blue: 255, alpha: 1 };
+
+      await dataStyleStore.mutateStyle(id, {
+        coloring: { constant: red, active: "constant" },
+      });
+      await dataStyleStore.setModelComponentsColor(id, surface_ids, red);
+      await sleep(SLEEP_MS);
+
+      await dataStyleStore.setModelComponentTypeColor(id, "Surface", green);
+      await sleep(SLEEP_MS);
+
+      await dataStyleStore.setModelSurfacesColor(id, [surface_id], blue);
+      await sleep(SLEEP_MS);
+
+      expect(dataStyleStore.getModelColor(id)).toStrictEqual(red);
+      expect(dataStyleStore.modelComponentTypeColor(id, "Surface")).toStrictEqual(green);
+      expect(dataStyleStore.modelSurfaceColor(id, surface_id)).toStrictEqual(blue);
+    });
+  });
 });

package/tests/integration/stores/data_style/model/lines.nuxt.test.js

@@ -178,11 +178,11 @@ describe("model lines", () => {
       const dataStore = useDataStore();
       const line_ids = await dataStore.getLinesGeodeIds(id);
       const [line_id] = line_ids;
-      const coloringName = "color";
-      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      const coloringName = "constant";
+      const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(dataStyleStore.modelLineActiveColoring(id, line_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -194,10 +194,10 @@ describe("model lines", () => {
       const [line_id] = line_ids;
       await dataStyleStore.setModelLinesVertexAttributeName(id, [line_id], "points");
       const coloringName = "vertex";
-      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(dataStyleStore.modelLineActiveColoring(id, line_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -209,10 +209,10 @@ describe("model lines", () => {
       const [line_id] = line_ids;
       await dataStyleStore.setModelLinesEdgeAttributeName(id, [line_id], "test_attribute");
       const coloringName = "edge";
-      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, line_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(dataStyleStore.modelLineActiveColoring(id, line_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });

package/tests/integration/stores/data_style/model/surfaces.nuxt.test.js

@@ -182,11 +182,11 @@ describe("model surfaces", () => {
       const dataStore = useDataStore();
       const surface_ids = await dataStore.getSurfacesGeodeIds(id);
       const [surface_id] = surface_ids;
-      const coloringName = "color";
-      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      const coloringName = "constant";
+      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -198,10 +198,10 @@ describe("model surfaces", () => {
       const [surface_id] = surface_ids;
       await dataStyleStore.setModelSurfacesVertexAttributeName(id, [surface_id], "points");
       const coloringName = "vertex";
-      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
 
@@ -213,10 +213,10 @@ describe("model surfaces", () => {
       const [surface_id] = surface_ids;
       await dataStyleStore.setModelSurfacesPolygonAttributeName(id, [surface_id], "test_attribute");
       const coloringName = "polygon";
-      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      const result = dataStyleStore.setModelComponentActiveColoring(id, surface_id, coloringName);
       expect(result).toBeInstanceOf(Promise);
       await result;
-      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(dataStyleStore.modelSurfaceActiveColoring(id, surface_id)).toBe(coloringName);
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });