From d33e8e0507e0f86ded9a823ce2350231338d7112 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:55:46 +0800 Subject: [PATCH] [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. (#872) 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. * [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. --- ...SourceBasicForm.tsx => ModelBasicForm.tsx} | 8 ++-- ...urceCreateForm.tsx => ModelCreateForm.tsx} | 35 ++++++++++++---- ...SourceFieldForm.tsx => ModelFieldForm.tsx} | 4 +- .../Metric/components/MetricBasicInfo.tsx | 3 ++ .../XflowJsonSchemaFormDrawerForm.tsx | 4 +- .../View/components/ViewCreateFormModal.tsx | 4 +- .../View/components/ViewTable.tsx | 7 ---- .../components/ClassDataSourceTypeModal.tsx | 8 ++-- .../components/ClassDimensionTable.tsx | 28 ++++--------- .../components/ClassMetricTable.tsx | 42 +++++++------------ .../components/ModelCreateFormModal.tsx | 4 +- .../SemanticModel/components/ModelTable.tsx | 7 ---- .../components/TableColumnRender.tsx | 18 +++++++- 13 files changed, 86 insertions(+), 86 deletions(-) rename webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/{DataSourceBasicForm.tsx => ModelBasicForm.tsx} (98%) rename webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/{DataSourceCreateForm.tsx => ModelCreateForm.tsx} (95%) rename webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/{DataSourceFieldForm.tsx => ModelFieldForm.tsx} (99%) diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx similarity index 98% rename from webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx rename to webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx index 726920e46..d782f7285 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceBasicForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelBasicForm.tsx @@ -17,7 +17,7 @@ type Props = { mode?: 'normal' | 'fast'; }; -const DataSourceBasicForm: React.FC = ({ +const ModelBasicForm: React.FC = ({ isEdit, modelItem, databaseConfigList, @@ -152,7 +152,7 @@ const DataSourceBasicForm: React.FC = ({ > - { @@ -170,7 +170,7 @@ const DataSourceBasicForm: React.FC = ({ tokenSeparators={[',']} maxTagCount={9} /> - + */} = ({ ); }; -export default DataSourceBasicForm; +export default ModelBasicForm; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx similarity index 95% rename from webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx rename to webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx index 9cfc81a24..7d968546d 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Form, Button, Modal, Steps, message } from 'antd'; -import DataSourceBasicForm from './DataSourceBasicForm'; -import DataSourceFieldForm from './DataSourceFieldForm'; +import ModelBasicForm from './ModelBasicForm'; +import ModelFieldForm from './ModelFieldForm'; import { formLayout } from '@/components/FormHelper/utils'; import { EnumDataSourceType } from '../constants'; import styles from '../style.less'; @@ -11,6 +11,7 @@ import { getColumns, getUnAvailableItem, getTagObjectList, + getModelDetail, } from '../../service'; import type { Dispatch } from 'umi'; import type { StateType } from '../../model'; @@ -43,7 +44,7 @@ const initFormVal = { description: '', // 模型描述 }; -const DataSourceCreateForm: React.FC = ({ +const ModelCreateForm: React.FC = ({ domainManger, onCancel, createModalVisible, @@ -51,14 +52,15 @@ const DataSourceCreateForm: React.FC = ({ sql = '', sqlParams, onSubmit, - modelItem, + modelItem: modelBasicInfo, databaseId, basicInfoFormMode, onDataSourceBtnClick, onOpenDataSourceEdit, children, }) => { - const isEdit = !!modelItem?.id; + const isEdit = !!modelBasicInfo?.id; + const [modelItem, setModelItem] = useState({}); const [fields, setFields] = useState([]); const [currentStep, setCurrentStep] = useState(0); const [saveLoading, setSaveLoading] = useState(false); @@ -102,9 +104,26 @@ const DataSourceCreateForm: React.FC = ({ queryTagObjectList(); }, []); + useEffect(() => { + if (modelBasicInfo?.id) { + queryModelDetail(modelBasicInfo.id); + } + }, [modelBasicInfo]); + const forward = () => setCurrentStep(currentStep + 1); const backward = () => setCurrentStep(currentStep - 1); + const queryModelDetail = async (modelId: number) => { + const { code, msg, data } = await getModelDetail({ + modelId, + }); + if (code === 200) { + setModelItem(data); + } else { + message.error(msg); + } + }; + const queryTagObjectList = async () => { const { code, msg, data } = await getTagObjectList({ domainId: domainData?.parentId || domainData?.id, @@ -447,7 +466,7 @@ const DataSourceCreateForm: React.FC = ({ return ( <>
- = ({ />
- = ({ export default connect(({ domainManger }: { domainManger: StateType }) => ({ domainManger, -}))(DataSourceCreateForm); +}))(ModelCreateForm); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx similarity index 99% rename from webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx rename to webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx index 16beae74f..c988e0682 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx @@ -52,7 +52,7 @@ const getCreateFieldName = (type: EnumDataSourceType) => { return isCreateName; }; -const DataSourceFieldForm: React.FC = ({ +const ModelFieldForm: React.FC = ({ fields, sql, tagObjectList, @@ -366,4 +366,4 @@ const DataSourceFieldForm: React.FC = ({ ); }; -export default DataSourceFieldForm; +export default ModelFieldForm; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx index 3149d4c5e..cb7fe05b2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricBasicInfo.tsx @@ -54,6 +54,9 @@ const MetricBasicInformation: React.FC = ({ metircData }) => { '该限定条件用于在计算指标时限定口径，作用于度量，所用于过滤的维度必须在创建模型的时候被标记为日期或者维度，不需要加where关键字。比如：维度A="值1" and 维度B="值2"', render: (_: any, record: any) => { const { constraint } = record; + if (!constraint) { + return '--'; + } return