fix: dsConfig type error (DataLinkDC#2296)

* feat: ignore dev dependencies in gitub Signed-off-by: Licho <[email protected]> * Spotless Apply * refactor Signed-off-by: Licho <[email protected]> * r Signed-off-by: Licho <[email protected]> * feat: update npm version Signed-off-by: Licho <[email protected]> * refactor Signed-off-by: Licho <[email protected]> * fix: dsConfig type error Signed-off-by: Licho <[email protected]> * Spotless Apply --------- Signed-off-by: Licho <[email protected]> Co-authored-by: leechor <[email protected]>
aiwenmo · Sep 6, 2023 · 7d4267a · 7d4267a
1 parent 6477fd2
commit 7d4267a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 46 deletions.
diff --git a/dinky-web/src/app.tsx b/dinky-web/src/app.tsx
@@ -21,7 +21,6 @@ import { AccessContextProvider } from '@/hooks/useAccess';
 import { UnAccessible } from '@/pages/Other/403';
 import { API_CONSTANTS } from '@/services/endpoints';
 import { SysMenu } from '@/types/AuthCenter/data';
-import { THEME } from '@/types/Public/data';
 import { l } from '@/utils/intl';
 import { PageLoading, Settings as LayoutSettings } from '@ant-design/pro-components';
 import type { RunTimeLayoutConfig } from '@umijs/max';
@@ -97,7 +96,10 @@ export async function getInitialState(): Promise<{
   const { location } = history;
   if (location.pathname !== loginPath) {
     const currentUser = await fetchUserInfo();
-    extraRoutes = currentUser?.menuList;
+    if (currentUser?.menuList) {
+      extraRoutes = currentUser?.menuList;
+    }
+
     return {
       fetchUserInfo,
       currentUser,
@@ -112,8 +114,6 @@ export async function getInitialState(): Promise<{
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
 export const layout: RunTimeLayoutConfig = ({ initialState }) => {
-  const theme = localStorage.getItem('navTheme') ?? THEME.light;
-
   return {
     headerTitleRender: () => {
       // 重新对 title 的设置进行设置
@@ -146,8 +146,9 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
     unAccessible: <UnAccessible />,
     // 增加一个 loading 的状态
     childrenRender: (children) => {
-      if (initialState?.loading) return <PageLoading />;
-      return (
+      return initialState?.loading ? (
+        <PageLoading />
+      ) : (
         <AccessContextProvider currentUser={initialState?.currentUser}>
           {children}
         </AccessContextProvider>

diff --git a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx
@@ -25,6 +25,7 @@ import {
 } from '@/pages/AuthCenter/Token/component/function';
 import { TokenStateType } from '@/pages/AuthCenter/Token/component/model';
 import { UserBaseInfo } from '@/types/AuthCenter/data';
+import { l } from '@/utils/intl';
 import {
   ProFormDateTimePicker,
   ProFormDateTimeRangePicker,
@@ -35,7 +36,6 @@ import {
 } from '@ant-design/pro-components';
 import { connect } from '@umijs/max';
 import React from 'react';
-import {l} from "@/utils/intl";
 
 type TokenFormProps = {
   users: UserBaseInfo.User[];
@@ -56,7 +56,7 @@ const TokenForm: React.FC<TokenFormProps & connect> = (props) => {
           label={l('token.value')}
           width={'xl'}
           placeholder={l('token.generate.placeholder')}
-          rules={[{ required: true, message:l('token.generate.placeholder') }]}
+          rules={[{ required: true, message: l('token.generate.placeholder') }]}
           fieldProps={{
             suffix: <a onClick={() => buildToken()}>{l('token.generate')}</a>
           }}

diff --git a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx
@@ -17,19 +17,18 @@
  *
  */
 
-import {FormContextValue} from '@/components/Context/FormContext';
-import {mapDispatchToProps, TokenStateType} from '@/pages/AuthCenter/Token/component/model';
+import { FormContextValue } from '@/components/Context/FormContext';
+import { mapDispatchToProps, TokenStateType } from '@/pages/AuthCenter/Token/component/model';
 import TokenForm from '@/pages/AuthCenter/Token/component/TokenModalForm/TokenForm';
-import {DATETIME_FORMAT, MODAL_FORM_STYLE} from '@/services/constants';
-import {SysToken} from '@/types/AuthCenter/data.d';
-import {formatDateToYYYYMMDDHHMMSS, parseDateStringToDate} from '@/utils/function';
-import {l} from '@/utils/intl';
-import {ModalForm} from '@ant-design/pro-components';
-import {ProFormInstance} from '@ant-design/pro-form/lib';
-import {connect} from '@umijs/max';
-import {Button, Form} from 'antd';
-import React, {useEffect, useRef} from 'react';
-import dayjs from "dayjs";
+import { MODAL_FORM_STYLE } from '@/services/constants';
+import { SysToken } from '@/types/AuthCenter/data.d';
+import { formatDateToYYYYMMDDHHMMSS, parseDateStringToDate } from '@/utils/function';
+import { l } from '@/utils/intl';
+import { ModalForm } from '@ant-design/pro-components';
+import { ProFormInstance } from '@ant-design/pro-form/lib';
+import { connect } from '@umijs/max';
+import { Button, Form } from 'antd';
+import React, { useEffect, useRef } from 'react';
 
 const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
@@ -88,11 +87,11 @@ const TokenModalForm: React.FC<TokenModalFormProps & connect> = (props) => {
         value.expireType === 2
           ? parseDateStringToDate(value.expireEndTime)
           : value.expireType === 3
-            ? [
+          ? [
               parseDateStringToDate(value.expireStartTime),
               parseDateStringToDate(value.expireEndTime)
             ]
-            : undefined
+          : undefined
     });
   }, [visible, value, form, selectUserId]);
 
@@ -109,24 +108,24 @@ const TokenModalForm: React.FC<TokenModalFormProps & connect> = (props) => {
    */
   const submitForm = async () => {
     const fieldsValue = await form.validateFields();
-    let result = {...value, ...fieldsValue};
+    let result = { ...value, ...fieldsValue };
     // 转化时间
     if (fieldsValue.expireType === 2) {
       // 只有一个时间 设置为结束时间
       result = {
         ...result,
-        expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime),
-      }
+        expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime)
+      };
     } else if (fieldsValue.expireType === 3) {
       // 两个时间都有 设置开始时间和结束时间
       result = {
         ...result,
         expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[0]),
-        expireStartTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[1]),
+        expireStartTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[1])
       };
     }
 
-    await handleSubmit({...result});
+    await handleSubmit({ ...result });
     await handleCancel();
   };
 
@@ -161,16 +160,16 @@ const TokenModalForm: React.FC<TokenModalFormProps & connect> = (props) => {
         form={form}
         formRef={formRef}
         onValuesChange={handleValuesChange}
-        submitter={{render: () => [...renderFooter()]}}
-        initialValues={{...value}}
+        submitter={{ render: () => [...renderFooter()] }}
+        initialValues={{ ...value }}
       >
-        <TokenForm expireType={expireType} buildToken={handleBuildToken}/>
+        <TokenForm expireType={expireType} buildToken={handleBuildToken} />
       </ModalForm>
     </>
   );
 };
 export default connect(
-  ({Token}: { Token: TokenStateType }) => ({
+  ({ Token }: { Token: TokenStateType }) => ({
     tokenValue: Token.token
   }),
   mapDispatchToProps

diff --git a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx
@@ -332,11 +332,9 @@ const HeaderContainer = (props: any) => {
     }
 
     return (
-      <>
-        <FlexCenterDiv style={{ width: (size.width - 2 * VIEW.paddingInline) / 2 }}>
-          <Breadcrumb separator={'>'} items={buildBreadcrumbItems(activeBreadcrumbTitle)} />
-        </FlexCenterDiv>
-      </>
+      <FlexCenterDiv style={{ width: (size.width - 2 * VIEW.paddingInline) / 2 }}>
+        <Breadcrumb separator={'>'} items={buildBreadcrumbItems(activeBreadcrumbTitle)} />
+      </FlexCenterDiv>
     );
   };
   const renderHotkey = () => {
@@ -397,14 +395,12 @@ const HeaderContainer = (props: any) => {
    * render
    */
   return (
-    <>
-      <Descriptions column={2} size={'middle'} layout={'horizontal'} key={'h'} style={headerStyle}>
-        <Descriptions.Item>{renderBreadcrumbItems()}</Descriptions.Item>
-        <Descriptions.Item contentStyle={{ display: 'flex', flexDirection: 'row-reverse' }}>
-          {renderRightButtons()}
-        </Descriptions.Item>
-      </Descriptions>
-    </>
+    <Descriptions column={2} size={'middle'} layout={'horizontal'} key={'h'} style={headerStyle}>
+      <Descriptions.Item>{renderBreadcrumbItems()}</Descriptions.Item>
+      <Descriptions.Item contentStyle={{ display: 'flex', flexDirection: 'row-reverse' }}>
+        {renderRightButtons()}
+      </Descriptions.Item>
+    </Descriptions>
   );
 };
 

diff --git a/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts b/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts
@@ -49,7 +49,7 @@ const ConfigModel: ConfigModelType = {
       const response: BaseConfigProperties[] = yield call(queryDsConfig, payload);
       yield put({
         type: 'saveDsConfig',
-        payload: response
+        payload: response || []
       });
     }
   },

diff --git a/dinky-web/src/utils/function.tsx b/dinky-web/src/utils/function.tsx
@@ -568,5 +568,5 @@ export const formatDateToYYYYMMDDHHMMSS = (date: Date) => {
 };
 
 export const parseDateStringToDate = (dateString: Date) => {
-  return  dayjs(dateString).toDate();
+  return dayjs(dateString).toDate();
 };