diff --git a/bigtop-manager-ui/src/api/repo/types.ts b/bigtop-manager-ui/src/api/repo/types.ts index 597adce4c..1c38eb853 100644 --- a/bigtop-manager-ui/src/api/repo/types.ts +++ b/bigtop-manager-ui/src/api/repo/types.ts @@ -17,10 +17,13 @@ * under the License. */ export interface RepoVO { + type: number arch?: string baseUrl?: string id?: number name?: string + pkgName?: string + checksum?: string [property: string]: any } diff --git a/bigtop-manager-ui/src/components/create-cluster/components/component-info.vue b/bigtop-manager-ui/src/components/create-cluster/components/component-info.vue index 3e6cd6847..725a74578 100644 --- a/bigtop-manager-ui/src/components/create-cluster/components/component-info.vue +++ b/bigtop-manager-ui/src/components/create-cluster/components/component-info.vue @@ -24,7 +24,7 @@ import { ServiceVO } from '@/api/service/types' import { useI18n } from 'vue-i18n' import useBaseTable from '@/composables/use-base-table' - import SetSource from './set-source.vue' + import SetSource from '@/components/set-source/index.vue' import type { TableColumnType } from 'ant-design-vue' const { t } = useI18n() diff --git a/bigtop-manager-ui/src/components/create-cluster/components/host-manage.vue b/bigtop-manager-ui/src/components/create-cluster/components/host-manage.vue index 9886e4304..b0c7f2775 100644 --- a/bigtop-manager-ui/src/components/create-cluster/components/host-manage.vue +++ b/bigtop-manager-ui/src/components/create-cluster/components/host-manage.vue @@ -24,7 +24,7 @@ import { useI18n } from 'vue-i18n' import useBaseTable from '@/composables/use-base-table' - import HostCreate from '@/components/create-host/create.vue' + import HostCreate from '@/components/create-host/index.vue' import type { FilterConfirmProps, FilterResetProps } from 'ant-design-vue/es/table/interface' import type { GroupItem } from '@/components/common/button-group/types' diff --git a/bigtop-manager-ui/src/components/create-cluster/components/set-source.vue b/bigtop-manager-ui/src/components/create-cluster/components/set-source.vue deleted file mode 100644 index b2449ee0f..000000000 --- a/bigtop-manager-ui/src/components/create-cluster/components/set-source.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - diff --git a/bigtop-manager-ui/src/components/create-cluster/create.vue b/bigtop-manager-ui/src/components/create-cluster/index.vue similarity index 100% rename from bigtop-manager-ui/src/components/create-cluster/create.vue rename to bigtop-manager-ui/src/components/create-cluster/index.vue diff --git a/bigtop-manager-ui/src/components/create-host/create.vue b/bigtop-manager-ui/src/components/create-host/index.vue similarity index 100% rename from bigtop-manager-ui/src/components/create-host/create.vue rename to bigtop-manager-ui/src/components/create-host/index.vue diff --git a/bigtop-manager-ui/src/components/create-host/install-dependencies.vue b/bigtop-manager-ui/src/components/create-host/install-dependencies.vue index 820d3c2bb..1646dbea6 100644 --- a/bigtop-manager-ui/src/components/create-host/install-dependencies.vue +++ b/bigtop-manager-ui/src/components/create-host/install-dependencies.vue @@ -27,7 +27,7 @@ import { generateRandomId } from '@/utils/tools' import { execCommand } from '@/api/command' - import HostCreate from './create.vue' + import HostCreate from './index.vue' import useBaseTable from '@/composables/use-base-table' import { type InstalledStatusVO, Status } from '@/api/hosts/types' diff --git a/bigtop-manager-ui/src/components/create-service/create.vue b/bigtop-manager-ui/src/components/create-service/index.vue similarity index 99% rename from bigtop-manager-ui/src/components/create-service/create.vue rename to bigtop-manager-ui/src/components/create-service/index.vue index 596327b09..2a3c21770 100644 --- a/bigtop-manager-ui/src/components/create-service/create.vue +++ b/bigtop-manager-ui/src/components/create-service/index.vue @@ -24,6 +24,7 @@ import { storeToRefs } from 'pinia' import { onBeforeRouteLeave, useRoute } from 'vue-router' import { StepContext, useCreateServiceStore } from '@/store/create-service' + import ServiceSelector from './components/service-selector.vue' import ComponentAssigner from './components/component-assigner.vue' import ServiceConfigurator from './components/service-configurator.vue' diff --git a/bigtop-manager-ui/src/components/job-modal/index.vue b/bigtop-manager-ui/src/components/job-modal/index.vue index 1452077c5..3fe48bfd7 100644 --- a/bigtop-manager-ui/src/components/job-modal/index.vue +++ b/bigtop-manager-ui/src/components/job-modal/index.vue @@ -24,6 +24,7 @@ import useBaseTable from '@/composables/use-base-table' import LogsView, { type LogViewProps } from '@/components/log-view/index.vue' import CustomProgress from '@/components/job/custom-progress.vue' + import type { JobVO, StageVO, StateType, TaskListParams, TaskVO } from '@/api/job/types' import type { CommandRes, JobStageProgressItem } from '@/store/job-progress' diff --git a/bigtop-manager-ui/src/components/job/index.vue b/bigtop-manager-ui/src/components/job/index.vue index 842145b8f..7b6f5c412 100644 --- a/bigtop-manager-ui/src/components/job/index.vue +++ b/bigtop-manager-ui/src/components/job/index.vue @@ -25,6 +25,7 @@ import useBaseTable from '@/composables/use-base-table' import LogsView, { type LogViewProps } from '@/components/log-view/index.vue' import CustomProgress from './custom-progress.vue' + import type { JobVO, StageVO, StateType, TaskListParams, TaskVO } from '@/api/job/types' import type { ClusterVO } from '@/api/cluster/types' import type { ListParams } from '@/api/types' diff --git a/bigtop-manager-ui/src/components/set-source/index.vue b/bigtop-manager-ui/src/components/set-source/index.vue new file mode 100644 index 000000000..401a592c5 --- /dev/null +++ b/bigtop-manager-ui/src/components/set-source/index.vue @@ -0,0 +1,281 @@ + + + + + + + diff --git a/bigtop-manager-ui/src/components/set-source/update-address.vue b/bigtop-manager-ui/src/components/set-source/update-address.vue new file mode 100644 index 000000000..3c65ae58b --- /dev/null +++ b/bigtop-manager-ui/src/components/set-source/update-address.vue @@ -0,0 +1,93 @@ + + + + + + diff --git a/bigtop-manager-ui/src/locales/en_US/common.ts b/bigtop-manager-ui/src/locales/en_US/common.ts index e6a46d182..47a75ad4c 100644 --- a/bigtop-manager-ui/src/locales/en_US/common.ts +++ b/bigtop-manager-ui/src/locales/en_US/common.ts @@ -55,7 +55,6 @@ export default { desc: 'Description', os: 'OS', arch: 'Arch', - base_url: 'Address', cluster: 'Cluster', host: 'Host', service: 'Service', @@ -101,7 +100,6 @@ export default { restore_msg: 'Are you sure you want to restore this?', delete_empty: 'Please select the records you want to delete.', total: 'Total {0} items', - note: 'Note: Changes to the source address will take effect for all clusters.', upload_file: 'Upload file', file_type_error: 'Only text files are allowed!', file_size_error: 'File size cannot exceed 10KB!', diff --git a/bigtop-manager-ui/src/locales/en_US/component.ts b/bigtop-manager-ui/src/locales/en_US/component.ts new file mode 100644 index 000000000..442487b70 --- /dev/null +++ b/bigtop-manager-ui/src/locales/en_US/component.ts @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +export default { + pkg_name: 'Package', + base_url: 'Address', + new_base_url: 'New Address', + note: 'Note: Changes to the source address will take effect for all clusters.', + dependency: 'Dependency', + update_all: 'Update All' +} diff --git a/bigtop-manager-ui/src/locales/en_US/index.ts b/bigtop-manager-ui/src/locales/en_US/index.ts index e91a5f9fb..063ecee75 100644 --- a/bigtop-manager-ui/src/locales/en_US/index.ts +++ b/bigtop-manager-ui/src/locales/en_US/index.ts @@ -29,6 +29,7 @@ import job from '@/locales/en_US/job.ts' import overview from '@/locales/en_US/overview' import service from '@/locales/en_US/service' import infra from '@/locales/en_US/infra.ts' +import component from '@/locales/en_US/component' export default { common, @@ -42,5 +43,6 @@ export default { job, overview, service, - infra + infra, + component } diff --git a/bigtop-manager-ui/src/locales/zh_CN/common.ts b/bigtop-manager-ui/src/locales/zh_CN/common.ts index ac593b7bc..196d5dc99 100644 --- a/bigtop-manager-ui/src/locales/zh_CN/common.ts +++ b/bigtop-manager-ui/src/locales/zh_CN/common.ts @@ -55,7 +55,6 @@ export default { desc: '描述', os: '系统', arch: '架构', - base_url: '地址', cluster: '集群', host: '主机', service: '服务', @@ -100,7 +99,6 @@ export default { delete_msgs: '确认要删除这些记录吗?', delete_empty: '请选择需要删除的记录', total: '共{0}条数据', - note: '注: 源地址的改动对所有集群生效。', upload_file: '上传文件', file_type_error: '只能上传文本文件!', file_size_error: '文件大小不能超过 10KB!', diff --git a/bigtop-manager-ui/src/locales/zh_CN/component.ts b/bigtop-manager-ui/src/locales/zh_CN/component.ts new file mode 100644 index 000000000..47e193ccc --- /dev/null +++ b/bigtop-manager-ui/src/locales/zh_CN/component.ts @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +export default { + pkg_name: '包名', + base_url: '地址', + new_base_url: '新地址', + note: '注: 源地址的改动对所有集群生效。', + dependency: '依赖', + update_all: '更新全部' +} diff --git a/bigtop-manager-ui/src/locales/zh_CN/index.ts b/bigtop-manager-ui/src/locales/zh_CN/index.ts index c2104cc2a..e18ecd767 100644 --- a/bigtop-manager-ui/src/locales/zh_CN/index.ts +++ b/bigtop-manager-ui/src/locales/zh_CN/index.ts @@ -29,6 +29,7 @@ import job from '@/locales/zh_CN/job.ts' import overview from '@/locales/zh_CN/overview.ts' import service from '@/locales/zh_CN/service.ts' import infra from '@/locales/zh_CN/infra.ts' +import component from '@/locales/zh_CN/component' export default { common, @@ -42,5 +43,6 @@ export default { job, overview, service, - infra + infra, + component } diff --git a/bigtop-manager-ui/src/pages/cluster-manage/cluster/host.vue b/bigtop-manager-ui/src/pages/cluster-manage/cluster/host.vue index bafe924b0..a26a874f7 100644 --- a/bigtop-manager-ui/src/pages/cluster-manage/cluster/host.vue +++ b/bigtop-manager-ui/src/pages/cluster-manage/cluster/host.vue @@ -26,7 +26,7 @@ import { useRouter } from 'vue-router' import useBaseTable from '@/composables/use-base-table' - import HostCreate from '@/components/create-host/create.vue' + import HostCreate from '@/components/create-host/index.vue' import InstallDependencies from '@/components/create-host/install-dependencies.vue' import type { FilterConfirmProps, FilterResetProps } from 'ant-design-vue/es/table/interface' diff --git a/bigtop-manager-ui/src/pages/cluster-manage/cluster/service.vue b/bigtop-manager-ui/src/pages/cluster-manage/cluster/service.vue index b9cb79228..ecce6d2f6 100644 --- a/bigtop-manager-ui/src/pages/cluster-manage/cluster/service.vue +++ b/bigtop-manager-ui/src/pages/cluster-manage/cluster/service.vue @@ -27,8 +27,6 @@ import { useRouter } from 'vue-router' import { useJobProgress } from '@/store/job-progress' - import FilterForm from '@/components/common/filter-form/index.vue' - import type { GroupItem } from '@/components/common/button-group/types' import type { FilterFormItem } from '@/components/common/filter-form/types' import type { ServiceListParams, ServiceStatusType, ServiceVO } from '@/api/service/types' diff --git a/bigtop-manager-ui/src/pages/cluster-manage/components/index.vue b/bigtop-manager-ui/src/pages/cluster-manage/components/index.vue index e7b40c227..4718e3894 100644 --- a/bigtop-manager-ui/src/pages/cluster-manage/components/index.vue +++ b/bigtop-manager-ui/src/pages/cluster-manage/components/index.vue @@ -19,7 +19,7 @@