From 3bf5b865355795e74949580d86c5b52bf8435dfe Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:37:19 +0800 Subject: [PATCH] [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. (#508) * [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. --- webapp/packages/supersonic-fe/src/app.tsx | 5 + .../SemanticModel/ChatSetting/ChatSetting.tsx | 3 +- .../ChatSetting/ChatSettingSection.tsx | 20 ++- .../src/pages/SemanticModel/DomainManager.tsx | 3 +- .../pages/SemanticModel/OverviewContainer.tsx | 3 +- .../components/Entity/DefaultSettingForm.tsx | 15 +- .../components/Entity/EntitySection.tsx | 149 ++++++++++-------- 7 files changed, 114 insertions(+), 84 deletions(-) diff --git a/webapp/packages/supersonic-fe/src/app.tsx b/webapp/packages/supersonic-fe/src/app.tsx index 59e2040c0..2af0917f7 100644 --- a/webapp/packages/supersonic-fe/src/app.tsx +++ b/webapp/packages/supersonic-fe/src/app.tsx @@ -126,6 +126,11 @@ export async function patchRoutes({ routes }) { } } +export function onRouteChange() { + const title = window.document.title.split('-SuperSonic')[0]; + window.document.title = `${title}-SuperSonic`; +} + export const layout: RunTimeLayoutConfig = (params) => { const { initialState } = params as any; return { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSetting.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSetting.tsx index 3cd46ffa0..28a378997 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSetting.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSetting.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { connect, Helmet } from 'umi'; +import { connect } from 'umi'; import type { StateType } from '../model'; import OverviewContainer from '../OverviewContainer'; import type { Dispatch } from 'umi'; @@ -11,7 +11,6 @@ type Props = { const ChatSetting: React.FC = () => { return ( <> - ); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSettingSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSettingSection.tsx index 6edc9f16b..eb3dbfa68 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSettingSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/ChatSetting/ChatSettingSection.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useRef } from 'react'; import { connect } from 'umi'; import type { StateType } from '../model'; import ProCard from '@ant-design/pro-card'; @@ -12,13 +12,27 @@ type Props = { }; const ChatSettingSection: React.FC = () => { + const metricRef = useRef(); + const tagRef = useRef(); return (
- + { + tagRef.current.refreshConfigData(); + }} + /> - + { + metricRef.current.refreshConfigData(); + }} + />
); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/DomainManager.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/DomainManager.tsx index bcd922468..ef837c842 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/DomainManager.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/DomainManager.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { connect, Helmet } from 'umi'; +import { connect } from 'umi'; import type { StateType } from './model'; import OverviewContainer from './OverviewContainer'; import type { Dispatch } from 'umi'; @@ -11,7 +11,6 @@ type Props = { const DomainManager: React.FC = () => { return ( <> - ); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx index 0b0ac789e..2be53f786 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/OverviewContainer.tsx @@ -1,6 +1,6 @@ import { Popover, message, Space } from 'antd'; import React, { useEffect, useState } from 'react'; -import { connect, Helmet, history, useParams } from 'umi'; +import { connect, history, useParams } from 'umi'; import DomainListTree from './components/DomainList'; import styles from './components/style.less'; @@ -199,7 +199,6 @@ const OverviewContainer: React.FC = ({ mode, domainManger, dispatch }) => return (
-
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DefaultSettingForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DefaultSettingForm.tsx index 24e01cc46..04745ce2b 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DefaultSettingForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DefaultSettingForm.tsx @@ -27,6 +27,12 @@ type Props = { const FormItem = Form.Item; const Option = Select.Option; +const formDefaultValue = { + unit: 7, + period: 'DAY', + timeMode: 'LAST', +}; + const DefaultSettingForm: ForwardRefRenderFunction = ( { metricList, dimensionList, entityData, chatConfigKey, chatConfigType, onSubmit }, ref, @@ -44,11 +50,12 @@ const DefaultSettingForm: ForwardRefRenderFunction = ( useEffect(() => { form.resetFields(); - if (!entityData?.chatDefaultConfig) { + if (!(entityData?.id && entityData?.chatDefaultConfig)) { return; } const { chatDefaultConfig, id } = formatEntityData; form.setFieldsValue({ + ...formDefaultValue, ...chatDefaultConfig, id, }); @@ -152,11 +159,7 @@ const DefaultSettingForm: ForwardRefRenderFunction = ( form={form} layout="vertical" className={styles.form} - initialValues={{ - unit: 7, - period: 'DAY', - timeMode: 'LAST', - }} + initialValues={formDefaultValue} >