diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index 6ea7e44981..400f0dca4f 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -24,11 +24,11 @@
async function deployApp() {
try {
- notifications.info(`Deployment started. Please wait.`)
const response = await api.post("/api/deploy")
- const json = await response.json()
if (response.status !== 200) {
- throw new Error()
+ throw new Error(`status ${response.status}`)
+ } else {
+ notifications.success(`Application published successfully`)
}
if (analytics.requestFeedbackOnDeploy()) {
@@ -36,7 +36,7 @@
}
} catch (err) {
analytics.captureException(err)
- notifications.error("Deployment unsuccessful. Please try again later.")
+ notifications.error(`Error publishing app: ${err}`)
}
}
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
index c9ce885c3e..841d8970f4 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
@@ -14,7 +14,9 @@
const ROUTE_NAME_MAP = {
"/": {
BASIC: "Home",
- PUBLIC: "Login",
+ PUBLIC: "Home",
+ ADMIN: "Home",
+ POWER: "Home",
},
}
diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index c5937c5637..e41ffc4469 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -9,8 +9,6 @@
StatusLight,
} from "@budibase/bbui"
import { gradient } from "actions"
- import { auth } from "stores/portal"
- import { AppStatus } from "constants"
import { processStringSync } from "@budibase/string-templates"
export let app
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 8bc24be624..85bad84376 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -8,6 +8,7 @@
MenuItem,
StatusLight,
} from "@budibase/bbui"
+ import { processStringSync } from "@budibase/string-templates"
export let app
export let exportApp
@@ -27,7 +28,13 @@
- Updated {Math.round(Math.random() * 10 + 1)} months ago
+ {#if app.updatedAt}
+ {processStringSync("Updated {{ duration time 'millisecond' }} ago", {
+ time: new Date().getTime() - new Date(app.updatedAt).getTime(),
+ })}
+ {:else}
+ Never updated
+ {/if}
{app.name}
- Updated {Math.round(Math.random() * 10 + 1)} months ago
+ {#if app.updatedAt}
+ {processStringSync(
+ "Updated {{ duration time 'millisecond' }} ago",
+ {
+ time:
+ new Date().getTime() -
+ new Date(app.updatedAt).getTime(),
+ }
+ )}
+ {:else}
+ Never updated
+ {/if}
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 7857cd658f..9802d5ec36 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -51,12 +51,16 @@
}
return a.status === AppStatus.DEPLOYED ? -1 : 1
})
- } else if (sortBy === "name") {
+ } else if (sortBy === "updated") {
+ return enrichedApps.sort((a, b) => {
+ const aUpdated = a.updatedAt || "9999"
+ const bUpdated = b.updatedAt || "9999"
+ return aUpdated < bUpdated ? 1 : -1
+ })
+ } else {
return enrichedApps.sort((a, b) => {
return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1
})
- } else {
- return enrichedApps
}
}