architwin 1.17.0 → 1.17.2

package/lib/atwinui/events.js

@@ -30,14 +30,14 @@ 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, selectedTagSortOption, tagVisibility, updateShowAllButton, saveTagVisibilityToStorage, initializeTagVisibility } from './components/toolbar/tagListPane';
+import { searchTagList, setSearchTagTerm, searchClearfield, getSearchTagTerm, sortTags, updateSelectedTagSortOption, resetSelectedTagSortOption, filterIotTagList, setTagPaneActive, isTagPaneActive, setCurrentTagPaneMode, currentTagPaneMode, selectedTagSortOption, tagVisibility, updateShowAllButton, saveTagVisibilityToStorage, initializeTagVisibility, setIotCategoryFilterOptions } from './components/toolbar/tagListPane';
 import { renderUserRows } from "./components/toolbar/spaceUserListPane";
 import { handleRemoteViewResponsiveChanges, renderRemoteSpaceViewing } from "./components/toolbar/viewingRemoteSpace";
 import { PipeList } from "./components/toolbar/pipeListPane";
 import { PipeForm } from "./components/toolbar/pipeFormPane";
 // import { EditPipeForm, initPipeFormPane, pipeFormData, setPipeFormMode } from "./components/toolbar/pipeFormPane";
 // import { initPipeData } from "./components/toolbar/addPipePane";
-import { toggleIoTCategoryOptions, toggleIoTDevicesOptions, setSelectedIoTSystemRadio, clearIoTDropdowns, initIoTFormData, setIotCategoryOptions, getIotTagFormData, iotTagFormMode, selectedIotTag, clearIotFields, getIotCategoryOption } from './components/toolbar/tagIotFormPane';
+import { toggleIoTCategoryOptions, toggleIoTDevicesOptions, clearIoTDropdowns, initIoTFormData, setIotCategoryOptions, getIotTagFormData, iotTagFormMode, selectedIotTag, clearIotFields, getIotCategoryOption, initIoTLinkedSystemOptions, toggleIoTLinkedSystemOptions } from './components/toolbar/tagIotFormPane';
 import { getTheseTagMessages, timedoutComment, unsendComment } from "./components/toolbar/tagMessagingPane";
 import { handleScreenShareResponsiveChanges, handleScreenShareAcceptRequest, handleScreenShareBackUserListPane, handleScreenShareEndSessionEvent, handleScreenShareUsersUpdated, renderScreenShareLeaveConfirmationModal } from "./components/toolbar/screenSharePane";
 const pipeList = new PipeList();
@@ -225,20 +225,11 @@ function toggleDisplayPane(targetId) {
                 }
                 if (paneId === 'at-tag-list-pane') {
                     renderTagPaneContent();
-                    setIotCategoryOptions();
-                    // clearTagFilterDropdown()
+                    setIotCategoryFilterOptions();
                     const tags = getMpTags();
-                    // if(selectedCategoryFilterId || selectedSubCategoryFilterId){
-                    //     const filteredTags = filterTagList(tags)
-                    //     const sortedTags = sortTags(filteredTags, {by: 'label', order: 'asc'})
-                    //     renderTags(sortedTags)
-                    // }else if (tags.length > 0) {
-                    //     const sortedTags = sortTags(tags, {by: 'label', order: 'asc'})
-                    //     renderTags(sortedTags,true)
-                    // }
                     //Render the category dropdown elements if tagCategories is populated
                     if (_tagCategories && _tagCategories.length > 0) {
-                        log.info("Has categories");
+                        log.info("_tagCategories");
                         renderCategoryDropdownOptions('at-category-filter-options', _tagCategories, 'at-category-filter-dropdown-toggle');
                     }
                     // for search
@@ -521,9 +512,8 @@ function setupIndividualEventListeners() {
     handleCloseCustomMinimap();
     handleCustomMapControls();
     handleCloseActiveMinimap();
-    handleIoTCategoryDropdown();
+    handleIoTOptions();
     handleIoTDeviceDropdown();
-    handleSelectedIoTLinkedSystem();
     handlePlaceIotTag();
     handleIotFormClose();
     handleIotFormSave();
@@ -3453,11 +3443,16 @@ function handleCloseActiveMinimap() {
         });
     }
 }
-function handleIoTCategoryDropdown() {
+function handleIoTOptions() {
     const iotCateogryDropdown = document.getElementById('at-iot-cat-filter-dropdown');
+    const iotLinkedSystemDropdown = document.getElementById('at-iot-linked-system-dropdown');
     if (iotCateogryDropdown) {
         toggleIoTCategoryOptions();
     }
+    if (iotLinkedSystemDropdown) {
+        initIoTLinkedSystemOptions();
+        toggleIoTLinkedSystemOptions();
+    }
 }
 function handleIoTDeviceDropdown() {
     const iotDeviceDropdown = document.getElementById('at-iot-cat-filter-dropdown');
@@ -3465,16 +3460,6 @@ function handleIoTDeviceDropdown() {
         toggleIoTDevicesOptions();
     }
 }
-function handleSelectedIoTLinkedSystem() {
-    document.querySelectorAll('input[name="iot-link-system"]').forEach(input => {
-        input.addEventListener('change', (event) => {
-            const target = event.target;
-            if (target.value) {
-                setSelectedIoTSystemRadio(target.value);
-            }
-        });
-    });
-}
 function handlePlaceIotTag() {
     log.info('handlePlaceIotTag()');
     const moveIotTag = document.getElementById('at-iot-move-btn');
@@ -3648,6 +3633,8 @@ function handleDisplayElements(id) {
             // hide dropdown sub/categories
             handleHideElement('at-custom-category-filter-dropdown-container');
             handleHideElement('at-custom-subcategory-filter-dropdown-container');
+            handleHideElement('at-custom-category-filter-dropdown-container');
+            handleDisplayElement('at-custom-iot-category-filter-dropdown-container');
             break;
         case 'at-expand-btn':
             // changep ane height
@@ -3662,6 +3649,8 @@ function handleDisplayElements(id) {
                 `;
             handleDisplayElement('at-custom-category-filter-dropdown-container');
             handleDisplayElement('at-custom-subcategory-filter-dropdown-container');
+            handleDisplayElement('at-custom-category-filter-dropdown-container');
+            handleHideElement('at-custom-iot-category-filter-dropdown-container');
             break;
         default:
             break;
@@ -3705,13 +3694,17 @@ function handleIotFormSave() {
     if (iotSave) {
         iotSave.addEventListener('click', (event) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            log.info('@caroline saving iot');
+            log.info('Saving iot');
             let iotTagFormPayload = getIotTagFormData();
             const selectedCat = getIotCategoryOption();
             log.info('@caroline iotTagFormPayload: ', iotTagFormPayload, iotTagFormMode);
             iotSave.classList.add('at_disabled');
             if (iotTagFormPayload && iotTagFormMode == "ADD" /* FORM_MODE.ADD */) {
                 log.info('@caroline saving IOT, Add Mode');
+                if (!currentTag) {
+                    notyf.error(`${i18n.t('NoTagSave')}`);
+                    iotSave.classList.remove('at_disabled');
+                }
                 currentTag.json_data.label = iotTagFormPayload.name;
                 log.info('@caroline current Tag: ', currentTag);
                 if (!currentTag.iot_tag) {
@@ -3925,9 +3918,10 @@ function handleWindowVisibility(visibilityBtn, updateStateDB, fromParentVisibili
                 }
                 else {
                     const polygonJson = JSON.parse(thisPartition.polygon_json);
-                    const wall = polygonJson.walls.find(item => item.uuid === wallId) || null;
+                    const wall = polygonJson.walls.find(w => w.uuid === wallId) || null;
                     const windows = (wall === null || wall === void 0 ? void 0 : wall.windows) || null;
-                    windows === null || windows === void 0 ? void 0 : windows.forEach(w => w.options.is_visible = isVisible);
+                    const targetWindow = windows === null || windows === void 0 ? void 0 : windows.find(w => w.index.toString() === windowIndex);
+                    targetWindow.options.is_visible = isVisible;
                     const payload = {
                         uuid: thisPartition.uuid,
                         space_uuid: thisPartition.space_uuid,

package/lib/atwinui/index.js

@@ -14,6 +14,7 @@ import { SPACE_EVENTS } from '../types';
 import { dispatchSpaceEvent } from '../architwin';
 import log from 'loglevel';
 import { toggleBasepointCalibratePane } from './components/toolbar/basepointCalibratePane';
+import { setSelectedIoTCategoryFilter } from './components/toolbar/tagListPane';
 // let menuBar:HTMLElement,
 //     actionBar:HTMLElement,
 //     objectListPane:HTMLElement,
@@ -76,6 +77,7 @@ function initToolbarUI(payload) {
             //@ts-expect-error
             if (event.target.id === 'at-tag-iot-btn') {
                 handleDisplayElements('at-tag-iot-btn');
+                setSelectedIoTCategoryFilter({ uuid: '', name: 'NoSelection' });
             }
             //@ts-ignore
             yield toggleDisplayPane(event.target.id);

package/lib/types.d.ts

@@ -61,6 +61,15 @@ export interface ITagCategory {
     };
     subcategories: Array<ITagCategory>;
 }
+export interface IotCategoryType {
+    name: string;
+    uuid: string;
+    json_data?: {
+        icon: string;
+        iconURL: string;
+        iconBase64: string;
+    };
+}
 export interface ITagColor {
     name: COLOR;
     rgb: {
@@ -769,6 +778,7 @@ export declare enum SPACE_EVENTS {
     SPACE_METADATA_RETRIEVED = "SPACE_METADATA_RETRIEVED",
     GET_IOT_CATEGORIES = "GET_IOT_CATEGORIES",
     GET_IOT_DEVICES = "GET_IOT_DEVICES",
+    GET_IOT_LINKED_SYSTEM_OPTIONS = "GET_IOT_LINKED_SYSTEM_OPTIONS",
     IOT_TAG_SAVED = "IOT_TAG_SAVED",
     TAG_SANDBOX_REGISTERED = "TAG_SANDBOX_REGISTERED",
     GET_IOT_TAG_ICON = "GET_IOT_TAG_ICON",
@@ -1444,7 +1454,8 @@ export declare enum MAP_OPTIONS {
 export declare enum IOT_LINKED_SYSTEMS {
     BEMAC = "BEMAC",
     HANASYS = "HANASYS",
-    URL_LINK = "URLLink"
+    URL_LINK = "URLLink",
+    I_MTEC = "i-MTEC"
 }
 export interface ITagIOTCategory {
     name: string;

package/lib/types.js

@@ -112,6 +112,7 @@ export var SPACE_EVENTS;
     SPACE_EVENTS["SPACE_METADATA_RETRIEVED"] = "SPACE_METADATA_RETRIEVED";
     SPACE_EVENTS["GET_IOT_CATEGORIES"] = "GET_IOT_CATEGORIES";
     SPACE_EVENTS["GET_IOT_DEVICES"] = "GET_IOT_DEVICES";
+    SPACE_EVENTS["GET_IOT_LINKED_SYSTEM_OPTIONS"] = "GET_IOT_LINKED_SYSTEM_OPTIONS";
     SPACE_EVENTS["IOT_TAG_SAVED"] = "IOT_TAG_SAVED";
     SPACE_EVENTS["TAG_SANDBOX_REGISTERED"] = "TAG_SANDBOX_REGISTERED";
     SPACE_EVENTS["GET_IOT_TAG_ICON"] = "GET_IOT_TAG_ICON";
@@ -198,6 +199,7 @@ export var IOT_LINKED_SYSTEMS;
     IOT_LINKED_SYSTEMS["BEMAC"] = "BEMAC";
     IOT_LINKED_SYSTEMS["HANASYS"] = "HANASYS";
     IOT_LINKED_SYSTEMS["URL_LINK"] = "URLLink";
+    IOT_LINKED_SYSTEMS["I_MTEC"] = "i-MTEC";
 })(IOT_LINKED_SYSTEMS || (IOT_LINKED_SYSTEMS = {}));
 export var TAG_TYPE;
 (function (TAG_TYPE) {

package/package.json

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

package/static/atwinui.css

@@ -2734,6 +2734,33 @@ li.at_partition_wall_row_item {
     box-sizing: border-box;
 }
 
+.at_listbox {
+    width: 230px;
+    background-color: var(--bg-secondary);
+}
+
+.at_listbox_options {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  max-height: 160px;
+  overflow-y: auto;
+}
+
+.at_listbox_option {
+  padding: 8px 12px;
+  cursor: pointer;
+}
+
+.at_listbox_option:hover {
+    background-color: var(--bg-accent);
+}
+
+.at_listbox_option.is-selected {
+    background-color: var(--bg-accent);
+    font-weight: 600;
+}
+
 /* FLEXIBLE MODAL CLASSES */
 
 .at_flexible_modal-overlay {
@@ -2953,4 +2980,11 @@ span.at_partition_name_text.toggle.selectable.selected {
 
 .at_linked_systems_options_contianer input {
     cursor: pointer;
+}
+
+.at_name span {
+  flex: 1;
+  min-width: 0;
+  white-space: normal !important;
+  word-break: break-all !important;
 }