Skip to content

Commit

Permalink
[improvement][headless-fe] Added dependency relationships between var…
Browse files Browse the repository at this point in the history
…ious items in system configuration. (tencentmusic#1449)

* [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.

* [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.
  • Loading branch information
sevenliu1896 authored Jul 23, 2024
1 parent 8f55fa0 commit 865788b
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 42 deletions.
36 changes: 25 additions & 11 deletions webapp/packages/supersonic-fe/src/pages/SemanticModel/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import FormItemTitle from '@/components/FormHelper/FormItemTitle';
import DisabledWheelNumberInput from '@/components/DisabledWheelNumberInput';
import { ConfigParametersItem } from '../System/types';
import { TransType } from './enum';
import { isString, isBoolean } from 'lodash';
import { ReactNode } from 'react';

const FormItem = Form.Item;
const { TextArea } = Input;
Expand Down Expand Up @@ -134,10 +136,12 @@ export const findLeafNodesFromDomainList = (
return leafNodes;
};

export const genneratorFormItemList = (itemList: ConfigParametersItem[]) => {
return itemList.map((item) => {
const { dataType, name, comment, placeholder, description, require, value } = item;

export const genneratorFormItemList = (itemList: ConfigParametersItem[], form) => {
const list = itemList.reduce((itemList: ReactNode[], item) => {
const { dataType, name, comment, placeholder, description, require, visible } = item;
if (visible === false) {
return itemList;
}
let defaultItem = <Input />;
switch (dataType) {
case 'string':
Expand All @@ -158,7 +162,7 @@ export const genneratorFormItemList = (itemList: ConfigParametersItem[]) => {
);
break;
case 'bool':
return (
itemList.push(
<FormItem
name={name}
label={comment}
Expand All @@ -174,12 +178,19 @@ export const genneratorFormItemList = (itemList: ConfigParametersItem[]) => {
}}
>
<Switch />
</FormItem>
</FormItem>,
);
return itemList;
case 'list': {
const { candidateValues = [] } = item;
const options = candidateValues.map((value) => {
return { label: value, value };
const options = candidateValues.map((item: string | { label: string; value: string }) => {
if (isString(item)) {
return { label: item, value: item };
}
if (item?.label) {
return item;
}
return { label: item, value: item };
});
defaultItem = (
<Select style={{ width: '100%' }} options={options} placeholder={placeholder} />
Expand All @@ -190,17 +201,20 @@ export const genneratorFormItemList = (itemList: ConfigParametersItem[]) => {
defaultItem = <Input placeholder={placeholder} />;
break;
}
return (

itemList.push(
<FormItem
name={name}
key={name}
rules={[{ required: !!require, message: `请输入${comment}` }]}
label={<FormItemTitle title={comment} subTitle={description} />}
>
{defaultItem}
</FormItem>
</FormItem>,
);
});
return itemList;
}, []);
return [...list];
};

export const wrapperTransTypeAndId = (exTransType: TransType, id: number) => {
Expand Down
166 changes: 135 additions & 31 deletions webapp/packages/supersonic-fe/src/pages/System/index.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,29 @@
import styles from './style.less';
import {
Button,
Form,
Input,
InputNumber,
message,
Space,
Switch,
Select,
Divider,
Anchor,
Row,
Col,
} from 'antd';
import React, { useState, useEffect } from 'react';
import { Button, Form, message, Space, Divider, Anchor, Row, Col } from 'antd';
import React, { useState, useEffect, useRef } from 'react';
import { getSystemConfig, saveSystemConfig } from '@/services/user';
import { ProCard } from '@ant-design/pro-components';
import SelectTMEPerson from '@/components/SelectTMEPerson';
import { ConfigParametersItem, SystemConfig } from './types';
import FormItemTitle from '@/components/FormHelper/FormItemTitle';
import { ConfigParametersItem, SystemConfig, dependenciesItem } from './types';

import { groupBy } from 'lodash';
import { genneratorFormItemList } from '../SemanticModel/utils';

const FormItem = Form.Item;
const { TextArea } = Input;

type Admin = string[];

const System: React.FC = () => {
const [systemConfig, setSystemConfig] = useState<Record<string, ConfigParametersItem[]>>({});
const [anchorItems, setAnchorItems] = useState<{ key: string; href: string; title: string }[]>(
[],
);
const [configSource, setConfigSource] = useState<SystemConfig>();

const configMap = useRef<Record<string, ConfigParametersItem>>();

const [configIocDepMap, setConfigIocDepMap] = useState<any>({});

useEffect(() => {
querySystemConfig();
}, []);
Expand All @@ -39,23 +32,80 @@ const System: React.FC = () => {
const { code, data, msg } = await getSystemConfig();
if (code === 200 && data) {
const { parameters = [], admins = [] } = data;
const groupByConfig = groupBy(parameters, 'module');
const anchor = Object.keys(groupByConfig).map((key: string) => {
return {
key,
href: `#${key}`,
title: key,
};
});
setAnchorItems(anchor);
setSystemConfig(groupByConfig);
setInitData(admins, parameters);

const parametersMap = parameters.reduce(
(configReduceMap: Record<string, ConfigParametersItem>, item: ConfigParametersItem) => {
return {
...configReduceMap,
[item.name]: item,
};
},
{},
);

configMap.current = parametersMap;

groupConfigAndSet(parameters);

initDepConfig(parameters, admins);

setConfigSource(data);
} else {
message.error(msg);
}
};

const initDepConfig = (parameters: ConfigParametersItem[], admins: Admin) => {
const iocMap = getDepIoc(parameters);
const initFormValues = setInitData(admins, parameters);
Object.keys(initFormValues).forEach((itemName) => {
const targetDep = iocMap[itemName] || {};
const excuteStack = Object.values(targetDep);
if (Array.isArray(excuteStack)) {
excuteDepConfig(itemName, initFormValues);
}
});

setConfigIocDepMap(iocMap);
};

const groupConfigAndSet = (parameters: ConfigParametersItem[]) => {
const groupByConfig = groupBy(parameters, 'module');
const anchor = Object.keys(groupByConfig).map((key: string) => {
return {
key,
href: `#${key}`,
title: key,
};
});
setAnchorItems(anchor);
setSystemConfig(groupByConfig);
};

const getDepIoc = (parameters: ConfigParametersItem[]) => {
const iocMap: Record<string, Record<string, ConfigParametersItem>> = {};
parameters.forEach((item) => {
const { name: itemName, dependencies } = item;
if (Array.isArray(dependencies)) {
dependencies.forEach((depItem) => {
const { name } = depItem;

if (iocMap[name]) {
iocMap[name] = {
...iocMap[name],
[itemName]: item,
};
} else {
iocMap[name] = {
[itemName]: item,
};
}
});
}
});
return iocMap;
};

const setInitData = (admins: string[], systemConfigParameters: ConfigParametersItem[]) => {
const fieldsValue = systemConfigParameters.reduce(
(fields, item) => {
Expand All @@ -68,6 +118,7 @@ const System: React.FC = () => {
{ admins },
);
form.setFieldsValue(fieldsValue);
return fieldsValue;
};

const querySaveSystemConfig = async () => {
Expand All @@ -93,6 +144,49 @@ const System: React.FC = () => {
}
};

const excuteDepConfig = (itemName: string, formValues: Record<string, any>) => {
const targetDep = configIocDepMap[itemName] || {};
const excuteStack = Object.values(targetDep);
if (!Array.isArray(excuteStack)) {
return;
}
const tempConfigMap: any = { ...configMap.current };
const currentFormValues = formValues;
const showStateList: boolean[] = [];
const hasValueFieldsSetDefaultValueList: any[] = [];
excuteStack.forEach((configItem: any) => {
const { dependencies, name: configItemName } = configItem;
dependencies.forEach((item: dependenciesItem) => {
const { name, setDefaultValue } = item;
const currentDepValue = currentFormValues[name];
const showIncludesValue = item.show?.includesValue;
if (Array.isArray(showIncludesValue)) {
showStateList.push(showIncludesValue.includes(currentDepValue));
}
if (setDefaultValue && currentDepValue) {
hasValueFieldsSetDefaultValueList.push({
excuteItem: configItemName,
...item,
});
}
});
const visible = showStateList.every((item) => item);
tempConfigMap[configItemName].visible = visible;
});

const lastSetDefaultValueItem =
hasValueFieldsSetDefaultValueList[hasValueFieldsSetDefaultValueList.length - 1];
const lastSetDefaultValue = lastSetDefaultValueItem?.setDefaultValue;

if (lastSetDefaultValue) {
const targetValue = lastSetDefaultValue[currentFormValues[lastSetDefaultValueItem.name]];
if (targetValue) {
form.setFieldValue(lastSetDefaultValueItem.excuteItem, targetValue);
}
}
groupConfigAndSet(Object.values(tempConfigMap));
};

return (
<>
<div style={{ margin: '40px auto', width: 1200 }}>
Expand All @@ -113,11 +207,21 @@ const System: React.FC = () => {
</Space>
}
>
<Form form={form} layout="vertical" className={styles.form}>
<Form
form={form}
layout="vertical"
className={styles.form}
onValuesChange={(value, values) => {
const valueKey = Object.keys(value)[0];
excuteDepConfig(valueKey, values);
}}
>
<FormItem name="admins" label="管理员">
<SelectTMEPerson placeholder="请邀请团队成员" />
</FormItem>

<Divider />

<Space direction="vertical" style={{ width: '100%' }} size={35}>
{Object.keys(systemConfig).map((key: string) => {
const itemList = systemConfig[key];
Expand All @@ -128,7 +232,7 @@ const System: React.FC = () => {
bordered
id={key}
>
{genneratorFormItemList(itemList)}
{genneratorFormItemList(itemList, form)}
</ProCard>
);
})}
Expand Down
9 changes: 9 additions & 0 deletions webapp/packages/supersonic-fe/src/pages/System/types.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
export type dependenciesItem = {
name: string;
show: {
includesValue: string[];
};
setDefaultValue: Record<string, any>;
};

export type ConfigParametersItem = {
dataType: string;
name: string;
Expand All @@ -8,6 +16,7 @@ export type ConfigParametersItem = {
description: string;
require?: boolean;
placeholder?: string;
dependencies: dependenciesItem[];
};

export type SystemConfig = {
Expand Down

0 comments on commit 865788b

Please sign in to comment.