architwin 1.15.1 → 1.15.3

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

@@ -191,6 +191,8 @@ i18n
                 "Chemical": "Chemical",
                 "Submeter": "Submeter",
                 "Frequency": "Frequency",
+                "Camera": "Camera",
+                "Others": "Others",
                 "DeleteDevice": "Delete Device",
                 "ConfirmDeleteDevice": "Are you sure you want to delete this device? This action cannot be reversed",
                 "SuccessDeleteDevice": "Successfully deleted device",
@@ -272,7 +274,8 @@ i18n
                 "MoveTagCancelled": "Move Tag Cancelled",
                 "Window": "Window",
                 "CannotBackDrawingMode": "Cannot go back while drawing mode is active.",
-                "PleaseOffDrawingMode": "Action cannot be done, please turn off drawing mode."
+                "PleaseOffDrawingMode": "Action cannot be done, please turn off drawing mode.",
+                "IotCategoryRequired": "IoT Category is required"
             }
         },
         ja: {
@@ -464,6 +467,8 @@ i18n
                 "Chemical": "化学物質",
                 "Submeter": "サブメーター",
                 "Frequency": "周波数",
+                "Camera": "カメラ",
+                "Others": "その他",
                 "DeleteDevice": "デバイス削除",
                 "ConfirmDeleteDevice": "この操作は元に戻せません。このデバイスを削除しますか?",
                 "SuccessDeleteDevice": "デバイスを削除しました",
@@ -538,7 +543,9 @@ i18n
                 "PressEscCancelRelocation": "再配置をキャンセルするには、Esc キーを押します。",
                 "Window": "建具",
                 "CannotBackDrawingMode": "描画モードがアクティブな間は戻ることができません。",
-                "PleaseOffDrawingMode": "操作を行う前に、描画モードをオフにしてください。"
+                "PleaseOffDrawingMode": "操作を行う前に、描画モードをオフにしてください。",
+                "Successfully Deleted Tag": "タグを削除しました",
+                "IotCategoryRequired": "IoTカテゴリは必須です"
             }
         }
     },

package/lib/atwinui/components/toolbar/index.d.ts

@@ -3,6 +3,7 @@ import { setActiveMenu, clearActiveMenu, getObjectListStatus } from "./menuBar";
 import { renderObjectCards, removeObjectCard } from "./objectListPane";
 import { getTagFormData, setTagCategoriesOption, tagFormMode, selectedTag, renderCategoryDropdownOptions, toggleDropdown } from "./tagFormPane";
 import { renderTags, renderTagRow, addClickEventToTagRow, setTagLink, getTagLink, selectedCategoryFilterId, selectedSubCategoryFilterId, filterTagList } from "./tagListPane";
+import { renderPreviewModal, togglePreviewModal, closePreviewModal, setPreviewModalAction, activePreviewModal } from "./previewModal";
 import { setActiveActionBtn, clearActiveActionBtn, toggleActionBarButtons } from "./actionBar";
 import { renderLibraryCards } from "./libraryPane";
 import { setActiveThemeCard } from "./themePane";
@@ -21,4 +22,4 @@ declare let actionBar: HTMLElement;
  */
 declare function setPreferredLanguage(): void;
 declare function renderToolbarUI(payload: IToolbarData): void;
-export { actionBar, tagFormMode, selectedTag, selectedCategoryFilterId, selectedSubCategoryFilterId, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, clearTagFilterDropdown, getObjectListStatus, toggleModal, setModalAction, toggleModelControl, toggleActionSettings, clearActiveActionBtn, toggleActionBarButtons, filterTagList, setPreferredLanguage };
+export { actionBar, tagFormMode, selectedTag, selectedCategoryFilterId, selectedSubCategoryFilterId, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, clearTagFilterDropdown, getObjectListStatus, toggleModal, setModalAction, toggleModelControl, toggleActionSettings, clearActiveActionBtn, toggleActionBarButtons, filterTagList, setPreferredLanguage, renderPreviewModal, togglePreviewModal, closePreviewModal, setPreviewModalAction, activePreviewModal };

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

@@ -7,6 +7,7 @@ import { renderViewingRemoteSpace } from "./viewingRemoteSpace";
 import { renderAddObjectPane } from "./addObjectPane";
 import { renderTagFormPane, getTagFormData, setTagCategoriesOption, tagFormMode, selectedTag, renderCategoryDropdownOptions, toggleDropdown } from "./tagFormPane";
 import { renderTagListPane, renderTags, renderTagRow, addClickEventToTagRow, setTagLink, getTagLink, selectedCategoryFilterId, selectedSubCategoryFilterId, filterTagList } from "./tagListPane";
+import { renderPreviewModal, togglePreviewModal, closePreviewModal, setPreviewModalAction, activePreviewModal } from "./previewModal";
 import { renderAddMediascreenFormPane } from "./addMediascreenFormPane";
 import { renderActionBar, setActiveActionBtn, clearActiveActionBtn, toggleActionBarButtons } from "./actionBar";
 import { renderLibraryPane, renderLibraryCards } from "./libraryPane";
@@ -108,6 +109,7 @@ function renderToolbarUI(payload) {
     pipeListPane = pipeList.renderPane();
     pipeFormPane = pipeForm.renderPane();
     renderModal();
+    renderPreviewModal();
     sidebarContainer.appendChild(modelControlPane);
     sidebarContainer.appendChild(basepointCalibratePane);
     sidebarContainer.appendChild(actionBar);
@@ -165,4 +167,4 @@ function renderToolbarUI(payload) {
         themeManager(config);
     }
 }
-export { actionBar, tagFormMode, selectedTag, selectedCategoryFilterId, selectedSubCategoryFilterId, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, clearTagFilterDropdown, getObjectListStatus, toggleModal, setModalAction, toggleModelControl, toggleActionSettings, clearActiveActionBtn, toggleActionBarButtons, filterTagList, setPreferredLanguage };
+export { actionBar, tagFormMode, selectedTag, selectedCategoryFilterId, selectedSubCategoryFilterId, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, clearTagFilterDropdown, getObjectListStatus, toggleModal, setModalAction, toggleModelControl, toggleActionSettings, clearActiveActionBtn, toggleActionBarButtons, filterTagList, setPreferredLanguage, renderPreviewModal, togglePreviewModal, closePreviewModal, setPreviewModalAction, activePreviewModal };

package/lib/atwinui/components/toolbar/previewModal.d.ts

@@ -0,0 +1,6 @@
+import type { ModalContent } from '../../../types';
+export declare let activePreviewModal: boolean;
+export declare function renderPreviewModal(): void;
+export declare function togglePreviewModal(visible?: boolean): void;
+export declare function closePreviewModal(): void;
+export declare function setPreviewModalAction(content: ModalContent, iframeSrc?: string): Promise<void>;

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

@@ -0,0 +1,104 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+export let activePreviewModal = false;
+export function renderPreviewModal() {
+    const element = document.createElement('div');
+    element.setAttribute('id', 'at-preview-modal-overlay');
+    element.setAttribute('data-cy', 'at-preview-modal-overlay');
+    element.innerHTML = `
+        <div class="at_preview_modal">
+            <div class="at_preview_modal-header">
+                <h2 class="at_preview_modal-title" id="at-preview-modal-content-heading" data-cy="at-preview-modal-content-heading"></h2>
+                <button class="at_preview_modal-close-btn" data-cy="at-preview-modal-close-btn">&times;</button>
+            </div>
+            <div class="at_preview_modal-body">
+                <div class="at_preview_modal-content" id="at-preview-modal-content-subheading" data-cy="at-preview-modal-content-subheading">
+                </div>
+            </div>
+        </div>
+    `;
+    document.body.appendChild(element);
+    const modalOverlay = document.getElementById('at-preview-modal-overlay');
+    const modalCloseBtn = document.querySelector('.at_preview_modal-close-btn');
+    if (modalCloseBtn) {
+        modalCloseBtn.addEventListener('click', () => {
+            modalOverlay.classList.remove('show');
+        });
+    }
+    if (modalOverlay) {
+        modalOverlay.addEventListener('click', (event) => {
+            if (event.target === modalOverlay) {
+                modalOverlay.classList.remove('show');
+            }
+        });
+    }
+    const handleEscape = (event) => {
+        if (event.key === 'Escape') {
+            modalOverlay.classList.remove('show');
+            document.removeEventListener('keydown', handleEscape);
+        }
+    };
+    document.addEventListener('keydown', handleEscape);
+}
+export function togglePreviewModal(visible = true) {
+    const modalOverlay = document.getElementById('at-preview-modal-overlay');
+    if (!modalOverlay) {
+        console.error("Preview modal overlay is undefined");
+        return;
+    }
+    if (visible) {
+        modalOverlay.classList.add('show');
+        activePreviewModal = true;
+        return;
+    }
+    modalOverlay.classList.remove('show');
+    activePreviewModal = false;
+    return;
+}
+export function closePreviewModal() {
+    const modalOverlay = document.getElementById('at-preview-modal-overlay');
+    if (modalOverlay) {
+        modalOverlay.classList.remove('show');
+        activePreviewModal = false;
+    }
+}
+export function setPreviewModalAction(content, iframeSrc) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const modalAcceptBtn = document.querySelector('.at_modal-accept-button');
+        const modalTitle = document.getElementById('at-preview-modal-content-heading');
+        const modelDesc = document.getElementById('at-preview-modal-content-subheading');
+        if (content) {
+            if (modalTitle && content.title) {
+                modalTitle.textContent = content.title;
+            }
+            if (modelDesc) {
+                if (iframeSrc) {
+                    // If iframeSrc is provided, create iframe instead of text
+                    modelDesc.innerHTML = `<iframe src="${iframeSrc}" class="at_preview_modal-iframe"></iframe>`;
+                }
+                else {
+                    modelDesc.innerHTML = `<div class="at_preview_modal-content">${content.description}</div>`;
+                }
+            }
+        }
+        // if (modalAcceptBtn) {
+        //    if (content && content.buttonLabel) {
+        //         modalAcceptBtn.textContent = content.buttonLabel
+        //    }
+        //    if (callback) {
+        //         modalAcceptBtn.onclick = async () => {
+        //            await callback()
+        //         }
+        //    }else{
+        //         modalAcceptBtn.onclick = closePreviewModal
+        //    }
+        // }
+    });
+}

package/lib/atwinui/components/toolbar/spacePartition/roomFormPane.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import i18n from '../i18n';
 import { SPACE_EVENTS } from "../../../../types";
 import { batchAddEventListenerByClassName } from "../../../events";
-import { startDraw, cancelDraw, disposeModel, _3DXObjects, getCurrentPolygon, dispatchSpaceEvent, enableVerticeControls, setCurrentPolygon, setMeshChildrenMaterialProperty, get3DXObjects, getChildrenOfModel, clearSelectedObject, renderPolygon, addUndoDrawActions, setWallBaseHeight, clearWallBaseHeight, setDrawingConfig, resetDrawingConfig, goToPosition } from '../../../../architwin';
+import { startDraw, cancelDraw, disposeModel, _3DXObjects, getCurrentPolygon, dispatchSpaceEvent, enableVerticeControls, setCurrentPolygon, setMeshChildrenMaterialProperty, get3DXObjects, getChildrenOfModel, clearSelectedObject, renderPolygon, addUndoDrawActions, setWallBaseHeight, clearWallBaseHeight, setDrawingConfig, resetDrawingConfig, goToPosition, clearFloorBaseHeight } from '../../../../architwin';
 import { generateUUID, extractUUID } from '../../../../utils';
 import { getCurrentEditRoomData } from './roomTreePane';
 import { toggleModal, setModalAction } from "../modal";
@@ -249,6 +249,7 @@ export function toggleDrawWindowButton() {
         `;
         const objectIndex = _3DXObjects.findIndex(obj => obj.object.id == currentObject.object.id);
         log.info("objectIndex", objectIndex);
+        clearFloorBaseHeight();
         drawingConfig = {
             lineTypeComponentConfig: {
                 renderPolygonOnAdd: false,
@@ -1023,48 +1024,53 @@ function setupDeleteWindow(element, window) {
     if (!deleteBtn)
         return;
     deleteBtn.addEventListener("click", () => {
-        toggleModal();
-        setModalAction({
-            title: i18n.t("DeleteWindow"),
-            description: i18n.t("ConfirmDeleteWindow"),
-            buttonLabel: i18n.t("YesDelete"),
-        }, () => __awaiter(this, void 0, void 0, function* () {
-            element.remove();
-            log.info("Deleted window:", window.index);
-            toggleModal(false);
-            // Update wall windows
-            currentPolygonData.walls = currentPolygonData.walls.map(wall => {
-                if (wall.uuid !== currentWall.uuid)
-                    return wall;
-                if (wall.windows.length === 1) {
-                    const windowLists = document.getElementById(`at-window-list-${wall.uuid}`);
-                    if (windowLists)
-                        windowLists.style.display = "none";
-                }
-                currentWall = Object.assign(Object.assign({}, wall), { windows: wall.windows.filter((w) => w.index !== window.index) });
-                return currentWall;
-            });
-            const objectIndex = _3DXObjects.findIndex(obj => obj.object.object_id == currentObject.object.object_id);
-            if (objectIndex != null) {
-                log.info("objectIndex", objectIndex);
-                if (_3DXObjects[objectIndex].children) {
-                    _3DXObjects[objectIndex].children.map((win) => __awaiter(this, void 0, void 0, function* () {
-                        log.info("WIND", win);
-                        if (win.index == window.index && win.wallUUID == currentWall.uuid) {
-                            yield disposeModel(win);
-                        }
-                    }));
+        if (!isDrawing) {
+            toggleModal();
+            setModalAction({
+                title: i18n.t("DeleteWindow"),
+                description: i18n.t("ConfirmDeleteWindow"),
+                buttonLabel: i18n.t("YesDelete"),
+            }, () => __awaiter(this, void 0, void 0, function* () {
+                element.remove();
+                log.info("Deleted window:", window.index);
+                toggleModal(false);
+                // Update wall windows
+                currentPolygonData.walls = currentPolygonData.walls.map(wall => {
+                    if (wall.uuid !== currentWall.uuid)
+                        return wall;
+                    if (wall.windows.length === 1) {
+                        const windowLists = document.getElementById(`at-window-list-${wall.uuid}`);
+                        if (windowLists)
+                            windowLists.style.display = "none";
+                    }
+                    currentWall = Object.assign(Object.assign({}, wall), { windows: wall.windows.filter((w) => w.index !== window.index) });
+                    return currentWall;
+                });
+                const objectIndex = _3DXObjects.findIndex(obj => obj.object.object_id == currentObject.object.object_id);
+                if (objectIndex != null) {
+                    log.info("objectIndex", objectIndex);
+                    if (_3DXObjects[objectIndex].children) {
+                        _3DXObjects[objectIndex].children.map((win) => __awaiter(this, void 0, void 0, function* () {
+                            log.info("WIND", win);
+                            if (win.index == window.index && win.wallUUID == currentWall.uuid) {
+                                yield disposeModel(win);
+                            }
+                        }));
+                    }
                 }
-            }
-            // Save + rerender window
-            currentObject.object.object_data.json_data = currentPolygonData;
-            saveWallChanges();
-            notify.success(`${i18n.t('SuccessWindowDelete')}`);
-            log.info("currentPartition polygonJson", JSON.parse(currentPartitionData.polygon_json));
-            log.info("currentObject", currentObject);
-            log.info("currentWall", currentWall);
-            log.info("currentPolygonData", currentPolygonData);
-        }));
+                // Save + rerender window
+                currentObject.object.object_data.json_data = currentPolygonData;
+                saveWallChanges();
+                notify.success(`${i18n.t('SuccessWindowDelete')}`);
+                log.info("currentPartition polygonJson", JSON.parse(currentPartitionData.polygon_json));
+                log.info("currentObject", currentObject);
+                log.info("currentWall", currentWall);
+                log.info("currentPolygonData", currentPolygonData);
+            }));
+        }
+        else {
+            notify.error(i18n.t("PleaseOffDrawingMode"));
+        }
     });
 }
 /**

package/lib/atwinui/components/toolbar/spacePartition/roomTreePane.d.ts

@@ -81,7 +81,7 @@ export declare function highlightSelectedPartitionChild(partitionId: string, nam
  * @param name - The specific name/identifier of the child element whose container to toggle
  * @param expand - Optional boolean to explicitly set expansion state (true = show, false = hide). If undefined, toggles current state
  */
-export declare function toggleExpandParitionWallChild(partitionId: string, name: string, expand?: boolean): void;
+export declare function toggleExpandPartitionWallChild(partitionId: string, name: string, expand?: boolean): void;
 /**
  * Highlights the selected window element by toggling CSS classes and ensures its parent partition is expanded.
  * @param wallUuid - The unique identifier of the wall containing the window elements
@@ -92,6 +92,11 @@ export declare function highlightSelectedWindow(wallUuid: string, index: number
  * Removes the highlight from all selected window items by removing the 'selected' CSS class.
  */
 export declare function toggleHighlightedWindowItem(): void;
+/**
+ * Toggles the highlighted state of partition items by adding 'selected' class to the matching partition and removing it from others.
+ * @param partitionId - The partition ID to highlight (only the prefix before the first hyphen is used for matching)
+ */
+export declare function toggleHighlightedPartitionItem(partitionId: string): void;
 /**
  * Calculates the midpoint (centroid) of multiple 3D coordinates by averaging their x, y, and z values.
  * @param coords - An array of objects containing start Vector3 coordinates

package/lib/atwinui/components/toolbar/spacePartition/roomTreePane.js

@@ -120,7 +120,7 @@ export function displayRoomPartition(partition, objectData) {
     element.innerHTML = `
         <li class="at_room_tree_parent">
             <div id="at-div-room-${partition.uuid}" class="at_flex at_space_between at_toggle">
-                <span class="toggle selectable" id="at-room-${partition.uuid}">▶ ${partition.name}</span> 
+                <span class="at_room_name_text toggle selectable" id="at-room-${partition.uuid}">▶ ${partition.name}</span> 
                 <div>
                     <span id="at-room-edit-${partition.uuid}-btn" class="mdi mdi-pencil at_room_edit_btn" target-pane="at-room-form-pane"></span>
                     <span id="at-room-visibility-btn-${partition.uuid}" class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_room_visible_btn"></span>
@@ -182,8 +182,8 @@ export function displayChildPartitions(partitions, parentPartitionId, objectData
         return `
                 
             <li class="at_room_tree_child">
-                <div id="at-child-partition-${partition.uuid.split('-')[0]}" class="at_flex at_space_between at_toggle">
-                    <span class="toggle selectable" id="at-partition-${partition.uuid}" object-id="${objectId}" parentId="at-partition-${parentPartitionId}">▶ ${i18n.t(`${partition.name}`)}</span> 
+                <div id="at-child-partition-${partition.uuid.split('-')[0]}" class="at_partion_row_item at_flex at_space_between at_toggle">
+                    <span class="at_partition_name_text toggle selectable" id="at-partition-${partition.uuid}" object-id="${objectId}" parentId="at-partition-${parentPartitionId}">▶ ${i18n.t(`${partition.name}`)}</span> 
                     <div>
                         <span id="at-partition-visibility-btn-${objectId}" parent-id="${parentPartitionId}" 
                               class="mdi ${isVisible ? 'mdi-eye ' : 'mdi-eye-off'} at_room_visible_btn"></span>
@@ -363,7 +363,7 @@ function toggleSelectedPartition() {
             yield new Promise(resolve => setTimeout(resolve, 0));
             yield new Promise(resolve => requestAnimationFrame(resolve));
             const wallId = target.getAttribute('polygon-item-id');
-            const windowItems = document.querySelectorAll(`li.at_wall_window_row_item[wall-id="${wallId}"]`);
+            const windowItems = document.querySelectorAll(`li.at_window_row_item[wall-id="${wallId}"]`);
             if (windowItems && windowItems.length > 0) {
                 windowItems.forEach((windowLi) => {
                     const visibilityBtn = windowLi.querySelector('.at_child_visible_btn');
@@ -387,6 +387,7 @@ function toggleSelectedPartition() {
             yield goToPosition(wallBottomMidPoint);
             highlightSelectedPartitionChild(partitionId, objectName);
             toggleHighlightedWindowItem();
+            toggleHighlightedPartitionItem(partitionId);
         }
         catch (e) {
             log.info('goToPosition failed: ', e);
@@ -404,6 +405,7 @@ function toggleSelectedPartition() {
             const floorMidPoint = calculateMidPoint(floorCoords);
             yield goToPosition(floorMidPoint);
             highlightSelectedPartitionChild(partitionId, objectName);
+            toggleHighlightedPartitionItem(partitionId);
         }
         catch (e) {
             log.info('goToPosition failed: ', e);
@@ -441,18 +443,21 @@ function toggleSelectedPartition() {
             log.info('goToPosition failed: ', e);
         }
     }));
-    batchAddEventListenerByClassName('at_wall_window_row_item', (event) => __awaiter(this, void 0, void 0, function* () {
+    batchAddEventListenerByClassName('at_window_row_item', (event) => __awaiter(this, void 0, void 0, function* () {
         event.stopPropagation();
         const targetElement = event.currentTarget;
         const wallUuid = targetElement.getAttribute('wall-id');
         const windowIndex = targetElement.getAttribute('window-index');
+        const partitionId = targetElement.getAttribute('partition-id');
         const windowCoordsEncoded = targetElement.getAttribute('window-coords');
         const windowCoordsJSON = atob(windowCoordsEncoded);
         const windowCoords = JSON.parse(windowCoordsJSON);
         try {
             const windowBottomMidPoint = calculateMidPoint(windowCoords);
             yield goToPosition(windowBottomMidPoint);
+            toggleHighlightedWindowItem();
             highlightSelectedWindow(wallUuid, windowIndex);
+            toggleHighlightedPartitionItem(partitionId);
         }
         catch (e) {
             log.info('goToPosition failed: ', e);
@@ -720,21 +725,15 @@ export function highlightSelectedPartitionChild(partitionId, name) {
     partitionChildren.forEach((partitionChild) => {
         const isSelected = partitionChild.id === targetId;
         const header = partitionChild.querySelector('.at_partition_child_header');
-        if (header) {
-            header.classList.toggle('selected', isSelected);
-            const arrow = header.querySelector('.at_partition_child_expand_icon');
-            if (arrow === null || arrow === void 0 ? void 0 : arrow.textContent) {
-                if (isSelected) {
-                    arrow.textContent = arrow.textContent.includes('▶')
-                        ? arrow.textContent.replace('▶', '▼')
-                        : arrow.textContent.replace('▼', '▶');
-                    toggleExpandParitionWallChild(partitionId, name);
-                }
-                else {
-                    arrow.textContent = arrow.textContent.replace('▼', '▶');
-                }
-            }
-        }
+        const listContainer = partitionChild.querySelector('.at_wall_children_container');
+        const arrow = header === null || header === void 0 ? void 0 : header.querySelector('.at_partition_child_expand_icon');
+        header === null || header === void 0 ? void 0 : header.classList.toggle('selected', isSelected);
+        if (!header || !(arrow === null || arrow === void 0 ? void 0 : arrow.textContent) || !listContainer)
+            return;
+        // for selected: toggle expand/collapse, for non-selected: always collapse
+        const shouldExpand = isSelected && arrow.textContent.includes('▶');
+        arrow.textContent = arrow.textContent.replace(shouldExpand ? '▶' : '▼', shouldExpand ? '▼' : '▶');
+        listContainer.classList.toggle('at_hidden', !shouldExpand);
     });
 }
 /**
@@ -743,20 +742,27 @@ export function highlightSelectedPartitionChild(partitionId, name) {
  * @param name - The specific name/identifier of the child element whose container to toggle
  * @param expand - Optional boolean to explicitly set expansion state (true = show, false = hide). If undefined, toggles current state
  */
-export function toggleExpandParitionWallChild(partitionId, name, expand) {
+export function toggleExpandPartitionWallChild(partitionId, name, expand) {
     const partitionChildren = document.querySelectorAll(`li[partition-li-id="${partitionId}"]`);
     const targetId = `partition-child-${name}`;
     partitionChildren.forEach((partitionChild) => {
         const isSelected = partitionChild.id === targetId;
+        const header = partitionChild.querySelector('.at_partition_child_header');
         const listContainer = partitionChild.querySelector('.at_wall_children_container');
-        if (listContainer) {
-            if (isSelected) {
-                listContainer.classList.toggle('at_hidden', expand !== undefined ? !expand : undefined);
-            }
-            else {
-                listContainer.classList.add('at_hidden');
-            }
+        const arrow = header === null || header === void 0 ? void 0 : header.querySelector('.at_partition_child_expand_icon');
+        if (!header || !(arrow === null || arrow === void 0 ? void 0 : arrow.textContent) || !listContainer)
+            return;
+        // Determine if should be expanded
+        let shouldExpand;
+        if (isSelected) {
+            shouldExpand = expand !== undefined ? expand : !arrow.textContent.includes('▶');
+        }
+        else {
+            shouldExpand = false;
         }
+        // Update arrow and container based on shouldExpand
+        arrow.textContent = arrow.textContent.replace(shouldExpand ? '▶' : '▼', shouldExpand ? '▼' : '▶');
+        listContainer.classList.toggle('at_hidden', !shouldExpand);
     });
 }
 function displayWindows(wall, partitionId, parentId) {
@@ -768,7 +774,7 @@ function displayWindows(wall, partitionId, parentId) {
                 const windowCoords = JSON.stringify(window.edges);
                 const windowCoordsEncoded = btoa(windowCoords);
                 itemsHTML += `
-                <li window-coords="${windowCoordsEncoded}" id="window-${wall.uuid}-${window.index}" wall-id="${wall.uuid}" window-name="${window.name}" window-index="${window.index}" class="at_wall_window_row_item">
+                <li window-coords="${windowCoordsEncoded}" partition-id="${partitionId}" id="window-${wall.uuid}-${window.index}" wall-id="${wall.uuid}" window-name="${window.name}" window-index="${window.index}" class="at_window_row_item">
                     <div>${window.name}</div>
                     <div>
                         <span window-coords="${windowCoordsEncoded}" partition-id="${partitionId}" partition-parent-uuid="${parentId}" polygon-item-id="${wall.uuid}" index="${window.index}"  class="mdi mdi-pencil at_window_edit_btn"></span>
@@ -844,7 +850,7 @@ export function highlightSelectedWindow(wallUuid, index) {
             const parentWallItem = windowElement.closest('li.at_partition_wall_row_item');
             const partitionId = parentWallItem.getAttribute('partition-li-id');
             const objectName = parentWallItem.getAttribute('object-name');
-            toggleExpandParitionWallChild(partitionId, objectName, true);
+            toggleExpandPartitionWallChild(partitionId, objectName, true);
         }
         windowElement.classList.toggle('selected', windowElement.id === targetId);
     });
@@ -853,11 +859,28 @@ export function highlightSelectedWindow(wallUuid, index) {
  * Removes the highlight from all selected window items by removing the 'selected' CSS class.
  */
 export function toggleHighlightedWindowItem() {
-    const windowItems = document.querySelectorAll('li.at_wall_window_row_item.selected');
+    const windowItems = document.querySelectorAll('li.at_window_row_item.selected');
     windowItems.forEach(el => {
         el.classList.remove('selected');
     });
 }
+/**
+ * Toggles the highlighted state of partition items by adding 'selected' class to the matching partition and removing it from others.
+ * @param partitionId - The partition ID to highlight (only the prefix before the first hyphen is used for matching)
+ */
+export function toggleHighlightedPartitionItem(partitionId) {
+    const partitions = document.querySelectorAll('div.at_partion_row_item');
+    partitions === null || partitions === void 0 ? void 0 : partitions.forEach(partition => {
+        if (partition.getAttribute('id') === `at-child-partition-${partitionId.split('-')[0]}`) {
+            partition.classList.add('selected');
+            partition.querySelector('.at_partition_name_text').classList.add('selected'); // Added dot
+        }
+        else {
+            partition.classList.remove('selected');
+            partition.querySelector('.at_partition_name_text').classList.remove('selected'); // Added dot
+        }
+    });
+}
 /**
  * Calculates the midpoint (centroid) of multiple 3D coordinates by averaging their x, y, and z values.
  * @param coords - An array of objects containing start Vector3 coordinates

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

@@ -23,7 +23,7 @@ export let selectedIotTag = undefined;
 let tagIotName, iotModelName, iotSerialNumber, iotMfrName, iotSystemLink;
 let selectedIoTCat;
 let linkedDevicesArray = [];
-let iotCategoryIconList = ['mdi-power', 'mdi-thermometer', 'mdi-water-percent', 'mdi-gauge', 'mdi-leak', 'mdi-water', 'mdi-lightbulb-on', 'mdi-gas-cylinder', 'mdi-flask', 'mdi-meter-electric', 'mdi-information-symbol', 'mdi-sine-wave'];
+let iotCategoryIconList = ['mdi-power', 'mdi-thermometer', 'mdi-water-percent', 'mdi-gauge', 'mdi-leak', 'mdi-water', 'mdi-lightbulb-on', 'mdi-gas-cylinder', 'mdi-flask', 'mdi-meter-electric', 'mdi-information-symbol', 'mdi-sine-wave', 'mdi-camera', 'mdi-dots-horizontal'];
 let notify = new Notyf({ position: { x: 'left', y: 'bottom' } });
 export function renderTagIOTFormPane() {
     const element = document.createElement('div');
@@ -544,7 +544,7 @@ export function getIotTagFormData() {
         serialNumber: iotSerialNumber.value,
         tagMf: iotMfrName.value,
         // tagCategoryId: selectedIoTCat.uuid,
-        tagCategoryId: selectedIoTCat.name,
+        tagCategoryId: selectedIoTCat ? selectedIoTCat.name : undefined,
         systemLink: iotSystemLink.value,
         linkedDevices: linkedDevicesArray,
         iotSystem: selectedIoTSystem,
@@ -678,6 +678,7 @@ export function clearIotFields() {
     iotSystemLink.innerText = '';
     linkedDevicesArray = [];
     selectedIoTSystem = '';
+    selectedIoTCat = undefined;
     setSelectedIoTSystemRadio(IOT_LINKED_SYSTEMS.BEMAC);
     deviceContainer.innerHTML = '';
     iotTagFormMode = "ADD" /* FORM_MODE.ADD */;

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

@@ -245,7 +245,7 @@ export function renderTags(tags, showOwnTagsOnly = false) {
                     const payload = { tag: targetTag };
                     dispatchSpaceEvent(SPACE_EVENTS.TAG_DISPOSED, payload);
                     toggleModal(false);
-                    notify.success("Successfully deleted tag");
+                    notify.success(i18n.t('Successfully deleted tag'));
                 }
                 else {
                     toggleModal(false);
@@ -414,7 +414,7 @@ export function addClickEventToTagRow(tag) {
                     yield disposeTag({ tagId: tagId });
                     const tagRow = document.getElementById(`at-tag-row-${tagId}`);
                     tagRow.remove();
-                    notify.success("Successfully deleted tag");
+                    notify.success(i18n.t('Successfully deleted tag'));
                 }
                 else {
                     notify.error("Tag id not found!");

package/lib/atwinui/events.js

@@ -28,7 +28,7 @@ import { toggleDrawPartitionButton, displayPartitionFormMode, setPartitionFormMo
 import { actionSettingsSelectOption, getTempCoordinateSystem, getTempMeasurementUnit, getTempRotationUnit, setCoordinateSystem, setMeasurementUnit, setRotationUnit, initSettingsValues, setTempCoordinateSystem, setTempMeasurementUnit, setTempRotationUnit, toggleActionSettingsDropdown, toggleCalibrateBasepoint, setScaleFactor, getTempScaleFactor, setTempScaleFactor, setBasepoint, getTempBasepoint, setTempBasepoint, getBasepoint, toggleActionSettings, getBasepointObjectPayload, displayConvertedCoordinates, getCoordinateSystem, getScaleFactor, getMeasurementUnit, getRotationUnit, setBasepointObjectPayload } from "./components/toolbar/actionSettingsPane";
 import { getBasepointCalibrateBpCoordinateValues, getBasepointCalibrateMpCoordinateValues, initBsepointCalibratePane, toggleBasepointCalibratePane } from "./components/toolbar/basepointCalibratePane";
 import { toggleGeneralMapOptions, initGeneralSelectedMap, getSelectedMapOption } from './components/toolbar/generalSettingsMenuPane';
-import { searchTagList, setSearchTagTerm, searchClearfield, getSearchTagTerm, sortTags, updateSelectedTagSortOption, resetSelectedTagSortOption, filterIotTagList, setTagPaneActive, isTagPaneActive, setCurrentTagPaneMode, currentTagPaneMode } from './components/toolbar/tagListPane';
+import { searchTagList, setSearchTagTerm, searchClearfield, getSearchTagTerm, sortTags, updateSelectedTagSortOption, resetSelectedTagSortOption, filterIotTagList, setTagPaneActive, isTagPaneActive, setCurrentTagPaneMode, currentTagPaneMode, selectedTagSortOption } from './components/toolbar/tagListPane';
 import { renderUserRows } from "./components/toolbar/spaceUserListPane";
 import { handleRemoteViewResponsiveChanges, renderRemoteSpaceViewing } from "./components/toolbar/viewingRemoteSpace";
 import { PipeList } from "./components/toolbar/pipeListPane";
@@ -343,19 +343,25 @@ function renderTagPaneContent() {
             log.info("1 content", tags);
             setTagPaneActive(true);
             setCurrentTagPaneMode(TAG_TYPE.MP);
-            renderTags(filterTagList(tags));
+            resetSelectedTagSortOption();
+            const sortedTagsToDisplay = sortTags(tags, selectedTagSortOption);
+            renderTags(filterTagList(sortedTagsToDisplay));
         }
         else if (tags.length > 0 && isTagPaneActive) {
             log.info("2 content", tags);
             setTagPaneActive(true);
             setCurrentTagPaneMode(TAG_TYPE.MP);
-            renderTags(tags, true);
+            resetSelectedTagSortOption();
+            const sortedTagsToDisplay = sortTags(tags, selectedTagSortOption);
+            renderTags(sortedTagsToDisplay, true);
         }
         else if (!isTagPaneActive) {
             log.info("3 content", tags);
             setTagPaneActive(false);
             setCurrentTagPaneMode(TAG_TYPE.IOT);
-            renderTags(filterIotTagList(tags));
+            resetSelectedTagSortOption();
+            const sortedTagsToDisplay = sortTags(tags, selectedTagSortOption);
+            renderTags(filterIotTagList(sortedTagsToDisplay));
             dispatchSpaceEvent(SPACE_EVENTS.GET_IOT_TAG_ICON, { payload: 'hello from library' });
         }
         if ((_tagCategories === null || _tagCategories === void 0 ? void 0 : _tagCategories.length) > 0) {
@@ -3476,7 +3482,12 @@ function handlePlaceIotTag() {
                     }
                 }
                 else {
-                    notyf.error(`${i18n.t('RequiredFieldsEmpty')}`);
+                    if (!payload.tagCategoryId) {
+                        notyf.error(`${i18n.t('IotCategoryRequired')}`);
+                    }
+                    else {
+                        notyf.error(`${i18n.t('RequiredFieldsEmpty')}`);
+                    }
                     isPlacingTag = false;
                 }
             }
@@ -3776,7 +3787,15 @@ function handleClickEventInTagSortOption() {
                     if (closestOption) {
                         const sortOption = closestOption.dataset.sort;
                         updateSelectedTagSortOption(sortOption);
-                        const tags = getMpTags();
+                        log.info("_@ _tags: ", _tags);
+                        let tags;
+                        if (currentTagPaneMode == TAG_TYPE.MP) {
+                            tags = getMpTags().filter(tag => (tag.tag_type === TAG_TYPE.MP || tag.tag_type === undefined));
+                        }
+                        else {
+                            tags = getMpTags().filter(tag => tag.tag_type === TAG_TYPE.IOT);
+                        }
+                        // const tags = getMpTags()
                         const filteredTags = filterTagList(tags);
                         const sortConfig = sortTagOptions[sortOption] || { by: 'label', order: 'asc' };
                         if (selectedCategoryFilterId || selectedSubCategoryFilterId) {