Skip to content

Commit

Permalink
[improvement][headless-fe] Replaced the term "view" with "dataset"
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanliu committed Mar 2, 2024
1 parent f6fc749 commit a24a373
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const visibleModeIconSvgPath = `<path d="M880 112H144c-17.7 0-32 14.3-32 32v736c
// });

// if (lastFoundNode) {
// // 将视图移动到找到的节点位置
// // 将数据集移动到找到的节点位置
// graph.focusItem(lastFoundNode, true, {
// duration: 300,
// easing: 'easeCubic',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const DimensionMetricTransferModal: React.FC<ModelCreateFormModalProps> = ({
});
setSourceList([...preUpdateSourceData]);

const viewModelConfigs = [...dimensionItemChangeList, ...metricItemChangeList].reduce(
const dataSetModelConfigs = [...dimensionItemChangeList, ...metricItemChangeList].reduce(
(config, item) => {
const { modelId, id, typeEnum } = item;
if (config[modelId]) {
Expand All @@ -162,7 +162,7 @@ const DimensionMetricTransferModal: React.FC<ModelCreateFormModalProps> = ({
{},
);

onSubmit?.(viewModelConfigs, newTargetKeys);
onSubmit?.(dataSetModelConfigs, newTargetKeys);
}}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
const queryData: ISemantic.IModelItem = {
...formVals,
...fieldsValue,
viewDetail: {
viewModelConfigs: Object.values(viewModelConfigsMap),
dataSetDetail: {
dataSetModelConfigs: Object.values(viewModelConfigsMap),
},
domainId,
};
Expand Down Expand Up @@ -225,17 +225,17 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
<div style={{ display: currentStep === 0 ? 'block' : 'none' }}>
<FormItem
name="name"
label="视图名称"
rules={[{ required: true, message: '请输入视图名称!' }]}
label="数据集名称"
rules={[{ required: true, message: '请输入数据集名称!' }]}
>
<Input placeholder="视图名称不可重复" />
<Input placeholder="数据集名称不可重复" />
</FormItem>
<FormItem
name="bizName"
label="视图英文名称"
rules={[{ required: true, message: '请输入视图英文名称!' }]}
label="数据集英文名称"
rules={[{ required: true, message: '请输入数据集英文名称!' }]}
>
<Input placeholder="请输入视图英文名称" />
<Input placeholder="请输入数据集英文名称" />
</FormItem>
<FormItem
name="alias"
Expand All @@ -259,8 +259,8 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
<FormItem name="admins" label={<FormItemTitle title={'责任人'} />}>
<SelectTMEPerson placeholder="请邀请团队成员" />
</FormItem>
<FormItem name="description" label="视图描述">
<Input.TextArea placeholder="视图描述" />
<FormItem name="description" label="数据集描述">
<Input.TextArea placeholder="数据集描述" />
</FormItem>
</div>
</>
Expand All @@ -271,7 +271,7 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
<Modal
width={modalWidth}
destroyOnClose
title={'视图信息'}
title={'数据集信息'}
open={true}
maskClosable={false}
footer={renderFooter()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
};

useEffect(() => {
const viewModelConfigs = viewItem?.viewDetail?.viewModelConfigs;
if (Array.isArray(viewModelConfigs)) {
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
if (Array.isArray(dataSetModelConfigs)) {
const idList: number[] = [];
const transferKeys: React.Key[] = [];
const viewConfigMap = {};
const allMetrics: number[] = [];
const allDimensions: number[] = [];
viewModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
const { id, metrics, dimensions } = item;
idList.push(id);
allMetrics.push(...metrics);
Expand All @@ -115,13 +115,13 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
if (!dimensionList || !metricList) {
return;
}
const viewModelConfigs = isArrayOfValues(Object.values(viewModelConfigsMap))
const dataSetModelConfigs = isArrayOfValues(Object.values(viewModelConfigsMap))
? (Object.values(viewModelConfigsMap) as ISemantic.IViewModelConfigItem[])
: viewItem?.viewDetail?.viewModelConfigs;
if (isArrayOfValues(viewModelConfigs)) {
: viewItem?.dataSetDetail?.dataSetModelConfigs;
if (isArrayOfValues(dataSetModelConfigs)) {
const allMetrics: number[] = [];
const allDimensions: number[] = [];
viewModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
const { metrics, dimensions } = item;
allMetrics.push(...metrics);
allDimensions.push(...dimensions);
Expand All @@ -146,12 +146,14 @@ const ViewModelConfigTransfer: React.FC<Props> = forwardRef(
submitData: Record<string, ISemantic.IViewModelConfigItem>,
selectedKeys: React.Key[],
) => {
const viewModelConfigs = Object.values(submitData) as ISemantic.IViewModelConfigItem[];
const dataSetModelConfigs = Object.values(
submitData,
) as ISemantic.IViewModelConfigItem[];

if (isArrayOfValues(viewModelConfigs)) {
if (isArrayOfValues(dataSetModelConfigs)) {
const allMetrics: number[] = [];
const allDimensions: number[] = [];
viewModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
const { metrics, dimensions } = item;
allMetrics.push(...metrics);
allDimensions.push(...dimensions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
const [metricList, setMetricList] = useState<ISemantic.IMetricItem[]>();

useEffect(() => {
const viewModelConfigs = viewItem?.viewDetail?.viewModelConfigs;
if (Array.isArray(viewModelConfigs)) {
const dataSetModelConfigs = viewItem?.dataSetDetail?.dataSetModelConfigs;
if (Array.isArray(dataSetModelConfigs)) {
const allMetrics: number[] = [];
const allDimensions: number[] = [];
viewModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
dataSetModelConfigs.forEach((item: ISemantic.IViewModelConfigItem) => {
const { metrics, dimensions } = item;
allMetrics.push(...metrics);
allDimensions.push(...dimensions);
Expand Down Expand Up @@ -135,7 +135,7 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
<Modal
width={800}
destroyOnClose
title={'视图信息'}
title={'数据集信息'}
open={true}
maskClosable={false}
footer={renderFooter()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const ViewTable: React.FC<Props> = ({ disabledEdit = false, modelList, domainMan
},
{
dataIndex: 'name',
title: '视图名称',
title: '数据集名称',
search: false,
},
{
Expand Down Expand Up @@ -212,7 +212,7 @@ const ViewTable: React.FC<Props> = ({ disabledEdit = false, modelList, domainMan
setCreateDataSourceModalOpen(true);
}}
>
创建视图
创建数据集
</Button>,
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ const DomainManagerTab: React.FC<Props> = ({
),
},
{
label: '视图管理',
key: 'viewManange',
label: '数据集管理',
key: 'dataSetManange',
children: (
<View
modelList={modelList}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ export declare namespace ISemantic {
typeEnum?: any;
sensitiveLevel: number;
domainId: number;
viewDetail: {
viewModelConfigs: IViewModelConfigItem[];
dataSetDetail: {
dataSetModelConfigs: IViewModelConfigItem[];
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -586,27 +586,27 @@ export function getDatabaseDetail(id: number): Promise<any> {
}

export function getViewList(domainId: number): Promise<any> {
return request(`${process.env.API_BASE_URL}view/getViewList`, {
return request(`${process.env.API_BASE_URL}dataSet/getDataSetList`, {
method: 'GET',
params: { domainId },
});
}

export function createView(data: any): Promise<any> {
return request(`${process.env.API_BASE_URL}view`, {
return request(`${process.env.API_BASE_URL}dataSet`, {
method: 'POST',
data,
});
}
export function updateView(data: any): Promise<any> {
return request(`${process.env.API_BASE_URL}view`, {
return request(`${process.env.API_BASE_URL}dataSet`, {
method: 'PUT',
data,
});
}

export function deleteView(viewId: number): Promise<any> {
return request(`${process.env.API_BASE_URL}view/${viewId}`, {
return request(`${process.env.API_BASE_URL}dataSet/${viewId}`, {
method: 'DELETE',
});
}

0 comments on commit a24a373

Please sign in to comment.