@vitrosoftware/common-ui-ts 1.1.81 → 1.1.83

package/lib/xeokit/VitroTreeViewPlugin.js

@@ -1,5 +1,5 @@
-import { Viewer, Plugin, math, ContextMenu, TreeViewPlugin, MetaObject } from "/resource/bimViewer/js/xeokit/xeokit-sdk.es.js";
-import { BIMModel } from '/resource/bimViewer/js/bim-viewer-models.js';
+import { Viewer, Plugin, math, ContextMenu, TreeViewPlugin, MetaObject } from "/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=v5";
+import { BIMModel } from '/resource/bimViewer/js/bim-viewer-models.js?version=v5';
 
 const processByChildIdList = (treeViewNode, event) => {
 	viewer.scene.canvas.spinner.processes++;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.81",
+    "version": "1.1.83",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",
@@ -65,10 +65,10 @@
         "dist",
         "css",
         "lib",
-        "src/controls/PdfViewer/js/init-viewer-page.js",
         "src/controls/PdfViewer/js/pdf-viewer.js",
         "src/controls/BimViewer/js/init-viewer-page.js",
-        "src/controls/BimViewer/js/bim-viewer.js"
+        "src/controls/BimViewer/js/bim-viewer.js",
+        "src/controls/BimViewer/js/bim-viewer-models.js"
     ],
     "dependencies": {
         "rollup-plugin-postcss": "^3.1.3",

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

@@ -0,0 +1,361 @@
+var BIMCommon = BIMCommon ||
+{
+    FileItemId: undefined,
+    FileVersion: undefined,
+
+    GetFileItem: function (itemId, version, callback, error) {
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();        
+
+        jQuery.ajax({
+            type: "GET",
+            url: webRelativeUrl +
+                "/bimViewer/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);
+                }
+            }
+        });
+    },
+
+    GetURLParameter: function(sParam) {
+        var sPageURL = window.location.search.substring(1);
+
+        var sURLVariables = sPageURL.split("&");
+        for (var i = 0; i < sURLVariables.length; i++) {
+            var sParameterName = sURLVariables[i].split("=");
+            if (sParameterName[0] == sParam) {
+                return sParameterName[1];
+            }
+        }
+    },
+
+    CreateWebServerUrl: function() {
+        var path = window.location.pathname;
+        var idx = path.indexOf("/bimViewer");
+
+        return path.substring(0, idx);
+    }
+}
+
+var BIMAnnotation = BIMAnnotation ||
+{
+    GetNote: function (callback) {
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/_vti_bin/Vitro/TableView/Comment/AnnotationWebService.svc/Get",
+            data: JSON.stringify(BIMCommon.FileItem),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: false,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+            },
+            success: function (data, status, jqXHR) {
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+
+    SaveNote: function (options, callback) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var annotation = {};
+        annotation.FileItem = BIMCommon.FileItem;
+
+        annotation.Comment = BIMAnnotation.CreateComment(options.values.title, options.values.description);
+
+        options.worldPos = [];
+        options.worldPos.push(options.pickResult._worldPos[0]);
+        options.worldPos.push(options.pickResult._worldPos[1]);
+        options.worldPos.push(options.pickResult._worldPos[2]);
+
+        var eye = options.eye;
+        options.eye = [];
+        options.eye.push(eye[0]);
+        options.eye.push(eye[1]);
+        options.eye.push(eye[2]);
+
+        var look = options.look;
+        options.look = [];
+        options.look.push(look[0]);
+        options.look.push(look[1]);
+        options.look.push(look[2]);
+
+        var up = options.up;
+        options.up = [];
+        options.up.push(up[0]);
+        options.up.push(up[1]);
+        options.up.push(up[2]);
+
+        var pickResult = options.pickResult;
+        options.pickResult = null;
+
+        annotation.AnnotationInfo = options;
+        var jsonString = JSON.stringify(annotation);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/_vti_bin/Vitro/TableView/Comment/AnnotationWebService.svc/Create",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: false,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+            },
+            success: function (data, status, jqXHR) {
+                if (callback) {
+                    options.id = data;
+                    options.values.glyph = options.id;
+                    options.pickResult = pickResult;
+                    callback(options);
+                }
+            }
+        });
+    },
+
+    UpdateNote: function (id, noteTitle, noteDesc, callback) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var annotation = {};
+        annotation.Id = id;
+        annotation.FileItem = BIMCommon.FileItem;
+        annotation.Comment = BIMAnnotation.CreateComment(noteTitle, noteDesc);
+        var jsonString = JSON.stringify(annotation);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/_vti_bin/Vitro/TableView/Comment/AnnotationWebService.svc/Update",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: false,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+            },
+            success: function (data, status, jqXHR) {
+                if (callback) {
+                    callback();
+                }
+            }
+        });
+    },
+
+    DeleteNote: function (id, callback) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var annotation = {};
+        annotation.Id = id;
+        annotation.FileItem = BIMCommon.FileItem;
+        var jsonString = JSON.stringify(annotation);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/_vti_bin/Vitro/TableView/Comment/AnnotationWebService.svc/Delete",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: false,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+            },
+            success: function (data, status, jqXHR) {
+                if (callback) {
+                    callback(id);
+                }
+            }
+        });
+    },
+
+    GoToCommentList: function(id) {
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        window.open(webRelativeUrl + '/_layouts/15/Vitro/TableView/ListView.aspx?List=CommentList&listname=%D0%97%D0%B0%D0%BC%D0%B5%D1%87%D0%B0%D0%BD%D0%B8%D1%8F&Id=' + id);
+    },
+
+    CreateComment: function(title, description) {
+        var text = [title, description].filter(Boolean).join(" ");
+        return text;
+    }
+}
+
+
+var BIMModel = BIMModel ||
+{
+
+    GetParentIdList: function (elementId, recurse, isGeometry, callback, error, async = true) {
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.FileItemId;
+        paramObj.version = BIMCommon.FileVersion;
+        paramObj.elementId = elementId.toString();
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetParentIdList",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+	
+    GetPropertyList: function (elementId, callback, error, async = true) {
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.FileItemId;
+        paramObj.version = BIMCommon.FileVersion;
+        paramObj.elementId = elementId.toString();
+         
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetPropertyList",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+
+    GetChildList: function (elementId, recurse, isGeometry, callback, error, async = true) {
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.FileItemId;
+        paramObj.version = BIMCommon.FileVersion;
+        paramObj.elementId = elementId.toString();
+        paramObj.recurse = recurse;
+        paramObj.isGeometry = isGeometry;
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetChildList",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+
+    GetChildIdList: function (elementId, recurse, isGeometry, callback, error, async = true) {
+
+        var paramObj = {};
+        paramObj.itemId = BIMCommon.FileItemId;
+        paramObj.version = BIMCommon.FileVersion;
+        paramObj.elementId = elementId.toString();
+        paramObj.recurse = recurse;
+        paramObj.isGeometry = isGeometry;
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/bimViewer/api/ModelElement/GetChildIdList",
+            data: JSON.stringify(paramObj),
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: async,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (error) {
+                    error(jqXHR, textStatus, errorThrown);
+                }
+            },
+            success: function (data, status, jqXHR) {
+                //console.log(data);
+                if (callback) {
+                    callback(data);
+                }
+            }
+        });
+    },
+
+    Compare: function (successFn, failFn) {
+
+        var webRelativeUrl = BIMCommon.CreateWebServerUrl();
+
+        var obj = {};
+        obj.source = window.model1DataUrl;
+        obj.compared = window.model2DataUrl;
+        var jsonString = JSON.stringify(obj);
+
+        $.ajax({
+            type: "POST",
+            url: webRelativeUrl + "/_vti_bin/Vitro/Viewer/BIM/BIMWebService.svc/CompareModel",
+            data: jsonString,
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            async: false,
+            beforeSend: function (data) {
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                failFn();
+            },
+            success: function (data, status, jqXHR) {
+                if (successFn) {
+                    successFn(data);
+                }
+            }
+        });
+    }
+}
+ export {BIMCommon, BIMAnnotation, BIMModel}

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

@@ -1,12 +1,12 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=v5';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js';
-import { VitroTreeViewPlugin } from "/resource/bimViewer/js/xeokit/VitroTreeViewPlugin.js";
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=v5';
+import { VitroTreeViewPlugin } from "/resource/bimViewer/js/xeokit/VitroTreeViewPlugin.js?version=v5";
 window.initBimViewer = function(context) {var angleMeasurementsData = [
 
 ];
@@ -2272,6 +2272,7 @@ function bindBtnToggleCreateNotes() {
             annotationByClick = true;
         } else {
             annotationByClick = false;
+            collapseSidebarIssueDetail();
         }
     });
 }
@@ -2288,14 +2289,18 @@ function bindBtnToggleSidebarNotes() {
                 expandSidebarNotes();
             }
         } else {
-            $('#navCubeCanvas').css('right', 10);
-            $('#sectionPlanesOverviewCanvas').css('right', 10);
-            $('.sidebar').hide();
-            $('body').removeClass('sidebar-expanded');
+            collapseSidebarNotes();
         }
     });
 }
 
+function bindSidebarNotesClose() {
+    $('.sidebar-close').on('click', function () {
+        $('#btnToggleSidebarNotes').removeClass('toggled');
+        collapseSidebarNotes();
+    });
+}
+
 function expandSidebarNotes() {
     hidePropInspector();
     collapseSidebarIssueDetail();
@@ -2390,10 +2395,12 @@ function updatePage(e) {
 }
 
 function goToNoteMarker(issue) {
-    var annotation = annotations.annotations[issue.id];
-    console.log('annotation', annotation);
-    viewer.cameraFlight.flyTo(annotation);
-    highlightSidebarNote(issue.id);
+    if (!$('#btnCreateNotes').hasClass('toggled')) {
+        var annotation = annotations.annotations[issue.id];
+        console.log('annotation', annotation);
+        viewer.cameraFlight.flyTo(annotation);
+        highlightSidebarNote(issue.id);
+    }
 }
 
 function onIssueShowMoreClick(issue) {
@@ -2420,6 +2427,7 @@ function onIssueShowMoreClick(issue) {
 }
 
 function collapseSidebarNotes() {
+    $('#sidebarWrap').hide();
     $('#navCubeCanvas').css('right', 10);
     $('#sectionPlanesOverviewCanvas').css('right', 10);
     $('.sidebar').hide();

package/src/controls/BimViewer/js/init-viewer-page.js

@@ -1,7 +1,7 @@
 async function initHtml() {
     let htmlContainer = document.getElementsByTagName('html')[0];
     htmlContainer.dir = 'ltr';
-    const resp = await fetch('resource/bimViewer/viewer.html?version=v2');
+    const resp = await fetch('resource/bimViewer/viewer.html?version=v5');
     const viewer = await resp.text();
     let container = document.getElementsByTagName('body')[0];
     container.insertAdjacentHTML('beforeend', viewer);
@@ -9,15 +9,15 @@ async function initHtml() {
 
 async function initPage() {
     let container = document.getElementsByTagName('head')[0];
-    container.innerHTML += '<link rel="resource" type="application/l10n" href="resource/bimViewer/locale/locale.js?version=v2">';
-    container.innerHTML += '<link href="/resource/bimViewer/css/bim-viewer.css?version=v2" rel="stylesheet">';
+    container.innerHTML += '<link rel="resource" type="application/l10n" href="resource/bimViewer/locale/locale.js?version=v5">';
+    container.innerHTML += '<link href="/resource/bimViewer/css/bim-viewer.css?version=v5" rel="stylesheet">';
 
     await initHtml();
 
     const script = document.createElement('script');
     script.type = 'module';
     script.id = 'bim-viewer';
-    script.src = 'resource/bimViewer/js/bim-viewer.js?version=v2';
+    script.src = 'resource/bimViewer/js/bim-viewer.js?version=v5';
     document.head.appendChild(script);
 }
 

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

@@ -3213,7 +3213,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?v=2",
+    value: "resource/pdfViewer/js/pdf.worker.js?v=1.1.83",
     kind: OptionKind.WORKER
   }
 };
@@ -17701,7 +17701,7 @@ function loadComparisonDocuments(compareObjList) {
 
 function loadDocumentA(doc) {
     var canvasId = 'compareCanvas-docA';
-    var color = '#ff5b2d';
+    var color = 'rgba(255,68,68,1)';
     loadDocumentToCanvas(pdfDocObjA, doc.page, canvasId, color);
 
     var fullColorCanvasId = 'compareCanvas-docA-full';
@@ -17711,13 +17711,12 @@ function loadDocumentA(doc) {
 
 function loadDocumentB(doc) {
     var canvasId = 'compareCanvas-docB';
-    var color = '#0097ff';
+    var color = 'rgba(68,68,255,1)';
     loadDocumentToCanvas(pdfDocObjB, doc.page, canvasId, color);
 
     var fullColorCanvasId = 'compareCanvas-docB-full';
     var colorFull = null;
     loadDocumentToCanvas(pdfDocObjB, doc.page, fullColorCanvasId, colorFull, true);
-
 }
 
 function isComparedDocumentCurrentOpened(url) {

package/src/controls/PdfViewer/js/init-viewer-page.js

@@ -1,25 +0,0 @@
-async function initHtml() {
-    let htmlContainer = document.getElementsByTagName('html')[0];
-    htmlContainer.dir = 'ltr';
-    const resp = await fetch('resource/pdfViewer/viewer.html?version=v2');
-    const viewer = await resp.text();
-    let container = document.getElementsByTagName('body')[0];
-    container.insertAdjacentHTML('afterbegin', viewer);
-}
-
-
-async function initPage() {
-    let container = document.getElementsByTagName('head')[0];
-    container.innerHTML += '<link rel="resource" type="application/l10n" href="resource/pdfViewer/locale/locale.js?version=v2">';
-    container.innerHTML += '<link href="/resource/pdfViewer/css/pdf-viewer.css?version=v2" rel="stylesheet">';
-
-    await initHtml();
-
-    const script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.id = 'pdf-viewer';
-    script.src = 'resource/pdfViewer/js/pdf-viewer.js?version=v2';
-    document.head.appendChild(script);
-}
-
-initPage();