From eefac0fe088a7532c5213f3a6acf136bd8b434e7 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 26 Jul 2023 18:13:18 +0100 Subject: [PATCH] Quick updates based on latest lerna version, as well as some fixes after running through flows (post refactoring). --- package.json | 4 +- .../pages/builder/portal/apps/index.svelte | 53 ++++++++++--------- .../worker/src/api/controllers/global/auth.ts | 8 +-- .../worker/src/api/controllers/global/self.ts | 6 +-- .../src/api/routes/global/tests/auth.spec.ts | 6 +-- .../src/api/routes/global/tests/users.spec.ts | 2 +- packages/worker/src/initPro.ts | 4 +- packages/worker/src/sdk/auth/auth.ts | 4 +- 8 files changed, 45 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 6a678f1bf3..2173e91055 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "kill-builder": "kill-port 3000", "kill-server": "kill-port 4001 4002", "kill-all": "yarn run kill-builder && yarn run kill-server", - "dev": "yarn run kill-all && yarn nx run-many --target=dev:builder", - "dev:noserver": "yarn run kill-builder && lerna run --stream dev:stack:up && yarn nx run-many --target=dev:builder --exclude=@budibase/backend-core,@budibase/server,@budibase/worker", + "dev": "yarn run kill-all && yarn nx run-many --target=dev:builder --parallel=10", + "dev:noserver": "yarn run kill-builder && lerna run --stream dev:stack:up && yarn nx run-many --target=dev:builder --parallel=10 --exclude=@budibase/backend-core,@budibase/server,@budibase/worker", "dev:server": "yarn run kill-server && yarn nx run-many --target=dev:builder --projects=@budibase/worker,@budibase/server", "dev:built": "yarn run kill-all && cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream dev:built", "dev:docker": "yarn build:docker:pre && docker-compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0", diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index dc5ee25688..00991dd39a 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -15,6 +15,7 @@ import CreateAppModal from "components/start/CreateAppModal.svelte" import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte" import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte" + import { sdk } from "@budibase/shared-core" import { store, automationStore } from "builderStore" import { API } from "api" @@ -237,35 +238,37 @@ {#if enrichedApps.length}
-
- - {#if $apps?.length > 0 && !$admin.offlineMode} + {#if sdk.isGlobalBuilder($auth.user)} +
- {/if} - {#if !$apps?.length} - - {/if} -
+ {#if $apps?.length > 0 && !$admin.offlineMode} + + {/if} + {#if !$apps?.length} + + {/if} +
+ {/if} {#if enrichedApps.length > 1}