@vitrosoftware/common-ui-ts 1.1.123 → 1.1.124

package/dist/index.js

@@ -62188,7 +62188,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.123";
+var version$1 = "1.1.124";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.123",
+    "version": "1.1.124",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.123';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.124';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.123';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.124';
 
 
 const processByChildIdList = (treeViewNode, event) => {

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,17 +1,17 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.123';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.123';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.123';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.123';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.123';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.123';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.123';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.123';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.123';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.123';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.123';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.123';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.123';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.123';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.124';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.124';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.124';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.124';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.124';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.124';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.124';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.124';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.124';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.124';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.124';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.124';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.124';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.124';
 
 let treeViewData = [];
 let notes = [];
@@ -3096,15 +3096,54 @@ function initTreeViewPanelResizable() {
 var canvas = document.getElementById('canvasContainer');
 window.dxfViewer = new Viewer(canvas, null);
 
-window.dxfViewer.Load('/api/file/getByItemId/' + context.file.id).then(() => {
-    anno.RemoveLabels();
-    anno.UpdateLabelPosition();
-    document.getElementById(window.dxfViewer.spaceName)?.classList.add('vitro-active');
-    bindThumbnailClick();
-    if (context.onLoaded) {
-        context.onLoaded();
-    }
-});
+const version = context.fileVersionList.find(x => x.id === context.versionId);
+const versionStr = version ? version.name : null;
+
+function getFileItemId(itemId, version, callback, error) {
+    const path = window.location.pathname;
+    const idx = path.indexOf("/dxfViewer");
+    const webRelativeUrl = path.substring(0, idx);
+
+    jQuery.ajax({
+        type: "GET",
+        url: webRelativeUrl +
+            "/dxfViewer/api/Model/Get/" +
+            itemId + "/" +
+            version,
+        cache: false,
+        contentType: "application/json",
+        error: function (jqXHR, textStatus, errorThrown) {
+            if (error) {
+                error();
+            }
+        },
+        success: function (modelId, status, jqXHR) {
+            if (callback) {
+                callback(modelId);
+            }
+        }
+    });
+}
+
+async function load(id) {
+    const url = '/api/file/getByItemId/' + id;
+
+    window.dxfViewer.Load(url).then(() => {
+        anno.RemoveLabels();
+        anno.UpdateLabelPosition();
+        document.getElementById(window.dxfViewer.spaceName)?.classList.add('vitro-active');
+        bindThumbnailClick();
+        if (context.onLoaded) {
+            context.onLoaded();
+        }
+    });
+}
+
+function onLoadError() {
+    alert('The file is being processed');
+}
+
+getFileItemId(context.file.id, versionStr, load, onLoadError);
 
 var strokeColorVal = '#2d9cdb';
 

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.123",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.124",
     kind: OptionKind.WORKER
   }
 };