diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue index bc86a482c..ef7a7e5c0 100644 --- a/admin-ui/src/App.vue +++ b/admin-ui/src/App.vue @@ -528,6 +528,7 @@ export default { if (newVal) { this.$store.dispatch("plugins/fetch"); this.$store.dispatch("currencies/fetch"); + this.$store.dispatch("settings/fetch"); } }, }, diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue index 5d103d92e..0815ab6ca 100644 --- a/admin-ui/src/components/dialogs/editPriceModel.vue +++ b/admin-ui/src/components/dialogs/editPriceModel.vue @@ -150,7 +150,7 @@ const originalProduct = computed(() => { ); } case "ione": - case "virtual": { + case "empty": { return template.value.product; } } @@ -187,7 +187,7 @@ const instanceTariffPrice = computed(() => { ]?.price; } case "ione": - case "virtual": { + case "empty": { return template.value.billingPlan.products[template.value.product]?.price; } } @@ -281,7 +281,7 @@ const setProduct = () => { template.value.config.duration + " " + template.value.config.planCode; } else if ( template.value.type === "ione" || - template.value.type === "virtual" + template.value.type === "empty" ) { product.value = template.value.product; } diff --git a/admin-ui/src/components/historyTable.vue b/admin-ui/src/components/historyTable.vue index 7438b8239..72bedfea5 100644 --- a/admin-ui/src/components/historyTable.vue +++ b/admin-ui/src/components/historyTable.vue @@ -55,6 +55,7 @@ import { toRefs, ref, onMounted, computed, watch } from "vue"; import nocloudTable from "@/components/table.vue"; import api from "@/api"; import { useStore } from "@/store"; +import useCustomSearch from "@/hooks/useCustomSearch"; const props = defineProps({ tableName: {}, @@ -79,6 +80,7 @@ const options = ref({}); const itemsPerPageOptions = ref([5, 10, 15, 25]); const store = useStore(); +useCustomSearch(); const headers = computed(() => [ { text: "Id", value: "id" }, diff --git a/admin-ui/src/components/instance/controls.vue b/admin-ui/src/components/instance/controls.vue index 78b8285dc..caed34806 100644 --- a/admin-ui/src/components/instance/controls.vue +++ b/admin-ui/src/components/instance/controls.vue @@ -253,24 +253,24 @@ export default { disabled: this.ovhActions?.reboot, }, ], - virtual: [ + empty: [ { action: "change_state", data: { state: 3 }, title: "start", - disabled: this.virtualActions.start, + disabled: this.emptyActions.start, }, { action: "change_state", data: { state: 2 }, title: "stop", - disabled: this.virtualActions.stop, + disabled: this.emptyActions.stop, }, { action: "change_state", data: { state: 6 }, title: "suspend", - disabled: this.virtualActions.suspend, + disabled: this.emptyActions.suspend, }, ], opensrs: [{ action: "dns" }], @@ -333,7 +333,7 @@ export default { vnc: this.template.state.state !== "RUNNING", }; }, - virtualActions() { + emptyActions() { if (!this.template?.state || this.template.state.state === "PENDING") return { stop: true, @@ -351,7 +351,7 @@ export default { : this.template.type; switch (type) { - case "virtual": + case "empty": case "openai": case "ione": { return (item) => { @@ -407,7 +407,7 @@ export default { ); } case "ione": - case "virtual": { + case "empty": { return this.template.product; } } diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue index f7a771395..0da5e7ead 100644 --- a/admin-ui/src/components/instance/info.vue +++ b/admin-ui/src/components/instance/info.vue @@ -135,6 +135,7 @@ diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue index c0c026528..6a082e64a 100644 --- a/admin-ui/src/components/instances_table.vue +++ b/admin-ui/src/components/instances_table.vue @@ -259,7 +259,7 @@ export default { case "ovh": { return getOvhPrice(inst); } - case "virtual": + case "empty": case "ione": { const initialPrice = inst.billingPlan.products[inst.product]?.price ?? 0; diff --git a/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue b/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue index 8aeefdbf0..4832ed89e 100644 --- a/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue +++ b/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue @@ -3,6 +3,9 @@ + + + diff --git a/admin-ui/src/components/modules/cpanel/billingInfo.vue b/admin-ui/src/components/modules/cpanel/billingInfo.vue new file mode 100644 index 000000000..e454d9f6b --- /dev/null +++ b/admin-ui/src/components/modules/cpanel/billingInfo.vue @@ -0,0 +1,63 @@ + + + diff --git a/admin-ui/src/components/modules/cpanel/billingLabel.vue b/admin-ui/src/components/modules/cpanel/billingLabel.vue new file mode 100644 index 000000000..62f00a24c --- /dev/null +++ b/admin-ui/src/components/modules/cpanel/billingLabel.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/admin-ui/src/components/modules/virtual/additionalInstanceInfo.vue b/admin-ui/src/components/modules/empty/additionalInstanceInfo.vue similarity index 100% rename from admin-ui/src/components/modules/virtual/additionalInstanceInfo.vue rename to admin-ui/src/components/modules/empty/additionalInstanceInfo.vue diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/empty/billingInfo.vue similarity index 99% rename from admin-ui/src/components/modules/virtual/billingInfo.vue rename to admin-ui/src/components/modules/empty/billingInfo.vue index fe56c1890..12f5b4430 100644 --- a/admin-ui/src/components/modules/virtual/billingInfo.vue +++ b/admin-ui/src/components/modules/empty/billingInfo.vue @@ -147,7 +147,7 @@ const date = computed(() => const isMonitoringsEmpty = computed(() => date.value === "-"); const filtredPlans = computed(() => - plans.value.filter((p) => p.type === "virtual") + plans.value.filter((p) => p.type === "empty") ); const totalPrice = computed(() => { diff --git a/admin-ui/src/components/modules/virtual/billingLabel.vue b/admin-ui/src/components/modules/empty/billingLabel.vue similarity index 100% rename from admin-ui/src/components/modules/virtual/billingLabel.vue rename to admin-ui/src/components/modules/empty/billingLabel.vue diff --git a/admin-ui/src/components/modules/virtual/instanceCreate.vue b/admin-ui/src/components/modules/empty/instanceCreate.vue similarity index 98% rename from admin-ui/src/components/modules/virtual/instanceCreate.vue rename to admin-ui/src/components/modules/empty/instanceCreate.vue index d21a57cab..5bfd35d42 100644 --- a/admin-ui/src/components/modules/virtual/instanceCreate.vue +++ b/admin-ui/src/components/modules/empty/instanceCreate.vue @@ -61,7 +61,7 @@ const getDefaultInstance = () => ({ billing_plan: {}, }); export default { - name: "instance-virtual-create", + name: "instance-empty-create", props: ["plans", "instance", "planRules", "sp-uuid", "is-edit"], data: () => ({ bilingPlan: null, products: [] }), mounted() { diff --git a/admin-ui/src/components/modules/virtual/serviceCreate.vue b/admin-ui/src/components/modules/empty/serviceCreate.vue similarity index 100% rename from admin-ui/src/components/modules/virtual/serviceCreate.vue rename to admin-ui/src/components/modules/empty/serviceCreate.vue diff --git a/admin-ui/src/components/modules/virtual/serviceProviderInfo.vue b/admin-ui/src/components/modules/empty/serviceProviderInfo.vue similarity index 100% rename from admin-ui/src/components/modules/virtual/serviceProviderInfo.vue rename to admin-ui/src/components/modules/empty/serviceProviderInfo.vue diff --git a/admin-ui/src/components/modules/virtual/serviceProviderSecrets.vue b/admin-ui/src/components/modules/empty/serviceProviderSecrets.vue similarity index 100% rename from admin-ui/src/components/modules/virtual/serviceProviderSecrets.vue rename to admin-ui/src/components/modules/empty/serviceProviderSecrets.vue diff --git a/admin-ui/src/components/modules/virtual/serviceProviders.vue b/admin-ui/src/components/modules/empty/serviceProviders.vue similarity index 81% rename from admin-ui/src/components/modules/virtual/serviceProviders.vue rename to admin-ui/src/components/modules/empty/serviceProviders.vue index 7b09dd663..38c645e10 100644 --- a/admin-ui/src/components/modules/virtual/serviceProviders.vue +++ b/admin-ui/src/components/modules/empty/serviceProviders.vue @@ -1,10 +1,10 @@