feat: remove loading from model and use DvaModel instead of redundant types such as kAModelType (#47)

* feat: use DvaModel instead of redundant types such as kAModelType

* feat: set the type for registerServer

* feat: remove loading from model

web/src/pages/add-knowledge/components/knowledge-setting/index.tsx

@@ -1,170 +1,157 @@
-import React, { useEffect, useState } from 'react';
-import { useNavigate, connect, Dispatch } from 'umi'
-import { Button, Form, Input, Radio, Select, Tag, Space, } from 'antd';
-import type { kSModelState } from './model'
-import type { settingModelState } from '@/pages/setting/model'
-import styles from './index.less'
+import { Button, Form, Input, Radio, Select, Space, Tag } from 'antd';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useDispatch, useNavigate, useSelector } from 'umi';
+import styles from './index.less';
 const { CheckableTag } = Tag;
 const layout = {
-    labelCol: { span: 8 },
-    wrapperCol: { span: 16 },
-    labelAlign: 'left' as const
+  labelCol: { span: 8 },
+  wrapperCol: { span: 16 },
+  labelAlign: 'left' as const,
 };
-const { Option } = Select
+const { Option } = Select;
 /* eslint-disable no-template-curly-in-string */
 
 interface kSProps {
-    dispatch: Dispatch;
-    kSModel: kSModelState;
-    settingModel: settingModelState;
-    kb_id: string
+  kb_id: string;
 }
-const Index: React.FC<kSProps> = ({ settingModel, kSModel, dispatch, kb_id }) => {
-    let navigate = useNavigate();
-    const { tenantIfo = {} } = settingModel
-    const { parser_ids = '', embd_id = '' } = tenantIfo
-    const [form] = Form.useForm();
+const KnowledgeSetting: React.FC<kSProps> = ({ kb_id }) => {
+  const dispatch = useDispatch();
+  const settingModel = useSelector((state: any) => state.settingModel);
+  let navigate = useNavigate();
+  const { tenantIfo = {} } = settingModel;
+  const { parser_ids = '', embd_id = '' } = tenantIfo;
+  const [form] = Form.useForm();
+  const [selectedTag, setSelectedTag] = useState('');
+  const values = Form.useWatch([], form);
 
-    useEffect(() => {
+  const getTenantInfo = useCallback(async () => {
+    dispatch({
+      type: 'settingModel/getTenantInfo',
+      payload: {},
+    });
+    if (kb_id) {
+      const data = await dispatch<any>({
+        type: 'kSModel/getKbDetail',
+        payload: {
+          kb_id,
+        },
+      });
+      if (data.retcode === 0) {
+        const { description, name, permission, embd_id } = data.data;
+        form.setFieldsValue({ description, name, permission, embd_id });
+        setSelectedTag(data.data.parser_id);
+      }
+    }
+  }, [kb_id]);
+
+  const onFinish = async () => {
+    try {
+      await form.validateFields();
+
+      if (kb_id) {
         dispatch({
-            type: 'settingModel/getTenantInfo',
-            payload: {
-            }
+          type: 'kSModel/updateKb',
+          payload: {
+            ...values,
+            parser_id: selectedTag,
+            kb_id,
+            embd_id: undefined,
+          },
         });
-        if (kb_id) {
+      } else {
+        const retcode = await dispatch<any>({
+          type: 'kSModel/createKb',
+          payload: {
+            ...values,
+            parser_id: selectedTag,
+          },
+        });
+        retcode === 0 &&
+          navigate(`/knowledge/add/setting?activeKey=file&id=${kb_id}`);
+      }
+    } catch (error) {
+      console.warn(error);
+    }
+  };
 
-            dispatch({
-                type: 'kSModel/getKbDetail',
-                payload: {
-                    kb_id
-                },
-                callback(detail: any) {
-                    console.log(detail)
-                    const { description, name, permission, embd_id } = detail
-                    form.setFieldsValue({ description, name, permission, embd_id })
-                    setSelectedTag(detail.parser_id)
-                }
-            });
-        }
+  useEffect(() => {
+    getTenantInfo();
+  }, [getTenantInfo]);
 
-    }, [kb_id])
-    const [selectedTag, setSelectedTag] = useState('')
-    const values = Form.useWatch([], form);
-    console.log(values, '......变化')
-    const onFinish = () => {
-        form.validateFields().then(
-            () => {
-                if (kb_id) {
-                    dispatch({
-                        type: 'kSModel/updateKb',
-                        payload: {
-                            ...values,
-                            parser_id: selectedTag,
-                            kb_id,
-                            embd_id: undefined
-                        }
-                    });
-                } else {
-                    dispatch({
-                        type: 'kSModel/createKb',
-                        payload: {
-                            ...values,
-                            parser_id: selectedTag
-                        },
-                        callback(id: string) {
-                            navigate(`/knowledge/add/setting?activeKey=file&id=${kb_id}`);
-                        }
-                    });
-                }
-            },
-            () => {
+  const handleChange = (tag: string, checked: boolean) => {
+    const nextSelectedTag = checked ? tag : selectedTag;
+    console.log('You are interested in: ', nextSelectedTag);
+    setSelectedTag(nextSelectedTag);
+  };
 
-            },
-        );
-
-
-
-    };
-
-    const handleChange = (tag: string, checked: boolean) => {
-        const nextSelectedTag = checked
-            ? tag
-            : selectedTag;
-        console.log('You are interested in: ', nextSelectedTag);
-        setSelectedTag(nextSelectedTag);
-    };
-
-    return <Form
-        {...layout}
-        form={form}
-        name="validateOnly"
-        style={{ maxWidth: 1000, padding: 14 }}
+  return (
+    <Form
+      {...layout}
+      form={form}
+      name="validateOnly"
+      style={{ maxWidth: 1000, padding: 14 }}
     >
-        <Form.Item name='name' label="知识库名称" rules={[{ required: true }]}>
-            <Input />
-        </Form.Item>
-        <Form.Item name='description' label="知识库描述">
-            <Input.TextArea />
-        </Form.Item>
-        <Form.Item name="permission" label="可见权限">
-            <Radio.Group>
-                <Radio value="me">只有我</Radio>
-                <Radio value="team">所有团队成员</Radio>
-            </Radio.Group>
-        </Form.Item>
-        <Form.Item
-            name="embd_id"
-            label="Embedding 模型"
-            hasFeedback
-            rules={[{ required: true, message: 'Please select your country!' }]}
-        >
-            <Select placeholder="Please select a country" >
-                {embd_id.split(',').map((item: string) => {
-                    return <Option value={item} key={item}>{item}</Option>
-                })}
-
-            </Select>
-        </Form.Item>
-        <div style={{ marginTop: '5px' }}>
-            修改Embedding 模型，请去<span style={{ color: '#1677ff' }}>设置</span>
+      <Form.Item name="name" label="知识库名称" rules={[{ required: true }]}>
+        <Input />
+      </Form.Item>
+      <Form.Item name="description" label="知识库描述">
+        <Input.TextArea />
+      </Form.Item>
+      <Form.Item name="permission" label="可见权限">
+        <Radio.Group>
+          <Radio value="me">只有我</Radio>
+          <Radio value="team">所有团队成员</Radio>
+        </Radio.Group>
+      </Form.Item>
+      <Form.Item
+        name="embd_id"
+        label="Embedding 模型"
+        hasFeedback
+        rules={[{ required: true, message: 'Please select your country!' }]}
+      >
+        <Select placeholder="Please select a country">
+          {embd_id.split(',').map((item: string) => {
+            return (
+              <Option value={item} key={item}>
+                {item}
+              </Option>
+            );
+          })}
+        </Select>
+      </Form.Item>
+      <div style={{ marginTop: '5px' }}>
+        修改Embedding 模型，请去<span style={{ color: '#1677ff' }}>设置</span>
+      </div>
+      <Space size={[0, 8]} wrap>
+        <div className={styles.tags}>
+          {parser_ids.split(',').map((tag: string) => {
+            return (
+              <CheckableTag
+                key={tag}
+                checked={selectedTag === tag}
+                onChange={(checked) => handleChange(tag, checked)}
+              >
+                {tag}
+              </CheckableTag>
+            );
+          })}
         </div>
-        <Space size={[0, 8]} wrap>
-            <div className={styles.tags}>
-                {
-                    parser_ids.split(',').map((tag: string) => {
-                        return (<CheckableTag
-                            key={tag}
-                            checked={selectedTag === tag}
-                            onChange={(checked) => handleChange(tag, checked)}
-                        >
-                            {tag}
-                        </CheckableTag>)
-                    })
-                }
-            </div>
-        </Space>
-        <Space size={[0, 8]} wrap>
-
-        </Space>
-        <div className={styles.preset}>
-            <div className={styles.left}>
-                xxxxx文章
-            </div>
-            <div className={styles.right}>
-                预估份数
-            </div>
-        </div>
-        <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
-            <Button type="primary" onClick={onFinish}>
-                保存并处理
-            </Button>
-            <Button htmlType="button" style={{ marginLeft: '20px' }}>
-                取消
-            </Button>
-        </Form.Item>
+      </Space>
+      <Space size={[0, 8]} wrap></Space>
+      <div className={styles.preset}>
+        <div className={styles.left}>xxxxx文章</div>
+        <div className={styles.right}>预估份数</div>
+      </div>
+      <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
+        <Button type="primary" onClick={onFinish}>
+          保存并处理
+        </Button>
+        <Button htmlType="button" style={{ marginLeft: '20px' }}>
+          取消
+        </Button>
+      </Form.Item>
     </Form>
-}
+  );
+};
 
-
-
-export default connect(({ settingModel, kSModel, loading }) => ({ settingModel, kSModel, loading }))(Index);
+export default KnowledgeSetting;

web/src/pages/add-knowledge/components/knowledge-setting/model.ts

@@ -1,72 +1,54 @@
-import { message } from 'antd';
-import { Effect, Reducer, Subscription } from 'umi'
 import kbService from '@/services/kbService';
+import { message } from 'antd';
+import { DvaModel } from 'umi';
 
-export interface kSModelState {
+export interface KSModelState {
   isShowPSwModal: boolean;
   isShowTntModal: boolean;
-  loading: boolean;
-  tenantIfo: any
+  tenantIfo: any;
 }
-export interface kSModelType {
-  namespace: 'kSModel';
-  state: kSModelState;
-  effects: {
-    createKb: Effect;
-    updateKb: Effect;
-    getKbDetail: Effect;
-  };
-  reducers: {
-    updateState: Reducer<kSModelState>;
-  };
-  subscriptions: { setup: Subscription };
-}
-const Model: kSModelType = {
+
+const model: DvaModel<KSModelState> = {
   namespace: 'kSModel',
   state: {
     isShowPSwModal: false,
     isShowTntModal: false,
-    loading: false,
-    tenantIfo: {}
-  },
-  subscriptions: {
-    setup({ dispatch, history }) {
-      history.listen(location => {
-      });
-    }
-  },
-  effects: {
-    * createKb({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.createKb, payload);
-      const { retcode, data: res, retmsg } = data
-      if (retcode === 0) {
-        message.success('创建知识库成功！');
-        callback && callback(res.kb_id)
-      }
-    },
-    * updateKb({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.updateKb, payload);
-      const { retcode, data: res, retmsg } = data
-      if (retcode === 0) {
-        message.success('更新知识库成功！');
-      }
-    },
-    *getKbDetail({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.get_kb_detail, payload);
-      const { retcode, data: res, retmsg } = data
-      if (retcode === 0) {
-        // localStorage.setItem('userInfo',res.)
-        callback && callback(res)
-      }
-    },
+    tenantIfo: {},
   },
   reducers: {
     updateState(state, { payload }) {
       return {
         ...state,
-        ...payload
+        ...payload,
       };
-    }
-  }
+    },
+  },
+  subscriptions: {
+    setup({ dispatch, history }) {
+      history.listen((location) => {});
+    },
+  },
+  effects: {
+    *createKb({ payload = {} }, { call, put }) {
+      const { data } = yield call(kbService.createKb, payload);
+      const { retcode } = data;
+      if (retcode === 0) {
+        message.success('创建知识库成功！');
+      }
+      return retcode;
+    },
+    *updateKb({ payload = {} }, { call, put }) {
+      const { data } = yield call(kbService.updateKb, payload);
+      const { retcode, data: res, retmsg } = data;
+      if (retcode === 0) {
+        message.success('更新知识库成功！');
+      }
+    },
+    *getKbDetail({ payload = {} }, { call, put }) {
+      const { data } = yield call(kbService.get_kb_detail, payload);
+
+      return data;
+    },
+  },
 };
-export default Model;
+export default model;