@itwin/saved-views-react 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/saved-views-react",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -59,9 +59,9 @@
   },
   "dependencies": {
     "@itwin/itwinui-icons-react": "^2.4.0",
-    "@itwin/itwinui-react": "^3.0.11",
+    "@itwin/itwinui-react": "^3.8.1",
     "fuse.js": "^6.6.2",
-    "@itwin/saved-views-client": "0.1.0"
+    "@itwin/saved-views-client": "^0.2.1"
   },
   "scripts": {
     "build": "run-p build:*",

package/lib/api/clients/IModelQueryClient.d.ts

@@ -1,10 +0,0 @@
-import type { Id64Array } from "@itwin/core-bentley";
-import type { IModelConnection } from "@itwin/core-frontend";
-export declare const IModelQueryClient: {
-    getAllModels: (iModel: IModelConnection) => Promise<Id64Array>;
-    getAllCategories: (iModel: IModelConnection) => Promise<Id64Array>;
-    getAllModelsAndCategories: (iModel: IModelConnection) => Promise<{
-        models: Id64Array;
-        categories: Id64Array;
-    }>;
-};

package/lib/api/clients/IModelQueryClient.js

@@ -1,45 +0,0 @@
-import { QueryRowFormat } from "@itwin/core-common";
-/**
- * Helper function to execute ECSql queries.
- */
-const executeQuery = async (iModel, query) => {
-    const rows = [];
-    const sqlReader = iModel.createQueryReader(query, undefined, {
-        rowFormat: QueryRowFormat.UseJsPropertyNames,
-    });
-    const result = await sqlReader.toArray();
-    for (const row of result) {
-        rows.push(row.id);
-    }
-    return rows;
-};
-export const IModelQueryClient = {
-    getAllModels: async (iModel) => {
-        // Note: IsNotSpatiallyLocated was introduced in a later version of the BisCore ECSchema.
-        // If the iModel has an earlier version, the statement will throw because the property does not exist.
-        // If the iModel was created from an earlier version and later upgraded to a newer version, the property may be NULL for models created prior to the upgrade.
-        let query = "SELECT ECInstanceId FROM Bis.GeometricModel3D WHERE IsPrivate = false AND IsTemplate = false AND (IsNotSpatiallyLocated IS NULL OR IsNotSpatiallyLocated = false)";
-        let models = [];
-        try {
-            models = await executeQuery(iModel, query);
-        }
-        catch {
-            query =
-                "SELECT ECInstanceId FROM Bis.GeometricModel3D WHERE IsPrivate = false AND IsTemplate = false";
-            models = await executeQuery(iModel, query);
-        }
-        return models;
-    },
-    getAllCategories: async (iModel) => {
-        // Only use categories with elements in them
-        const query = "SELECT DISTINCT Category.Id AS id FROM BisCore.GeometricElement3d WHERE Category.Id IN (SELECT ECInstanceId FROM BisCore.SpatialCategory)";
-        const categories = await executeQuery(iModel, query);
-        return categories;
-    },
-    getAllModelsAndCategories: async (iModel) => {
-        return {
-            models: await IModelQueryClient.getAllModels(iModel),
-            categories: await IModelQueryClient.getAllCategories(iModel),
-        };
-    },
-};

package/lib/api/utilities/translation/ModelsAndCategoriesHelper.d.ts

@@ -1,3 +0,0 @@
-import type { IModelConnection, ViewState } from "@itwin/core-frontend";
-import type { LegacySavedViewBase } from "../SavedViewTypes.js";
-export declare function applyHiddenModelsAndCategories(viewState: ViewState, savedView: LegacySavedViewBase, iModelConnection: IModelConnection): Promise<void>;

package/lib/api/utilities/translation/ModelsAndCategoriesHelper.js

@@ -1,57 +0,0 @@
-import { IModelQueryClient } from "../../clients/IModelQueryClient.js";
-import { isSavedView3d } from "../../clients/ISavedViewsClient.js";
-function legacyViewHasValidHiddenModelsAndCategories(savedView) {
-    if (isSavedView3d(savedView)) {
-        return !!(savedView.hiddenCategories && savedView.hiddenModels);
-    }
-    return !!savedView.hiddenCategories;
-}
-export async function applyHiddenModelsAndCategories(viewState, savedView, iModelConnection) {
-    if (legacyViewHasValidHiddenModelsAndCategories(savedView)) {
-        const visible = await getVisibleModelsAndCategories(savedView, iModelConnection);
-        if (visible.categories) {
-            viewState.categorySelector.addCategories(visible.categories);
-        }
-        if (viewState.isSpatialView() && visible.models) {
-            viewState.modelSelector.addModels(visible.models);
-        }
-        await viewState.load();
-    }
-}
-async function getVisibleModelsAndCategories(savedView, iModelConnection) {
-    return {
-        models: isSavedView3d(savedView)
-            ? await getVisibleModels(savedView, iModelConnection)
-            : undefined,
-        categories: await getVisibleCategories(savedView, iModelConnection),
-    };
-}
-async function getVisibleModels(savedView, iModelConnection) {
-    const hiddenModels = savedView.hiddenModels;
-    return hiddenModels ? getMissingModels(hiddenModels, iModelConnection) : undefined;
-}
-async function getVisibleCategories(savedView, iModelConnection) {
-    const hiddenCategories = savedView.hiddenCategories;
-    return hiddenCategories
-        ? getMissingCategories(hiddenCategories, iModelConnection)
-        : undefined;
-}
-async function getMissingModels(models, iModelConnection) {
-    const allModels = await getAllModels(iModelConnection);
-    return getDiff(models, allModels);
-}
-async function getMissingCategories(categories, iModelConnection) {
-    const allCategories = await getAllCategories(iModelConnection);
-    return getDiff(categories, allCategories);
-}
-async function getAllModels(iModelConnection) {
-    return IModelQueryClient.getAllModels(iModelConnection);
-}
-async function getAllCategories(iModelConnection) {
-    return IModelQueryClient.getAllCategories(iModelConnection);
-}
-const getDiff = (arr1, arr2) => {
-    const set1 = new Set([...arr1]);
-    const set2 = new Set([...arr2].filter((x) => !set1.has(x)));
-    return [...set2];
-};

package/lib/api/utilities/translation/urlConverter.d.ts

@@ -1,7 +0,0 @@
-import type { ViewData } from "@itwin/saved-views-client";
-/**
- * Convert url that potentially contains subtituted characters ('++and++' or '++dot++') to use restricated characters ('&' or '.')
- * @param extensionData
- */
-export declare const urlToLegacyUrl: (restrictedUrl: string) => string;
-export declare const convertAllLegacyUrlsToUrls: (savedViewData: ViewData, convert: (url: string) => string) => void;

package/lib/api/utilities/translation/urlConverter.js

@@ -1,42 +0,0 @@
-/**
- * Convert url that potentially contains subtituted characters ('++and++' or '++dot++') to use restricated characters ('&' or '.')
- * @param extensionData
- */
-export const urlToLegacyUrl = (restrictedUrl) => {
-    const unrestrictedUrl = restrictedUrl
-        .replaceAll("++and++", "&")
-        .replaceAll("++dot++", ".");
-    return unrestrictedUrl;
-};
-export const convertAllLegacyUrlsToUrls = (savedViewData, convert) => {
-    const displayStyle = savedViewData?.itwin3dView.displayStyle ??
-        savedViewData?.itwinDrawingView.displayStyle ??
-        savedViewData?.itwinSheetView.displayStyle;
-    if (displayStyle === undefined) {
-        return;
-    }
-    // Convert legacy urls to restricted urls
-    const baseUrl = displayStyle.mapImagery?.backgroundBase
-        ?.url;
-    if (displayStyle.mapImagery && baseUrl) {
-        displayStyle.mapImagery.backgroundBase.url =
-            convert(baseUrl);
-    }
-    for (const layer of (displayStyle.mapImagery?.overlayLayers ??
-        [])) {
-        if (layer.url) {
-            layer.url = convert(layer.url);
-        }
-    }
-    for (const layer of (displayStyle.mapImagery?.backgroundLayers ??
-        [])) {
-        if (layer.url) {
-            layer.url = convert(layer.url);
-        }
-    }
-    for (const model of displayStyle.contextRealityModels ?? []) {
-        if (model.tilesetUrl) {
-            model.tilesetUrl = convert(model.tilesetUrl);
-        }
-    }
-};