architwin 1.0.95 → 1.0.97

package/lib/atwinui/events.js

@@ -19,8 +19,15 @@ import { renderObjectCard } from "./components/toolbar/card";
 import { toggleModelControl, getCoordinateValues } from "./components/toolbar/modelControlsPane";
 import { attachTagMedia } from "../tag";
 import i18n from './components/toolbar/i18n';
+import { isValidUrl } from "../utils";
 let activeToolbarItem, activeActionItem, activePane, activeActionPane;
-let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500 });
+let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500, types: [
+        {
+            type: 'info',
+            background: 'blue',
+            icon: '<span class="mdi mdi-information-outline"></span>'
+        }
+    ] });
 let currentTag = undefined;
 let modelsView = 'card';
 function batchAddEventListenerByClassName(className, callback) {
@@ -269,7 +276,19 @@ function handlePlaceTag() {
                     if (payload.tagEmbed && !tag.attachments) {
                         tag.attachments = [];
                     }
-                    tag.attachments.push(payload.tagEmbed);
+                    if (payload.tagEmbed) {
+                        notyf.open({
+                            type: 'info',
+                            message: 'Verifying embedded link URL format'
+                        });
+                        if (isValidUrl(payload.tagEmbed)) {
+                            tag.attachments.push(payload.tagEmbed);
+                        }
+                        else {
+                            notyf.error("Invalid URL format");
+                            return;
+                        }
+                    }
                     if (targetCategory) {
                         console.log("targetCategory is", targetCategory);
                         tag.color = targetCategory.json_data.color.rgb;
@@ -294,7 +313,9 @@ function handlePlaceTag() {
                             const row = renderTagRow(iTag);
                             tagContainer.appendChild(row);
                             addClickEventToTagRow(iTag);
-                            yield attachTagMedia({ sdk: _atwin, tag: iTag, attachments: iTag.attachments });
+                            if (iTag.attachments && iTag.attachments.length > 0) {
+                                yield attachTagMedia({ sdk: _atwin, tag: iTag, attachments: iTag.attachments });
+                            }
                             // toggleDisplayPane('at-cancel-tag-form-btn')
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();
@@ -344,6 +365,18 @@ function handlePlaceTag() {
                 if (payload && payload.tagName && payload.tagCategoryId && payload.tagSubcategoryId) {
                     tag.label = payload.tagName;
                     tag.description = payload.tagDescription;
+                    if (payload.tagEmbed && !tag.attachments) {
+                        tag.attachments = [];
+                    }
+                    if (payload.tagEmbed) {
+                        if (isValidUrl(payload.tagEmbed)) {
+                            tag.attachments.push(payload.tagEmbed);
+                        }
+                        else {
+                            notyf.error("Invalid URL format");
+                            return;
+                        }
+                    }
                     // const iTag = await renderTag({tag:tag},true)
                     const iTag = selectedTag;
                     console.log('iTag', iTag);
@@ -355,7 +388,9 @@ function handlePlaceTag() {
                             const row = renderTagRow(iTag);
                             tagContainer.appendChild(row);
                             addClickEventToTagRow(iTag);
-                            yield attachTagMedia({ sdk: _atwin, tag: iTag, attachments: iTag.attachments });
+                            if (iTag.attachments && iTag.attachments.length > 0) {
+                                yield attachTagMedia({ sdk: _atwin, tag: iTag, attachments: iTag.attachments });
+                            }
                             // toggleDisplayPane('at-cancel-tag-form-btn')
                             notyf.success(`${i18n.t('SuccessAddTagToSpace')}`);
                             const tags = getMpTags();

package/lib/tag.d.ts

@@ -1,5 +1,5 @@
 import { MpSdk } from "../bundle/sdk";
-import { IAtwinFloor, IAtwinLabel, ITag } from "./types";
+import { IAtwinFloor, IAtwinLabel, ITag, EmbedlyData } from "./types";
 import { AxiosInstance } from "axios";
 declare function renderTag({ tag, sdk }: {
     tag: MpSdk.Tag.Descriptor;
@@ -60,4 +60,8 @@ declare function deleteTag(payload: {
     tag: ITag;
     api: AxiosInstance;
 }): Promise<boolean>;
-export { renderTag, disposeTag, moveTag, attachTagMedia, detachTagMedia, setTagIcon, editBillboard, editStem, editColor, saveTagDb, deleteTag, getTagColorCodeID, };
+declare function getEmbedlyData(src: string): Promise<{
+    success: boolean;
+    embedlyData?: EmbedlyData;
+}>;
+export { renderTag, disposeTag, moveTag, attachTagMedia, detachTagMedia, setTagIcon, editBillboard, editStem, editColor, saveTagDb, deleteTag, getTagColorCodeID, getEmbedlyData };

package/lib/tag.js

@@ -356,7 +356,30 @@ function deleteTag(payload) {
         return false;
     });
 }
-export { renderTag, disposeTag, moveTag, attachTagMedia, detachTagMedia, setTagIcon, editBillboard, editStem, editColor, saveTagDb, deleteTag, getTagColorCodeID, };
+function getEmbedlyData(src) {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('getEmbedlyData()');
+        console.log('src', src);
+        const res = yield axios.get("https://api.embedly.com/1/oembed", {
+            params: {
+                url: src,
+                //@ts-expect-error
+                key: import.meta.env.VITE_EMBEDLY_KEY,
+            },
+        }).catch(e => {
+            console.error(`Bad request from embedly. Error: ${e}`);
+            return { success: false };
+        });
+        // @ts-ignore
+        const data = JSON.parse(JSON.stringify(res.data));
+        console.log('Data from embedly', data);
+        if (!data) {
+            return { success: false };
+        }
+        return { success: true, embedlyData: data };
+    });
+}
+export { renderTag, disposeTag, moveTag, attachTagMedia, detachTagMedia, setTagIcon, editBillboard, editStem, editColor, saveTagDb, deleteTag, getTagColorCodeID, getEmbedlyData };
 // # -------------------------------------------------------------------------
 // # tag
 // # -------------------------------------------------------------------------

package/lib/utils.d.ts

@@ -27,4 +27,10 @@ export declare function dateTimeFormat(d: any): string;
 export declare function stringContains(str: string, target: string, isCaseSensitive?: boolean): boolean;
 export declare function getURLParams(param: string): string;
 export declare function useCapitalizeFirstLetter(string: string): string;
+/**
+ * Basic URL validation
+ * @param string
+ * @returns
+ */
+export declare function isValidUrl(string: string): boolean;
 export declare function bytesToMegabytes(bytes: number): number;

package/lib/utils.js

@@ -123,6 +123,20 @@ export function getURLParams(param) {
 export function useCapitalizeFirstLetter(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
 }
+/**
+ * Basic URL validation
+ * @param string
+ * @returns
+ */
+export function isValidUrl(string) {
+    try {
+        new URL(string);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
 export function bytesToMegabytes(bytes) {
     return bytes / (1024 * 1024);
 }

package/package.json

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