MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into feature/audit-log-sqs

This commit is contained in:
mike12345567 2024-05-28 17:29:47 +01:00
parent 3b310b188e 11f3d9b946
commit fa140b5f3d
10 changed files with 117 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosting/single/Dockerfile
View File

@ -1,3 +1,4 @@
ARG BASEIMG=budibase/couchdb:v3.3.3
FROM node:20-slim as build
# install node-gyp dependencies
@ -32,7 +33,7 @@ COPY packages/worker/dist packages/worker/dist
COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
FROM budibase/couchdb:v3.3.3 as runner
FROM $BASEIMG as runner
ARG TARGETARCH
ENV TARGETARCH $TARGETARCH
#TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)

4
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.27.3",
"version": "2.27.4",
"npmClient": "yarn",
"packages": [
"packages/*",
@ -22,4 +22,4 @@
"loadEnvFiles": false
}
}
}
}

3
package.json
View File

@ -35,6 +35,8 @@
"get-past-client-version": "node scripts/getPastClientVersion.js",
"setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
"build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
"build:apps": "yarn build --scope @budibase/server --scope @budibase/worker",
"build:cli": "yarn build --scope @budibase/cli",
"build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
"build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
"build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
@ -73,6 +75,7 @@
"build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
"build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .",
"build:docker:single": "./scripts/build-single-image.sh",
"build:docker:single:sqs": "./scripts/build-single-image-sqs.sh",
"build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting",
"publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 --push ./hosting/couchdb",
"publish:docker:couch-sqs": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile.v2 -t budibase/couchdb:v3.3.3-sqs --push ./hosting/couchdb",

175
packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
View File

@ -14,16 +14,13 @@
const dispatch = createEventDispatcher()
export let value = ""
export let maxIconsPerPage = 30
export let maxIconsPerPage = 10
let searchTerm = ""
let selectedLetter = "A"
let currentPage = 1
let filteredIcons = findIconByTerm(selectedLetter)
$: dispatch("change", value)
const alphabet = [
"A",
"B",
@ -107,12 +104,15 @@
loading = false
}
$: displayValue = value ? value.substring(3) : "Pick icon"
const select = icon => {
value = icon
dispatch("change", icon)
}
$: totalPages = Math.ceil(filteredIcons.length / maxIconsPerPage)
$: displayValue = value ? value.substring(3) : "Pick icon"
$: totalPages = Math.max(1, Math.ceil(filteredIcons.length / maxIconsPerPage))
$: pageEndIdx = maxIconsPerPage * currentPage
$: pagedIcons = filteredIcons.slice(pageEndIdx - maxIconsPerPage, pageEndIdx)
$: pagerText = `Page ${currentPage} of ${totalPages}`
</script>
@ -123,49 +123,52 @@
</div>
<!-- svelte-ignore a11y-no-static-element-interactions -->
<!-- svelte-ignore a11y-click-events-have-key-events -->
<Popover bind:this={dropdown} on:open={setSelectedUI} anchor={buttonAnchor}>
<Popover
bind:this={dropdown}
on:open={setSelectedUI}
anchor={buttonAnchor}
resizable={false}
>
<div class="container">
<div class="search-area">
<div class="alphabet-area">
{#each alphabet as letter, idx}
<span
class="letter"
class:letter-selected={letter === selectedLetter}
on:click={() => switchLetter(letter)}
>
{letter}
</span>
{#if idx !== alphabet.length - 1}<span>-</span>{/if}
{/each}
</div>
<div class="search-input">
<div class="input-wrapper" style={`width: ${value ? "425" : "510"}px`}>
<Input
bind:value={searchTerm}
on:keyup={event => {
if (event.key === "Enter") {
searchForIcon()
}
}}
thin
placeholder="Search Icon"
/>
</div>
<Button secondary on:click={searchForIcon}>Search</Button>
{#if value}
<Button primary on:click={() => (value = null)}>Clear</Button>
{/if}
</div>
<div class="page-area">
<div class="pager">
<span on:click={() => pageClick(false)}>
<i class="page-btn ri-arrow-left-line ri-sm" />
</span>
<span>{pagerText}</span>
<span on:click={() => pageClick(true)}>
<i class="page-btn ri-arrow-right-line ri-sm" />
</span>
</div>
<div class="alphabet-area">
{#each alphabet as letter, idx}
<span
class="letter"
class:letter-selected={letter === selectedLetter}
on:click={() => switchLetter(letter)}
>
{letter}
</span>
{#if idx !== alphabet.length - 1}<span>-</span>{/if}
{/each}
</div>
<div class="search-input">
<Input
bind:value={searchTerm}
on:keyup={event => {
if (event.key === "Enter") {
searchForIcon()
}
}}
thin
placeholder="Search icons"
/>
<Button secondary on:click={searchForIcon}>Search</Button>
{#if value}
<Button primary on:click={() => select(null)}>Clear</Button>
{/if}
</div>
<div class="page-area">
<div class="pager">
<i
on:click={() => pageClick(false)}
class="page-btn ri-arrow-left-line ri-sm"
/>
<span>{pagerText}</span>
<i
on:click={() => pageClick(true)}
class="page-btn ri-arrow-right-line ri-sm"
/>
</div>
</div>
{#if pagedIcons.length > 0}
@ -175,7 +178,7 @@
<div
class="icon-container"
class:selected={value === `ri-${icon}-fill`}
on:click={() => (value = `ri-${icon}-fill`)}
on:click={() => select(`ri-${icon}-fill`)}
>
<div class="icon-preview">
<i class={`ri-${icon}-fill ri-xl`} />
@ -185,7 +188,7 @@
<div
class="icon-container"
class:selected={value === `ri-${icon}-line`}
on:click={() => (value = `ri-${icon}-line`)}
on:click={() => select(`ri-${icon}-line`)}
>
<div class="icon-preview">
<i class={`ri-${icon}-line ri-xl`} />
@ -196,11 +199,7 @@
{/if}
</div>
{:else}
<div class="no-icons">
<h5>
{`There is no icons for this ${searchTerm ? "search" : "page"}`}
</h5>
</div>
<div class="no-icons">No icons found</div>
{/if}
</div>
</Popover>
@ -208,11 +207,13 @@
<style>
.container {
width: 610px;
height: 350px;
height: 380px;
display: flex;
flex-direction: column;
padding: 10px 0px 10px 15px;
overflow-x: hidden;
gap: var(--spacing-l);
align-items: stretch;
padding: var(--spacing-l);
background: var(--spectrum-global-color-gray-100);
}
.search-area {
flex: 0 0 80px;
@ -223,22 +224,18 @@
flex: 1;
display: grid;
grid-template-columns: repeat(5, 1fr);
grid-gap: 5px;
grid-gap: 8px;
justify-content: flex-start;
overflow-y: auto;
overflow-x: hidden;
padding-right: 10px;
}
.no-icons {
display: flex;
justify-content: center;
align-items: center;
color: var(--spectrum-global-color-gray-600);
}
.alphabet-area {
display: flex;
flex-flow: row wrap;
padding-bottom: 10px;
padding-right: 15px;
justify-content: space-around;
}
.loading-container {
@ -248,43 +245,55 @@
}
.search-input {
display: flex;
flex-flow: row nowrap;
width: 100%;
padding-right: 15px;
gap: 10px;
}
.input-wrapper {
width: 510px;
margin-right: 5px;
.search-input :global(> :first-child) {
flex: 1 1 auto;
}
.page-area {
padding: 10px;
display: flex;
justify-content: center;
user-select: none;
}
.pager {
display: flex;
align-items: center;
gap: var(--spacing-m);
}
.page-area i {
font-size: 16px;
transition: color 130ms ease-out;
}
.page-area i:hover {
color: var(--spectrum-global-color-blue-600);
cursor: pointer;
}
.letter {
color: var(--blue);
color: var(--spectrum-global-color-gray-700);
transition: color 130ms ease-out;
}
.letter:hover {
cursor: pointer;
text-decoration: underline;
}
.letter-selected {
text-decoration: underline;
.letter-selected,
.letter:hover {
color: var(--spectrum-global-color-blue-600);
}
.icon-container {
height: 100px;
height: 60px;
display: flex;
justify-content: center;
flex-direction: column;
border: var(--border-dark);
border: 1px solid var(--spectrum-global-color-gray-400);
border-radius: 4px;
transition: background 130ms ease-out;
}
.icon-container:hover {
cursor: pointer;
background: var(--grey-2);
background: var(--spectrum-global-color-gray-200);
}
.selected {
background: var(--grey-3);
.icon-container.selected {
background: var(--spectrum-global-color-gray-300);
}
.icon-preview {
flex: 1;
@ -296,9 +305,11 @@
flex: 0 0 20px;
text-align: center;
font-size: 12px;
margin-bottom: 2px;
color: var(--spectrum-global-color-gray-700);
}
.page-btn {
color: var(--blue);
color: var(--spectrum-global-color-gray-700);
}
.page-btn:hover {
cursor: pointer;

1
packages/client/src/components/app/GridBlock.svelte
View File

@ -105,6 +105,7 @@
size: "M",
text: settings.text,
type: settings.type,
icon: settings.icon,
onClick: async row => {
// Create a fake, ephemeral context to run the buttons actions with
const id = get(component).id

29
packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
View File

@ -43,19 +43,6 @@
})
</script>
<!-- Hidden copy of buttons to measure -->
<div class="measure" bind:this={measureContainer}>
<GridCell width="auto">
<div class="buttons">
{#each buttons as button}
<Button size="S">
{button.text || "Button"}
</Button>
{/each}
</div>
</GridCell>
</div>
<!-- svelte-ignore a11y-no-static-element-interactions -->
<div
class="button-column"
@ -72,6 +59,7 @@
class="row"
on:mouseenter={$isDragging ? null : () => ($hoveredRowId = row._id)}
on:mouseleave={$isDragging ? null : () => ($hoveredRowId = null)}
bind:this={measureContainer}
>
<GridCell
width="auto"
@ -91,6 +79,9 @@
overBackground={button.type === "overBackground"}
on:click={() => handleClick(button, row)}
>
{#if button.icon}
<i class="{button.icon} S" />
{/if}
{button.text || "Button"}
</Button>
{/each}
@ -130,16 +121,14 @@
gap: var(--cell-padding);
height: inherit;
}
.buttons :global(.spectrum-Button-Label) {
display: flex;
align-items: center;
gap: 4px;
}
/* Add left cell border */
.button-column :global(.cell) {
border-left: var(--cell-border);
}
/* Hidden copy of buttons to measure width against */
.measure {
position: absolute;
opacity: 0;
pointer-events: none;
}
</style>

5
packages/server/src/startup/index.ts
View File

@ -28,11 +28,6 @@ import fs from "fs"
let STARTUP_RAN = false
if (env.isProd() && env.SQS_SEARCH_ENABLE) {
console.error("Stopping service - SQS search support is not yet available.")
process.exit(-1)
}
async function initRoutes(app: Koa) {
if (!env.isTest()) {
const plugin = await bullboard.init()

5
scripts/build-single-image-sqs.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
yarn build:apps
version=$(./scripts/getCurrentVersion.sh)
docker build -f hosting/single/Dockerfile -t budibase:sqs --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single --build-arg BASEIMG=budibase/couchdb:v3.3.3-sqs .

2
scripts/build-single-image.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
yarn build --scope @budibase/server --scope @budibase/worker
yarn build:apps
version=$(./scripts/getCurrentVersion.sh)
docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single .

3
scripts/devDocker.sh
View File

@ -6,7 +6,6 @@ if [ ! -d "./packages/pro/src" ]; then
exit 1
fi
yarn build --scope @budibase/server --scope @budibase/worker
yarn build:apps
docker compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0