From d8abc1e492d6f3bf18653cab3b731920cfa0c46f Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 30 May 2024 15:56:26 +0800 Subject: [PATCH] [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. (#1054) 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. * [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. --- .../Datasource/components/ModelCreateForm.tsx | 3 +- .../Datasource/components/ModelFieldForm.tsx | 3 +- .../src/pages/SemanticModel/Metric/Edit.tsx | 80 ++----------------- .../components/MetricInfoCreateForm.tsx | 37 ++------- .../pages/SemanticModel/OverviewContainer.tsx | 3 +- .../components/ClassDimensionTable.tsx | 5 +- .../components/ClassMetricTable.tsx | 5 +- .../components/DomainManagerTab.tsx | 2 +- .../components/MetricFieldFormTable.tsx | 6 +- 9 files changed, 27 insertions(+), 117 deletions(-) diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx index 599f60395..714cce1ea 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelCreateForm.tsx @@ -286,7 +286,7 @@ const ModelCreateForm: React.FC = ({ return; } const columnFields: any[] = columns.map((item: IDataSource.IExecuteSqlColumn) => { - const { type, nameEn, comment } = item; + const { type, nameEn, comment, name } = item; const oldItem = fieldsClassifyList.find((oItem) => { return oItem.fieldName === item.nameEn; @@ -296,6 +296,7 @@ const ModelCreateForm: React.FC = ({ bizName: nameEn, fieldName: nameEn, dataType: type, + name: name || comment, comment, }; }); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx index 8859bb773..732ef1270 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx @@ -110,11 +110,12 @@ const ModelFieldForm: React.FC = ({ } const isCreateName = getCreateFieldName(value); const editState = !isUndefined(record[isCreateName]) ? !!record[isCreateName] : true; + const { name, comment } = record; // handleFieldChange(record, 'type', value); onFieldChange(record.bizName, { ...record, type: value, - name: '', + name: name || comment, [isCreateName]: editState, ...defaultParams, }); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx index ff5419bf3..abcf8432d 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Edit.tsx @@ -1,32 +1,19 @@ -import { message, Tabs, Button, Space } from 'antd'; +import { message } from 'antd'; import React, { useState, useEffect } from 'react'; -import { getMetricData, getDimensionList, getDrillDownDimension } from '../service'; -import { connect, useParams, history } from 'umi'; -import type { StateType } from '../model'; +import { getMetricData } from '../service'; +import { useParams } from '@umijs/max'; import styles from './style.less'; -import { ArrowLeftOutlined } from '@ant-design/icons'; -import MetricTrendSection from '@/pages/SemanticModel/Metric/components/MetricTrendSection'; import { ISemantic } from '../data'; -import MetricBasicInfo from './components/MetricBasicInfo'; -import DimensionAndMetricRelationModal from '../components/DimensionAndMetricRelationModal'; import MetricInfoEditSider from './MetricInfoEditSider'; import MetricInfoCreateForm from './components/MetricInfoCreateForm'; -import { MetricSettingKey, MetricSettingWording } from './constants'; +import { MetricSettingKey } from './constants'; type Props = Record; const MetricDetail: React.FC = () => { const params: any = useParams(); const metricId = params.metricId; - const [metricRelationModalOpenState, setMetricRelationModalOpenState] = useState(false); const [metircData, setMetircData] = useState(); - const [dimensionList, setDimensionList] = useState([]); - const [drillDownDimension, setDrillDownDimension] = useState( - [], - ); - const [relationDimensionOptions, setRelationDimensionOptions] = useState< - { value: string; label: string; modelId: number }[] - >([]); const [settingKey, setSettingKey] = useState(MetricSettingKey.BASIC); @@ -35,7 +22,6 @@ const MetricDetail: React.FC = () => { return; } queryMetricData(metricId); - queryDrillDownDimension(metricId); }, [metricId]); const queryMetricData = async (metricId: string) => { @@ -47,42 +33,6 @@ const MetricDetail: React.FC = () => { message.error(msg); }; - const queryDrillDownDimension = async (metricId: number) => { - const { code, data, msg } = await getDrillDownDimension(metricId); - if (code === 200 && Array.isArray(data)) { - setDrillDownDimension(data); - const ids = data.map((item) => item.dimensionId); - queryDimensionList(ids); - return data; - } else { - setDimensionList([]); - setRelationDimensionOptions([]); - } - if (code !== 200) { - message.error(msg); - } - return []; - }; - - const queryDimensionList = async (ids: number[]) => { - if (!(Array.isArray(ids) && ids.length > 0)) { - setRelationDimensionOptions([]); - return; - } - const { code, data, msg } = await getDimensionList({ ids }); - if (code === 200 && Array.isArray(data?.list)) { - setDimensionList(data.list); - setRelationDimensionOptions( - data.list.map((item: ISemantic.IMetricItem) => { - return { label: item.name, value: item.bizName, modelId: item.modelId }; - }), - ); - return data.list; - } - message.error(msg); - return []; - }; - return ( <>
@@ -96,29 +46,9 @@ const MetricDetail: React.FC = () => { />
- {/* {metircData && ( */} - - {/* )} */} +
- { - setMetricRelationModalOpenState(false); - }} - onSubmit={(relations) => { - queryMetricData(metricId); - queryDrillDownDimension(metricId); - setMetricRelationModalOpenState(false); - }} - /> ); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx index e97efd8dc..4c36dcfd8 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricInfoCreateForm.tsx @@ -100,8 +100,6 @@ const MetricInfoCreateForm: React.FC = ({ }, } as any); - // const [exprTypeParamsState, setExprTypeParamsState] = useState([]); - const [defineType, setDefineType] = useState(METRIC_DEFINE_TYPE.MEASURE); const [createNewMetricList, setCreateNewMetricList] = useState([]); @@ -123,11 +121,11 @@ const MetricInfoCreateForm: React.FC = ({ ISemantic.IDrillDownDimensionItem[] >([]); - const forward = () => setCurrentStep(currentStep + 1); - const backward = () => setCurrentStep(currentStep - 1); - const queryModelDetail = async () => { - const { code, data } = await getModelDetail({ modelId: modelId || metricItem?.modelId }); + if (!modelId) { + return; + } + const { code, data } = await getModelDetail({ modelId }); if (code === 200) { if (Array.isArray(data?.modelDetail?.fields)) { if (Array.isArray(metricItem?.metricDefineByFieldParams?.fields)) { @@ -817,32 +815,7 @@ const MetricInfoCreateForm: React.FC = ({ ); }; - const renderFooter = () => { - if (!hasMeasuresState) { - return ; - } - if (currentStep === 1) { - return ( - <> - - - - - ); - } - return ( - <> - - - - ); - }; + return ( <> {hasMeasuresState ? ( diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx index 66422a771..88103390d 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx @@ -5,7 +5,7 @@ import DomainListTree from './components/DomainList'; import styles from './components/style.less'; import { LeftOutlined, RightOutlined } from '@ant-design/icons'; import { ISemantic } from './data'; -import { getDomainList, getModelList } from './service'; +import { getDomainList } from './service'; import DomainManagerTab from './components/DomainManagerTab'; type Props = { @@ -33,7 +33,6 @@ const OverviewContainer: React.FC = ({ mode }) => { const { MrefreshMetricList } = metricModel; const { MrefreshDatabaseList } = databaseModel; const menuKey = params.menuKey ? params.menuKey : !Number(modelId) ? 'overview' : ''; - // const [modelList, setModelList] = useState([]); const [isModel, setIsModel] = useState(false); const [collapsedState, setCollapsedState] = useState(true); const [activeKey, setActiveKey] = useState(menuKey); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx index 651eed109..22da44b6b 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -52,6 +52,9 @@ const ClassDimensionTable: React.FC = ({}) => { const actionRef = useRef(); const queryDimensionList = async (params: any) => { + if (!modelId) { + return; + } setLoading(true); const { code, data, msg } = await getDimensionList({ ...pagination, @@ -85,7 +88,7 @@ const ClassDimensionTable: React.FC = ({}) => { useEffect(() => { queryDimensionList({ ...filterParams, ...defaultPagination }); - }, [filterParams]); + }, [filterParams, modelId]); useEffect(() => { queryDataSourceList(); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx index 940d27b5f..88f94946a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -108,9 +108,12 @@ const ClassMetricTable: React.FC = ({ onEmptyMetricData }) => { useEffect(() => { queryMetricList({ ...filterParams, ...defaultPagination }); - }, [filterParams]); + }, [filterParams, modelId]); const queryMetricList = async (params: any) => { + if (!modelId) { + return; + } setLoading(true); const { code, data, msg } = await queryMetric({ ...pagination, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx index 170de78b2..e9b1a0694 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DomainManagerTab.tsx @@ -205,7 +205,7 @@ const DomainManagerTab: React.FC = ({ />