From aad8bb43673204e26cae8a44281ff97291d23938 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 14 Mar 2024 19:42:21 +0800 Subject: [PATCH] [improvement][headless-fe] Added tag value setting. (#821) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab. [improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions. [improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager. * [improvement][semantic-fe] Add time granularity setting in the data source configuration. * [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility * [improvement][semantic-fe] Modification of data source creation prompt wording" * [improvement][semantic-fe] metric market experience optimization * [improvement][semantic-fe] enhance the analysis of metric trends * [improvement][semantic-fe] optimize the presentation of metric trend permissions * [improvement][semantic-fe] add metric trend download functionality * [improvement][semantic-fe] fix the dimension initialization issue in metric correlation * [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source. * [improvement][semantic-fe] Optimizing pagination logic and some CSS styles * [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum" * [improvement][semantic-fe] Fixing the default value setting for the indicator list * [improvement][semantic-fe] Adding batch operations for indicators/dimensions/models * [improvement][semantic-fe] Replacing the single status update API for indicators/dimensions with a batch update API * [improvement][semantic-fe] Redesigning the indicator homepage to incorporate trend charts and table functionality for indicators * [improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality * [improvement][semantic-fe] Upgrading antd version to 5.x, extracting the batch operation button component, optimizing the interaction for system settings, and expanding the configuration generation types for list-to-select component. * [improvement][semantic-fe] Adding the ability to filter dimensions based on whether they are tags or not. * [improvement][semantic-fe] Adding the ability to edit relationships between models in the canvas. * [improvement][semantic-fe] Updating the datePicker component to use dayjs instead. * [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market. * [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model. * [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market. * [improvement][semantic-fe] Adding the ability to download and transpose data. * [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity. * [improvement][semantic-fe] Fixing the logic error in the dimension value setting. * [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. --- .../Insights/components/ClassTagTable.tsx | 25 ++++++ .../Insights/components/TagTrendSection.tsx | 3 + .../components/TagValueSettingModal.tsx | 86 +++++++++++++++++++ .../View/components/DefaultSettingForm.tsx | 80 ++++++----------- .../View/components/ViewCreateFormModal.tsx | 1 + .../components/ViewModelConfigTransfer.tsx | 14 +-- .../View/components/ViewSearchFormModal.tsx | 56 ++++++++---- .../components/DimensionValueSettingModal.tsx | 2 +- .../Entity/DimensionValueSettingForm.tsx | 52 ++++++----- .../src/pages/SemanticModel/enum.ts | 12 +++ .../src/pages/SemanticModel/service.ts | 2 +- 11 files changed, 228 insertions(+), 105 deletions(-) create mode 100644 webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagValueSettingModal.tsx diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx index 9d24be86f..c59afe0ec 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx @@ -15,6 +15,7 @@ import moment from 'moment'; import styles from '../style.less'; import { ISemantic } from '../../data'; import { ColumnsConfig } from '../../components/TableColumnRender'; +import TagValueSettingModal from './TagValueSettingModal'; type Props = { dispatch: Dispatch; @@ -37,6 +38,8 @@ const ClassTagTable: React.FC = ({ domainManger, dispatch }) => { const [filterParams, setFilterParams] = useState>({}); + const [tagValueSettingModalVisible, setTagValueSettingModalVisible] = useState(false); + const actionRef = useRef(); const queryBatchUpdateStatus = async (ids: React.Key[], status: StatusEnum) => { @@ -160,6 +163,16 @@ const ClassTagTable: React.FC = ({ domainManger, dispatch }) => { > 编辑 + {record.status === StatusEnum.ONLINE ? ( + + + + + ); + }; + + return ( + + + + ); +}; + +export default connect(({ domainManger }: { domainManger: StateType }) => ({ + domainManger, +}))(TagValueSettingModal); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/DefaultSettingForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/DefaultSettingForm.tsx index e6c1c2196..1344269eb 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/DefaultSettingForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/DefaultSettingForm.tsx @@ -7,18 +7,15 @@ import { Form, Input, Select, InputNumber } from 'antd'; import { wrapperTransTypeAndId } from '../../utils'; import { ISemantic } from '../../data'; -import { ChatConfigType, TransType, SemanticNodeType } from '../../enum'; +import { TransType, SemanticNodeType } from '../../enum'; import TransTypeTag from '../../components/TransTypeTag'; type Props = { - // entityData: any; - // chatConfigKey: string; - chatConfigType: ChatConfigType.TAG | ChatConfigType.METRIC; + chatConfigType: TransType; metricList?: ISemantic.IMetricItem[]; dimensionList?: ISemantic.IDimensionItem[]; + tagList?: ISemantic.ITagItem[]; form: any; - // domainId: number; - // onSubmit: (params?: any) => void; }; const FormItem = Form.Item; @@ -31,7 +28,7 @@ const formDefaultValue = { }; const DefaultSettingForm: ForwardRefRenderFunction = ( - { metricList, dimensionList, chatConfigType, form }, + { metricList, dimensionList, tagList, chatConfigType, form }, ref, ) => { const [dataItemListOptions, setDataItemListOptions] = useState([]); @@ -54,84 +51,57 @@ const DefaultSettingForm: ForwardRefRenderFunction = ( } }, []); - const defaultConfigKeyMap = { - [ChatConfigType.TAG]: 'tagTypeDefaultConfig', - [ChatConfigType.METRIC]: 'metricTypeDefaultConfig', + const defaultConfigKeyMap: any = { + [TransType.TAG]: 'tagTypeDefaultConfig', + [TransType.METRIC]: 'metricTypeDefaultConfig', }; useEffect(() => { - if (Array.isArray(dimensionList) && Array.isArray(metricList)) { - const dimensionEnum = dimensionList.map((item: ISemantic.IDimensionItem) => { + if (Array.isArray(tagList)) { + const tagEnum = tagList.map((item: ISemantic.ITagItem) => { const { name, id, bizName } = item; return { name, label: ( <> - + {name} ), - value: wrapperTransTypeAndId(TransType.DIMENSION, id), + value: wrapperTransTypeAndId(TransType.TAG, id), bizName, id, - transType: TransType.DIMENSION, + transType: TransType.TAG, }; }); - const metricEnum = metricList.map((item: ISemantic.IMetricItem) => { - const { name, id, bizName } = item; - return { - name, - label: ( - <> - - {name} - - ), - value: wrapperTransTypeAndId(TransType.METRIC, id), - bizName, - id, - transType: TransType.METRIC, - }; - }); - setDataItemListOptions([...dimensionEnum, ...metricEnum]); + setDataItemListOptions([...tagEnum]); } - }, [dimensionList, metricList]); + }, [tagList]); return ( <> - {chatConfigType === ChatConfigType.TAG && ( + {chatConfigType === TransType.TAG && ( { - const result: { dimensionIds: number[]; metricIds: number[] } = { - dimensionIds: [], - metricIds: [], + const result: { tagIds: number[] } = { + tagIds: [], }; items.forEach((item: any) => { - if (item.transType === TransType.DIMENSION) { - result.dimensionIds.push(item.id); - } - if (item.transType === TransType.METRIC) { - result.metricIds.push(item.id); - } + result.tagIds.push(item.id); }); return result; }} getValueProps={(value) => { - const { dimensionIds, metricIds } = value || {}; - const dimensionValues = Array.isArray(dimensionIds) - ? dimensionIds.map((id: number) => { - return wrapperTransTypeAndId(TransType.DIMENSION, id); - }) - : []; - const metricValues = Array.isArray(metricIds) - ? metricIds.map((id: number) => { - return wrapperTransTypeAndId(TransType.METRIC, id); + const { tagIds } = value || {}; + const tagValues = Array.isArray(tagIds) + ? tagIds.map((id: number) => { + return wrapperTransTypeAndId(TransType.TAG, id); }) : []; return { - value: [...dimensionValues, ...metricValues], + value: [...tagValues], }; }} > @@ -161,7 +131,7 @@ const DefaultSettingForm: ForwardRefRenderFunction = ( } > - {chatConfigType === ChatConfigType.TAG ? ( + {chatConfigType === TransType.TAG ? ( = ({ const queryTagList = async (modelId: number) => { const { code, data, msg } = await getTagList({ modelIds: [modelId], + pageSize: 9999, }); const { list } = data || {}; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewModelConfigTransfer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewModelConfigTransfer.tsx index 56352c883..599c1b764 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewModelConfigTransfer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewModelConfigTransfer.tsx @@ -21,7 +21,7 @@ type Props = { const ViewModelConfigTransfer: React.FC = forwardRef( ( { - queryType = 'METRIC', + queryType = TransType.METRIC, viewItem, modelItem, dimensionList, @@ -138,7 +138,7 @@ const ViewModelConfigTransfer: React.FC = forwardRef( idList.push(id); viewConfigMap[id] = { ...item }; - if (queryType === 'METRIC') { + if (queryType === TransType.METRIC) { if (Array.isArray(metrics)) { metrics.forEach((metricId: number) => { transferKeys.push(wrapperTransTypeAndId(TransType.METRIC, metricId)); @@ -150,7 +150,7 @@ const ViewModelConfigTransfer: React.FC = forwardRef( }); } } - if (queryType === 'TAG') { + if (queryType === TransType.TAG) { if (Array.isArray(tagIds)) { tagIds.forEach((tagId: number) => { transferKeys.push(wrapperTransTypeAndId(TransType.TAG, tagId)); @@ -164,7 +164,7 @@ const ViewModelConfigTransfer: React.FC = forwardRef( }, [queryType]); useEffect(() => { - if (queryType !== 'METRIC') { + if (queryType !== TransType.METRIC) { return; } if (!dimensionList || !metricList) { @@ -190,7 +190,7 @@ const ViewModelConfigTransfer: React.FC = forwardRef( }, [queryType, modelItem, dimensionList, metricList]); useEffect(() => { - if (queryType !== 'TAG') { + if (queryType !== TransType.TAG) { return; } if (!tagList) { @@ -213,7 +213,7 @@ const ViewModelConfigTransfer: React.FC = forwardRef( return ( <> -
+
= forwardRef( onCancel={() => {}} />
-
+
= ({ const [dimensionList, setDimensionList] = useState(); const [metricList, setMetricList] = useState(); + const [tagList, setTagList] = useState(); useEffect(() => { const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs; if (Array.isArray(dataSetModelConfigs)) { const allMetrics: number[] = []; const allDimensions: number[] = []; + const allTags: number[] = []; dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => { - const { metrics, dimensions } = item; + const { metrics, dimensions, tagIds } = item; allMetrics.push(...metrics); allDimensions.push(...dimensions); + allTags.push(...tagIds); }); queryDimensionListByIds(allDimensions); queryMetricListByIds(allMetrics); + queryTagListByIds(allTags); } }, [viewItem]); + const queryTagListByIds = async (ids: number[]) => { + const { code, data, msg } = await getTagList({ + ids, + }); + + const { list } = data || {}; + if (code === 200) { + setTagList(list); + } else { + message.error(msg); + setTagList([]); + } + }; + const queryDimensionListByIds = async (ids: number[]) => { if (!isArrayOfValues(ids)) { setDimensionList([]); @@ -110,23 +129,22 @@ const ViewSearchFormModal: React.FC = ({ const renderContent = () => { return (
- - - + {viewItem?.queryType === TransType.METRIC && ( + + + + )} - - - + {viewItem?.queryType === TransType.TAG && ( + + + + )}
); }; 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 e7e10b87b..ab3249ce1 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx @@ -184,7 +184,7 @@ const DimensionValueSettingModal: React.FC = ({ { label: '维度值设置', key: 'setting', - children: , + children: , }, ]; 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 a847a5937..faae5a066 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 @@ -4,7 +4,12 @@ import { Form, Switch, Space, Button, Tooltip, message, Select } from 'antd'; import FormItemTitle from '@/components/FormHelper/FormItemTitle'; import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons'; import { formLayout } from '@/components/FormHelper/utils'; -import { DictTaskState, KnowledgeConfigTypeEnum, KnowledgeConfigStatusEnum } from '../../enum'; +import { + DictTaskState, + KnowledgeConfigTypeEnum, + KnowledgeConfigStatusEnum, + KnowledgeConfigTypeWordingMap, +} from '../../enum'; import { searchKnowledgeConfigQuery, searchDictLatestTaskList, @@ -19,14 +24,15 @@ import styles from '../style.less'; import CommonEditList from '../../components/CommonEditList'; type Props = { - dimensionItem: ISemantic.IDimensionItem; + dataItem: ISemantic.IDimensionItem | ISemantic.ITagItem; + type?: KnowledgeConfigTypeEnum; onSubmit?: () => void; }; const FormItem = Form.Item; const DimensionValueSettingForm: ForwardRefRenderFunction = ( - { dimensionItem }, + { dataItem, type = KnowledgeConfigTypeEnum.DIMENSION }, ref, ) => { const [form] = Form.useForm(); @@ -56,7 +62,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( if (taskItemState?.taskStatus) { return ( - {DictTaskState[taskItemState.taskStatus] || '未知状态'} + {DictTaskState[taskItemState?.taskStatus || 'unknown']} ); } @@ -66,8 +72,8 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( const searchKnowledgeConfig = async () => { setRefreshLoading(true); const { code, data } = await searchKnowledgeConfigQuery({ - type: KnowledgeConfigTypeEnum.DIMENSION, - itemId: dimensionItem.id, + type, + itemId: dataItem.id, }); setRefreshLoading(false); @@ -91,15 +97,15 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( form.setFieldsValue({ ...defaultKnowledgeConfig, }); - createDictConfigQuery(dimensionItem, defaultKnowledgeConfig); + createDictConfigQuery(dataItem, defaultKnowledgeConfig); } }; const queryDictLatestTaskList = async () => { setRefreshLoading(true); const { code, data } = await searchDictLatestTaskList({ - type: KnowledgeConfigTypeEnum.DIMENSION, - itemId: dimensionItem.id, + type, + itemId: dataItem.id, }); setRefreshLoading(false); if (code !== 200) { @@ -117,7 +123,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( const getFormValidateFields = async () => { const fields = await form.validateFields(); - const fieldValue = Object.keys(fields).reduce((formField, key: string) => { + const fieldValue = Object.keys(fields).reduce((formField: any, key: string) => { const targetValue = fields[key]; if (exchangeFields.includes(key)) { if (isString(targetValue)) { @@ -144,7 +150,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( config: ISemantic.IDictKnowledgeConfigItemConfig, ) => { const { code, data } = await createDictConfig({ - type: KnowledgeConfigTypeEnum.DIMENSION, + type, itemId: dimension.id, config, status: 1, @@ -160,7 +166,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( const createDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => { setImportDictState(true); const { code } = await createDictTask({ - type: KnowledgeConfigTypeEnum.DIMENSION, + type, itemId: dimension.id, }); @@ -199,7 +205,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( const deleteDictTaskQuery = async (dimension: ISemantic.IDimensionItem) => { setDeleteLoading(true); const { code } = await deleteDictTask({ - type: KnowledgeConfigTypeEnum.DIMENSION, + type, itemId: dimension.id, }); setDeleteLoading(false); @@ -225,7 +231,9 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( title={ <> - 维度值可见 + + {KnowledgeConfigTypeWordingMap[type]}值可见 + = ( } - subTitle={'设置可见后，维度值将在搜索时可以被联想出来'} + subTitle={`设置可见后，${KnowledgeConfigTypeWordingMap[type]}值将在搜索时可以被联想出来`} /> } > {dimensionVisible && ( - + @@ -295,7 +303,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( disabled={taskItemState?.taskStatus === 'running'} loading={deleteLoading} onClick={(event) => { - deleteDictTaskQuery(dimensionItem); + deleteDictTaskQuery(dataItem); setTaskItemState({ ...(taskItemState || ({} as ISemantic.IDictKnowledgeTaskItem)), taskStatus: '', @@ -328,7 +336,7 @@ const DimensionValueSettingForm: ForwardRefRenderFunction = ( marginBottom: 20, }} > - 维度值过滤 + {KnowledgeConfigTypeWordingMap[type]}值过滤