This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 810c1625cb481de14a2851af27a31a2c16c543a9
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Thu Feb 9 14:56:26 2023 +0800
KYLIN-5419 remove frontend code of AUTO_MAIN model type for kylin5
---
kystudio/src/components/common/ProjectEditModal/handler.js | 1 -
.../src/components/common/ProjectSidebar/ProjectSidebar.vue | 6 +-----
kystudio/src/components/project/project_list.vue | 12 +-----------
kystudio/src/components/project/project_select.vue | 2 +-
.../src/components/setting/SettingBasic/SettingBasic.vue | 9 +--------
kystudio/src/components/setting/SettingBasic/handler.js | 12 ++----------
.../src/components/studio/StudioModel/ModelEdit/model.js | 1 -
.../src/components/studio/StudioModel/ModelEdit/schama.js | 2 --
kystudio/src/config/spec.js | 3 ---
kystudio/src/store/project.js | 3 ---
kystudio/src/store/types.js | 1 -
11 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/kystudio/src/components/common/ProjectEditModal/handler.js
b/kystudio/src/components/common/ProjectEditModal/handler.js
index 06f35ff11f..722a18bca9 100644
--- a/kystudio/src/components/common/ProjectEditModal/handler.js
+++ b/kystudio/src/components/common/ProjectEditModal/handler.js
@@ -22,7 +22,6 @@ export function getSubmitData (that) {
return JSON.stringify({
name: form.name,
description: form.description,
- maintain_model_type: 'MANUAL_MAINTAIN',
override_kylin_properties: fromArrToObj(form.properties)
})
case 'edit':
diff --git a/kystudio/src/components/common/ProjectSidebar/ProjectSidebar.vue
b/kystudio/src/components/common/ProjectSidebar/ProjectSidebar.vue
index 57d7eb5b3b..452d66807e 100644
--- a/kystudio/src/components/common/ProjectSidebar/ProjectSidebar.vue
+++ b/kystudio/src/components/common/ProjectSidebar/ProjectSidebar.vue
@@ -91,16 +91,12 @@ export default class ProjectSidebar extends Vue {
isShowNameTooltip = false
emptyImg = emptyImg
get projectTypeClass () {
- switch (this.project.maintain_model_type) {
- case 'MANUAL_MAINTAIN':
- return 'el-icon-ksd-model_designer'
- }
+ return 'el-icon-ksd-model_designer'
}
get projectDetails () {
return {
owner: this.project.owner || 'None',
createTime: dayjs(this.project.create_time_utc).format('MM-DD-YYYY'),
- projectType: this.$t(this.project.maintain_model_type),
description: this.project.description
}
}
diff --git a/kystudio/src/components/project/project_list.vue
b/kystudio/src/components/project/project_list.vue
index 4f44776bc5..e0403af7bc 100644
--- a/kystudio/src/components/project/project_list.vue
+++ b/kystudio/src/components/project/project_list.vue
@@ -26,15 +26,6 @@
:width="320"
prop="name">
</el-table-column>
- <!-- <el-table-column
- :label="$t('type')"
- show-overflow-tooltip
- :width="120"
- prop="maintain_model_type">
- <template slot-scope="scope">
- {{scope.row.maintain_model_type === projectType.auto ?
$t('autoType') : $t('manualType')}}
- </template>
- </el-table-column> -->
<el-table-column
:label="$t('owner')"
:width="220"
@@ -214,8 +205,7 @@ import { Component } from 'vue-property-decorator'
})
export default class ProjectList extends Vue {
canExecuteModelMetadata (row) {
- return this.projectActions.includes('executeModelsMetadata') &&
- row.maintain_model_type !== projectCfgs.projectType.auto
+ return this.projectActions.includes('executeModelsMetadata')
}
inputFilter (value) {
this.filterData.project = value
diff --git a/kystudio/src/components/project/project_select.vue
b/kystudio/src/components/project/project_select.vue
index 741be45a8d..e95e17ec05 100644
--- a/kystudio/src/components/project/project_select.vue
+++ b/kystudio/src/components/project/project_select.vue
@@ -15,7 +15,7 @@
class="project_option"
:label="item.name"
:value="item.name">
- <i class="el-ksd-icon-project_16" v-if="item.maintain_model_type ===
'MANUAL_MAINTAIN'"></i>
+ <i class="el-ksd-icon-project_16"></i>
<span>{{item.name}}</span>
</el-option>
</el-select>
diff --git a/kystudio/src/components/setting/SettingBasic/SettingBasic.vue
b/kystudio/src/components/setting/SettingBasic/SettingBasic.vue
index 7803f82200..c2ffa2ad27 100644
--- a/kystudio/src/components/setting/SettingBasic/SettingBasic.vue
+++ b/kystudio/src/components/setting/SettingBasic/SettingBasic.vue
@@ -11,10 +11,6 @@
<div class="setting-label font-medium">{{$t('projectName')}}</div>
<div class="setting-value fixed">{{project.alias ||
project.project}}</div>
</div>
- <!-- <div class="setting-item">
- <div class="setting-label font-medium">{{$t('projectType')}}</div>
- <div class="setting-value fixed"><i
:class="projectIcon"></i>{{$t(project.maintain_model_type)}}</div>
- </div> -->
<div class="setting-item clearfix">
<div class="setting-label font-medium">{{$t('description')}}</div>
<div class="setting-value">{{project.description}}</div>
@@ -207,7 +203,7 @@ import { Component, Watch } from 'vue-property-decorator'
import locales from './locales'
import { handleError, handleSuccessAsync, objectClone, ArrayFlat, kylinConfirm
} from '../../../util'
-import { projectTypeIcons, lowUsageStorageTypes, autoMergeTypes,
volatileTypes, validate, initialFormValue, _getProjectGeneralInfo,
_getSegmentSettings, _getPushdownConfig, _getExcludeColumnConfig,
_getStorageQuota, _getIndexOptimization, _getRetentionRangeScale } from
'./handler'
+import { lowUsageStorageTypes, autoMergeTypes, volatileTypes, validate,
initialFormValue, _getProjectGeneralInfo, _getSegmentSettings,
_getPushdownConfig, _getExcludeColumnConfig, _getStorageQuota,
_getIndexOptimization, _getRetentionRangeScale } from './handler'
import { retentionTypes } from '../handler'
import { pageCount, pageRefTags } from '../../../config'
import EditableBlock from '../../common/EditableBlock/EditableBlock.vue'
@@ -290,9 +286,6 @@ export default class SettingBasic extends Vue {
}
excludeColumnsTablesSize = 1
- get projectIcon () {
- return projectTypeIcons[this.project.maintain_model_type]
- }
get retentionRangeScale () {
return _getRetentionRangeScale(this.form).toLowerCase()
}
diff --git a/kystudio/src/components/setting/SettingBasic/handler.js
b/kystudio/src/components/setting/SettingBasic/handler.js
index 47fe367182..9a5e35ecf5 100644
--- a/kystudio/src/components/setting/SettingBasic/handler.js
+++ b/kystudio/src/components/setting/SettingBasic/handler.js
@@ -1,6 +1,3 @@
-export const projectTypeIcons = {
- MANUAL_MAINTAIN: 'el-icon-ksd-expert_mode_small'
-}
export const lowUsageStorageTypes = [
'DAY',
'WEEK',
@@ -43,7 +40,6 @@ export const initialFormValue = {
alias: '',
project: '',
description: '',
- maintain_model_type: '',
jdbc_datasource_enabled: false,
JDBCConnectSetting: []
}
@@ -75,13 +71,9 @@ export function _getProjectGeneralInfo (data) {
let params = {
project: data.project,
alias: data.alias || data.project,
- description: data.description,
- maintain_model_type: data.maintain_model_type
- }
- // 专家档时才加 semi_automatic_mode 这个属性
- if (data.maintain_model_type === 'MANUAL_MAINTAIN') {
- params.semi_automatic_mode = data.semi_automatic_mode || false
+ description: data.description
}
+ params.semi_automatic_mode = data.semi_automatic_mode || false
return params
}
export function _getSegmentSettings (data, project) {
diff --git a/kystudio/src/components/studio/StudioModel/ModelEdit/model.js
b/kystudio/src/components/studio/StudioModel/ModelEdit/model.js
index 50967a90ac..17d801a649 100644
--- a/kystudio/src/components/studio/StudioModel/ModelEdit/model.js
+++ b/kystudio/src/components/studio/StudioModel/ModelEdit/model.js
@@ -259,7 +259,6 @@ class NModel extends Schama {
metaData.partition_desc = this.partition_desc
metaData.batch_partition_desc = this.batch_partition_desc
metaData.multi_partition_desc = this.multi_partition_desc
- metaData.maintain_model_type = this._mount.maintain_model_type
metaData.management_type = this.management_type
metaData.with_second_storage = this.second_storage_enabled
metaData.second_storage_size = this.second_storage_size
diff --git a/kystudio/src/components/studio/StudioModel/ModelEdit/schama.js
b/kystudio/src/components/studio/StudioModel/ModelEdit/schama.js
index 48c6719907..8a144b95f9 100644
--- a/kystudio/src/components/studio/StudioModel/ModelEdit/schama.js
+++ b/kystudio/src/components/studio/StudioModel/ModelEdit/schama.js
@@ -91,7 +91,6 @@ export default class SchemaModels {
// this.lookups = options.lookups || options.join_tables || []
this.all_measures = options.simplified_measures || []
this.project = options.project
- this.maintain_model_type = options.maintain_model_type
this.management_type = options.management_type || 'MODEL_BASED'
this.globalDataSource = store.state.datasource.dataSource //
全局数据源表数据，新拖入时，需要从这里这个数据中取遍历
// 能从模型详情接口里取到 simplified_tables 字段，就取这个字段，取不到的时候，取编辑模型时，模型使用到的 table
的信息这个接口里的返回
@@ -126,7 +125,6 @@ export default class SchemaModels {
this.$set(this._mount, 'zoomYSpace', 0)
this.$set(this._mount, 'tableIndexColumns', this.tableIndexColumns)
this.$set(this._mount, 'maintain_model_type', this.maintain_model_type)
- this.$set(this._mount, 'management_type', this.management_type)
this.$set(this._mount, 'linkUsedColumns', this.linkUsedColumns)
this.$set(this._mount, 'hasBrokenLinkedTable', false)
this.$set(this._mount, 'broken_reason', options.broken_reason)
diff --git a/kystudio/src/config/spec.js b/kystudio/src/config/spec.js
index 191d02edb5..1227a5b5ed 100644
--- a/kystudio/src/config/spec.js
+++ b/kystudio/src/config/spec.js
@@ -35,9 +35,6 @@ export default {
{ "id": "kafka", "value": 1, "title": "HIVE" },
{ "id": "rdbms2", "value": 8, "title": "RDBMS2" }
],
- "projectType": [
- { "id": "manualMaintain", "value": "MANUAL_MAINTAIN", "title": "Manual
Maintain" }
- ],
"modelType": [
{ "id": "tableOriented", "value": "TABLE_ORIENTED", "title": "Table
Oriented" },
{ "id": "modelBased", "value": "MODEL_BASED", "title": "Model Based" }
diff --git a/kystudio/src/store/project.js b/kystudio/src/store/project.js
index b64a89de57..a5b9a8e7d8 100644
--- a/kystudio/src/store/project.js
+++ b/kystudio/src/store/project.js
@@ -37,9 +37,6 @@ export default {
[types.SAVE_DEFAULT_CONFIG_LIST]: function (state, { list }) {
state.defaultConfigList = list
},
- [types.UPDATE_PROJECT_SEMI_AUTOMATIC_STATUS]: function (state, result) {
- state.isSemiAutomatic = result
- },
[types.SET_PROJECT]: function (state, project) {
cacheSessionStorage('preProjectName', state.selected_project) //
储存上一次选中的project
cacheSessionStorage('projectName', project)
diff --git a/kystudio/src/store/types.js b/kystudio/src/store/types.js
index d02a703296..20d7567f71 100644
--- a/kystudio/src/store/types.js
+++ b/kystudio/src/store/types.js
@@ -44,7 +44,6 @@ export const UPDATE_PROJECT_DATASOURCE =
'UPDATE_PROJECT_DATASOURCE'
export const RESET_PROJECT_CONFIG = 'RESET_PROJECT_CONFIG'
export const UPDATE_DEFAULT_DB_SETTINGS = 'UPDATE_DEFAULT_DB_SETTINGS'
export const CACHE_PROJECT_DEFAULT_DB = 'CACHE_PROJECT_DEFAULT_DB'
-export const UPDATE_PROJECT_SEMI_AUTOMATIC_STATUS =
'UPDATE_PROJECT_SEMI_AUTOMATIC_STATUS'
export const UPDATE_YARN_QUEUE = 'UPDATE_YARN_QUEUE'
export const GET_ACL_PERMISSION = 'GET_ACL_PERMISSION'
export const CHECK_SSB = 'CHECK_SSB'
