From 679630bfd52dc89f31f75bcdc9474cf98ad6c98e Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:29:19 +0800 Subject: [PATCH] [improvement][headless-fe] Optimized the initialization process of dimension value settings in the assistant module. (#1843) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. * [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience. * [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas. * [improvement][semantic-fe] Changing the line type for canvas connections. * [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless". * [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model. * [improvement][semantic-fe] Updating the logic for the fieldName. * [improvement][semantic-fe] Adjusting the position of the metrics tab. * [improvement][semantic-fe] Changing the 字段名称 to 英文名称. * [improvement][semantic-fe] Fix metric measurement deletion. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI adjustment for metric details page. * [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty. * [improvement][semantic-fe] Added field type and metric type to the metric creation options. * [improvement][semantic-fe] The organization structure selection feature has been added to the permission management. * [improvement][semantic-fe] Improved user experience for the metric list. * [improvement][semantic-fe] fix update the metric list. * [improvement][headless-fe] Added view management functionality. * [improvement][headless-fe] The view management functionality has been added. This feature allows users to create, edit, and manage different views within the system. * [improvement][headless-fe] Added model editing side effect detection. * [improvement][headless-fe] Fixed the logic error in view editing. * [improvement][headless-fe] Fixed the issue with initializing dimension associations in metric settings. * [improvement][headless-fe] Added the ability to hide the Q&A settings entry point. * [improvement][headless-fe] Fixed the issue with selecting search results in metric field creation. * [improvement][headless-fe] Added search functionality to the field list in model editing. * [improvement][headless-fe] fix the field list in model editing * [improvement][headless-fe] Restructured the data for the dimension value settings interface. * [improvement][headless-fe] Added dynamic variable functionality to model creation based on SQL scripts. * [improvement][headless-fe] Added support for passing dynamic variables as parameters in the executeSql function. * [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. * [improvement][headless-fe] Replaced the term "view" with "dataset" * [improvement][headless-fe] Added the ability to export metrics and dimensions to a specific target. * [improvement][headless-fe] Enhanced dataset creation to support the tag mode. * [improvement][headless-fe] Added tag value setting. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. * [improvement][headless-fe] Added search functionality to model management. * [improvement][headless-fe] Removed field null validation during model editing. * [improvement][headless-fe] Updated the batch operation button component. * [improvement][headless-fe] Optimized the logic for initializing indicators in dimension value settings. * [improvement][headless-fe] Adjusted the length of the input field for model editing names. * [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. * [improvement][headless-fe] Optimized the style of the metrics market and tags market. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly. * [improvement][headless-fe] Default value setting for hiding dimensions. * [improvement][headless-fe] Updated the file imports in the project. * [improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. * [improvement][headless-fe] Added term management functionality. * [improvement][headless-fe] When creating a model, the current metric operator now allows for clearance. * [improvement][headless-fe] Term management interface transformation * [improvement][headless-fe] Migrating scaffold version to @umi/max * [improvement][headless-fe] remove modle column * [improvement][headless-fe] 1.Added configuration for the large language model in the agent; 2.upgraded React version from 17 to 18; 3.modified some UI effects. * [improvement][headless-fe] Added a simplified mode to the question-answering system. * [improvement][headless-fe] remove pnpm-lock * [improvement][headless-fe] add pnpm-lock * [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation. * [improvement][headless-fe] fix build bugs * [improvement][headless-fe] change build config * [improvement][headless-fe] route config change * [improvement][headless-fe] Optimized data updating when switching domains. * [improvement][headless-fe] css change * [improvement][semantic-fe] logo css change * [improvement][semantic-fe] system config add defaultValue support * [improvement][semantic-fe] tag mode wording change * [improvement][semantic-fe] fix metric edit page init error * [improvement][supersonic-fe] Updated the way chat projects are imported in supersonic-fe. * [improvement][chat-engine] Added a background silent mode for watching chat projects. * [improvement][supersonic-fe] fix proxy url * [improvement][headless-fe] agent setting update * [improvement][headless-fe] Agent configuration: Added connectivity testing for large models. * [improvement][headless-fe] Chat: Enabled integration with agent configuration. * [improvement][headless-fe] SQL formatter: Updated the import method. * [improvement][headless-fe] login fixed * [improvement][headless-fe] Agent: Optimized the logic for saving. * [improvement][headless-fe] Model management: Integrated into the main theme domain. * [improvement][headless-fe] Sensitivity: Added bulk modification functionality. * [improvement][headless-fe] wording change * [improvement][headless-fe] Prompt configuration: Added the ability to configure prompts. * [improvement][headless-fe] Added the ability to configure embedding models. * [improvement][headless-fe] hidden configure embedding models. * [improvement][headless-fe] Connection test prompt update for large language model settings. * [improvement][headless-fe] add memory review config * [improvement][headless-fe] Rollback of data structure for large language model configuration. * [improvement][headless-fe] Added dependency relationships between various items in system configuration. * [improvement][headless-fe] Added password parsing to the generation rules of system settings. * [improvement][headless-fe] Added slider parsing to the generation rules of system settings. * [improvement][headless-fe] Optimized the logic for initializing values in system settings. * [improvement][headless-fe] Optimized the time format * [improvement][headless-fe] Unified the SQL generation method for data sets to ensure consistency and improve efficiency. * [improvement][headless-fe] Added support for data sets with non-partitioned time fields * [improvement][headless-fe] Added support for editing time formats in dimension settings * [improvement][headless-fe] Rolled back the time parameter in the metric details page to its previous state * [improvement][headless-fe] Fixed the issue with hidden field validation when editing dimensions * [improvement][headless-fe] Added a connectivity test for large models in the system settings * [improvement][headless-fe] Changed the METRIC type in ChatContextType queryType to AGGREGATE * [improvement][headless-fe] Added query and batch delete operations to the terminology management feature * [improvement][headless-fe] Enhanced the memory management feature by adding sorting functionality and other optimization features. * [improvement][headless-fe] Resolved the compatibility issue with the backend service where the updatedAt and other time fields were not being properly converted to the updated_at format for sorting purposes. * [improvement][headless-fe] Added a configuration interface for large language models * [improvement][headless-fe] Introduced a new configuration option in the assistant module specifically for large model applications. * [improvement][headless-fe] Replaced the agentConfig with toolConfig * [improvement][headless-fe] Resolved the issue with the test connection parameters for the large model configuration. * [improvement][headless-fe] Implemented a new feature where the tool configuration types can be fetched from the backend API * [improvement][headless-fe] Updated the dimension value settings to retrieve and display values from a dictionary. * [improvement][headless-fe] Adjusted the pageSize of the dimension value settings list to 20. * [improvement][headless-fe] Introduced a revamped configuration for the large model in the assistant module. * [improvement][headless-fe] Added new functionality to the assistant's memory management system * [improvement][headless-fe] Optimized the management of CSS styles in the assistant module. * [improvement][headless] fixed build config * [improvement][headless-fe] Revamped the dimension value settings in the assistant module. * [improvement][headless-fe] Optimized the initialization process of dimension value settings in the assistant module. --------- Co-authored-by: tristanliu --- .../packages/supersonic-fe/config/routes.ts | 12 +++---- .../components/DimensionValueSettingModal.tsx | 19 +++++++---- .../Entity/DimensionValueFilterModal.tsx | 2 ++ .../Entity/DimensionValueSettingForm.tsx | 33 ++++++++++++++----- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/webapp/packages/supersonic-fe/config/routes.ts b/webapp/packages/supersonic-fe/config/routes.ts index 1f2baddf6..a0bddf36a 100644 --- a/webapp/packages/supersonic-fe/config/routes.ts +++ b/webapp/packages/supersonic-fe/config/routes.ts @@ -42,12 +42,12 @@ const ROUTES = [ component: './Agent', envEnableList: [ENV_KEY.CHAT], }, - { - path: '/plugin', - name: 'plugin', - component: './ChatPlugin', - envEnableList: [ENV_KEY.CHAT], - }, + // { + // path: '/plugin', + // name: 'plugin', + // component: './ChatPlugin', + // envEnableList: [ENV_KEY.CHAT], + // }, { path: '/model/metric/edit/:metricId', name: 'metricEdit', diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx index 99592a897..ec734c508 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx @@ -94,6 +94,7 @@ const DimensionValueSettingModal: React.FC = ({ ...knowledgeConfig.config, ...config, }, + status: dimensionVisibleState, }; const { code } = await editDictConfig(queryConfig); setSaveLoading(false); @@ -313,12 +314,12 @@ const DimensionValueSettingModal: React.FC = ({ } }; - // const refreshTableData = () => { - // queryDictData({ - // ...pagination, - // ...filterParams, - // }); - // }; + const refreshTableData = () => { + queryDictData({ + ...pagination, + ...filterParams, + }); + }; // const tabItem = [ // { @@ -357,6 +358,12 @@ const DimensionValueSettingModal: React.FC = ({ onVisibleChange={(state) => { setDimensionVisibleState(state); }} + onSubmit={() => { + searchKnowledgeConfig(); + }} + onDictChange={() => { + refreshTableData(); + }} /> {dimensionVisibleState === KnowledgeConfigStatusEnum.ONLINE && ( <> diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueFilterModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueFilterModal.tsx index 4e3c2ee64..8af6003b4 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueFilterModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueFilterModal.tsx @@ -31,6 +31,8 @@ const DimensionValueFilterModal: React.FC = ({ style={{ top: 48 }} maskClosable={false} open={true} + cancelText="关闭" + okButtonProps={{ hidden: true }} onCancel={onCancel} >
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx index 40a347763..a5822c652 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx @@ -1,7 +1,6 @@ import { useState, useEffect } from 'react'; import { Form, Switch, Space, Button, Tooltip, message, Select } from 'antd'; import FormItemTitle from '@/components/FormHelper/FormItemTitle'; -import { useModel } from '@umijs/max'; import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons'; import { formLayout } from '@/components/FormHelper/utils'; import { @@ -15,9 +14,9 @@ import { createDictTask, editDictConfig, deleteDictTask, + createDictConfig, } from '../../service'; import type { ISemantic } from '../../data'; -import type { StateType } from '../../model'; import styles from '../style.less'; type Props = { @@ -25,6 +24,7 @@ type Props = { type?: KnowledgeConfigTypeEnum; knowledgeConfig?: ISemantic.IDictKnowledgeConfigItem; onSubmit?: () => void; + onDictChange?: () => void; onVisibleChange?: (visible: KnowledgeConfigStatusEnum) => void; }; @@ -34,11 +34,12 @@ const DimensionValueSettingForm: React.FC = ({ dataItem, knowledgeConfig, type = KnowledgeConfigTypeEnum.DIMENSION, + onSubmit, + onDictChange, onVisibleChange, }) => { const [form] = Form.useForm(); - const domainModel = useModel('SemanticModel.domainData'); - const { selectDomainId } = domainModel; + const [dimensionVisible, setDimensionVisible] = useState(false); const [taskItemState, setTaskItemState] = useState(); const [saveLoading, setSaveLoading] = useState(false); @@ -48,7 +49,6 @@ const DimensionValueSettingForm: React.FC = ({ const [importDictState, setImportDictState] = useState(false); useEffect(() => { - // searchKnowledgeConfig(); queryDictLatestTaskList(); }, []); @@ -56,9 +56,7 @@ const DimensionValueSettingForm: React.FC = ({ if (!knowledgeConfig) { return; } - const configItem = knowledgeConfig; - // if (configItem) { const { status, config } = configItem; if (status === KnowledgeConfigStatusEnum.ONLINE) { setDimensionVisible(true); @@ -107,7 +105,7 @@ const DimensionValueSettingForm: React.FC = ({ type, itemId: dimension.id, }); - + onDictChange?.(); if (code !== 200) { message.error('字典导入任务创建失败!'); return; @@ -117,10 +115,27 @@ const DimensionValueSettingForm: React.FC = ({ }, 2000); }; + const createDictConfigQuery = async () => { + setSaveLoading(true); + const { code } = await createDictConfig({ + type: KnowledgeConfigTypeEnum.DIMENSION, + itemId: dataItem.id, + status: KnowledgeConfigStatusEnum.ONLINE, + }); + setSaveLoading(false); + if (code === 200) { + message.success('维度值设置保存成功!'); + onSubmit?.(); + return; + } + message.error('维度值设置保存失败!'); + }; + const editDictTaskQuery = async ( status: KnowledgeConfigStatusEnum = KnowledgeConfigStatusEnum.ONLINE, ) => { if (!knowledgeConfig?.id) { + createDictConfigQuery(); return; } const config = await form.validateFields(); @@ -136,6 +151,7 @@ const DimensionValueSettingForm: React.FC = ({ setSaveLoading(false); if (code === 200) { message.success('维度值设置保存成功!'); + onSubmit?.(); return; } message.error('维度值设置保存失败!'); @@ -147,6 +163,7 @@ const DimensionValueSettingForm: React.FC = ({ type, itemId: dimension.id, }); + onDictChange?.(); setDeleteLoading(false); if (code !== 200) { message.error('字典清除失败!');