From b49be566b72108a94bcd5d63c95245f169ccea38 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 20 Jan 2022 21:34:28 +0000 Subject: [PATCH] Remove cloud checks --- packages/builder/src/pages/builder/apps/index.svelte | 5 ++--- .../builder/src/pages/builder/portal/apps/index.svelte | 9 +-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index aafc28cd92..4d83531ed6 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -12,7 +12,7 @@ Modal, } from "@budibase/bbui" import { onMount } from "svelte" - import { apps, organisation, auth, admin } from "stores/portal" + import { apps, organisation, auth } from "stores/portal" import { goto } from "@roxi/routify" import { AppStatus } from "constants" import { gradient } from "actions" @@ -34,7 +34,6 @@ const publishedAppsOnly = app => app.status === AppStatus.DEPLOYED $: publishedApps = $apps.filter(publishedAppsOnly) - $: isCloud = $admin.cloud $: userApps = $auth.user?.builder?.global ? publishedApps : publishedApps.filter(app => @@ -42,7 +41,7 @@ ) function getUrl(app) { - return !isCloud ? `/app/${encodeURIComponent(app.name)}` : `/${app.prodId}` + return `/app${app.url}` } diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 880614538a..abbf48d0da 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -49,7 +49,6 @@ $: filteredApps = enrichedApps.filter(app => app?.name?.toLowerCase().includes(searchTerm.toLowerCase()) ) - $: isCloud = $admin.cloud const enrichApps = (apps, user, sortBy) => { const enrichedApps = apps.map(app => ({ @@ -162,13 +161,7 @@ } const viewApp = app => { - if (!isCloud && app.deployed) { - // special case to use the short form name if self hosted - window.open(`/app${app.url}`) - } else { - const id = app.deployed ? app.prodId : app.devId - window.open(`/${id}`, "_blank") - } + window.open(`/app${app.url}`) } const editApp = app => {