diff --git a/ui/src/components/view/DedicateData.vue b/ui/src/components/view/DedicateData.vue new file mode 100644 index 00000000000..63954b157db --- /dev/null +++ b/ui/src/components/view/DedicateData.vue @@ -0,0 +1,331 @@ +// 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 +// +// http://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. + + + + diff --git a/ui/src/components/view/DedicateDomain.vue b/ui/src/components/view/DedicateDomain.vue new file mode 100644 index 00000000000..eebf6e8ee02 --- /dev/null +++ b/ui/src/components/view/DedicateDomain.vue @@ -0,0 +1,145 @@ +// 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 +// +// http://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. + + + + + + diff --git a/ui/src/components/view/DedicateModal.vue b/ui/src/components/view/DedicateModal.vue new file mode 100644 index 00000000000..6dcbfed9e5e --- /dev/null +++ b/ui/src/components/view/DedicateModal.vue @@ -0,0 +1,286 @@ +// 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 +// +// http://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. + + + + diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue index e0baffbeb48..a6569e38070 100644 --- a/ui/src/components/view/DetailsTab.vue +++ b/ui/src/components/view/DetailsTab.vue @@ -28,12 +28,19 @@ + diff --git a/ui/src/config/section/infra/clusters.js b/ui/src/config/section/infra/clusters.js index 03fbaaa29e2..2c3216a4bbc 100644 --- a/ui/src/config/section/infra/clusters.js +++ b/ui/src/config/section/infra/clusters.js @@ -58,32 +58,6 @@ export default { defaultArgs: { allocationstate: 'Disabled' }, show: (record) => { return record.allocationstate === 'Enabled' } }, - { - api: 'dedicateCluster', - icon: 'user-add', - label: 'label.dedicate.cluster', - dataView: true, - show: (record) => { return !record.domainid }, - args: ['clusterid', 'domainid', 'account'], - mapping: { - clusterid: { - value: (record) => { return record.id } - } - } - }, - { - api: 'releaseDedicatedCluster', - icon: 'user-delete', - label: 'label.release.dedicated.cluster', - dataView: true, - show: (record) => { return record.domainid }, - args: ['clusterid'], - mapping: { - clusterid: { - value: (record) => { return record.id } - } - } - }, { api: 'updateCluster', icon: 'plus-square', diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js index f4bfa7cf4a8..83ea7f8313c 100644 --- a/ui/src/config/section/infra/hosts.js +++ b/ui/src/config/section/infra/hosts.js @@ -80,32 +80,6 @@ export default { defaultArgs: { allocationstate: 'Enable' }, show: (record) => { return record.resourcestate === 'Disabled' } }, - { - api: 'dedicateHost', - icon: 'user-add', - label: 'label.dedicate.host', - dataView: true, - show: (record) => { return !record.domainid }, - args: ['hostid', 'domainid', 'account'], - mapping: { - hostid: { - value: (record) => { return record.id } - } - } - }, - { - api: 'releaseDedicatedHost', - icon: 'user-delete', - label: 'label.release.dedicated.host', - dataView: true, - show: (record) => { return record.domainid }, - args: ['hostid'], - mapping: { - hostid: { - value: (record) => { return record.id } - } - } - }, { api: 'prepareHostForMaintenance', icon: 'plus-square', diff --git a/ui/src/config/section/infra/pods.js b/ui/src/config/section/infra/pods.js index 19ef0303233..ad2cfc9bea1 100644 --- a/ui/src/config/section/infra/pods.js +++ b/ui/src/config/section/infra/pods.js @@ -46,32 +46,6 @@ export default { dataView: true, args: ['name', 'netmask', 'gateway'] }, - { - api: 'dedicatePod', - icon: 'user-add', - label: 'label.dedicate.pod', - dataView: true, - show: (record) => { return !record.domainid }, - args: ['podid', 'domainid', 'account'], - mapping: { - podid: { - value: (record) => { return record.id } - } - } - }, - { - api: 'releaseDedicatedPod', - icon: 'user-delete', - label: 'label.release.dedicated.pod', - dataView: true, - show: (record) => { return record.domainid }, - args: ['podid'], - mapping: { - podid: { - value: (record) => { return record.id } - } - } - }, { api: 'updatePod', icon: 'play-circle', diff --git a/ui/src/config/section/infra/zones.js b/ui/src/config/section/infra/zones.js index 696c440b0c4..1d1938f7af2 100644 --- a/ui/src/config/section/infra/zones.js +++ b/ui/src/config/section/infra/zones.js @@ -99,32 +99,6 @@ export default { defaultArgs: { allocationstate: 'Enabled' }, show: (record) => { return record.allocationstate === 'Disabled' } }, - { - api: 'dedicateZone', - icon: 'user-add', - label: 'label.dedicate.zone', - dataView: true, - show: (record) => { return !record.domainid }, - args: ['zoneid', 'domainid', 'account'], - mapping: { - zoneid: { - value: (record) => { return record.id } - } - } - }, - { - api: 'releaseDedicatedZone', - icon: 'user-delete', - label: 'label.release.dedicated.zone', - dataView: true, - show: (record) => { return record.domainid }, - args: ['zoneid'], - mapping: { - zoneid: { - value: (record) => { return record.id } - } - } - }, { api: 'enableOutOfBandManagementForZone', icon: 'plus-circle',