From 299fd8413a90aae8fe17a8a57465ba5190ee8269 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:32:04 +0800 Subject: [PATCH] [improvement][headless-fe] Added query and batch delete operations to the terminology management feature (#1735) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation. * [improvement][headless-fe] fix build bugs * [improvement][headless-fe] change build config * [improvement][headless-fe] route config change * [improvement][headless-fe] Optimized data updating when switching domains. * [improvement][headless-fe] css change * [improvement][semantic-fe] logo css change * [improvement][semantic-fe] system config add defaultValue support * [improvement][semantic-fe] tag mode wording change * [improvement][semantic-fe] fix metric edit page init error * [improvement][supersonic-fe] Updated the way chat projects are imported in supersonic-fe. * [improvement][chat-engine] Added a background silent mode for watching chat projects. * [improvement][supersonic-fe] fix proxy url * [improvement][headless-fe] agent setting update * [improvement][headless-fe] Agent configuration: Added connectivity testing for large models. * [improvement][headless-fe] Chat: Enabled integration with agent configuration. * [improvement][headless-fe] SQL formatter: Updated the import method. * [improvement][headless-fe] login fixed * [improvement][headless-fe] Agent: Optimized the logic for saving. * [improvement][headless-fe] Model management: Integrated into the main theme domain. * [improvement][headless-fe] Sensitivity: Added bulk modification functionality. * [improvement][headless-fe] wording change * [improvement][headless-fe] Prompt configuration: Added the ability to configure prompts. * [improvement][headless-fe] Added the ability to configure embedding models. * [improvement][headless-fe] hidden configure embedding models. * [improvement][headless-fe] Connection test prompt update for large language model settings. * [improvement][headless-fe] add memory review config * [improvement][headless-fe] Rollback of data structure for large language model configuration. * [improvement][headless-fe] Added dependency relationships between various items in system configuration. * [improvement][headless-fe] Added password parsing to the generation rules of system settings. * [improvement][headless-fe] Added slider parsing to the generation rules of system settings. * [improvement][headless-fe] Optimized the logic for initializing values in system settings. * [improvement][headless-fe] Optimized the time format * [improvement][headless-fe] Unified the SQL generation method for data sets to ensure consistency and improve efficiency. * [improvement][headless-fe] Added support for data sets with non-partitioned time fields * [improvement][headless-fe] Added support for editing time formats in dimension settings * [improvement][headless-fe] Rolled back the time parameter in the metric details page to its previous state * [improvement][headless-fe] Fixed the issue with hidden field validation when editing dimensions * [improvement][headless-fe] Added a connectivity test for large models in the system settings * [improvement][headless-fe] Changed the METRIC type in ChatContextType queryType to AGGREGATE * [improvement][headless-fe] Added query and batch delete operations to the terminology management feature --------- Co-authored-by: tristanliu --- webapp/packages/supersonic-fe/config/proxy.ts | 3 +- .../components/TableHeaderFilter/index.less | 10 ++++ .../components/TableHeaderFilter/index.tsx | 28 +++++++++ .../components/ClassDimensionTable.tsx | 2 +- .../components/ClassMetricTable.tsx | 2 +- .../SemanticModel/components/ModelTable.tsx | 2 +- .../components/Term/TermTable.tsx | 59 ++++++++++++++++--- .../src/pages/SemanticModel/service.ts | 13 ++-- 8 files changed, 100 insertions(+), 19 deletions(-) create mode 100644 webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less create mode 100644 webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx diff --git a/webapp/packages/supersonic-fe/config/proxy.ts b/webapp/packages/supersonic-fe/config/proxy.ts index 7d956b9a4..166919713 100644 --- a/webapp/packages/supersonic-fe/config/proxy.ts +++ b/webapp/packages/supersonic-fe/config/proxy.ts @@ -1,8 +1,7 @@ export default { dev: { '/api/': { - target: 'http://10.91.210.65:9080', - // target: 'http://s2.tmeoa.com', + target: 'http://localhost:9080', changeOrigin: true, }, }, diff --git a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less new file mode 100644 index 000000000..57c672723 --- /dev/null +++ b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less @@ -0,0 +1,10 @@ +.tableHeaderTitle { + margin-left: 20px; + .headerTitleLabel { + color: #667085; + font-size: 14px; + font-weight: 400; + width: max-content; + display: flex; + } +} diff --git a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx new file mode 100644 index 000000000..7df4c7820 --- /dev/null +++ b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx @@ -0,0 +1,28 @@ +import { Space } from 'antd'; +import React, { ReactNode } from 'react'; + +import styles from './index.less'; + +type Props = { + components: { + label: string; + component: ReactNode; + }[]; +}; + +const TableHeaderFilter: React.FC = ({ components }) => { + return ( + <> + + {components.map(({ label, component }) => ( + + {label}: + {component} + + ))} + + + ); +}; + +export default TableHeaderFilter; 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 805589098..4eb45e6b3 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -15,7 +15,7 @@ import { import DimensionInfoModal from './DimensionInfoModal'; import DimensionValueSettingModal from './DimensionValueSettingModal'; import { ISemantic, IDataSource } from '../data'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import BatchCtrlDropDownButton from '@/components/BatchCtrlDropDownButton'; import { ColumnsConfig } from './TableColumnRender'; import BatchSensitiveLevelModal from '@/components/BatchCtrlDropDownButton/BatchSensitiveLevelModal'; 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 153ad7eca..e15d32046 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -17,7 +17,7 @@ import { import MetricInfoCreateForm from './MetricInfoCreateForm'; import BatchCtrlDropDownButton from '@/components/BatchCtrlDropDownButton'; import BatchSensitiveLevelModal from '@/components/BatchCtrlDropDownButton/BatchSensitiveLevelModal'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import styles from './style.less'; import { ISemantic } from '../data'; import { ColumnsConfig } from './TableColumnRender'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx index c87a97553..1ecd296da 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx @@ -7,7 +7,7 @@ import { useModel } from '@umijs/max'; import { deleteModel, batchUpdateModelStatus } from '../service'; import ClassModelTypeModal from './ClassModelTypeModal'; import { ColumnsConfig } from './TableColumnRender'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import moment from 'moment'; import styles from './style.less'; import { ISemantic } from '../data'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx index be0c0a2cb..6ed97b7e2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx @@ -1,6 +1,6 @@ import type { ActionType, ProColumns } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components'; -import { message, Button, Space, Popconfirm, Typography } from 'antd'; +import { message, Button, Space, Popconfirm, Typography, Input } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { useModel } from '@umijs/max'; import { getTermList, saveOrUpdate, deleteTerm } from '../../service'; @@ -8,6 +8,8 @@ import dayjs from 'dayjs'; import styles from '../style.less'; import { ISemantic } from '../../data'; import TermCreateForm from './TermCreateForm'; +import { isArrayOfValues } from '@/utils/utils'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; const { Paragraph } = Typography; @@ -21,16 +23,19 @@ const TermTable: React.FC = ({}) => { const [tableData, setTableData] = useState([]); const [loading, setLoading] = useState(false); - + const [selectedRowKeys, setSelectedRowKeys] = useState([]); const actionRef = useRef(); useEffect(() => { queryTermList(); }, [selectDomainId]); - const queryTermList = async () => { + const queryTermList = async (queryKey?: string) => { setLoading(true); - const { code, data, msg } = await getTermList(selectDomainId); + const { code, data, msg } = await getTermList({ + domainId: selectDomainId, + queryKey, + }); setLoading(false); if (code === 200) { setTableData(data || []); @@ -53,10 +58,11 @@ const TermTable: React.FC = ({}) => { } }; - const deleteTermConfig = async (termItem: ISemantic.ITermItem) => { - const { code, msg } = await deleteTerm(termItem.id); + const deleteTermConfig = async (ids: number[]) => { + const { code, msg } = await deleteTerm({ ids }); if (code === 200) { queryTermList(); + setSelectedRowKeys([]); } else { message.error(msg); } @@ -125,7 +131,7 @@ const TermTable: React.FC = ({}) => { okText="是" cancelText="否" onConfirm={() => { - deleteTermConfig(record); + deleteTermConfig([record.id]); }} > , + , ]} /> {createModalVisible && ( diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts index 46c831a43..9b772227a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts @@ -760,12 +760,10 @@ export function batchUpdateMetricSensitiveLevel(data: any): Promise { }); } -export function getTermList(domainId: number): Promise { +export function getTermList(data: any): Promise { return request(`${process.env.API_BASE_URL}term`, { method: 'GET', - params: { - domainId, - }, + params: data, }); } @@ -776,8 +774,9 @@ export function saveOrUpdate(data: any): Promise { }); } -export function deleteTerm(id: number): Promise { - return request(`${process.env.API_BASE_URL}term/${id}`, { - method: 'DELETE', +export function deleteTerm(data: any): Promise { + return request(`${process.env.API_BASE_URL}term/deleteBatch`, { + method: 'POST', + data: { ...data }, }); }