From 2033421c336905d97d1d8396e76f6f80e98981a0 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:50:12 +0800 Subject: [PATCH] [improvement][headless-fe] Updated the file imports in the project. (#966) 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. --- webapp/packages/supersonic-fe/package.json | 7 ++----- .../supersonic-fe/src/components/MDatePicker/index.tsx | 2 +- .../SemanticModel/Insights/components/TagTrendSection.tsx | 2 +- .../SemanticModel/Metric/components/MetricTrendSection.tsx | 2 +- .../SemanticModel/View/components/ViewSearchFormModal.tsx | 2 +- .../View/components/ViewSearchFormModal_tag.tsx | 2 +- .../components/Entity/DimensionValueSettingForm.tsx | 2 +- .../components/Entity/RecommendedQuestionsSection.tsx | 2 +- .../SemanticModel/components/MetricFieldFormTable.tsx | 2 +- .../SemanticModel/components/MetricMeasuresFormTable.tsx | 2 +- .../SemanticModel/components/MetricMetricFormTable.tsx | 2 +- .../components/Permission/PermissionSection.tsx | 2 +- .../SemanticModel/components/TagDimensionFormTable.tsx | 2 +- webapp/packages/supersonic-fe/src/pages/System/index.tsx | 2 +- 14 files changed, 15 insertions(+), 18 deletions(-) diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json index 36f7dde81..be02d11ee 100644 --- a/webapp/packages/supersonic-fe/package.json +++ b/webapp/packages/supersonic-fe/package.json @@ -56,7 +56,6 @@ ], "dependencies": { "@ant-design/icons": "^5.2.6", - "@ant-design/pro-card": "^2.5.26", "@ant-design/pro-components": "2.7.0", "@ant-design/pro-layout": "^7.17.15", "@antv/dom-util": "^2.0.4", @@ -64,8 +63,6 @@ "@antv/g6-core": "^0.8.23", "@antv/layout": "^0.3.20", "@antv/x6": "1.30.1", - "@antv/xflow": "^1.0.55", - "@antv/xflow-extension": "1.0.55", "@babel/runtime": "^7.22.5", "@types/numeral": "^2.0.2", "@types/react-draft-wysiwyg": "^1.13.2", @@ -73,7 +70,7 @@ "@umijs/route-utils": "^1.0.33", "ace-builds": "^1.4.12", "ahooks": "^3.7.7", - "antd": "5.11.0", + "antd": "5.11.2", "classnames": "^2.2.6", "compression-webpack-plugin": "^11.0.0", "copy-to-clipboard": "^3.3.1", @@ -100,7 +97,7 @@ "react-split-pane": "^2.0.3", "react-syntax-highlighter": "^15.4.3", "sql-formatter": "^2.3.3", - "supersonic-chat-sdk": "0.0.0", + "supersonic-chat-sdk": "^1.0.10", "supersonic-insights-flow-components": "^1.4.6", "umi": "3.5", "umi-request": "^1.4.0" diff --git a/webapp/packages/supersonic-fe/src/components/MDatePicker/index.tsx b/webapp/packages/supersonic-fe/src/components/MDatePicker/index.tsx index b7288d4f4..998c82fef 100644 --- a/webapp/packages/supersonic-fe/src/components/MDatePicker/index.tsx +++ b/webapp/packages/supersonic-fe/src/components/MDatePicker/index.tsx @@ -16,7 +16,7 @@ import { LatestDateMap } from './type'; import StaticDate from './StaticDate'; import DynamicDate from './DynamicDate'; import dayjs from 'dayjs'; -import { ProCard } from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; type Props = { disabledAdvanceSetting?: boolean; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagTrendSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagTrendSection.tsx index 637932402..2c98f6b64 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagTrendSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagTrendSection.tsx @@ -6,7 +6,7 @@ import TagTable from './Table'; import { ISemantic } from '../../data'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import { TagGraph } from 'supersonic-insights-flow-components'; import styles from '../style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx index 5e6c71565..992af900c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricTrendSection.tsx @@ -13,7 +13,7 @@ import { ColumnConfig } from '../data'; import dayjs from 'dayjs'; import { ISemantic } from '../../data'; import { DateFieldMap } from '@/pages/SemanticModel/constant'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import styles from '../style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal.tsx index 53ae2963d..c174db3bc 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal.tsx @@ -7,7 +7,7 @@ import { createView, updateView, getDimensionList, queryMetric } from '../../ser import { ISemantic } from '../../data'; import DefaultSettingForm from './DefaultSettingForm'; import { isArrayOfValues } from '@/utils/utils'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import { ChatConfigType } from '../../enum'; export type ModelCreateFormModalProps = { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal_tag.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal_tag.tsx index 7e79f053d..02ca3e6cb 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal_tag.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewSearchFormModal_tag.tsx @@ -7,7 +7,7 @@ import { createView, updateView, getDimensionList, queryMetric, getTagList } fro import { ISemantic } from '../../data'; import DefaultSettingForm from './DefaultSettingForm'; import { isArrayOfValues } from '@/utils/utils'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import { TransType, ChatConfigType } from '../../enum'; import { number } from 'echarts'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx index 5a4ac98ae..82ae5fc54 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionValueSettingForm.tsx @@ -5,7 +5,7 @@ import FormItemTitle from '@/components/FormHelper/FormItemTitle'; import { RedoOutlined, InfoCircleOutlined } from '@ant-design/icons'; import DisabledWheelNumberInput from '@/components/DisabledWheelNumberInput'; import { formLayout } from '@/components/FormHelper/utils'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import { connect } from 'umi'; import { DictTaskState, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/RecommendedQuestionsSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/RecommendedQuestionsSection.tsx index d13513e7c..bcc478a0e 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/RecommendedQuestionsSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/RecommendedQuestionsSection.tsx @@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'umi'; import type { StateType } from '../../model'; import { getDomainExtendConfig, addDomainExtend, editDomainExtend } from '../../service'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import TextAreaCommonEditList from '../../components/CommonEditList/TextArea'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx index 3d988ff7c..b82f12c99 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Button, Tag, Space } from 'antd'; import { ProTable } from '@ant-design/pro-components'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import SqlEditor from '@/components/SqlEditor'; import styles from './style.less'; import FormLabelRequire from './FormLabelRequire'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx index ce12c2a3b..e547f38d7 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Input, Space, Tag } from 'antd'; import { ProTable } from '@ant-design/pro-components'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx index 2ade6f363..b4ba45d8e 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; import { ProTable } from '@ant-design/pro-components'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; import styles from './style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionSection.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionSection.tsx index 692bdbf4a..f26473dfa 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionSection.tsx @@ -3,7 +3,7 @@ import React from 'react'; import type { Dispatch } from 'umi'; import { connect } from 'umi'; import type { StateType } from '../../model'; -import { ProCard } from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import PermissionTable from './PermissionTable'; import PermissionAdminForm from './PermissionAdminForm'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx index ac2e4f6e2..8599f40ae 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; import { ProTable } from '@ant-design/pro-components'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; import styles from './style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/System/index.tsx b/webapp/packages/supersonic-fe/src/pages/System/index.tsx index 6a3af8a8f..2597916fd 100644 --- a/webapp/packages/supersonic-fe/src/pages/System/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/System/index.tsx @@ -15,7 +15,7 @@ import { } from 'antd'; import React, { useState, useEffect } from 'react'; import { getSystemConfig, saveSystemConfig } from '@/services/user'; -import ProCard from '@ant-design/pro-card'; +import { ProCard } from '@ant-design/pro-components'; import SelectTMEPerson from '@/components/SelectTMEPerson'; import { ConfigParametersItem, SystemConfig } from './types'; import FormItemTitle from '@/components/FormHelper/FormItemTitle';