@geode/opengeodeweb-front 10.40.0 → 10.41.0-rc.1

package/internal/stores/data_style/model/blocks/polyhedron.ts

@@ -72,7 +72,7 @@ interface UseModelBlocksPolyhedronAttributeReturn {
     modelId: string,
     blockIds: string[],
     timeStep: number,
-  ) => Promise<void>;
+  ) => Promise<boolean>;
   modelBlocksPolyhedronAttributeColorMap: (modelId: string, blockId?: string) => string | undefined;
   modelBlocksPolyhedronAttributeStoredConfig: (
     modelId: string,
@@ -89,29 +89,29 @@ interface UseModelBlocksPolyhedronAttributeReturn {
     modelId: string,
     blockIds: string[],
     name: string,
-  ) => Promise<unknown>;
+  ) => Promise<boolean>;
   setModelBlocksPolyhedronAttributeItem: (
     modelId: string,
     blockIds: string[],
     item: number,
-  ) => Promise<unknown>;
+  ) => Promise<boolean>;
   setModelBlocksPolyhedronAttributeRange: (
     modelId: string,
     blockIds: string[],
     minimum: number,
     maximum: number,
-  ) => Promise<unknown>;
+  ) => Promise<boolean>;
   setModelBlocksPolyhedronAttributeColorMap: (
     modelId: string,
     blockIds: string[],
     colorMap: string | undefined,
-  ) => Promise<unknown>;
+  ) => Promise<boolean>;
   modelBlocksPolyhedronAttributeNoDataColor: (modelId: string, blockId?: string) => RGBAColor;
   setModelBlocksPolyhedronAttributeNoDataColor: (
     modelId: string,
     blockIds: string[],
     no_data_color: RGBAColor,
-  ) => Promise<unknown>;
+  ) => Promise<boolean>;
 }
 
 // oxlint-disable-next-line max-lines-per-function
@@ -281,7 +281,8 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
       params,
     });
   }
-  async function applyPolyhedronAttribute(modelId: string, blockIds: string[]): Promise<unknown> {
+  // True when the attribute was sent to the viewer, so the caller knows a render is needed
+  async function applyPolyhedronAttribute(modelId: string, blockIds: string[]): Promise<boolean> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksPolyhedronAttributeStoredConfig(
@@ -298,17 +299,17 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
       colorMap: storedConfig.colorMap,
       no_data_color: storedConfig.no_data_color,
     };
-    if (isModelBlocksPolyhedronAttributeValid(attribute)) {
-      const result = await setModelBlocksPolyhedronAttribute(modelId, blockIds, attribute);
-      return result;
+    if (!isModelBlocksPolyhedronAttributeValid(attribute)) {
+      return false;
     }
-    return undefined;
+    await setModelBlocksPolyhedronAttribute(modelId, blockIds, attribute);
+    return true;
   }
   async function setModelBlocksPolyhedronAttributeName(
     modelId: string,
     blockIds: string[],
     name: string,
-  ): Promise<unknown> {
+  ): Promise<boolean> {
     const item = modelBlocksPolyhedronAttributeLastItem(modelId, blockIds[0], name);
     await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       name,
@@ -320,7 +321,7 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
     modelId: string,
     blockIds: string[],
     item: number,
-  ): Promise<unknown> {
+  ): Promise<boolean> {
     await mutateModelBlocksPolyhedronStyle(modelId, blockIds, {
       item,
     });
@@ -330,13 +331,14 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
     modelId: string,
     blockIds: string[],
     timeStep: number,
-  ): Promise<void> {
+  ): Promise<boolean> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     if (name === undefined) {
-      return;
+      return false;
     }
     await setAttributeTimeStep(modelId, modelBlockPolyhedronAttributeSchema.$id, name, timeStep);
-    await Promise.all([
+    let reapplied = false;
+    const [applied] = await Promise.all([
       applyPolyhedronAttribute(modelId, blockIds),
       reapplySameSeries(
         await dataStore.getBlocksGeodeIds(modelId),
@@ -352,17 +354,18 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
               ].join("|")
             : undefined,
         async (ids) => {
-          await applyPolyhedronAttribute(modelId, ids);
+          reapplied = (await applyPolyhedronAttribute(modelId, ids)) || reapplied;
         },
       ),
     ]);
+    return applied || reapplied;
   }
   async function setModelBlocksPolyhedronAttributeRange(
     modelId: string,
     blockIds: string[],
     minimum: number,
     maximum: number,
-  ): Promise<unknown> {
+  ): Promise<boolean> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     await setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
@@ -375,7 +378,7 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
     modelId: string,
     blockIds: string[],
     colorMap: string | undefined,
-  ): Promise<unknown> {
+  ): Promise<boolean> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     await setModelBlocksPolyhedronAttributeStoredConfig(modelId, blockIds, name, item, {
@@ -387,7 +390,7 @@ function useModelBlocksPolyhedronAttribute(): UseModelBlocksPolyhedronAttributeR
     modelId: string,
     blockIds: string[],
     no_data_color: RGBAColor,
-  ): Promise<unknown> {
+  ): Promise<boolean> {
     const name = modelBlocksPolyhedronAttributeName(modelId, blockIds[0]);
     const item = modelBlocksPolyhedronAttributeItem(modelId, blockIds[0]);
     const storedConfig = modelBlocksPolyhedronAttributeStoredConfig(

package/internal/utils/upload_file.ts

@@ -44,7 +44,7 @@ async function upload_file(
   const feedbackStore = useFeedbackStore();
 
   if (!(file instanceof File)) {
-    throw new Error("file must be an instance of File");
+    throw new TypeError("file must be an instance of File");
   }
 
   const route = schema.$id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.40.0",
+  "version": "10.41.0-rc.1",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -64,9 +64,9 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@geode/cloud-api": "latest",
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/cloud-api": "next",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@msgpack/msgpack": "2.8.0",

package/shared/utils/file.ts

@@ -10,7 +10,7 @@ const CHUNK_SIZE_BYTES = CHUNK_SIZE_MEBIBYTES * KIBIBYTES_PER_MEBIBYTE * BYTES_P
 function assertFile(file: unknown): asserts file is File {
   consola.debug("[ASSERT_FILE] Asserting file", { file });
   if (!(file instanceof File)) {
-    throw new Error("file must be an instance of File");
+    throw new TypeError("file must be an instance of File");
   }
 }
 

package/shared/utils/response_handlers/load.ts

@@ -106,4 +106,40 @@ function resolveAllowedObjects(
   };
 }
 
-export { resolveAllowedObjects, getFileExtension };
+interface FileAllowedObjects {
+  readonly filename: string;
+  // Loadable types only, sorted by best is_loadable then best object_priority
+  readonly candidates: string[];
+  readonly selectedGeodeObject: string | undefined;
+}
+
+function sortCandidates(objectMap: AllowedObjectMap): string[] {
+  return Object.keys(objectMap)
+    .filter((key) => getObject(objectMap, key).is_loadable > 0)
+    .toSorted((keyA, keyB) => {
+      const objectA = getObject(objectMap, keyA);
+      const objectB = getObject(objectMap, keyB);
+      if (objectA.is_loadable !== objectB.is_loadable) {
+        return objectB.is_loadable - objectA.is_loadable;
+      }
+      return (objectB.object_priority ?? -Infinity) - (objectA.object_priority ?? -Infinity);
+    });
+}
+
+// Each file gets its own geode object type; files are no longer required to share one
+function resolveAllowedObjectsPerFile(
+  filenames: readonly string[],
+  allowedObjectsList: readonly AllowedObjectMap[],
+): FileAllowedObjects[] {
+  return filenames.map((filename, index) => {
+    const objectMap = allowedObjectsList[index] ?? {};
+    return {
+      filename,
+      candidates: sortCandidates(objectMap),
+      selectedGeodeObject: selectGeodeObject(objectMap),
+    };
+  });
+}
+
+export { resolveAllowedObjects, resolveAllowedObjectsPerFile, getFileExtension };
+export type { FileAllowedObjects };