@vitrosoftware/common-ui-ts 1.1.208 → 1.1.210

package/dist/src/models/ItemPath.d.ts

@@ -0,0 +1,5 @@
+export interface ItemPath {
+    childCount: number;
+    path: string[];
+    scopeId: string;
+}

package/dist/src/models/ItemUpdateRequest.d.ts

@@ -0,0 +1,8 @@
+export interface ItemUpdateRequest {
+    listId: string;
+    id?: string;
+    contentTypeId?: string;
+    parentId?: string;
+    file?: File;
+    fieldValueMap?: Map<string, any>;
+}

package/dist/src/models/ListConfig.d.ts

@@ -0,0 +1,25 @@
+import { ContentType } from './ContentType';
+import { ContentTypeView } from './ContentTypeView';
+import { Action } from './Action';
+import { Site } from './Site';
+export interface ListConfig {
+    id: string;
+    contentTypeList: ContentType[];
+    data: string;
+    fieldList: any[];
+    name: string;
+    statusList: any[];
+    description: string;
+    listAction: {
+        [key: string]: Action[];
+    };
+    siteId: string;
+    fieldValueMap: {
+        [key: string]: any;
+    };
+    contentTypeViewList: ContentTypeView[];
+    treeListConfig?: ListConfig;
+    site: Site;
+    isDocumentArchive?: boolean;
+    validContentTypeIdList?: string[];
+}

package/dist/src/models/Site.d.ts

@@ -0,0 +1,10 @@
+export interface Site {
+    id: string;
+    name: string;
+    description: string;
+    readonly fieldValueMap: {
+        [key: string]: any;
+    };
+    imageUrl?: string;
+    isSelected: boolean;
+}

package/dist/src/models/ViewPart.d.ts

@@ -0,0 +1,7 @@
+import { Item } from "./Item";
+export interface ViewPart extends Item {
+    name: string;
+    settings: {
+        [key: string]: any;
+    };
+}

package/dist/src/models/ViewPartList.d.ts

@@ -0,0 +1,7 @@
+import { ViewPart } from "./ViewPart";
+export interface ViewPartList {
+    name: string;
+    isAdmin: boolean;
+    list: ViewPart[];
+    permission: string;
+}

package/dist/src/models.d.ts

@@ -26,6 +26,7 @@ import { SiteSelectItem as _SiteSelectItem } from './controls/SiteSelect/models/
 import { QuillRichEditorSettings as _QuillRichEditorSettings } from './controls/Input/models/QuillRichEditorSettings';
 import { TelerikMediaPlayerSettings as _TelerikMediaPlayerSettings } from './controls/VideoViewer/models/TelerikMediaPlayerSettings';
 import { FilePickerItem as _FilePickerItem } from './controls/FilePicker/models/FilePickerItem';
+import { SortItem as _SortItem } from './controls/Filter/models/SortItem';
 export declare namespace models {
     interface JsTreeViewNode extends _JsTreeViewNode {
     }
@@ -83,4 +84,6 @@ export declare namespace models {
     }
     interface FilePickerItem extends _FilePickerItem {
     }
+    interface SortItem extends _SortItem {
+    }
 }

package/dist/src/services/ColumnService.d.ts

@@ -0,0 +1,9 @@
+export interface ColumnService {
+    getSystemList(): {
+        internalName: string;
+        name: string;
+        component: string;
+    }[];
+    getName(internalName: string): string;
+    isSystemUserLookupPicker(internalName: string): boolean;
+}

package/dist/src/services/ContentTypeService.d.ts

@@ -0,0 +1,8 @@
+import { ContentType } from '../models/ContentType';
+export interface ContentTypeService {
+    get(contentTypeId: string): Promise<ContentType>;
+    getByList(listId: string): Promise<ContentType[]>;
+    getListByFeature(feature: {
+        id: string;
+    }[], contentTypeList: ContentType[]): ContentType[];
+}

package/dist/src/services/EventHandlerService.d.ts

@@ -0,0 +1,4 @@
+export interface EventHandlerService {
+    readonly id: string;
+    process(...params: any[]): unknown;
+}

package/dist/src/services/EventService.d.ts

@@ -0,0 +1,6 @@
+import { EventHandlerService } from './EventHandlerService';
+export interface EventService {
+    send<T>(eventId: string, data: T, eventScopeId?: string): void;
+    register(eventHandler: EventHandlerService, eventScopeId?: string): void;
+    remove(eventHandler: EventHandlerService): void;
+}

package/dist/src/services/GuidService.d.ts

@@ -0,0 +1,3 @@
+export interface GuidService {
+    get(): string;
+}

package/dist/src/services/ImageService.d.ts

@@ -0,0 +1,7 @@
+import type { ContentType } from '../models/ContentType';
+export interface ImageService {
+    get(name: string, contentType: ContentType): string;
+    getByContentType(contentType: ContentType): string;
+    getByFileName(name: string): string;
+    getByImageId(imageId: string): string;
+}

package/dist/src/services/ItemSelectDialogService.d.ts

@@ -0,0 +1,12 @@
+export interface ItemSelectDialogService {
+    show(listId: string, viewId?: string, isMultiSelect?: boolean, isFolderOnly?: boolean, dialogSettings?: {
+        title?: string;
+        subtitle?: string;
+        image?: string;
+        buttonText?: string;
+        isListSelectEnabled?: boolean;
+        isShowSelection?: boolean;
+    }, viewSettings?: {
+        [key: string]: unknown;
+    }): Promise<string[]>;
+}

package/dist/src/services/ItemService.d.ts

@@ -0,0 +1,24 @@
+import type { ItemUpdateRequest } from '../models/ItemUpdateRequest';
+import type { ItemCopyRequest } from '../models/ItemCopyRequest';
+import { MOVE_TYPE } from '../constants/MoveType';
+import { Item } from '../models/Item';
+import { ItemId } from '../models/ItemId';
+export interface ItemService {
+    get(itemId: string | ItemId, onError?: (response: any) => void): Promise<Item>;
+    getListByParentId(listId: string, query?: string, sort?: {
+        [internalName: string]: number;
+    }): Promise<Array<any>>;
+    getList(itemIdList: string[]): Promise<Array<Item>>;
+    getParentList(item: Item): Promise<Array<any>>;
+    getRecursive(itemId: string): Promise<Array<Item>>;
+    createByContentType(listId: string, contentTypeId: string, parentId?: string): Promise<any>;
+    update(itemList: ItemUpdateRequest[]): Promise<any>;
+    delete(idList: string[] | string): Promise<string[]>;
+    restore(deleteTransactionId: string): Promise<void>;
+    move(itemId: string, toItemId: string, type: MOVE_TYPE): Promise<any>;
+    createItemUpdateRequestMap(item: ItemUpdateRequest, itemList: File[]): {
+        [key: string]: string | number | Array<string | number>;
+    };
+    copy(parentId: any, nodeList: ItemCopyRequest[]): Promise<any>;
+    createNewInstance(listId: string, contentTypeId: string, parentId: string, fieldValueMap?: Map<string, string | number>): Promise<Item>;
+}

package/dist/src/services/LookupListItemService.d.ts

@@ -0,0 +1,9 @@
+import { Item } from "../models/Item";
+import { ItemId } from "../models/ItemId";
+export interface LookupListItemService {
+    getValueList(field: Item, searchValue: string, currentItemRef?: {
+        item: ItemId | null;
+        changedFieldValueMap?: Map<string, unknown>;
+    }): Promise<any>;
+    getFilteredItemList(fieldId: string, searchValue: string, query?: string): Promise<Item[]>;
+}

package/lib/dxf-viewer/parser/entities/lwpolyline.js

@@ -80,6 +80,8 @@ function parseLWPolylineVertices(n, scanner) {
             case 42: // bulge
                 if(curr.value != 0) vertex.bulge = curr.value;
                 break;
+            case 91: // Vertex Identifier - to ignore
+                break;
             default:
                 // if we do not hit known code return vertices.  Code might belong to entity
                 if (vertexIsStarted) {

package/lib/dxf-viewer/parser/entities/viewport.js

@@ -51,6 +51,17 @@ EntityParser.prototype.parseEntity = function(scanner, curr) {
         }
         curr = scanner.next();
     }
+	ProcessXData(entity);
     return entity;
 };
 
+
+function ProcessXData(entity){
+	if (entity.hasOwnProperty("xdata")){
+		const xd = entity.xdata["[Vitro_VP]"]
+		if (xd !== undefined && xd !== null){
+			entity.viewCenter.x = xd.values[0].value
+			entity.viewCenter.y = xd.values[1].value
+		}
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.208",
+    "version": "1.1.210",
     "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.208';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.210';
 
 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.208';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.210';
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -1645,7 +1645,8 @@ function clearSectionPanes() {
 // Load Annotations
 //------------------------------------------------------------------------------------------------------------------
 function loadAnnotations() {
-    context.getIssueList().then(issueList => {
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : []; 
+    context.getIssueList(searchCriterion).then(issueList => {
         issueList.map(issue => {
             let data = getMarkupData(issue.item);
             data.occludable = false;
@@ -3087,7 +3088,11 @@ const fastNavPlugin = new FastNavPlugin(viewer, {
 //
 //------------------------------------------------------------------------------------------------------------------
 
-var notesDescriptionVisibleList = {};
+const EVENT_SEARCH_ISSUE_LIST = 'vitro.search.issue.list';
+const EVENT_ISSUE_LIST_REFRESH = 'vitro.issue.list.refresh';
+const EVENT_ISSUE_LIST_SELECT_ITEM = 'vitro.issue.list.select.item';
+
+var notesDescriptionVisibleList = {};
 
 BIMAnnotation.GetNote = (callback) => {
     callback([]);
@@ -3296,21 +3301,25 @@ function updatePage(e) {
                 annotations.annotations[data.id].setLabelShown(false);
             }
         }, 10);
+        setTimeout(function () { refreshIssueList(); }, 250);
     }
 
     if (e.type === context.deleteIssueEvent) {
 
         let item = e.detail.itemList[0];
         annotations.destroyAnnotation(item.fieldValueMap.item_id);
-        if ($('.sidebar').is(':visible')) {
-            initSidebarNotes();
-        }
+        refreshIssueList();
         if (isNoteDescriptionVisible(item.fieldValueMap.item_id)) {
             removeFromNotesDescriptionVisibleList(item.fieldValueMap.item_id);
         }
     }
 }
 
+function refreshIssueList() {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_REFRESH, { detail: {} });
+    window.dispatchEvent(event);
+}
+
 function goToNoteMarker(issue) {
     if (!$('#btnCreateNotes').hasClass('toggled')) {
         hideNotesDescription();
@@ -3898,7 +3907,41 @@ function bindBtnAddModel() {
     });
 }
 
+function bindUpdateDocumentMarkupList() {
+    window.addEventListener(EVENT_SEARCH_ISSUE_LIST, updateDocumentMarkupList);
+}
 
+function updateDocumentMarkupList(e) {
+    annotations.clear();
+    if (e.detail.issueList && e.detail.issueList.length) {
+        e.detail.issueList.map(issue => {
+            let data = getMarkupData(issue.item);
+            data.occludable = false;
+            annotations.createAnnotation(data);
+        });
+    }
+}
+
+bindUpdateDocumentMarkupList();
+
+function highlightSidebarNote(noteId) {
+    var noteWrap = $('#vitro-issue-tile-' + noteId);
+
+    if (!noteWrap.position()) {
+        setTimeout(() => {
+            highlightSidebarNote(noteId);
+        }, 500);
+
+        return;
+    }
+
+    selectIssueListItem(noteId);
+}
+
+function selectIssueListItem(itemId) {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_SELECT_ITEM, { detail: { itemId: itemId } });
+    window.dispatchEvent(event);
+}
                         
 //------------------------------------------------------------------------------------------------------------------
 // Do action wherever we click on an object

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.208';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.208';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.208';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.208';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.208';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.208';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.208';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.208';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.208';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.208';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.208';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.208';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.208';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.208';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.210';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.210';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.210';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.210';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.210';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.210';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.210';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.210';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.210';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.210';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.210';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.210';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.210';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.210';
 
 let treeViewData = [];
 let notes = [];
@@ -505,26 +505,31 @@ export class VitroDxfScene extends DxfScene {
     _ProcessLayouts(dxf) {
         for (let i = 0; i < this.layouts.length; i++) {
 			const layout = this.layouts[i]
-            layout.origin = this.origins.get(layout.spaceHandle)
-            layout.bounds = this.bounds.get(layout.spaceHandle)
-			if (!layout.origin || !layout.bounds)
-			{
-				this.layouts.splice(i, 1)
-				i--
-				continue
-			}
             for (const viewport of this.viewports) {
                 if (layout.spaceHandle === viewport.ownerHandle) {
                     layout.viewports.set(viewport.status, viewport)
                 }
             }
-
             const blockCtx = layout.block.DefinitionContext()
             const entities = layout.block.data.entities ? layout.block.data.entities : dxf.entities
             for (const viewport of layout.viewports.values()) {
                 this._CreateViewportVertices(viewport, entities)
                 this._ProcessDxfEntity(viewport, blockCtx)
             }
+			
+            layout.origin = this.origins.get(layout.spaceHandle)
+            layout.bounds = this.bounds.get(layout.spaceHandle)
+			if (IsModelSpace(layout.space) && !layout.origin)
+			{
+				layout.origin = { x: 0, y: 0 }
+				layout.bounds = { minX: 0, maxX: 0, minY: 0, maxY: 0 }
+			}
+			if (!layout.origin || !layout.bounds)
+			{
+				this.layouts.splice(i, 1)
+				i--
+				continue
+			}
         }
     }
 
@@ -2873,7 +2878,8 @@ function bindBtnToggleSidebarNotes() {
     $(document).on('click', '#btnToggleSidebarNotes', function() {
         $(this).toggleClass('toggled');
 
-        if($(this).hasClass('toggled')) {
+        if ($(this).hasClass('toggled')) {
+            collapseSidebarIssueDetail();
             if(!$('.sidebar').is(':visible')) {
                 expandSidebarNotes();
                 $('body').addClass('vitro-sidebar-notes-expanded');
@@ -2886,7 +2892,8 @@ function bindBtnToggleSidebarNotes() {
 }
 
 function expandSidebarNotes() {
-    context.initIssueList();
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+    context.initIssueList(true, searchCriterion);
 
     if ($('#btnCreateNotes').hasClass('toggled')) {
         $('#btnCreateNotes').removeClass('toggled');
@@ -3172,6 +3179,9 @@ function initTreeViewPanelResizable() {
         minWidth: 150
     });
 }
+const EVENT_SEARCH_ISSUE_LIST = 'vitro.search.issue.list';
+const EVENT_ISSUE_LIST_REFRESH = 'vitro.issue.list.refresh';
+
 var canvas = document.getElementById('canvasContainer');
 window.dxfViewer = new Viewer(canvas, null);
 
@@ -3239,7 +3249,7 @@ function KeyDown(event) {
     const code = event.code;
     if (code == 'Delete') {
         const selectedId = window.dxfViewer.GetSelectedHandle();
-        if (selectedId) {initi
+        if (selectedId) {
             const drawable = window.dxfViewer.GetDrawable(selectedId);
             if (drawable?.drawMode === DrawMode.ANNOTATIONS) {
                 window.dxfViewer.DeleteDrawable(selectedId);
@@ -3371,16 +3381,23 @@ function bindUpdatePage() {
     }
 }
 
+function refreshIssueList() {
+    const event = new CustomEvent(EVENT_ISSUE_LIST_REFRESH, { detail: {} });
+    window.dispatchEvent(event);
+}
+
 function updatePage(e) {
     const item = e.detail.itemList[0];
     const markup = item.fieldValueMap.markup;
-    context.initIssueList(true);
+    const searchCriterion = window.searchCriterionList ? window.searchCriterionList : [];
+    context.initIssueList(true, searchCriterion);
     anno.RemoveLabels();
     removeNewAnnotations();
 
     if (e.type === context.deleteIssueEvent && markup) {
         const selectedId = item.fieldValueMap.item_id;
         deleteNote(selectedId);
+        refreshIssueList();
     }
 
     if (e.type === context.updateIssueEvent && markup) {
@@ -3434,15 +3451,20 @@ function getCurrentSpaceHandle() {
 }
 
 function onSelectAnnotation(id) {
-    if (context.selectIssue) {
-        context.selectIssue(id, true);
-    }
     zoomToAnnotation(id);
 
     if (!$('#btnToggleSidebarNotes').hasClass('toggled')) {
         $('#btnToggleSidebarNotes').addClass('toggled');
         expandSidebarNotes();
     }
+    if (context.selectIssue) {
+        const interval = setInterval(() => {
+            if ($('.sidebar').find('.vitro-viewer-issue-list').length) {
+                context.selectIssue(id, true);
+                clearInterval(interval);
+            }
+        }, 50);        
+    }
     updateCanvasContainerWidth();
 }
 
@@ -3461,6 +3483,9 @@ function switchSpace(space) {
 
     if (layout) {
         window.dxfViewer.SwitchSpace(layout);
+
+        refreshMarkupList();
+
         dxfViewer.ZoomTo(dxfViewer.GetSpace(dxfViewer.spaceName).scene);
         dxfViewer.DoFakeZoomToRedrawScene();
         anno.RemoveLabels();
@@ -3631,6 +3656,42 @@ function updateCanvasContainerWidth() {
     $('#canvasContainer').css('width', `calc(100% - ${insetStart + insetEnd}px)`);
     $('#canvasContainer').css('inset-inline-start', `${insetStart}px`);
     $('#canvasContainer').css('inset-inline-end', `${insetEnd}px`);
+}
+
+function bindUpdateDocumentMarkupList() {
+    window.removeEventListener(context.searchIssueListEvent, updateDocumentMarkupList);
+    window.addEventListener(context.searchIssueListEvent, updateDocumentMarkupList);
+}
+
+function updateDocumentMarkupList(e) {
+    removeAllMarkups();
+    context.issueList = e.detail.issueList;
+    reinitMarkupList();
+    anno.UpdateLabelPosition();
+}
+
+function removeAllMarkups() {
+    context.issueList?.forEach(item => {
+        deleteNote(item.id);
+    });
+    anno.RemoveLabels();
+}
+
+function refreshMarkupList() {
+    removeAllMarkups();
+    reinitMarkupList();
+}
+
+function reinitMarkupList() {
+    const currentSpaceHandle = getCurrentSpaceHandle();
+
+    if (context.issueList && context.issueList.length) {
+        $.each(context.issueList, function (index, note) {
+            if (note.markup) {
+                initNote(note, currentSpaceHandle);
+            }
+        });
+    }
 }
 $(document).ready(function () {
 	bindBtnToggleSidebarNotes();
@@ -3655,6 +3716,7 @@ $(document).ready(function () {
 	bindSelectList();
 	bindScaleSelectChange();
 	bindPanelResize();
+	bindUpdateDocumentMarkupList();
 });
 
 var userLocale =