Merge branch 'master' into BUDI-7654/app-migration-builder-frontend

2024-01-04 13:13:06 +01:00 · 2024-01-04 13:13:06 +01:00 · e08138d84a
parent ec43246974 9f7b84c07a
commit e08138d84a
13 changed files with 54 additions and 4 deletions
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@ -252,4 +252,10 @@ spec:
      {{ end }}
      restartPolicy: Always
      serviceAccountName: ""
+      {{ if .Values.services.apps.ndots }}
+      dnsConfig:
+        options:
+          - name: ndots
+            value: {{ .Values.services.apps.ndots | quote }}
+      {{ end }}
 status: {}
--- a/charts/budibase/templates/automation-worker-service-deployment.yaml
+++ b/charts/budibase/templates/automation-worker-service-deployment.yaml
@ -227,6 +227,7 @@ spec:
        resources:
        {{- toYaml . | nindent 10 }}
        {{ end }}
+        {{ if .Values.services.automationWorkers.command }}
        command:
        {{- toYaml .Values.services.automationWorkers.command | nindent 10 }}
        {{ end }}
@ -251,6 +252,11 @@ spec:
      {{ end }}
      restartPolicy: Always
      serviceAccountName: ""
-      {{ if .Values.services.automationWorkers.command }}}
+      {{ if .Values.services.automationWorkers.ndots }}
+      dnsConfig:
+        options:
+          - name: ndots
+            value: {{ .Values.services.automationWorkers.ndots | quote }}
+      {{ end }}
 status: {}
 {{- end }}
--- a/charts/budibase/templates/proxy-service-deployment.yaml
+++ b/charts/budibase/templates/proxy-service-deployment.yaml
@ -109,4 +109,10 @@ spec:
      {{- toYaml .Values.services.proxy.args | nindent 8 }}
      {{ end }}
      volumes:
+      {{ if .Values.services.proxy.ndots }}
+      dnsConfig:
+        options:
+          - name: ndots
+            value: {{ .Values.services.proxy.ndots | quote }}
+      {{ end }}
 status: {}
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@ -238,4 +238,10 @@ spec:
      {{ end }}
      restartPolicy: Always
      serviceAccountName: ""
+      {{ if .Values.services.worker.ndots }}
+      dnsConfig:
+        options:
+          - name: ndots
+            value: {{ .Values.services.worker.ndots | quote }}
+      {{ end }}
 status: {}
--- a/packages/backend-core/src/timers/timers.ts
+++ b/packages/backend-core/src/timers/timers.ts
@ -50,7 +50,7 @@ export class ExecutionTimeTracker {
    return this.totalTimeMs
  }

-  private checkLimit() {
+  checkLimit() {
    if (this.totalTimeMs > this.limitMs) {
      throw new ExecutionTimeoutError(
        `Execution time limit of ${this.limitMs}ms exceeded: ${this.totalTimeMs}ms`
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@ -53,6 +53,7 @@
  export let value = ""
  export let placeholder = null
  export let autocompleteEnabled = true
+  export let autofocus = false

  // Export a function to expose caret position
  export const getCaretPosition = () => {
@ -241,6 +242,12 @@
    })
  }

+  $: {
+    if (autofocus && isEditorInitialised) {
+      editor.focus()
+    }
+  }
+
  $: editorHeight = typeof height === "number" ? `${height}px` : height

  // Init when all elements are ready
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@ -45,6 +45,7 @@
  export let valid
  export let allowJS = false
  export let allowHelpers = true
+  export let autofocusEditor = false

  const drawerActions = getContext("drawer-actions")
  const bindingDrawerActions = getContext("binding-drawer-actions")
@ -199,6 +200,7 @@
                  ]}
                  placeholder=""
                  height="100%"
+                  autofocus={autofocusEditor}
                />
              </div>
              <div class="binding-footer">
@ -301,6 +303,7 @@
                    bind:getCaretPosition
                    bind:insertAtPos
                    height="100%"
+                    autofocus={autofocusEditor}
                  />
                </div>
                <div class="binding-footer">
--- a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
@ -6,6 +6,7 @@
  export let value = ""
  export let allowJS = false
  export let allowHelpers = true
+  export let autofocusEditor = false

  $: enrichedBindings = enrichBindings(bindings)

@ -27,5 +28,6 @@
  {value}
  {allowJS}
  {allowHelpers}
+  {autofocusEditor}
  on:change
 />
--- a/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsEditor.svelte
@ -25,7 +25,6 @@
 </script>

 <div class="options-wrap">
-  <div />
  <div><ActionButton on:click={drawer.show}>Define Options</ActionButton></div>
 </div>
 <Drawer bind:this={drawer} title="Options" on:drawerHide on:drawerShow>
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
@ -64,6 +64,7 @@
      on:change={event => (tempValue = event.detail)}
      allowJS
      {bindings}
+      autofocusEditor={true}
    />
  </Drawer>
 {/key}
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@ -3295,6 +3295,7 @@
      },
      {
        "type": "options",
+        "label": "Custom options",
        "key": "customOptions",
        "dependsOn": {
          "setting": "optionsSource",
@ -3502,6 +3503,7 @@
      },
      {
        "type": "options",
+        "label": "Custom options",
        "key": "customOptions",
        "dependsOn": {
          "setting": "optionsSource",
--- a/packages/server/src/jsRunner.ts
+++ b/packages/server/src/jsRunner.ts
@ -18,13 +18,16 @@ export function init() {
            bbCtx.jsExecutionTracker =
              timers.ExecutionTimeTracker.withLimit(perRequestLimit)
          }
-          track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
          span?.addTags({
            js: {
              limitMS: bbCtx.jsExecutionTracker.limitMs,
              elapsedMS: bbCtx.jsExecutionTracker.elapsedMS,
            },
          })
+          // We call checkLimit() here to prevent paying the cost of creating
+          // a new VM context below when we don't need to.
+          bbCtx.jsExecutionTracker.checkLimit()
+          track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
        }
      }

--- a/yarn.lock
+++ b/yarn.lock
@ -2019,6 +2019,15 @@
    "@babel/parser" "^7.22.15"
    "@babel/types" "^7.22.15"

+"@babel/template@^7.22.5", "@babel/template@^7.3.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/traverse@^7.22.5":
  version "7.23.6"
  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5"