From ddc360a3da3a1c3c31a5e7b6cb7daebdbd7caaba Mon Sep 17 00:00:00 2001 From: mikesealey Date: Fri, 20 Sep 2024 11:54:26 +0100 Subject: [PATCH 1/6] tweaks sizing of multi-attachment preview in compact setting --- packages/bbui/src/Form/Core/Dropzone.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index c69bf0d6bb..e223d789a1 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -396,6 +396,10 @@ padding: 6px 10px; margin-bottom: 8px; } + + .compact .gallery > * { + max-height: 25px; + } .title { display: flex; flex-direction: row; From 4975ae7fef1b2bcac717a3706194743d51f0cf8b Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 20 Sep 2024 16:58:06 +0100 Subject: [PATCH 2/6] Extra test logging. --- .github/workflows/budibase_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 4b9ebf1e5d..388f2000ed 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -186,6 +186,8 @@ jobs: - run: yarn --frozen-lockfile - name: Test server + env: + DEBUG: "testcontainers*" run: | if ${{ env.ONLY_AFFECTED_TASKS }}; then node scripts/run-affected.js --task=test --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }} From da805b10ae576f23fd6d8d823d655a3d20382a49 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 20 Sep 2024 17:31:44 +0100 Subject: [PATCH 3/6] Set mssql SHA back to 2019. --- packages/server/datasource-sha.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/datasource-sha.env b/packages/server/datasource-sha.env index 61249d530c..9b935ed8eb 100644 --- a/packages/server/datasource-sha.env +++ b/packages/server/datasource-sha.env @@ -1,4 +1,4 @@ -MSSQL_SHA=sha256:3b913841850a4d57fcfcb798be06acc88ea0f2acc5418bc0c140a43e91c4a545 +MSSQL_SHA=sha256:c4369c38385eba011c10906dc8892425831275bb035d5ce69656da8e29de50d8 MYSQL_SHA=sha256:9de9d54fecee6253130e65154b930978b1fcc336bcc86dfd06e89b72a2588ebe POSTGRES_SHA=sha256:bd0d8e485d1aca439d39e5ea99b931160bd28d862e74c786f7508e9d0053090e MONGODB_SHA=sha256:afa36bca12295b5f9dae68a493c706113922bdab520e901bd5d6c9d7247a1d8d From 028d15911ee1d02d17382c7b127d2bbf61935114 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Mon, 23 Sep 2024 11:47:08 +0100 Subject: [PATCH 4/6] Revert "Set mssql SHA back to 2019." This reverts commit da805b10ae576f23fd6d8d823d655a3d20382a49. --- packages/server/datasource-sha.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/datasource-sha.env b/packages/server/datasource-sha.env index 9b935ed8eb..61249d530c 100644 --- a/packages/server/datasource-sha.env +++ b/packages/server/datasource-sha.env @@ -1,4 +1,4 @@ -MSSQL_SHA=sha256:c4369c38385eba011c10906dc8892425831275bb035d5ce69656da8e29de50d8 +MSSQL_SHA=sha256:3b913841850a4d57fcfcb798be06acc88ea0f2acc5418bc0c140a43e91c4a545 MYSQL_SHA=sha256:9de9d54fecee6253130e65154b930978b1fcc336bcc86dfd06e89b72a2588ebe POSTGRES_SHA=sha256:bd0d8e485d1aca439d39e5ea99b931160bd28d862e74c786f7508e9d0053090e MONGODB_SHA=sha256:afa36bca12295b5f9dae68a493c706113922bdab520e901bd5d6c9d7247a1d8d From 8a5a94338ad7b63d83288b73b24358f2a2a420de Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Mon, 23 Sep 2024 14:18:34 +0100 Subject: [PATCH 5/6] Remove extra logging. --- .github/workflows/budibase_ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 388f2000ed..4b9ebf1e5d 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -186,8 +186,6 @@ jobs: - run: yarn --frozen-lockfile - name: Test server - env: - DEBUG: "testcontainers*" run: | if ${{ env.ONLY_AFFECTED_TASKS }}; then node scripts/run-affected.js --task=test --scope=@budibase/server --since=${{ env.NX_BASE_BRANCH }} From 3e9ca562c598a7099ba9c18669b8d6cda8f37013 Mon Sep 17 00:00:00 2001 From: mikesealey Date: Tue, 24 Sep 2024 12:12:46 +0100 Subject: [PATCH 6/6] reworks changes based on feedback --- packages/bbui/src/Form/Core/Dropzone.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index e223d789a1..2922d88e7a 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -397,9 +397,10 @@ margin-bottom: 8px; } - .compact .gallery > * { - max-height: 25px; + .compact .placeholder { + height: fit-content; } + .title { display: flex; flex-direction: row;