Skip to content

Commit ec1329d

Browse files
authored
Merge branch 'master' into switch-save-to-new-action-button
2 parents 58f889b + bed91bb commit ec1329d

58 files changed

Lines changed: 1898 additions & 298 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/readme-openapi.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.husky/pre-push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ git status --porcelain > "$before_lint_status"
1313
git diff --binary > "$before_lint_diff"
1414
git diff --cached --binary > "$before_lint_cached_diff"
1515

16-
yarn lint:fix || {
16+
BUDIBASE_ALLOW_LINT_WARNINGS=1 yarn lint:fix || {
1717
printf >&2 "\n%s\n\n" "Linting failed. Push halted."
1818
exit 1
1919
}

CLAUDE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
on intermediate states. Just assert the final outcome
4343
against, provided there are no type errors.
4444
- Avoid adding nested ternary statements.
45+
- Prefer a svelte5 approach over svelte4.
46+
- Don't use // @ts-nocheck when asked to fix type errors.
4547
- When writing tests involving a URL, use example.com as the domain.
4648

4749
## Test style - packages/server

charts/budibase/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
108108
| Key | Type | Default | Description |
109109
|-----|------|---------|-------------|
110110
| affinity | object | `{}` | Sets the affinity for all pods created by this chart. Should not ordinarily need to be changed. See <https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity/> for more information on affinity. |
111+
| awsAlbIngress.accessLogs.bucket | string | `""` | |
112+
| awsAlbIngress.accessLogs.enabled | bool | `false` | ALB access logging to S3. The bucket must already exist in the same region as the ALB, with a bucket policy allowing the regional ELB log-delivery principal to write to it. |
113+
| awsAlbIngress.accessLogs.prefix | string | `""` | Object key prefix within the bucket (logs land under <prefix>/AWSLogs/...). |
111114
| awsAlbIngress.certificateArn | string | `""` | If you're wanting to use HTTPS, you'll need to create an ACM certificate and specify the ARN here. |
112115
| awsAlbIngress.enabled | bool | `false` | Whether to create an ALB Ingress resource pointing to the Budibase proxy. Requires the AWS ALB Ingress Controller. |
113116
| couchdb.clusterSize | int | `1` | The number of replicas to run in the CouchDB cluster. We set this to 1 by default to make things simpler, but you can set it to 3 if you need a high-availability CouchDB cluster. |
@@ -216,6 +219,7 @@ $ helm install --create-namespace --namespace budibase budibase . -f values.yaml
216219
| services.proxy.livenessProbe | object | HTTP health checks. | Liveness probe configuration for proxy pods. You shouldn't need to change this, but if you want to you can find more information here: <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/> |
217220
| services.proxy.readinessProbe | object | HTTP health checks. | Readiness probe configuration for proxy pods. You shouldn't need to change this, but if you want to you can find more information here: <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/> |
218221
| services.proxy.replicaCount | int | `1` | The number of proxy replicas to run. |
222+
| services.proxy.resolver | string | `""` | The DNS resolver the nginx proxy uses to resolve upstreams at request time. MUST be an IP address (nginx resolves this once at config-load and exits fatally if it is an unresolvable DNS name). Leave empty to auto-detect the kube-dns ClusterIP at install/upgrade time; only set this if auto-detection cannot run (e.g. restricted RBAC for `lookup`). |
219223
| services.proxy.resources | object | `{}` | The resources to use for proxy pods. See <https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/> for more information on how to set these. |
220224
| services.proxy.startupProbe | object | HTTP health checks. | Startup probe configuration for proxy pods. You shouldn't need to change this, but if you want to you can find more information here: <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/> |
221225
| services.redis.enabled | bool | `true` | Whether or not to deploy a Redis pod into your cluster. |

charts/budibase/templates/alb-ingress.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
alb.ingress.kubernetes.io/success-codes: '200'
1111
alb.ingress.kubernetes.io/healthcheck-path: '/health'
1212
alb.ingress.kubernetes.io/target-group-attributes: deregistration_delay.timeout_seconds={{ .Values.awsAlbIngress.deregistrationDelay }}
13+
{{- if .Values.awsAlbIngress.accessLogs.enabled }}
14+
alb.ingress.kubernetes.io/load-balancer-attributes: access_logs.s3.enabled=true,access_logs.s3.bucket={{ required "awsAlbIngress.accessLogs.bucket is required when awsAlbIngress.accessLogs.enabled is true" .Values.awsAlbIngress.accessLogs.bucket }},access_logs.s3.prefix={{ .Values.awsAlbIngress.accessLogs.prefix }}
15+
{{- end }}
1316
{{- if .Values.awsAlbIngress.certificateArn }}
1417
alb.ingress.kubernetes.io/ssl-redirect: '443'
1518
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'

charts/budibase/templates/proxy-service-deployment.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ spec:
8989
value: {{ .Values.services.proxy.proxyRateLimitApiPerSecond | quote }}
9090
{{ end }}
9191
- name: RESOLVER
92-
{{ if .Values.services.proxy.resolver }}
93-
value: {{ .Values.services.proxy.resolver }}
94-
{{ else }}
95-
value: kube-dns.kube-system.svc.{{ .Values.services.dns }}
96-
{{ end }}
92+
{{- if .Values.services.proxy.resolver }}
93+
value: {{ .Values.services.proxy.resolver | quote }}
94+
{{- else if (lookup "v1" "Service" "kube-system" "kube-dns") }}
95+
value: {{ (lookup "v1" "Service" "kube-system" "kube-dns").spec.clusterIP | quote }}
96+
{{- else }}
97+
value: {{ printf "kube-dns.kube-system.svc.%s" .Values.services.dns | quote }}
98+
{{- end }}
9799
{{ with .Values.services.proxy.resources }}
98100
resources:
99101
{{- toYaml . | nindent 10 }}
@@ -119,7 +121,7 @@ spec:
119121
{{- end }}
120122
{{ if .Values.schedulerName }}
121123
schedulerName: {{ .Values.schedulerName | quote }}
122-
{{ end }}
124+
{{ end }}
123125
{{ if .Values.imagePullSecrets }}
124126
imagePullSecrets:
125127
{{- toYaml .Values.imagePullSecrets | nindent 6 }}

charts/budibase/values.yaml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ awsAlbIngress:
5353
# -- Time in seconds ALB waits for in-flight requests during target deregistration.
5454
# This allows graceful connection draining during pod rollouts.
5555
deregistrationDelay: 30
56+
# -- ALB access logging to S3.
57+
# The bucket must already exist in the same region as the ALB, with a bucket policy
58+
# allowing the regional ELB log-delivery principal to write to it.
59+
accessLogs:
60+
enabled: false
61+
bucket: ""
62+
# -- Object key prefix within the bucket (logs land under <prefix>/AWSLogs/...).
63+
prefix: ""
5664

5765
# -- Sets the tolerations for all pods created by this chart. Should not ordinarily need to be changed.
5866
# See <https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/> for more information
@@ -170,6 +178,13 @@ services:
170178
port: 10000
171179
# -- The number of proxy replicas to run.
172180
replicaCount: 2
181+
# -- The DNS resolver the nginx proxy uses to resolve upstreams at request time.
182+
# MUST be an IP address (nginx resolves this once at config-load and exits fatally
183+
# if it is an unresolvable DNS name). Leave empty to auto-detect the kube-dns
184+
# ClusterIP at install/upgrade time; only set this if auto-detection cannot run
185+
# (e.g. restricted RBAC for `lookup`) — then use your cluster's DNS ClusterIP,
186+
# e.g. `kubectl -n kube-system get svc kube-dns -o jsonpath='{.spec.clusterIP}'`.
187+
resolver: ""
173188
# @ignore (you should never need to change this)
174189
upstreams:
175190
apps: "http://app-service.{{ .Release.Namespace }}.svc.{{ .Values.services.dns }}:{{ .Values.services.apps.port }}"
@@ -330,7 +345,9 @@ services:
330345
# @ignore
331346
periodSeconds: 3
332347
# @ignore
333-
failureThreshold: 1
348+
failureThreshold: 3
349+
# @ignore
350+
timeoutSeconds: 5
334351
# -- Liveness probe configuration for apps pods. You shouldn't need to
335352
# change this, but if you want to you can find more information here:
336353
# <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>
@@ -342,9 +359,11 @@ services:
342359
port: 4002
343360
scheme: HTTP
344361
# @ignore
345-
failureThreshold: 3
362+
failureThreshold: 5
346363
# @ignore
347364
periodSeconds: 5
365+
# @ignore
366+
timeoutSeconds: 5
348367
autoscaling:
349368
# -- Whether to enable horizontal pod autoscaling for the apps service.
350369
enabled: false
@@ -439,7 +458,9 @@ services:
439458
# @ignore
440459
periodSeconds: 3
441460
# @ignore
442-
failureThreshold: 1
461+
failureThreshold: 3
462+
# @ignore
463+
timeoutSeconds: 5
443464
# -- Liveness probe configuration for automation worker pods. You shouldn't
444465
# need to change this, but if you want to you can find more information
445466
# here:
@@ -452,9 +473,11 @@ services:
452473
port: 4002
453474
scheme: HTTP
454475
# @ignore
455-
failureThreshold: 3
476+
failureThreshold: 5
456477
# @ignore
457478
periodSeconds: 30
479+
# @ignore
480+
timeoutSeconds: 5
458481
autoscaling:
459482
# -- Whether to enable horizontal pod autoscaling for the apps service.
460483
enabled: false
@@ -550,6 +573,8 @@ services:
550573
periodSeconds: 5
551574
# @ignore
552575
failureThreshold: 3
576+
# @ignore
577+
timeoutSeconds: 5
553578
# -- Liveness probe configuration for worker pods. You shouldn't need to
554579
# change this, but if you want to you can find more information here:
555580
# <https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>
@@ -561,9 +586,11 @@ services:
561586
port: 4003
562587
scheme: HTTP
563588
# @ignore
564-
failureThreshold: 3
589+
failureThreshold: 5
565590
# @ignore
566591
periodSeconds: 5
592+
# @ignore
593+
timeoutSeconds: 5
567594
autoscaling:
568595
# -- Whether to enable horizontal pod autoscaling for the worker service.
569596
enabled: false

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "3.39.21",
3+
"version": "3.39.22",
44
"npmClient": "yarn",
55
"concurrency": 20,
66
"command": {

packages/bbui/src/Form/Core/DatePicker/DateInput.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
}
7878
.spectrum-Datepicker {
7979
width: 100%;
80+
min-width: 104px;
8081
overflow: hidden;
8182
}
8283
.spectrum-Datepicker .spectrum-Textfield {

packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<script>
22
export let value
3-
export let min
4-
export let max
3+
export let min = undefined
4+
export let max = undefined
55
export let hideArrows = false
6-
export let width
6+
export let width = undefined
77
export let type = "number"
8+
export let disabled = false
9+
export let readonly = false
810
911
$: style = width ? `width:${width}px;` : ""
1012
@@ -18,6 +20,8 @@
1820
{value}
1921
{min}
2022
{max}
23+
{disabled}
24+
{readonly}
2125
on:click={selectAll}
2226
on:change
2327
on:input

0 commit comments

Comments
 (0)