@lark-apaas/client-toolkit 1.2.51-alpha.6 → 1.2.51-alpha.7

package/lib/components/AppContainer/safety.js

@@ -2,12 +2,29 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from "react";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
 import { getAppId } from "../../utils/getAppId.js";
+import { getEnv } from "../../utils/getParentOrigin.js";
 import { getCsrfToken } from "../../utils/getCsrfToken.js";
 import { isNewPathEnabled } from "../../utils/apiPath.js";
 import { useIsMobile } from "../../hooks/index.js";
 import { X } from "lucide-react";
 import { Sheet, SheetContent, SheetTrigger } from "../ui/drawer.js";
 import { t } from "../../locales/index.js";
+const ICON_FEEDBACK_URL = 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/miaoda-ui/icon_feedback_outlined.png';
+const REPORT_DOMAIN = {
+    BOE: 'tns.feishu-boe.cn',
+    PRE: 'tns.feishu-pre.cn',
+    ONLINE: 'tns.feishu.cn'
+};
+const openReport = ()=>{
+    const params = JSON.stringify({
+        scene: 'miaoda_app_report',
+        entity_id: getAppId() ?? '',
+        entity_type: 'miaoda_app',
+        extra: ''
+    });
+    const url = `https://${REPORT_DOMAIN[getEnv()]}/cust/lark_report/?type=common&params=${encodeURIComponent(params)}&lang=zh-CN`;
+    window.open(url, '_blank', 'noopener,noreferrer');
+};
 const Component = ()=>{
     const HasClosedKey = `miaoda-creatByMiaoda-has-closed-${getAppId()}`;
     const [visible, setVisible] = useState(!window.localStorage?.getItem(HasClosedKey));
@@ -129,6 +146,21 @@ const Component = ()=>{
                                                     children: t('safety.ai.disclaimer')
                                                 })
                                             ]
+                                        }),
+                                        /*#__PURE__*/ jsxs("div", {
+                                            className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
+                                            "data-custom-element": "safety-report",
+                                            onClick: openReport,
+                                            children: [
+                                                /*#__PURE__*/ jsx("img", {
+                                                    src: ICON_FEEDBACK_URL,
+                                                    className: "shrink-0 w-[14px] h-[14px]"
+                                                }),
+                                                /*#__PURE__*/ jsx("p", {
+                                                    className: "shrink-0 m-0! text-[#646A73] text-sm underline underline-offset-2",
+                                                    children: t('safety.report')
+                                                })
+                                            ]
                                         })
                                     ]
                                 }),
@@ -248,6 +280,21 @@ const Component = ()=>{
                                                     children: t('safety.ai.disclaimer')
                                                 })
                                             ]
+                                        }),
+                                        /*#__PURE__*/ jsxs("div", {
+                                            className: "self-stretch shrink-0 flex items-center gap-x-[6px] cursor-pointer",
+                                            "data-custom-element": "safety-report",
+                                            onClick: openReport,
+                                            children: [
+                                                /*#__PURE__*/ jsx("img", {
+                                                    src: ICON_FEEDBACK_URL,
+                                                    className: "shrink-0 w-[12px] h-[12px]"
+                                                }),
+                                                /*#__PURE__*/ jsx("p", {
+                                                    className: "shrink-0 m-0! text-[#a6a6a6] underline underline-offset-2",
+                                                    children: t('safety.report')
+                                                })
+                                            ]
                                         })
                                     ]
                                 }),

package/lib/integrations/dataloom.d.ts

@@ -1,4 +1,4 @@
-declare const createDataLoomClient: () => import("@lark-apaas/dataloom").DataloomClient;
+declare const createDataLoomClient: (url?: string, pat?: string) => import("@lark-apaas/dataloom").DataloomClient;
 /** 获取dataloom实例 */
 export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
 export {};

package/lib/integrations/dataloom.js

@@ -1,10 +1,14 @@
+import { splitWorkspaceUrl } from "../utils/url.js";
 import { createClient } from "@lark-apaas/dataloom";
 import { authClient } from "@lark-apaas/auth-sdk";
 import { getAppId } from "../utils/getAppId.js";
-import { getInitialInfo } from "../utils/getInitialInfo.js";
-const createDataLoomClient = ()=>{
+import { getAppPublished } from "../utils/getInitialInfo.js";
+const createDataLoomClient = (url, pat)=>{
+    const { baseUrl } = url ? splitWorkspaceUrl(url) : {
+        baseUrl: ''
+    };
     const appId = getAppId();
-    return createClient({
+    return createClient(baseUrl, pat, {
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
@@ -22,8 +26,10 @@ let pendingPromise = null;
 function getDataloom() {
     if (dataloom) return Promise.resolve(dataloom);
     if (pendingPromise) return pendingPromise;
-    pendingPromise = getInitialInfo().then(()=>{
-        dataloom = createDataLoomClient();
+    pendingPromise = getAppPublished().then((info)=>{
+        const DATALOOM_CLIENT_URL = info?.app_runtime_extra?.url;
+        const DATALOOM_PAT = info?.app_runtime_extra?.token;
+        dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
         return dataloom;
     }).finally(()=>{
         pendingPromise = null;

package/lib/locales/messages.js

@@ -23,6 +23,10 @@ const messages_messages = {
         zh: '了解更多',
         en: 'Learn more'
     },
+    'safety.report': {
+        zh: '投诉与举报',
+        en: 'Report'
+    },
     'safety.cover.pc': {
         zh: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover.png',
         en: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/LMfspH/ljhwZthlaukjlkulzlp/logo/miaodacover-weben.png'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.51-alpha.6",
+  "version": "1.2.51-alpha.7",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -101,7 +101,7 @@
     "@lark-apaas/aily-web-sdk": "^0.0.11",
     "@lark-apaas/auth-sdk": "^0.1.5",
     "@lark-apaas/client-capability": "^0.1.7",
-    "@lark-apaas/dataloom": "0.1.4-alpha.0",
+    "@lark-apaas/dataloom": "^0.1.3",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",

package/lib/integrations/__test__/dataloom.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/integrations/__test__/dataloom.test.js

@@ -1,83 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { getDataloom } from "../dataloom.js";
-const { getInitialInfoMock, getAppPublishedMock, getAppIdMock, createClientMock, authUserMock, authSessionMock } = vi.hoisted(()=>({
-        getInitialInfoMock: vi.fn(),
-        getAppPublishedMock: vi.fn(),
-        getAppIdMock: vi.fn(),
-        createClientMock: vi.fn(),
-        authUserMock: {},
-        authSessionMock: {}
-    }));
-vi.mock('../../utils/getInitialInfo', ()=>({
-        getInitialInfo: getInitialInfoMock,
-        getAppPublished: getAppPublishedMock
-    }));
-vi.mock('../../utils/getAppId', ()=>({
-        getAppId: getAppIdMock
-    }));
-vi.mock('@lark-apaas/dataloom', ()=>({
-        createClient: createClientMock
-    }));
-vi.mock('@lark-apaas/auth-sdk', ()=>({
-        authClient: {
-            user: authUserMock,
-            session: authSessionMock
-        }
-    }));
-beforeEach(()=>{
-    getInitialInfoMock.mockReset();
-    getAppPublishedMock.mockReset();
-    getAppIdMock.mockReset();
-    createClientMock.mockReset();
-});
-afterEach(()=>{
-    vi.restoreAllMocks();
-});
-describe('getDataloom', ()=>{
-    it('返回-createClient实例-改用getInitialInfo-新签名不取token/url-appId注入-并发去重-缓存复用', async ()=>{
-        getAppIdMock.mockReturnValue('app-1');
-        getInitialInfoMock.mockResolvedValue({
-            app_runtime_extra: {
-                token: 'pat',
-                url: 'https://x'
-            }
-        });
-        const client = {
-            __id: 'client-1'
-        };
-        createClientMock.mockReturnValue(client);
-        const p1 = getDataloom();
-        const p2 = getDataloom();
-        expect(p1).toBe(p2);
-        const [c1, c2] = await Promise.all([
-            p1,
-            p2
-        ]);
-        expect(c1).toBe(client);
-        expect(c2).toBe(client);
-        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
-        expect(getAppPublishedMock).not.toHaveBeenCalled();
-        expect(createClientMock).toHaveBeenCalledTimes(1);
-        const args = createClientMock.mock.calls[0];
-        expect(args).toHaveLength(1);
-        const options = args[0];
-        expect(typeof options).toBe('object');
-        expect(options).not.toBe('https://x');
-        expect(options).not.toBe('pat');
-        expect(options.global).toBeDefined();
-        expect(options.global).not.toHaveProperty('url');
-        expect(options.global).not.toHaveProperty('key');
-        expect(options.global?.appId).toBe('app-1');
-        expect(options.global?.accountServices).toEqual({
-            user: authUserMock,
-            session: authSessionMock
-        });
-        const cached1 = await getDataloom();
-        const cached2 = await getDataloom();
-        expect(cached1).toBe(client);
-        expect(cached2).toBe(client);
-        expect(cached1).toBe(cached2);
-        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
-        expect(createClientMock).toHaveBeenCalledTimes(1);
-    });
-});