architwin 1.17.2 → 1.17.4

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

@@ -70,7 +70,7 @@ export function renderObjectCard(payload, objectComponent) {
             </div>
             <div>            
                 <div class="at_button_icon" style="display:inline-block">
-                    <span class="mdi ${isObjectVisible ? 'mdi-eye-off' : 'mdi-eye'}  at_model_visibility_btn" id="at-visibility-model-${payload.id}-btn" data-cy="at-visibility-model-${payload.id}-btn" card-id="${payload.id}"></span>
+                    <span class="mdi ${isObjectVisible ? 'mdi-eye' : 'mdi-eye-off'}  at_model_visibility_btn" id="at-visibility-model-${payload.id}-btn" data-cy="at-visibility-model-${payload.id}-btn" card-id="${payload.id}"></span>
                 </div>
                 <div class="at_button_icon" style="display:inline-block">
                     <span class="mdi mdi-delete-outline at_model_delete_btn" id="at-delete-model-${payload.id}-btn" data-cy="at-delete-model-${payload.id}-btn" card-id="${payload.id}"></span>

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

@@ -106,22 +106,20 @@ export function renderTagIOTFormPane() {
               </div>
             </div>
           </div>
-        </div>
-
-        <div class="at_iot_list_container at_h-min-40" id="at-iot-device-list-container" data-cy="at-iot-device-list-container">
-          <div class="at_section at_iot_item_container at_scrollable_container" id="at-linked-device-container" data-cy="at-linked-device-container">
-            <div class="at_title" style="padding-left: 20px !important;">
-              <div> </div>
-              <label for="">${i18n.t('LinkedIoTDevices')}</label>
-              <div> </div>
-            </div>
-            <div>
-              <div class="at_body at_linked_device_container" id="at-device-item-container">
+          <div class="at_iot_list_container at_h-min-40" id="at-iot-device-list-container" data-cy="at-iot-device-list-container">
+            <div class="at_section at_iot_item_container at_scrollable_container" id="at-linked-device-container" data-cy="at-linked-device-container">
+              <div class="at_title" style="padding-left: 20px !important;">
+                <div> </div>
+                <label for="">${i18n.t('LinkedIoTDevices')}</label>
+                <div> </div>
+              </div>
+              <div>
+                <div class="at_body at_linked_device_container" id="at-device-item-container">
+                </div>
               </div>
             </div>
           </div>
         </div>
-
       </div>
     </div>
 
@@ -237,6 +235,17 @@ export function setSelectedIoTSystem(payload) {
     if (selectedToggle) {
         selectedToggle.textContent = payload ? i18n.t(payload) : i18n.t('NoSelection');
     }
+    const linkedDeviceContainer = document.getElementById('at-iot-device-main-container');
+    const systemLinkContainer = document.getElementById('at-iot-system-link-container');
+    if (payload === IOT_LINKED_SYSTEMS.URL_LINK) {
+        log.info('payload == IOT_LINKED_SYSTEMS.URL_LINK', payload, IOT_LINKED_SYSTEMS.URL_LINK);
+        linkedDeviceContainer.style.display = 'none';
+        systemLinkContainer.style.display = 'block';
+    }
+    else {
+        linkedDeviceContainer.style.display = 'block';
+        systemLinkContainer.style.display = 'none';
+    }
 }
 /**
  * Clears dropdowns for both Category and Devices
@@ -522,7 +531,7 @@ export function getIotTagFormData() {
         tagMf: iotMfrName.value,
         // tagCategoryId: selectedIoTCat.uuid,
         tagCategoryId: selectedIoTCat ? selectedIoTCat.name : undefined,
-        systemLink: selectedIoTSystem,
+        systemLink: iotSystemLink.value,
         linkedDevices: linkedDevicesArray,
         iotSystem: selectedIoTSystem,
         tag_type: TAG_TYPE.IOT

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

@@ -1330,13 +1330,13 @@ function handleModelVisibility(objId) {
                 //@ts-ignore
                 if (target.component.mesh.visible) {
                     setModelVisibility(targetId, false);
-                    setVisibilityBtn.classList.remove('mdi-eye-off');
-                    setVisibilityBtn.classList.add('mdi-eye');
+                    setVisibilityBtn.classList.add('mdi-eye-off');
+                    setVisibilityBtn.classList.remove('mdi-eye');
                 }
                 else {
                     setModelVisibility(targetId, true);
-                    setVisibilityBtn.classList.remove('mdi-eye');
-                    setVisibilityBtn.classList.add('mdi-eye-off');
+                    setVisibilityBtn.classList.add('mdi-eye');
+                    setVisibilityBtn.classList.remove('mdi-eye-off');
                 }
                 yield goToModel(targetId);
             }
@@ -1913,11 +1913,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 +4046,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/types.d.ts

@@ -1454,7 +1454,7 @@ export declare enum MAP_OPTIONS {
 export declare enum IOT_LINKED_SYSTEMS {
     BEMAC = "BEMAC",
     HANASYS = "HANASYS",
-    URL_LINK = "URLLink",
+    URL_LINK = "URL Link",
     I_MTEC = "i-MTEC"
 }
 export interface ITagIOTCategory {

package/lib/types.js

@@ -198,7 +198,7 @@ export var IOT_LINKED_SYSTEMS;
 (function (IOT_LINKED_SYSTEMS) {
     IOT_LINKED_SYSTEMS["BEMAC"] = "BEMAC";
     IOT_LINKED_SYSTEMS["HANASYS"] = "HANASYS";
-    IOT_LINKED_SYSTEMS["URL_LINK"] = "URLLink";
+    IOT_LINKED_SYSTEMS["URL_LINK"] = "URL Link";
     IOT_LINKED_SYSTEMS["I_MTEC"] = "i-MTEC";
 })(IOT_LINKED_SYSTEMS || (IOT_LINKED_SYSTEMS = {}));
 export var TAG_TYPE;

package/package.json

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