From 830069970ad635e0f95e0fb94f8c49098d631894 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 7 May 2021 11:14:43 +0100 Subject: [PATCH] Bump svelte and routify deps, fix builder _reset usage and some tidy ups --- packages/bbui/package.json | 2 +- packages/bbui/yarn.lock | 8 +- packages/builder/package.json | 4 +- .../{AppList.svelte => AppGridView.svelte} | 3 - .../src/components/start/AppTableView.svelte | 23 ++++++ .../components/start/CreateAppModal.svelte | 1 - .../{_reset.svelte => _layout.svelte} | 0 .../src/pages/builder/portal/_layout.svelte | 9 ++- .../pages/builder/portal/apps/_layout.svelte | 7 -- .../pages/builder/portal/apps/index.svelte | 76 ++++++++++--------- packages/builder/yarn.lock | 8 +- packages/client/package.json | 2 +- packages/server/package.json | 2 +- packages/server/yarn.lock | 8 +- packages/standard-components/package.json | 2 +- 15 files changed, 88 insertions(+), 67 deletions(-) rename packages/builder/src/components/start/{AppList.svelte => AppGridView.svelte} (87%) create mode 100644 packages/builder/src/components/start/AppTableView.svelte rename packages/builder/src/pages/builder/app/[application]/{_reset.svelte => _layout.svelte} (100%) delete mode 100644 packages/builder/src/pages/builder/portal/apps/_layout.svelte diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 573e115377..056f4229cb 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -27,7 +27,7 @@ "rollup-plugin-postcss": "^4.0.0", "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.37.0" + "svelte": "^3.38.2" }, "keywords": [ "svelte" diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 5dcac027b9..e9bad2e162 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -2407,10 +2407,10 @@ svelte-portal@^1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte@^3.37.0: - version "3.37.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.37.0.tgz#dc7cd24bcc275cdb3f8c684ada89e50489144ccd" - integrity sha512-TRF30F4W4+d+Jr2KzUUL1j8Mrpns/WM/WacxYlo5MMb2E5Qy2Pk1Guj6GylxsW9OnKQl1tnF8q3hG/hQ3h6VUA== +svelte@^3.38.2: + version "3.38.2" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.38.2.tgz#55e5c681f793ae349b5cc2fe58e5782af4275ef5" + integrity sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg== svgo@^1.0.0: version "1.3.2" diff --git a/packages/builder/package.json b/packages/builder/package.json index 4b9522aab0..a22cacd57c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -90,7 +90,7 @@ "@babel/preset-env": "^7.13.12", "@babel/runtime": "^7.13.10", "@rollup/plugin-replace": "^2.4.2", - "@roxi/routify": "2.15.1", + "@roxi/routify": "2.18.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5", "@testing-library/jest-dom": "^5.11.10", "@testing-library/svelte": "^3.0.0", @@ -106,7 +106,7 @@ "rollup": "^2.44.0", "rollup-plugin-copy": "^3.4.0", "start-server-and-test": "^1.12.1", - "svelte": "^3.37.0", + "svelte": "^3.38.2", "svelte-jester": "^1.3.2", "vite": "^2.1.5" }, diff --git a/packages/builder/src/components/start/AppList.svelte b/packages/builder/src/components/start/AppGridView.svelte similarity index 87% rename from packages/builder/src/components/start/AppList.svelte rename to packages/builder/src/components/start/AppGridView.svelte index 33c8d765f9..947477b03e 100644 --- a/packages/builder/src/components/start/AppList.svelte +++ b/packages/builder/src/components/start/AppGridView.svelte @@ -1,9 +1,6 @@ {#if $apps.length} diff --git a/packages/builder/src/components/start/AppTableView.svelte b/packages/builder/src/components/start/AppTableView.svelte new file mode 100644 index 0000000000..0886f3e1eb --- /dev/null +++ b/packages/builder/src/components/start/AppTableView.svelte @@ -0,0 +1,23 @@ + + +{#if $apps.length} +
+ {#each $apps as app} + + {/each} +
+{:else} +
No apps found.
+{/if} + + diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index 3cbdaa3f34..fcfea2d8cf 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -7,7 +7,6 @@ import Spinner from "components/common/Spinner.svelte" import { Info, User } from "./Steps" import Indicator from "./Indicator.svelte" - import { goto } from "@roxi/routify" import { fade } from "svelte/transition" import { post } from "builderStore/api" import analytics from "analytics" diff --git a/packages/builder/src/pages/builder/app/[application]/_reset.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/app/[application]/_reset.svelte rename to packages/builder/src/pages/builder/app/[application]/_layout.svelte diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 5019edb56e..cd2b6ecccc 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -17,9 +17,6 @@ import { auth } from "stores/backend" import BuilderSettingsModal from "components/start/BuilderSettingsModal.svelte" - organisation.init() - apps.load() - let orgName let orgLogo let user @@ -32,7 +29,11 @@ user = { name: "John Doe" } } - onMount(getInfo) + onMount(() => { + organisation.init() + apps.load() + getInfo() + }) let menu = [ { title: "Apps", href: "/builder/portal/apps" }, diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte deleted file mode 100644 index c87ab149ba..0000000000 --- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 5062248e11..09b179bdf1 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -8,12 +8,15 @@ ButtonGroup, Select, Modal, + Page, } from "@budibase/bbui" - import AppList from "components/start/AppList.svelte" + import AppGridView from "components/start/AppGridView.svelte" + import AppTableView from "components/start/AppTableView.svelte" import CreateAppModal from "components/start/CreateAppModal.svelte" import api from "builderStore/api" import analytics from "analytics" import { onMount } from "svelte" + import { apps } from "stores/portal" let layout = "grid" let modal @@ -32,42 +35,47 @@ modal.show() } - onMount(checkKeys) + onMount(() => { + checkKeys() + apps.load() + }) - -
- Apps - - - - -
-
-
- +
+ + (layout = "grid")} + selected={layout === "grid"} + quiet + icon="ClassicGridView" + /> + (layout = "table")} + selected={layout === "table"} + quiet + icon="ViewRow" + /> + +
+ {#if layout === "grid"} + + {:else} + + {/if} + + =4.2.0 < 13" diff --git a/packages/client/package.json b/packages/client/package.json index a34835eccf..b96c20a2f2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -38,7 +38,7 @@ "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-svg": "^2.0.0", "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.37.0" + "svelte": "^3.38.2" }, "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321" } diff --git a/packages/server/package.json b/packages/server/package.json index 62e4c50d71..ed77be004d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -127,7 +127,7 @@ "pouchdb-replication-stream": "1.2.9", "sanitize-s3-objectkey": "0.0.1", "server-destroy": "1.0.1", - "svelte": "3.30.0", + "svelte": "^3.38.2", "tar-fs": "2.1.0", "to-json-schema": "0.2.5", "uuid": "3.3.2", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 28084e86e3..e8f7c53e30 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -8767,10 +8767,10 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -svelte@3.30.0: - version "3.30.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6" - integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag== +svelte@^3.38.2: + version "3.38.2" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.38.2.tgz#55e5c681f793ae349b5cc2fe58e5782af4275ef5" + integrity sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg== symbol-tree@^3.2.2: version "3.2.4" diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index d3030d590d..48c966f558 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -23,7 +23,7 @@ ], "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5", - "svelte": "^3.37.0", + "svelte": "^3.38.2", "vite": "^2.1.5" }, "keywords": [