From 26260c79f1f60eab7a19cf7d63eccdc4ae8c5840 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Tue, 27 Feb 2024 20:25:55 +0800 Subject: [PATCH] [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. (#771) 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. --- .../components/MetricFieldFormTable.tsx | 45 +++++++++----- .../components/MetricMeasuresFormTable.tsx | 62 ++++++++++++------- .../components/MetricMetricFormTable.tsx | 48 +++++++++----- 3 files changed, 103 insertions(+), 52 deletions(-) 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 4da89399b..06bf488bf 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx @@ -67,26 +67,41 @@ const MetricFieldFormTable: React.FC = ({ }, ]; + const handleUpdateKeys = (updateKeys: Record) => { + setSelectedKeysMap(updateKeys); + const selectedKeys: string[] = []; + const fieldList = Object.entries(updateKeys).reduce((list: any[], item) => { + const [fieldName, selected] = item; + if (selected) { + selectedKeys.push(fieldName); + list.push({ fieldName }); + } + return list; + }, []); + setSelectedKeys(selectedKeys); + onFieldChange(fieldList); + }; + const rowSelection = { selectedRowKeys: selectedKeys, onSelect: (record: ISemantic.IFieldTypeParamsItem, selected: boolean) => { const updateKeys = { ...selectedKeysMap, [record.fieldName]: selected }; - const selectedKeys: string[] = []; - setSelectedKeysMap(updateKeys); - const fieldList = Object.entries(updateKeys).reduce((list: any[], item) => { - const [fieldName, selected] = item; - if (selected) { - selectedKeys.push(fieldName); - list.push({ fieldName }); - } - return list; - }, []); - setSelectedKeys(selectedKeys); - onFieldChange(fieldList); + handleUpdateKeys(updateKeys); + }, + onSelectAll: ( + selected: boolean, + selectedRows: ISemantic.IFieldTypeParamsItem[], + changeRows: ISemantic.IFieldTypeParamsItem[], + ) => { + const updateKeys = changeRows.reduce( + (keyMap: Record, item: ISemantic.IFieldTypeParamsItem) => { + keyMap[item.fieldName] = selected; + return keyMap; + }, + {}, + ); + handleUpdateKeys({ ...selectedKeysMap, ...updateKeys }); }, - // onChange: (_selectedRowKeys: any[]) => { - // setSelectedKeys([..._selectedRowKeys]); - // }, }; return ( 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 a28442d07..6f8719e54 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx @@ -106,34 +106,52 @@ const MetricMeasuresFormTable: React.FC = ({ }, ]; + const handleUpdateKeys = (updateKeys: Record) => { + const datasource = + datasourceId && Array.isArray(measuresList) + ? measuresList.filter((item) => item.datasourceId === datasourceId) + : measuresList; + setSelectedKeysMap(updateKeys); + const selectedKeys: string[] = []; + const measures = datasource.reduce( + (list: any[], { bizName, name, expr, datasourceId, agg }) => { + if (updateKeys[bizName] === true) { + selectedKeys.push(bizName); + list.push({ + bizName, + name, + expr, + agg, + datasourceId, + }); + } + return list; + }, + [], + ); + setSelectedKeys(selectedKeys); + onFieldChange(measures); + }; + const rowSelection = { selectedRowKeys: selectedKeys, onSelect: (record: ISemantic.IMeasure, selected: boolean) => { - const datasource = - datasourceId && Array.isArray(measuresList) - ? measuresList.filter((item) => item.datasourceId === datasourceId) - : measuresList; const updateKeys = { ...selectedKeysMap, [record.bizName]: selected }; - setSelectedKeysMap(updateKeys); - const selectedKeys: string[] = []; - const measures = datasource.reduce( - (list: any[], { bizName, name, expr, datasourceId, agg }) => { - if (updateKeys[bizName] === true) { - selectedKeys.push(bizName); - list.push({ - bizName, - name, - expr, - agg, - datasourceId, - }); - } - return list; + handleUpdateKeys(updateKeys); + }, + onSelectAll: ( + selected: boolean, + selectedRows: ISemantic.IMeasure[], + changeRows: ISemantic.IMeasure[], + ) => { + const updateKeys = changeRows.reduce( + (keyMap: Record, item: ISemantic.IMeasure) => { + keyMap[item.bizName] = selected; + return keyMap; }, - [], + {}, ); - setSelectedKeys(selectedKeys); - onFieldChange(measures); + handleUpdateKeys({ ...selectedKeysMap, ...updateKeys }); }, }; 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 39a2c434c..c9659c6c9 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx @@ -74,25 +74,43 @@ const MetricMetricFormTable: React.FC = ({ }, ]; + const handleUpdateKeys = (updateKeys: Record) => { + setSelectedKeysMap(updateKeys); + const selectedKeys: string[] = []; + const metrics = metricList.reduce((list: any[], item) => { + const { bizName, id } = item; + if (updateKeys[bizName] === true) { + selectedKeys.push(bizName); + list.push({ + bizName, + id, + }); + } + return list; + }, []); + setSelectedKeys(selectedKeys); + onFieldChange(metrics); + }; + const rowSelection = { selectedRowKeys: selectedKeys, onSelect: (record: ISemantic.IMeasure, selected: boolean) => { const updateKeys = { ...selectedKeysMap, [record.bizName]: selected }; - setSelectedKeysMap(updateKeys); - const selectedKeys: string[] = []; - const metrics = metricList.reduce((list: any[], item) => { - const { bizName, id } = item; - if (updateKeys[bizName] === true) { - selectedKeys.push(bizName); - list.push({ - bizName, - id, - }); - } - return list; - }, []); - setSelectedKeys(selectedKeys); - onFieldChange(metrics); + handleUpdateKeys(updateKeys); + }, + onSelectAll: ( + selected: boolean, + selectedRows: ISemantic.IMetricItem[], + changeRows: ISemantic.IMetricItem[], + ) => { + const updateKeys = changeRows.reduce( + (keyMap: Record, item: ISemantic.IMetricItem) => { + keyMap[item.bizName] = selected; + return keyMap; + }, + {}, + ); + handleUpdateKeys({ ...selectedKeysMap, ...updateKeys }); }, };