architwin 1.18.5 → 1.18.7

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

@@ -271,19 +271,22 @@ export function setActiveLibraryCard(cardId) {
                 const payload = yield addObjectToSpace(selectedObject.amazon_uri, selectedObject.object_type, { position: coords });
                 payload.object_data = selectedObject;
                 if (isToolbarFeatureEnabled('bim')) {
-                    payload.coordinate_system = getCoordinateSystem();
-                    const thisObjBimPosition = convertYupToZup(payload.object_position, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
-                    console.log("====== caroline thisObjBimPosition: ", thisObjBimPosition);
-                    const thisObjBimScale = convertYupScaleToZupScale(payload.object_scale, UNITS.METER, parseInt(getScaleFactor()));
-                    console.log("====== caroline thisObjBimScale: ", thisObjBimScale);
-                    const coordPayload = {
-                        coord_system: getCoordinateSystem(),
-                        bim_coordinates: {
-                            position: thisObjBimPosition,
-                            scale: thisObjBimScale,
-                        }
-                    };
-                    payload.json_data = JSON.stringify({ coordSystemCalibration: coordPayload });
+                    const basepoint = get3DXObjects().find(obj => obj.type === "BASEPOINT");
+                    if (basepoint) {
+                        payload.coordinate_system = getCoordinateSystem();
+                        const thisObjBimPosition = convertYupToZup(payload.object_position, getMPBasepoint(), getBasepoint(), getMeasurementUnit(), parseInt(getScaleFactor()));
+                        console.log("====== caroline thisObjBimPosition: ", thisObjBimPosition);
+                        const thisObjBimScale = convertYupScaleToZupScale(payload.object_scale, UNITS.METER, parseInt(getScaleFactor()));
+                        console.log("====== caroline thisObjBimScale: ", thisObjBimScale);
+                        const coordPayload = {
+                            coord_system: getCoordinateSystem(),
+                            bim_coordinates: {
+                                position: thisObjBimPosition,
+                                scale: thisObjBimScale,
+                            }
+                        };
+                        payload.json_data = JSON.stringify({ coordSystemCalibration: coordPayload });
+                    }
                 }
                 console.log("======Payload:", payload);
                 dispatchSpaceEvent(SPACE_EVENTS.MODEL_RENDERED, { model: payload });

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

@@ -168,7 +168,8 @@ export function getTagFormData() {
     }
     if (tagNameInput) {
         const tagName = tagNameInput.value;
-        const tagDescription = tagDescriptionInput.value.split('\n')[0];
+        const tagDescription = tagDescriptionInput.value;
+        //const tagDescription = tagDescriptionInput.value.split('\n')[0]
         const tagEmbed = tagEmbedInput.value;
         const formData = {
             tagName: tagName,

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

@@ -59,7 +59,7 @@ export function renderTagListPane() {
             <span id="at-tag-list-title">${i18n.t('Tags')}</span>
         </div>
         <div class="at_form_container at_h-min-65 at_tag_list_pane">
-            <div class="at_button_row at_justify_end ${_mpConfig.restrictionConfig.isTagReadOnly ? 'at_disabled' : ''}">
+            <div class="at_button_row at_justify_end">
                 <div class="at_button at_ghost">
                     <span class="mdi mdi-sort at_icon_hover" id="at-tag-sort-icon"  data-cy="at-tag-sort-btn" >
                         <span id="at-tag-sort-options-tooltip" class="at_custom_tooltip">
@@ -70,14 +70,14 @@ export function renderTagListPane() {
                         </span>
                     </span>
                 </div>
-                <div class="at_button at_ghost" id="at-visibility-tag-btn" data-cy="at-visibility-tag-btn" >
+                <div class="at_button at_ghost ${_mpConfig.restrictionConfig.isTagReadOnly ? 'at_hidden' : ''}" id="at-visibility-tag-btn" data-cy="at-visibility-tag-btn">
                     <span class="mdi mdi-eye at_icon_hover" id="at-visibility-tag-btn">
                         <span class="at_custom_tooltip">
                             <p class="at_tag_sort_option">${i18n.t('HideAll')}</p>
                         </span>
                     </span>
                 </div>
-                <div class="at_button at_ghost" id="at-add-tag-btn" data-cy="at-add-tag-btn" target-pane="at-tag-form-pane">
+                <div class="at_button at_ghost ${_mpConfig.restrictionConfig.isTagReadOnly ? 'at_hidden' : ''}" id="at-add-tag-btn" data-cy="at-add-tag-btn" target-pane="at-tag-form-pane">
                     ${i18n.t('AddTag')}
                     <span class="mdi mdi-plus-circle-outline" id="at-add-tag-btn"></span>
                 </div>
@@ -174,8 +174,6 @@ export function renderTags(tags, showOwnTagsOnly = false) {
     console.log("renderTags", tags);
     iotTags = tags;
     const tagContainer = document.getElementById('at-tag-list-container');
-    // get value from mp config
-    const isReadOnly = _mpConfig.restrictionConfig.isTagReadOnly;
     if (!tagContainer) {
         console.error("Tag container does not exist in DOM");
         return;

package/lib/graphql.d.ts

@@ -0,0 +1,8 @@
+import { IMattertagsResponse } from "./types";
+/**
+ * Sends a GraphQL query to the Matterport API to retrieve all mattertags and their associated data for a given model ID and application key.
+ * @param modelId - Id of the model space
+ * @param appKey - Matterport app key
+ * @returns
+ */
+export declare function getTagAndTagData(modelId: string, appKey: string): Promise<IMattertagsResponse>;

package/lib/graphql.js

@@ -0,0 +1,60 @@
+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());
+    });
+};
+/**
+ * Sends a GraphQL query to the Matterport API to retrieve all mattertags and their associated data for a given model ID and application key.
+ * @param modelId - Id of the model space
+ * @param appKey - Matterport app key
+ * @returns
+ */
+export function getTagAndTagData(modelId, appKey) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var query = `{
+        model(id: "${modelId}") {
+            mattertags(includeDisabled: true) {
+            id
+            floor { id }
+            created
+            modified
+            enabled
+            color
+            icon
+            keywords
+            label
+            description
+            media
+            mediaType
+            position { x, y, z }
+            anchorPosition { x, y, z }
+            discPosition { x, y, z }
+            stemNormal { x, y, z }
+            stemLength
+            stemEnabled
+            stemDirection { x, y, z } # Deprecated, use stemNormal and stemLength
+            
+            }
+        }
+    }`;
+        var headers = {
+            'Content-Type': 'application/graphql',
+            'x-matterport-application-key': appKey,
+        };
+        var options = {
+            method: 'POST',
+            mode: 'cors',
+            headers: headers,
+            body: query,
+            redirect: 'follow',
+        };
+        var url = 'https://my.matterport.com/api/mp/models/graph';
+        //@ts-ignore
+        const response = yield fetch(url, options);
+        return yield response.json();
+    });
+}

package/package.json

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