architwin 1.15.2 → 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": "デバイスを削除しました",
@@ -539,7 +544,8 @@ i18n
                 "Window": "建具",
                 "CannotBackDrawingMode": "描画モードがアクティブな間は戻ることができません。",
                 "PleaseOffDrawingMode": "操作を行う前に、描画モードをオフにしてください。",
-                "Successfully Deleted Tag": "タグを削除しました"
+                "Successfully Deleted Tag": "タグを削除しました",
+                "IotCategoryRequired": "IoTカテゴリは必須です"
             }
         }
     },

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/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;
                 }
             }

package/package.json

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