@geode/opengeodeweb-front 10.34.0-rc.9 → 10.34.0

package/app/components/Viewer/Generic/Model/BlocksOptions.vue

@@ -1,37 +1,47 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
-// This file exhaustively wires group- and per-component style properties (visibility/color/coloring/vertex+polyhedron attributes) to the style store; the formatter's line-wrapping of the resulting store calls pushes the file past max-lines even though no logic was added.
-// oxlint-disable eslint/max-lines
+import type { CollectionComponent } from "@ogw_front/stores/data_helpers/collections";
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
   blockId?: string;
   targetBlockIds: string[];
+  collections?: CollectionComponent[];
 }
 
-const { modelId, blockId = undefined, targetBlockIds } = defineProps<Props>();
+const {
+  modelId,
+  blockId = undefined,
+  targetBlockIds,
+  collections = undefined,
+} = defineProps<Props>();
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
+const referenceBlockId = computed<string | undefined>(() =>
+  collections ? targetBlockIds[0] : undefined,
+);
+
 // Visibility
-const blocksVisibility = computed({
-  get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Block"),
+const blocksVisibility = computed<boolean>({
+  get: () =>
+    collections
+      ? targetBlockIds.every((id) => dataStyleStore.modelBlockVisibility(modelId, id))
+      : dataStyleStore.modelComponentTypeVisibility(modelId, "Block"),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVisibility(modelId, targetBlockIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
 
-const blockVisibility = computed({
+const blockVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelBlockVisibility(modelId, blockId) as boolean | undefined,
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -44,7 +54,8 @@ const blockVisibility = computed({
 
 // Color
 const blocksColor = computed<RGBAColor | undefined>({
-  get: () => dataStyleStore.modelComponentTypeColor(modelId, "Block") as RGBAColor | undefined,
+  get: () =>
+    dataStyleStore.modelBlockColor(modelId, referenceBlockId.value) as RGBAColor | undefined,
   set: async (color) => {
     await dataStyleStore.setModelBlocksColor(modelId, targetBlockIds, color);
     hybridViewerStore.remoteRender();
@@ -64,12 +75,25 @@ const blockColor = computed<RGBAColor | undefined>({
 
 const blocksActiveColoring = computed<string | undefined>({
   get: () =>
-    dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Block") as string | undefined,
+    dataStyleStore.modelBlockActiveColoring(modelId, referenceBlockId.value) as string | undefined,
   set: async (coloringType) => {
     if (typeof coloringType !== "string") {
       return;
     }
-    await dataStyleStore.setModelBlocksActiveColoring(modelId, targetBlockIds, coloringType);
+    if (collections && coloringType === "random") {
+      await Promise.all(
+        collections.map((collection) =>
+          dataStyleStore.setModelBlocksActiveColoring(
+            modelId,
+            collection.children.map((child) => child.id),
+            coloringType,
+            collection.id,
+          ),
+        ),
+      );
+    } else {
+      await dataStyleStore.setModelBlocksActiveColoring(modelId, targetBlockIds, coloringType);
+    }
     hybridViewerStore.remoteRender();
   },
 });
@@ -86,8 +110,8 @@ const blockActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const blocksVertexAttributeName = computed({
-  get: () => dataStyleStore.modelBlocksVertexAttributeName(modelId),
+const blocksVertexAttributeName = computed<string | undefined>({
+  get: () => dataStyleStore.modelBlocksVertexAttributeName(modelId, referenceBlockId.value),
   set: async (newValue) => {
     if (newValue === undefined) {
       return;
@@ -97,16 +121,16 @@ const blocksVertexAttributeName = computed({
   },
 });
 
-const blocksVertexAttributeItem = computed({
-  get: () => dataStyleStore.modelBlocksVertexAttributeItem(modelId),
+const blocksVertexAttributeItem = computed<string | undefined>({
+  get: () => dataStyleStore.modelBlocksVertexAttributeItem(modelId, referenceBlockId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVertexAttributeItem(modelId, targetBlockIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
 
-const blocksVertexAttributeRange = computed({
-  get: () => dataStyleStore.modelBlocksVertexAttributeRange(modelId),
+const blocksVertexAttributeRange = computed<[number, number] | undefined>({
+  get: () => dataStyleStore.modelBlocksVertexAttributeRange(modelId, referenceBlockId.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
     if (minimum === undefined || maximum === undefined) {
@@ -122,8 +146,8 @@ const blocksVertexAttributeRange = computed({
   },
 });
 
-const blocksVertexAttributeColorMap = computed({
-  get: () => dataStyleStore.modelBlocksVertexAttributeColorMap(modelId),
+const blocksVertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
+  get: () => dataStyleStore.modelBlocksVertexAttributeColorMap(modelId, referenceBlockId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVertexAttributeColorMap(modelId, targetBlockIds, newValue);
     hybridViewerStore.remoteRender();
@@ -131,7 +155,10 @@ const blocksVertexAttributeColorMap = computed({
 });
 
 const blocksVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
-  get: () => dataStyleStore.modelBlocksVertexAttributeNoDataColor(modelId) as RGBAColor | undefined,
+  get: () =>
+    dataStyleStore.modelBlocksVertexAttributeNoDataColor(modelId, referenceBlockId.value) as
+      | RGBAColor
+      | undefined,
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksVertexAttributeNoDataColor(
       modelId,
@@ -142,8 +169,8 @@ const blocksVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const blocksPolyhedronAttributeName = computed({
-  get: () => dataStyleStore.modelBlocksPolyhedronAttributeName(modelId),
+const blocksPolyhedronAttributeName = computed<string | undefined>({
+  get: () => dataStyleStore.modelBlocksPolyhedronAttributeName(modelId, referenceBlockId.value),
   set: async (newValue) => {
     if (newValue === undefined) {
       return;
@@ -153,16 +180,16 @@ const blocksPolyhedronAttributeName = computed({
   },
 });
 
-const blocksPolyhedronAttributeItem = computed({
-  get: () => dataStyleStore.modelBlocksPolyhedronAttributeItem(modelId),
+const blocksPolyhedronAttributeItem = computed<string | undefined>({
+  get: () => dataStyleStore.modelBlocksPolyhedronAttributeItem(modelId, referenceBlockId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksPolyhedronAttributeItem(modelId, targetBlockIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
 
-const blocksPolyhedronAttributeRange = computed({
-  get: () => dataStyleStore.modelBlocksPolyhedronAttributeRange(modelId),
+const blocksPolyhedronAttributeRange = computed<[number, number] | undefined>({
+  get: () => dataStyleStore.modelBlocksPolyhedronAttributeRange(modelId, referenceBlockId.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
     if (minimum === undefined || maximum === undefined) {
@@ -178,8 +205,8 @@ const blocksPolyhedronAttributeRange = computed({
   },
 });
 
-const blocksPolyhedronAttributeColorMap = computed({
-  get: () => dataStyleStore.modelBlocksPolyhedronAttributeColorMap(modelId),
+const blocksPolyhedronAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
+  get: () => dataStyleStore.modelBlocksPolyhedronAttributeColorMap(modelId, referenceBlockId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksPolyhedronAttributeColorMap(
       modelId,
@@ -192,7 +219,9 @@ const blocksPolyhedronAttributeColorMap = computed({
 
 const blocksPolyhedronAttributeNoDataColor = computed<RGBAColor | undefined>({
   get: () =>
-    dataStyleStore.modelBlocksPolyhedronAttributeNoDataColor(modelId) as RGBAColor | undefined,
+    dataStyleStore.modelBlocksPolyhedronAttributeNoDataColor(modelId, referenceBlockId.value) as
+      | RGBAColor
+      | undefined,
   set: async (newValue) => {
     await dataStyleStore.setModelBlocksPolyhedronAttributeNoDataColor(
       modelId,
@@ -204,7 +233,7 @@ const blocksPolyhedronAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeName(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined || newValue === undefined) {
@@ -215,7 +244,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeItem(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -226,7 +255,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeRange(modelId, blockId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -238,7 +267,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksVertexAttributeColorMap(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -261,7 +290,7 @@ const vertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   },
 });
 
-const polyhedronAttributeName = computed({
+const polyhedronAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeName(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined || newValue === undefined) {
@@ -272,7 +301,7 @@ const polyhedronAttributeName = computed({
   },
 });
 
-const polyhedronAttributeItem = computed({
+const polyhedronAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeItem(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {
@@ -283,7 +312,7 @@ const polyhedronAttributeItem = computed({
   },
 });
 
-const polyhedronAttributeRange = computed({
+const polyhedronAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeRange(modelId, blockId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -300,7 +329,7 @@ const polyhedronAttributeRange = computed({
   },
 });
 
-const polyhedronAttributeColorMap = computed({
+const polyhedronAttributeColorMap = computed<Map<string, RGBAColor> | undefined>({
   get: () => dataStyleStore.modelBlocksPolyhedronAttributeColorMap(modelId, blockId),
   set: async (newValue) => {
     if (blockId === undefined) {

package/app/components/Viewer/Generic/Model/CornersOptions.vue

@@ -1,35 +1,47 @@
 <script setup lang="ts">
-// Not auto-fixable (eslint's sort-imports core rule has no autofixer) and this file's import order doesn't match its syntax-kind-then-alphabetical requirement - left as-is rather than manually reordered across the codebase for a purely cosmetic rule.
-// oxlint-disable eslint/sort-imports
+import type { CollectionComponent } from "@ogw_front/stores/data_helpers/collections";
 import OptionsSection from "@ogw_front/components/Viewer/Options/OptionsSection.vue";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue";
 import VisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
-import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 
 interface Props {
   modelId: string;
   cornerId?: string;
   targetCornerIds: string[];
+  collections?: CollectionComponent[];
 }
 
-const { modelId, cornerId = undefined, targetCornerIds } = defineProps<Props>();
+const {
+  modelId,
+  cornerId = undefined,
+  targetCornerIds,
+  collections = undefined,
+} = defineProps<Props>();
 
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
+const referenceCornerId = computed<string | undefined>(() =>
+  collections ? targetCornerIds[0] : undefined,
+);
+
 // Visibility
-const cornersVisibility = computed({
-  get: () => dataStyleStore.modelComponentTypeVisibility(modelId, "Corner"),
+const cornersVisibility = computed<boolean>({
+  get: () =>
+    collections
+      ? targetCornerIds.every((id) => dataStyleStore.modelCornerVisibility(modelId, id))
+      : dataStyleStore.modelComponentTypeVisibility(modelId, "Corner"),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVisibility(modelId, targetCornerIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
 
-const cornerVisibility = computed({
+const cornerVisibility = computed<boolean | undefined>({
   get: () => dataStyleStore.modelCornerVisibility(modelId, cornerId) as boolean | undefined,
   set: async (newValue) => {
     if (cornerId === undefined) {
@@ -42,7 +54,8 @@ const cornerVisibility = computed({
 
 // Color
 const cornersColor = computed<RGBAColor | undefined>({
-  get: () => dataStyleStore.modelComponentTypeColor(modelId, "Corner") as RGBAColor | undefined,
+  get: () =>
+    dataStyleStore.modelCornerColor(modelId, referenceCornerId.value) as RGBAColor | undefined,
   set: async (color) => {
     await dataStyleStore.setModelCornersColor(modelId, targetCornerIds, color);
     hybridViewerStore.remoteRender();
@@ -62,12 +75,27 @@ const cornerColor = computed<RGBAColor | undefined>({
 
 const cornersActiveColoring = computed<string | undefined>({
   get: () =>
-    dataStyleStore.getModelComponentTypeActiveColoring(modelId, "Corner") as string | undefined,
+    dataStyleStore.modelCornerActiveColoring(modelId, referenceCornerId.value) as
+      | string
+      | undefined,
   set: async (coloringType) => {
     if (typeof coloringType !== "string") {
       return;
     }
-    await dataStyleStore.setModelCornersActiveColoring(modelId, targetCornerIds, coloringType);
+    if (collections && coloringType === "random") {
+      await Promise.all(
+        collections.map((collection) =>
+          dataStyleStore.setModelCornersActiveColoring(
+            modelId,
+            collection.children.map((child) => child.id),
+            coloringType,
+            collection.id,
+          ),
+        ),
+      );
+    } else {
+      await dataStyleStore.setModelCornersActiveColoring(modelId, targetCornerIds, coloringType);
+    }
     hybridViewerStore.remoteRender();
   },
 });
@@ -84,8 +112,8 @@ const cornerActiveColoring = computed<string | undefined>({
 });
 
 // Group Attributes
-const cornersVertexAttributeName = computed({
-  get: () => dataStyleStore.modelCornersVertexAttributeName(modelId),
+const cornersVertexAttributeName = computed<string | undefined>({
+  get: () => dataStyleStore.modelCornersVertexAttributeName(modelId, referenceCornerId.value),
   set: async (newValue) => {
     if (newValue === undefined) {
       return;
@@ -95,16 +123,16 @@ const cornersVertexAttributeName = computed({
   },
 });
 
-const cornersVertexAttributeItem = computed({
-  get: () => dataStyleStore.modelCornersVertexAttributeItem(modelId),
+const cornersVertexAttributeItem = computed<string | undefined>({
+  get: () => dataStyleStore.modelCornersVertexAttributeItem(modelId, referenceCornerId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVertexAttributeItem(modelId, targetCornerIds, newValue);
     hybridViewerStore.remoteRender();
   },
 });
 
-const cornersVertexAttributeRange = computed({
-  get: () => dataStyleStore.modelCornersVertexAttributeRange(modelId),
+const cornersVertexAttributeRange = computed<[number, number] | undefined>({
+  get: () => dataStyleStore.modelCornersVertexAttributeRange(modelId, referenceCornerId.value),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
     if (minimum === undefined || maximum === undefined) {
@@ -120,8 +148,8 @@ const cornersVertexAttributeRange = computed({
   },
 });
 
-const cornersVertexAttributeColorMap = computed({
-  get: () => dataStyleStore.modelCornersVertexAttributeColorMap(modelId),
+const cornersVertexAttributeColorMap = computed<ColorMap | undefined>({
+  get: () => dataStyleStore.modelCornersVertexAttributeColorMap(modelId, referenceCornerId.value),
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVertexAttributeColorMap(modelId, targetCornerIds, newValue);
     hybridViewerStore.remoteRender();
@@ -130,7 +158,9 @@ const cornersVertexAttributeColorMap = computed({
 
 const cornersVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
   get: () =>
-    dataStyleStore.modelCornersVertexAttributeNoDataColor(modelId) as RGBAColor | undefined,
+    dataStyleStore.modelCornersVertexAttributeNoDataColor(modelId, referenceCornerId.value) as
+      | RGBAColor
+      | undefined,
   set: async (newValue) => {
     await dataStyleStore.setModelCornersVertexAttributeNoDataColor(
       modelId,
@@ -142,7 +172,7 @@ const cornersVertexAttributeNoDataColor = computed<RGBAColor | undefined>({
 });
 
 // Individual Attributes
-const vertexAttributeName = computed({
+const vertexAttributeName = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeName(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined || newValue === undefined) {
@@ -153,7 +183,7 @@ const vertexAttributeName = computed({
   },
 });
 
-const vertexAttributeItem = computed({
+const vertexAttributeItem = computed<string | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeItem(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined) {
@@ -164,7 +194,7 @@ const vertexAttributeItem = computed({
   },
 });
 
-const vertexAttributeRange = computed({
+const vertexAttributeRange = computed<[number, number] | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeRange(modelId, cornerId),
   set: async (newValue) => {
     const [minimum, maximum] = newValue;
@@ -176,7 +206,7 @@ const vertexAttributeRange = computed({
   },
 });
 
-const vertexAttributeColorMap = computed({
+const vertexAttributeColorMap = computed<ColorMap | undefined>({
   get: () => dataStyleStore.modelCornersVertexAttributeColorMap(modelId, cornerId),
   set: async (newValue) => {
     if (cornerId === undefined) {

package/app/components/Viewer/Generic/Model/EdgesOptions.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg";
-// oxlint-disable import/consistent-type-specifier-style -- combining the default import with the type import avoids a duplicate-imports violation on this same module; using disable-next-line here is fragile because a formatter can re-wrap the import onto multiple lines and shift the flagged line
 import ViewerContextMenuItem, {
   type ItemProps,
 } from "@ogw_front/components/Viewer/ContextMenu/ContextMenuItem.vue";
+import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue";
-
 import { useBatchStyle } from "@ogw_front/composables/batch_style";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";