Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[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

Merged
merged 122 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
dcc0a96
[improvement][semantic-fe] Add model alias setting & Add view permiss…
Sep 9, 2023
109cc91
Merge branch 'tencentmusic:master' into master
sevenliu1896 Sep 11, 2023
82b1955
[improvement][semantic-fe] Add time granularity setting in the data s…
Sep 11, 2023
602e532
Merge branch 'tencentmusic:master' into master
sevenliu1896 Sep 14, 2023
e12fa20
[improvement][semantic-fe] Dictionary import for dimension values sup…
Sep 14, 2023
ef391d3
Merge branch 'tencentmusic:master' into master
sevenliu1896 Sep 19, 2023
9488453
[improvement][semantic-fe] Modification of data source creation promp…
Sep 19, 2023
5672b82
Merge branch 'tencentmusic:master' into master
sevenliu1896 Sep 20, 2023
215c25e
[improvement][semantic-fe] metric market experience optimization
Sep 20, 2023
1083531
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 16, 2023
b7d8a73
[improvement][semantic-fe] enhance the analysis of metric trends
Oct 16, 2023
901ca64
[improvement][semantic-fe] optimize the presentation of metric trend …
Oct 16, 2023
bc523ae
Merge branch 'master' into master
sevenliu1896 Oct 16, 2023
fce2a9f
[improvement][semantic-fe] add metric trend download functionality
Oct 17, 2023
050a331
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 17, 2023
9e202cd
Merge branch 'master' of https://github.com/sevenliu1896/supersonic
Oct 17, 2023
3b278fb
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 17, 2023
803b487
[improvement][semantic-fe] fix the dimension initialization issue in …
Oct 17, 2023
b57016d
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 18, 2023
29ddf88
[improvement][semantic-fe] Fix the issue of database changes not taki…
Oct 18, 2023
ccfb31c
[improvement][semantic-fe] Optimizing pagination logic and some CSS s…
Oct 26, 2023
239851d
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 26, 2023
a801dbd
Merge branch 'master' of https://github.com/sevenliu1896/supersonic
Oct 26, 2023
f59b7f6
[improvement][semantic-fe] Fixing the API for the indicator list by c…
Oct 26, 2023
f0e98e3
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 26, 2023
8469bf3
Merge branch 'master' of https://github.com/sevenliu1896/supersonic
Oct 26, 2023
6401227
Merge branch 'tencentmusic:master' into master
sevenliu1896 Oct 27, 2023
0f77cec
[improvement][semantic-fe] Fixing the default value setting for the i…
Oct 27, 2023
a9e5e8c
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 2, 2023
e600d1f
[improvement][semantic-fe] Adding batch operations for indicators/dim…
Nov 2, 2023
a105f99
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 6, 2023
3f63ac1
[improvement][semantic-fe] Replacing the single status update API for…
Nov 6, 2023
257720a
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 9, 2023
fea84c6
[improvement][semantic-fe] Redesigning the indicator homepage to inco…
Nov 9, 2023
6a758de
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 14, 2023
f63c1d0
[improvement][semantic-fe] Optimizing the logic for setting dimension…
Nov 14, 2023
50e1058
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 17, 2023
5d735f5
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 20, 2023
bdc7564
[improvement][semantic-fe] Upgrading antd version to 5.x, extracting …
Nov 20, 2023
72a6999
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 20, 2023
f000a86
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 23, 2023
9895571
[improvement][semantic-fe] Adding the ability to filter dimensions b…
Nov 23, 2023
cfe3232
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 27, 2023
14267da
[improvement][semantic-fe] Adding the ability to edit relationships b…
Nov 27, 2023
8e10f45
[improvement][semantic-fe] Updating the datePicker component to use d…
Nov 27, 2023
2b094da
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 27, 2023
00f46b0
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 27, 2023
7d58cc4
[improvement][semantic-fe] Fixing the issue with passing the model ID…
Nov 27, 2023
a969391
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 27, 2023
1fab051
Merge branch 'tencentmusic:master' into master
sevenliu1896 Nov 30, 2023
a378a53
[improvement][semantic-fe] Fixing the abnormal state of the popup whe…
Nov 30, 2023
9d83f62
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 4, 2023
e71c187
[improvement][semantic-fe] Adding permission logic for bulk operation…
Dec 4, 2023
1cf8835
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 6, 2023
01b10b1
[improvement][semantic-fe] Adding the ability to download and transpo…
Dec 6, 2023
529eed5
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 8, 2023
b9b3378
[improvement][semantic-fe] Fixing the initialization issue with the d…
Dec 8, 2023
9584a6d
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 12, 2023
b47cf1f
[improvement][semantic-fe] Fixing the logic error in the dimension va…
Dec 12, 2023
a44e276
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 14, 2023
50d47ff
[improvement][semantic-fe] Fixing the synchronization issue with the …
Dec 14, 2023
c22de1b
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 15, 2023
15f99ed
[improvement][semantic-fe] Optimizing the canvas functionality for be…
Dec 15, 2023
ebc637c
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 18, 2023
aa98f32
[improvement][semantic-fe] Optimizing the update process for drawing …
Dec 18, 2023
0a8000a
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 18, 2023
e56fd1a
[improvement][semantic-fe] Changing the line type for canvas connecti…
Dec 18, 2023
7b22f5f
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 20, 2023
771a53a
[improvement][semantic-fe] Replacing the initialization variable fro…
Dec 20, 2023
0351910
Merge branch 'tencentmusic:master' into master
sevenliu1896 Dec 28, 2023
9307922
[improvement][semantic-fe] Fixing the missing migration issue for def…
Dec 28, 2023
9083e48
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 2, 2024
0a7fd68
[improvement][semantic-fe] Updating the logic for the fieldName.
Jan 2, 2024
adae7ab
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 3, 2024
47383d7
[improvement][semantic-fe] Adjusting the position of the metrics tab.
Jan 3, 2024
e639240
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 5, 2024
2a02d65
[improvement][semantic-fe] Changing the 字段名称 to 英文名称.
Jan 5, 2024
bf8cbfc
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 8, 2024
d880b01
[improvement][semantic-fe] Fix metric measurement deletion.
Jan 8, 2024
fda743b
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 9, 2024
5c41a40
[improvement][semantic-fe] UI optimization for metric details page.
Jan 9, 2024
d9a53dc
[improvement][semantic-fe] UI optimization for metric details page.
Jan 9, 2024
d7f3075
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 9, 2024
75d0a2c
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 11, 2024
d20f795
[improvement][semantic-fe] UI adjustment for metric details page.
Jan 11, 2024
b7f0c4d
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 15, 2024
8779bc5
[improvement][semantic-fe] The granularity field in the time type of …
Jan 15, 2024
b582ea7
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 19, 2024
71f75ff
[improvement][semantic-fe] Added field type and metric type to the me…
Jan 19, 2024
7cdbcf1
[improvement][semantic-fe] The organization structure selection featu…
Jan 19, 2024
ae11f07
Merge branch 'master' into master
sevenliu1896 Jan 19, 2024
5a894b6
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 19, 2024
557d09a
[improvement][semantic-fe] Improved user experience for the metric list.
Jan 19, 2024
91ab5f1
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 22, 2024
3d1f79d
[improvement][semantic-fe] fix update the metric list.
Jan 22, 2024
b9918b1
Merge branch 'tencentmusic:master' into master
sevenliu1896 Jan 30, 2024
552cf1f
[improvement][headless-fe] Added view management functionality.
Jan 30, 2024
c7f4713
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 4, 2024
bea1c1c
[improvement][headless-fe] The view management functionality has been…
Feb 4, 2024
30b91c6
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 5, 2024
25eb4d2
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 21, 2024
c1f3fad
[improvement][headless-fe] Added model editing side effect detection.
Feb 21, 2024
cdbf382
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 22, 2024
f085ea0
[improvement][headless-fe] Fixed the logic error in view editing.
Feb 22, 2024
c527b65
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 22, 2024
4f4f3cd
[improvement][headless-fe] Fixed the issue with initializing dimensio…
Feb 22, 2024
e3d9b6e
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 23, 2024
6877baf
[improvement][headless-fe] Added the ability to hide the Q&A settings…
Feb 23, 2024
4adeb3c
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 23, 2024
9d58871
[improvement][headless-fe] Fixed the issue with selecting search resu…
Feb 23, 2024
1032c57
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 24, 2024
9926e17
[improvement][headless-fe] Added search functionality to the field li…
Feb 24, 2024
2795aca
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 26, 2024
6d71228
[improvement][headless-fe] fix the field list in model editing
Feb 26, 2024
fbc44ac
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 26, 2024
73b8dce
[improvement][headless-fe] Restructured the data for the dimension va…
Feb 26, 2024
2032bf8
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 26, 2024
de5dfb4
[improvement][headless-fe] Added dynamic variable functionality to mo…
Feb 26, 2024
0ef1658
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 26, 2024
7bb869a
[improvement][headless-fe] Added support for passing dynamic variable…
Feb 26, 2024
bd908e5
Merge branch 'tencentmusic:master' into master
sevenliu1896 Feb 27, 2024
0411466
[improvement][headless-fe] Resolved the issue where users were unable…
Feb 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,41 @@ const MetricFieldFormTable: React.FC<Props> = ({
},
];

const handleUpdateKeys = (updateKeys: Record<string, boolean>) => {
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<string, boolean>, item: ISemantic.IFieldTypeParamsItem) => {
keyMap[item.fieldName] = selected;
return keyMap;
},
{},
);
handleUpdateKeys({ ...selectedKeysMap, ...updateKeys });
},
// onChange: (_selectedRowKeys: any[]) => {
// setSelectedKeys([..._selectedRowKeys]);
// },
};

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,34 +106,52 @@ const MetricMeasuresFormTable: React.FC<Props> = ({
},
];

const handleUpdateKeys = (updateKeys: Record<string, boolean>) => {
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<string, boolean>, item: ISemantic.IMeasure) => {
keyMap[item.bizName] = selected;
return keyMap;
},
[],
{},
);
setSelectedKeys(selectedKeys);
onFieldChange(measures);
handleUpdateKeys({ ...selectedKeysMap, ...updateKeys });
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,43 @@ const MetricMetricFormTable: React.FC<Props> = ({
},
];

const handleUpdateKeys = (updateKeys: Record<string, boolean>) => {
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<string, boolean>, item: ISemantic.IMetricItem) => {
keyMap[item.bizName] = selected;
return keyMap;
},
{},
);
handleUpdateKeys({ ...selectedKeysMap, ...updateKeys });
},
};

Expand Down
Loading