Merge pull request #911 from Support-pl/dev

Dev

Author: SazukinPavel

src/components/cloud/modules/ione-vpn/init.vue

@@ -19,21 +19,21 @@ const props = defineProps({
   productSize: { type: String, required: true },
   isFlavorsLoading: { type: Boolean, default: false },
 });
-const { isFlavorsLoading, plans } = toRefs(props);
+const { isFlavorsLoading } = toRefs(props);
 
 const emits = defineEmits(["update:periods", "update:product-size"]);
 
 const cloudStore = useCloudStore();
 const instancesStore = useInstancesStore();
-const { provider, authData } = storeToRefs(useCloudStore());
+const { provider, authData, plan } = storeToRefs(cloudStore);
 const [options, setOptions] = inject("useOptions")();
 
 const images = computed(() => {
   const { templates } = provider.value.publicData;
   const images = {};
 
   Object.entries(templates ?? {}).forEach(([key, value]) => {
-    if (cloudStore.plan.meta.hidedOs?.includes(key)) return;
+    if (plan.value.meta.hidedOs?.includes(key)) return;
     if (value.is_public !== false) {
       images[key] = value;
     }
@@ -42,10 +42,6 @@ const images = computed(() => {
   return images;
 });
 
-const plan = computed(() => {
-  return cloudStore.plan;
-});
-
 emits("update:periods", getPeriods(props.productSize, props.plans));
 watch(
   () => props.productSize,
@@ -65,9 +61,9 @@ watch(
   }
 );
 
-function getProduct(size, plan = cloudStore.plan) {
-  const isDynamic = cloudStore.plan.kind === "DYNAMIC";
-  const products = Object.values(plan.products);
+function getProduct(size) {
+  const isDynamic = plan.value.kind === "DYNAMIC";
+  const products = Object.values(plan.value.products);
   const product = products.find(
     ({ title, period }) =>
       title === size && (getTarification(period) === props.mode || isDynamic)
@@ -80,11 +76,10 @@ async function setProduct(value) {
   emits("update:product-size", value);
 
   await nextTick();
-  const plan = cloudStore.plan;
 
-  if (!plan) return;
-  const resources = getProduct(value, plan) ?? {};
-  const minDisk = (plan.meta.minDiskSize ?? {})[options.disk.type];
+  if (!plan.value) return;
+  const resources = getProduct(value) ?? {};
+  const minDisk = (plan.value.meta.minDiskSize ?? {})[options.disk.type];
 
   setOptions("cpu.size", resources.cpu ?? 0);
   setOptions("ram.size", (resources.ram ?? 0) / 1024);

src/hooks/cloud/plans.js

@@ -137,23 +137,25 @@ function useCloudPlans(tarification, options) {
 
       if (cachedPlans.value[cacheKey]) {
         plansStore.setPlans(cachedPlans.value[cacheKey]);
-
-        const { items } =
-          showcases.value.find(({ uuid }) => uuid === showcaseId.value) ?? {};
-        const { plan } =
-          items?.find((item) => item.locations.includes(locationId.value)) ??
-          {};
-
-        planId.value =
-          planId.value ?? plan ?? filteredPlans.value[0]?.uuid ?? "";
       } else {
         const { pool } = await plansStore.fetch({
           sp_uuid: provider.uuid,
           anonymously: !authStore.isLogged,
         });
         cachedPlans.value[cacheKey] = pool;
+      }
+
+      const { items } =
+        showcases.value.find(({ uuid }) => uuid === showcaseId.value) ?? {};
+      const { plan } =
+        items?.find((item) => item.locations.includes(locationId.value)) ?? {};
+
+      if (
+        !planId.value ||
+        !filteredPlans.value.find((p) => planId.value === p.uuid)
+      ) {
         planId.value =
-          planId.value ?? filteredPlans.value[0]?.uuid ?? pool[0]?.uuid ?? "";
+          plan ?? filteredPlans.value[0]?.uuid ?? planId.value ?? "";
       }
 
       await addonsStore.fetch({