Fix/ts errors in fe (#2218)

webapp/packages/supersonic-fe/config/defaultSettings.ts

@@ -1,9 +1,9 @@
 import { ProLayoutProps } from '@ant-design/pro-components';
-
+export type DefaultSetting = ProLayoutProps & {
-const Settings: ProLayoutProps & {
   pwa?: boolean;
   logo?: string;
-} = {
+};
+const Settings: DefaultSetting = {
   navTheme: 'light',
   colorPrimary: '#296DF3',
   layout: 'top',

webapp/packages/supersonic-fe/src/app.tsx

@@ -1,6 +1,5 @@
 import RightContent from '@/components/RightContent';
 import S2Icon, { ICON } from '@/components/S2Icon';
-import type { Settings as LayoutSettings } from '@ant-design/pro-components';
 import { Space, Spin, ConfigProvider } from 'antd';
 import ScaleLoader from 'react-spinners/ScaleLoader';
 import { history, RunTimeLayoutConfig } from '@umijs/max';
@@ -9,6 +8,7 @@ import settings from '../config/themeSettings';
 import { queryCurrentUser } from './services/user';
 import { deleteUrlQuery, isMobile, getToken } from '@/utils/utils';
 import { publicPath } from '../config/defaultSettings';
+import type { DefaultSetting } from '../config/defaultSettings';
 import { Copilot } from 'supersonic-chat-sdk';
 import { configProviderTheme } from '../config/themeSettings';
 export { request } from './services/request';
@@ -42,7 +42,7 @@ const getAuthCodes = (params: any) => {
 };
 
 export async function getInitialState(): Promise<{
-  settings?: LayoutSettings;
+  settings?: DefaultSetting;
   currentUser?: API.CurrentUser;
   fetchUserInfo?: () => Promise<API.CurrentUser | undefined>;
   codeList?: string[];

webapp/packages/supersonic-fe/src/components/RightContent/AvatarDropdown.tsx

@@ -1,13 +1,13 @@
 import React, { useRef } from 'react';
 import { LogoutOutlined, KeyOutlined, UnlockOutlined } from '@ant-design/icons';
-import { useModel } from 'umi';
+import { useModel } from '@umijs/max';
 import HeaderDropdown from '../HeaderDropdown';
 import styles from './index.less';
 import TMEAvatar from '../TMEAvatar';
 import { AUTH_TOKEN_KEY } from '@/common/constants';
 import ChangePasswordModal, { IRef as IRefChangePasswordModal } from './ChangePasswordModal';
 import AccessTokensModal, { IRef as IAccessTokensModalRef } from './AccessTokensModal';
-import { history } from 'umi';
+import { history } from '@umijs/max';
 
 export type GlobalHeaderRightProps = {
   menu?: boolean;

webapp/packages/supersonic-fe/src/components/SelectPartner/service.ts

@@ -1,4 +1,4 @@
-import { request } from 'umi';
+import { request } from '@umijs/max';
 
 export async function getUserByDeptid(id: any) {
   return request<any>(`${process.env.AUTH_API_BASE_URL}user/getUserByOrg/${id}`, {

webapp/packages/supersonic-fe/src/global.tsx

@@ -1,7 +1,7 @@
 import { Button, message, notification } from 'antd';
 
 import React from 'react';
-import { useIntl } from 'umi';
+import { useIntl } from '@umijs/max';
 import defaultSettings from '../config/defaultSettings';
 
 const { pwa } = defaultSettings;
@@ -37,7 +37,7 @@ if (pwa) {
         worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
       });
       // Refresh current page to use the updated HTML and other assets after SW has skiped waiting
-      window.location.reload(true);
+      (window.location.reload as (forceReload?: boolean) => void)(true); //兼容老版IE,现在浏览器中此方法均不再接收参数
       return true;
     };
     const key = `open${Date.now()}`;
@@ -75,7 +75,7 @@ if (pwa) {
   });
 
   // remove all caches
-  if (window.caches && window.caches.keys) {
+  if ('caches' in window) {
     caches.keys().then((keys) => {
       keys.forEach((key) => {
         caches.delete(key);

webapp/packages/supersonic-fe/src/pages/401.tsx

@@ -1,6 +1,6 @@
 import { Button, Result } from 'antd';
 import React from 'react';
-import { history } from 'umi';
+import { history } from '@umijs/max';
 
 const NoAuthPage: React.FC = () => (
   <Result

webapp/packages/supersonic-fe/src/pages/404.tsx

@@ -1,6 +1,6 @@
 import { Button, Result } from 'antd';
 import React from 'react';
-import { history } from 'umi';
+import { history } from '@umijs/max';
 
 const NoFoundPage: React.FC = () => (
   <Result

webapp/packages/supersonic-fe/src/pages/Agent/service.ts

@@ -1,4 +1,4 @@
-import { request } from 'umi';
+import { request } from '@umijs/max';
 import { AgentType, MemoryType, MetricType, ModelType } from './type';
 
 export function getAgentList() {

webapp/packages/supersonic-fe/src/pages/ChatPlugin/service.ts

@@ -1,4 +1,4 @@
-import { request } from 'umi';
+import { request } from '@umijs/max';
 import { DimensionType, ModelType, PluginType } from './type';
 
 export function savePlugin(params: Partial<PluginType>) {

webapp/packages/supersonic-fe/src/pages/SemanticModel/HeadlessFlows/index.tsx

@@ -7,7 +7,7 @@ import { XFlowGraphCommands, XFlowNodeCommands, XFlowEdgeCommands } from '@antv/
 import { CanvasMiniMap, CanvasScaleToolbar, CanvasSnapline } from '@antv/xflow';
 import { MODELS } from '@antv/xflow';
 import GraphToolbar from './GraphToolbar/index';
-import { connect } from 'umi';
+import { connect } from '@umijs/max';
 
 /** 配置画布 */
 import { useGraphConfig } from './config-graph';

webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Detail.tsx

@@ -1,7 +1,7 @@
 import { message, Tabs, Button, Space } from 'antd';
 import React, { useState, useEffect } from 'react';
 import { getTagData } from '../service';
-import { useParams, history } from 'umi';
+import { useParams, history } from '@umijs/max';
 import styles from './style.less';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import TagTrendSection from './components/TagTrendSection';

webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx

@@ -2,7 +2,7 @@ import type { ActionType, ProColumns } from '@ant-design/pro-components';
 import { ProTable } from '@ant-design/pro-components';
 import { message, Space, Popconfirm } from 'antd';
 import React, { useRef, useState, useEffect } from 'react';
-import { useModel } from 'umi';
+import { useModel } from '@umijs/max';
 import { SENSITIVE_LEVEL_ENUM } from '../constant';
 import { getTagList, deleteTag, batchDeleteTag, getTagObjectList } from '../service';
 import TagFilter from './components/TagFilter';

webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateSqlConfig.tsx

@@ -36,7 +36,7 @@ import TableTitleTooltips from '../../components/TableTitleTooltips';
 import { createMetric, updateMetric, mockMetricAlias, getMetricTags } from '../../service';
 import { MetricSettingKey, MetricSettingWording } from '../constants';
 import { ISemantic } from '../../data';
-import { history } from 'umi';
+import { history } from '@umijs/max';
 
 export type CreateFormProps = {
   datasourceId?: number;

webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { useModel } from 'umi';
+import { useModel } from '@umijs/max';
 import {
   typeConfigs,
   formatterRelationData,

webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraphCanvas.tsx

@@ -1,6 +1,6 @@
 // import { Radio } from 'antd';
 import React, { useState } from 'react';
-import { connect } from 'umi';
+import { connect } from '@umijs/max';
 import styles from './components/style.less';
 import type { StateType } from './model';
 import { SemanticNodeType } from './enum';

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionCreateDrawer.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { Button, message, Form, Space, Drawer, Input } from 'antd';
 import { ProCard } from '@ant-design/pro-components';
-import { useModel } from 'umi';
+import { useModel } from '@umijs/max';
 import { createGroupAuth, updateGroupAuth } from '../../service';
 import PermissionCreateForm from './PermissionCreateForm';
 import type { StateType } from '../../model';

webapp/packages/supersonic-fe/src/services/API.d.ts

@@ -1,6 +1,6 @@
 import type { SqlParamsItem } from '@/pages/data-explore/data';
-
+declare global {
-declare namespace API {
+  namespace API {
     // export type CurrentUser = {
     //   avatar?: string;
     //   name?: string;
@@ -18,9 +18,10 @@ declare namespace API {
 
     export type CurrentUser = {
       staffid: string;
-    staffName: string;
+      staffName: string | undefined;
       orgName: string;
       access?: 'user' | 'guest' | 'admin';
+      name?:string;
     };
 
     export interface UserItem {
@@ -239,3 +240,4 @@ declare namespace API {
       bindSourceId: number;
     };
   }
+}

webapp/packages/supersonic-fe/src/services/request.ts

@@ -17,7 +17,9 @@ export const TOKEN_KEY = AUTH_TOKEN_KEY;
 const authHeaderInterceptor = (url: string, options: RequestOptionsInit) => {
   const headers: any = {};
   const query = queryString.parse(history.location.search) || {};
-  const token = query[TOKEN_KEY] || localStorage.getItem(TOKEN_KEY);
+
+  const rawToken = query[TOKEN_KEY];
+  const token = (typeof rawToken === 'string' ? rawToken : null) || localStorage.getItem(TOKEN_KEY);
   if (token) {
     headers.Authorization = `Bearer ${token}`;
     headers.auth = `Bearer ${token}`;