architwin 1.17.3 → 1.18.0

package/lib/atwinui/components/toolbar/card.js

@@ -17,6 +17,7 @@ import i18n from './i18n';
 import { getBasepoint, getCoordinateSystem, getMeasurementUnit, getMPBasepoint, getScaleFactor } from "./actionSettingsPane";
 import { convertYupScaleToZupScale } from "../../../worldConversion";
 import { toggleActionBarButtons } from "../../components/toolbar";
+import log from "loglevel";
 let activeCard, activeLibraryCard;
 let _basePath = '../../../../architwin/static';
 export function renderObjectCard(payload, objectComponent) {
@@ -219,13 +220,13 @@ export function renderLibraryRow(payload) {
     let thumbnail;
     const element = document.createElement('div');
     element.classList.add('at_card');
-    element.classList.add('at_mx-w-8');
+    element.classList.add('at_mx-w-16');
     //element.setAttribute('id','some-id')
     element.innerHTML = `
         <div class="at_card-body at_library_card_body" card-id="${payload.id}">
             ${payload.name ?
-        `<div class="at_card-title at_library_card_title" id="at-library-card-title-${payload.id}" card-id="${payload.id}">
-                <h2 class="at_title" id="at-card-title-${payload.id}" data-cy="at-card-title-${payload.id}">${payload.name}.${payload.object_type}</h2>
+        `<div class="at_card-title at_library_card_title" id="at-library-card-title-${payload.id}">
+                <h2 class="at_title" id="at-card-title-${payload.id}" data-cy="at-card-title-${payload.id}" card-id="${payload.id}">${payload.name}.${payload.object_type}</h2>
                 </div>` :
         ``}
         </div>
@@ -244,6 +245,7 @@ export function setActiveLibraryCard(cardId) {
             activeLibraryCard.classList.remove('at_card_active');
         }
         const objId = target.getAttribute('card-id');
+        log.info("@@ objId", objId, target);
         let targetId;
         if (/[a-z]/.test(objId) || /[A-Z]/.test(objId)) {
             targetId = objId;

package/lib/atwinui/components/toolbar/libraryPane.js

@@ -55,6 +55,7 @@ export function renderLibraryCards(cardList) {
     console.log("renderLibraryCards()");
     libraryCardContainer = document.getElementById('at-library-cards');
     if (cardList && cardList.length > 0) {
+        libraryCardContainer.classList.add('at_flex_tiles');
         console.log("Card numbers", cardList.length);
         libraryCardContainer.innerHTML = ``;
         cardList.forEach(list => {

package/lib/atwinui/components/toolbar/tagFormPane.js

@@ -102,7 +102,7 @@ export function initFormData(tagId) {
             });
             console.log('tagCategoryId', tagCategory, tagCategory.uuid);
             tagNameInput.value = targetTag.json_data.label;
-            tagDescriptionInput.value = targetTag.json_data.description;
+            tagDescriptionInput.value = targetTag.json_data.description.split('\n')[0];
             tagEmbedInput.value = targetTag.media_url && targetTag.media_url !== '' ? targetTag.media_url : '';
             const subcategories = getAllSubcategories();
             const selectectedSubcategory = subcategories.find(sub => sub.uuid === targetTag.category_uuid);
@@ -168,7 +168,7 @@ export function getTagFormData() {
     }
     if (tagNameInput) {
         const tagName = tagNameInput.value;
-        const tagDescription = tagDescriptionInput.value;
+        const tagDescription = tagDescriptionInput.value.split('\n')[0];
         const tagEmbed = tagEmbedInput.value;
         const formData = {
             tagName: tagName,

package/lib/atwinui/events.d.ts

@@ -1,3 +1,4 @@
+import { MpSdk } from "../../bundle/sdk";
 import { Notyf } from 'notyf';
 import 'notyf/notyf.min.css';
 declare let activeToolbarItem: HTMLElement, activeActionItem: HTMLElement, cancelModelPlacementPrompt: HTMLDivElement;
@@ -48,4 +49,5 @@ declare function handleShowCustomMinimap(): void;
 declare function handleDisplayElements(id: string): void;
 declare function handleWindowVisibility(visibilityBtn: HTMLElement, updateStateDB: boolean, fromParentVisibilityState?: boolean): Promise<void>;
 declare function clearActivePane(): void;
-export { activeToolbarItem, activeActionItem, cancelModelPlacementPrompt, isCustomMapControlsVisible, pipeColor, batchAddEventListenerById, batchAddEventListenerByClassName, batchAddEventListenerByClassNames, batchAddEventListenerByDataAttribute, setActiveToolbarItem, toggleDisplayPane, toggleActionBar, setupIndividualEventListeners, setupSpaceEventSubscriptions, handleModelVisibility, handleDeleteModel, handleShowMinimap, handleScrollToView, handleRenderMeetingUI, handleShowCustomMinimap, renderTagPaneContent, handlePartitionVisibility, handlePolygonVisibility, handleDeletePartition, handleToggleVisibilityTags, handleDisplayElements, handleWindowVisibility, clearActivePane };
+declare function handleVisiblePartitions(mpSdk: MpSdk): void;
+export { activeToolbarItem, activeActionItem, cancelModelPlacementPrompt, isCustomMapControlsVisible, pipeColor, batchAddEventListenerById, batchAddEventListenerByClassName, batchAddEventListenerByClassNames, batchAddEventListenerByDataAttribute, setActiveToolbarItem, toggleDisplayPane, toggleActionBar, setupIndividualEventListeners, setupSpaceEventSubscriptions, handleModelVisibility, handleDeleteModel, handleShowMinimap, handleScrollToView, handleRenderMeetingUI, handleShowCustomMinimap, renderTagPaneContent, handlePartitionVisibility, handlePolygonVisibility, handleDeletePartition, handleToggleVisibilityTags, handleDisplayElements, handleWindowVisibility, clearActivePane, handleVisiblePartitions };

package/lib/atwinui/events.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { actionBar, renderObjectCards, renderLibraryCards, renderTags, renderTagRow, getTagFormData, addClickEventToTagRow, setActiveCard, setActiveMenu, removeObjectCard, clearActiveMenu, setTagCategoriesOption, toggleDropdown, tagFormMode, selectedTag, renderRecepientOptions, renderTagMessages, createTagMessage, setTagLink, setTagMessagingDetails, renderCategoryDropdownOptions, clearTagFormDropdown, clearActiveActionBtn, clearActiveCard, toggleActionBarButtons, selectedCategoryFilterId, selectedSubCategoryFilterId, filterTagList, toggleModal, setModalAction, } from "./components/toolbar";
-import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTransformControls, copyObject, revertTransform, clearSelectedObject, removeTransformControls, getLibrary, getMpTags, renderTag, captureSpaceScreenshot, moveTag, subscribeSpaceEvent, setModelVisibility, disposeModel, disposeTag, _tags, _tagCategories, dispatchSpaceEvent, editTagLabel, editTagDescription, setTagMessageRecepients, setTagMessages, setSelectedTagUuid, renderMeetingSidebar, setTagIcon, setObjectTransformation, getSelectedObject, _atwin, isCdnMapDataAvailable, captureScreenshotAndCameraDetails, _mpConfig, cancelModelPlacement, _modelDetails, actionHistory, get3DXObjects, transformHistory, goToModel, themeManager, _partitionNodes, setSpacePartitionNodes, getSpaceId, setFloorBaseHeight, toggleWallVisibility, getChildrenOfModel, toggleFloorVisibility, renderPolygon, getCurrentPolygon, getFloorBaseHeight, setSelectedObject, redoDrawAction, undoDrawAction, setWallBaseHeight, clearWallBaseHeight, clearFloorBaseHeight, isToolbarFeatureEnabled, captureCurrentView, getCurrentFloor, _spaceUsers, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection, setVertexPath, _screenSharingHostUser, toggleVisibilityTag, _tagIotCategoryTypes, getIoTDeviceTagIcons, toggleMeshChildrenVisibility, set3DXObjects, partitionHistory, _thisVertexPath, setPolygonPath,
+import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTransformControls, copyObject, revertTransform, clearSelectedObject, removeTransformControls, getLibrary, getMpTags, renderTag, captureSpaceScreenshot, moveTag, subscribeSpaceEvent, setModelVisibility, disposeModel, disposeTag, _tags, _tagCategories, dispatchSpaceEvent, editTagLabel, editTagDescription, setTagMessageRecepients, setTagMessages, setSelectedTagUuid, renderMeetingSidebar, setTagIcon, setObjectTransformation, getSelectedObject, _atwin, isCdnMapDataAvailable, captureScreenshotAndCameraDetails, _mpConfig, cancelModelPlacement, _modelDetails, actionHistory, get3DXObjects, transformHistory, goToModel, themeManager, _partitionNodes, setSpacePartitionNodes, getSpaceId, setFloorBaseHeight, toggleWallVisibility, getChildrenOfModel, toggleFloorVisibility, renderPolygon, getCurrentPolygon, getFloorBaseHeight, setSelectedObject, redoDrawAction, undoDrawAction, setWallBaseHeight, clearWallBaseHeight, clearFloorBaseHeight, isToolbarFeatureEnabled, captureCurrentView, getCurrentFloor, _spaceUsers, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection, setVertexPath, _screenSharingHostUser, toggleVisibilityTag, _tagIotCategoryTypes, getIoTDeviceTagIcons, toggleMeshChildrenVisibility, set3DXObjects, partitionHistory, _thisVertexPath, setPolygonPath, editMode,
 // polygonHistory
  } from "../architwin";
 import { Notyf } from 'notyf';
@@ -1654,7 +1654,8 @@ function handleVertexPlace(payload) {
         }
         toggleUndoRedoButtons(partitionHistory.canUndo(), partitionHistory.canRedo());
     }
-    if (isToolbarFeatureEnabled('pipe')) {
+    // add editmode condiition to prevent error of pipe form when vertex initialized without editmode and pipe feature enabled
+    if (editMode && isToolbarFeatureEnabled('pipe')) {
         pipeForm.setPipeVertices(payload.path);
     }
 }
@@ -1771,6 +1772,7 @@ function handleSetModelsView() {
 function handleSetLibraryModelsView() {
     const libraryModelsCardViewBtn = document.getElementById('at-library-models-card-view-btn');
     const libraryModelsListViewBtn = document.getElementById('at-library-models-list-view-btn');
+    const libraryCards = document.getElementById('at-library-cards');
     if (!libraryModelsCardViewBtn) {
         return;
     }
@@ -1780,6 +1782,7 @@ function handleSetLibraryModelsView() {
     libraryModelsCardViewBtn.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
         libraryModelsCardViewBtn.classList.add('at_ghost_active');
         libraryModelsListViewBtn.classList.remove('at_ghost_active');
+        libraryCards.classList.add('at_flex_tiles');
         modelsView = 'card';
         log.info("libraryModelsCardViewBtn", modelsView);
         const checkAssetLibrary = yield getLibrary();
@@ -1796,6 +1799,7 @@ function handleSetLibraryModelsView() {
     libraryModelsListViewBtn.addEventListener('click', () => __awaiter(this, void 0, void 0, function* () {
         libraryModelsListViewBtn.classList.add('at_ghost_active');
         libraryModelsCardViewBtn.classList.remove('at_ghost_active');
+        libraryCards.classList.remove('at_flex_tiles');
         modelsView = 'list';
         log.info("libraryModelsListViewBtn", modelsView);
         const checkAssetLibrary = yield getLibrary();
@@ -1913,11 +1917,13 @@ function handlePartitionVisibility(targetId) {
         };
         const processPartitionVisibility = (targetObject) => {
             if (targetObject) {
+                log.info("targetObject", targetObject);
                 const { component, object } = targetObject;
                 // Update main partition visibility
                 // @ts-ignore
                 if (component.mesh.visible !== isVisible) {
                     setModelVisibility(object.id, isVisible);
+                    targetObject.object.object_data.json_data.options.is_visible = isVisible;
                 }
                 // Update model children visibility
                 getChildrenOfModel(component)
@@ -4044,10 +4050,48 @@ function handlePreviewModalResize() {
         }
     });
 }
+function handleVisiblePartitions(mpSdk) {
+    log.info('handleVisiblePartitions()');
+    let lastFloorSequence = null;
+    mpSdk.Floor.current.subscribe((currentFloor) => __awaiter(this, void 0, void 0, function* () {
+        if ((currentFloor === null || currentFloor === void 0 ? void 0 : currentFloor.sequence) == null || currentFloor.sequence === -1 || currentFloor.sequence === lastFloorSequence) {
+            return;
+        }
+        lastFloorSequence = currentFloor.sequence;
+        log.info('handleVisiblePartitions', currentFloor);
+        const polygons = get3DXObjects().filter(obj => obj.type === 'POLYGON');
+        log.info("room partitions", polygons);
+        if (!polygons.length)
+            return;
+        const updateChildrenVisibility = (component) => {
+            getChildrenOfModel(component).filter(child => child.name && !child.deleted && child.visible !== true).forEach(child => {
+                if (child.name.includes('wall')) {
+                    toggleWallVisibility(component, child.name);
+                }
+                else {
+                    toggleFloorVisibility(component, child.name);
+                }
+            });
+        };
+        const setPolygonsVisibility = (visible, polygon) => {
+            setModelVisibility(polygon.object.id, visible);
+            updateChildrenVisibility(polygon.component);
+        };
+        polygons.forEach(polygon => {
+            log.info("JAMES polygon", polygon);
+            const polygonFloorId = polygon.object.object_data.json_data.floor_sequence.sequence;
+            log.info("JAMES polygonFloorId", polygonFloorId);
+            log.info("JAMES currentFloor.sequence", currentFloor.sequence);
+            const isCurrentFloor = polygonFloorId === currentFloor.sequence;
+            log.info('partition matches current floor:', isCurrentFloor);
+            setPolygonsVisibility(isCurrentFloor, polygon);
+        });
+    }));
+}
 export { 
 //state
 activeToolbarItem, activeActionItem, cancelModelPlacementPrompt, isCustomMapControlsVisible, pipeColor, 
 //methods
 batchAddEventListenerById, batchAddEventListenerByClassName, batchAddEventListenerByClassNames, batchAddEventListenerByDataAttribute, setActiveToolbarItem, toggleDisplayPane, toggleActionBar, setupIndividualEventListeners, setupSpaceEventSubscriptions, handleModelVisibility, handleDeleteModel, handleShowMinimap, handleScrollToView, handleRenderMeetingUI, handleShowCustomMinimap, renderTagPaneContent, 
 // partition
-handlePartitionVisibility, handlePolygonVisibility, handleDeletePartition, handleToggleVisibilityTags, handleDisplayElements, handleWindowVisibility, clearActivePane };
+handlePartitionVisibility, handlePolygonVisibility, handleDeletePartition, handleToggleVisibilityTags, handleDisplayElements, handleWindowVisibility, clearActivePane, handleVisiblePartitions };

package/lib/loaders/polydrawerLoader.js

@@ -63,7 +63,7 @@ export class TubeLine {
                 //this.renderGUI();
             }
             if (this.inputs.path.length > 1) {
-                if (isToolbarFeatureEnabled('pipes')) {
+                if (isToolbarFeatureEnabled('pipe')) {
                     this.renderTubeLine();
                 }
             }

package/lib/types.d.ts

@@ -33,6 +33,7 @@ export interface ITag {
     sandboxId?: string;
     iot_tag?: IoTTagDetails;
     created_on?: string;
+    notion_page_url: string;
 }
 export interface IoTTagDetails {
     linked_system?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.17.3",
+  "version": "1.18.0",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",