Merge pull request #1552 from slntopp/dev

Dev
slntopp · Mar 14, 2024 · 4d8f0e4 · 4d8f0e4
2 parents bcf4d6c + ceb946e
commit 4d8f0e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/admin-ui/src/views/PlanPage.vue b/admin-ui/src/views/PlanPage.vue
@@ -43,6 +43,7 @@ export default {
   data: () => ({
     tabsIndex: 0,
     navTitles: config.navTitles ?? {},
+    planTitle: "Not found",
   }),
   methods: {
     navTitle(title) {
@@ -57,9 +58,6 @@ export default {
     plan() {
       return this.$store.getters["plans/one"];
     },
-    planTitle() {
-      return this?.plan.title ?? "not found";
-    },
     planLoading() {
       return this.$store.getters["plans/isLoading"];
     },
@@ -88,6 +86,7 @@ export default {
   created() {
     const id = this.$route.params?.planId;
     this.$store.dispatch("plans/fetchItem", id).then(() => {
+      this.planTitle = this.plan.title || this.planTitle;
       document.title = `${this.planTitle} | NoCloud`;
     });
   },

diff --git a/admin-ui/src/views/ShowcaseCreate.vue b/admin-ui/src/views/ShowcaseCreate.vue
@@ -161,7 +161,7 @@ const requiredRule = ref((val) => !!val || "Required field");
 const serviceProviders = computed(() => store.getters["servicesProviders/all"]);
 
 const plans = computed(() => {
-  const allPlans = store.getters["plans/all"];
+  const allPlans = store.getters["plans/all"].filter((p) => p.status !== "DEL");
 
   return showcase.value.items.reduce((result, { servicesProvider }, i) => {
     const { meta } =