From cd727663a5e2f3d19e561c8cdcb441499696bce7 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:01:43 +0800 Subject: [PATCH] [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. (#579) * [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. --- .../components/DataSourceBasicForm.tsx | 56 +++++++++++++++++-- .../components/DataSourceCreateForm.tsx | 56 ++++++++++++------- .../components/DataSourceFieldForm.tsx | 10 ++-- .../components/ClassDataSourceTypeModal.tsx | 8 +-- .../components/DimensionInfoModal.tsx | 4 +- .../src/pages/SemanticModel/data.d.ts | 20 ++++--- 6 files changed, 111 insertions(+), 43 deletions(-) diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx index e53016dd4..726920e46 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx @@ -1,8 +1,9 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { Form, Input, Spin, Select, message } from 'antd'; import type { FormInstance } from 'antd/lib/form'; -import { getDbNames, getTables } from '../../service'; +import { getDbNames, getTables, getDimensionList } from '../../service'; import { ISemantic } from '../../data'; +import FormItemTitle from '@/components/FormHelper/FormItemTitle'; import { isString } from 'lodash'; const FormItem = Form.Item; @@ -11,15 +12,45 @@ const { TextArea } = Input; type Props = { isEdit?: boolean; databaseConfigList: ISemantic.IDatabaseItemList; + modelItem: ISemantic.IModelItem; form: FormInstance; mode?: 'normal' | 'fast'; }; -const DataSourceBasicForm: React.FC = ({ isEdit, databaseConfigList, mode = 'normal' }) => { +const DataSourceBasicForm: React.FC = ({ + isEdit, + modelItem, + databaseConfigList, + mode = 'normal', +}) => { const [currentDbLinkConfigId, setCurrentDbLinkConfigId] = useState(); const [dbNameList, setDbNameList] = useState([]); const [tableNameList, setTableNameList] = useState([]); const [loading, setLoading] = useState(false); + const [dimensionOptions, setDimensionOptions] = useState<{ label: string; value: number }[]>([]); + + useEffect(() => { + if (modelItem?.id) { + queryDimensionList(); + } + }, [modelItem]); + + const queryDimensionList = async () => { + const { code, data, msg } = await getDimensionList({ modelId: modelItem?.id }); + if (code === 200 && Array.isArray(data?.list)) { + setDimensionOptions( + data.list.map((item: ISemantic.IDimensionItem) => { + return { + label: item.name, + value: item.id, + }; + }), + ); + } else { + message.error(msg); + } + }; + const queryDbNameList = async (databaseId: number) => { setLoading(true); const { code, data, msg } = await getDbNames(databaseId); @@ -129,7 +160,7 @@ const DataSourceBasicForm: React.FC = ({ isEdit, databaseConfigList, mode }} getValueProps={(value) => { return { - value: isString(value) ? value.split(',') : [], + value: value && isString(value) ? value.split(',') : [], }; }} > @@ -140,6 +171,23 @@ const DataSourceBasicForm: React.FC = ({ isEdit, databaseConfigList, mode maxTagCount={9} /> + + } + hidden={!modelItem?.id} + > +