Merge branch 'master' into better-types-in-global-users

2024-07-04 22:11:23 +12:00 · 2023-11-08 13:53:01 +00:00 · 2023-11-08 13:53:01 +00:00 · 1c5cce5551
parent 935ec4c47e 1016fa97f5
commit 1c5cce5551
8 changed files with 57 additions and 40 deletions
--- a/hosting/couchdb/build-target-paths.sh
+++ b/hosting/couchdb/build-target-paths.sh
@ -2,8 +2,8 @@

 echo ${TARGETBUILD} > /buildtarget.txt
 if [[ "${TARGETBUILD}" = "aas" ]]; then
-    # Azure AppService uses /home for persisent data & SSH on port 2222
-    DATA_DIR=/home
+    # Azure AppService uses /home for persistent data & SSH on port 2222
+    DATA_DIR="${DATA_DIR:-/home}"
    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
    mkdir -p $DATA_DIR/{search,minio,couch}
    mkdir -p $DATA_DIR/couch/{dbs,views}
--- a/hosting/scripts/build-target-paths.sh
+++ b/hosting/scripts/build-target-paths.sh
@ -2,8 +2,8 @@

 echo ${TARGETBUILD} > /buildtarget.txt
 if [[ "${TARGETBUILD}" = "aas" ]]; then
-    # Azure AppService uses /home for persisent data & SSH on port 2222
-    DATA_DIR=/home
+    # Azure AppService uses /home for persistent data & SSH on port 2222
+    DATA_DIR="${DATA_DIR:-/home}"
    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
    mkdir -p $DATA_DIR/{search,minio,couch}
    mkdir -p $DATA_DIR/couch/{dbs,views}
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@ -22,7 +22,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME

 # Azure App Service customisations
 if [[ "${TARGETBUILD}" = "aas" ]]; then
-    DATA_DIR=/home
+    DATA_DIR="${DATA_DIR:-/home}"
    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
    /etc/init.d/ssh start
 else
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.13.3",
+  "version": "2.13.5",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@ -13,13 +13,13 @@
  export let idx
  export let addLooping
  export let deleteStep
-
+  export let enableNaming = true
  let validRegex = /^[A-Za-z0-9_\s]+$/
  let typing = false

  const dispatch = createEventDispatcher()

-  $: stepNames = $selectedAutomation.definition.stepNames
+  $: stepNames = $selectedAutomation?.definition.stepNames
  $: automationName = stepNames?.[block.id] || block?.name || ""
  $: automationNameError = getAutomationNameError(automationName)
  $: status = updateStatus(testResult, isTrigger)
@ -32,7 +32,7 @@
      )?.[0]
    }
  }
-  $: loopBlock = $selectedAutomation.definition.steps.find(
+  $: loopBlock = $selectedAutomation?.definition.steps.find(
    x => x.blockToLoop === block?.id
  )

@ -126,24 +126,33 @@
            <Body size="XS"><b>Step {idx}</b></Body>
          </div>
        {/if}
-        <input
-          placeholder="Enter some text"
-          name="name"
-          autocomplete="off"
-          value={automationName}
-          on:input={e => {
-            automationName = e.target.value.trim()
-          }}
-          on:click={startTyping}
-          on:blur={async () => {
-            typing = false
-            if (automationNameError) {
-              automationName = stepNames[block.id] || block?.name
-            } else {
-              await saveName()
-            }
-          }}
-        />
+
+        {#if enableNaming}
+          <input
+            class="input-text"
+            disabled={!enableNaming}
+            placeholder="Enter some text"
+            name="name"
+            autocomplete="off"
+            value={automationName}
+            on:input={e => {
+              automationName = e.target.value.trim()
+            }}
+            on:click={startTyping}
+            on:blur={async () => {
+              typing = false
+              if (automationNameError) {
+                automationName = stepNames[block.id] || block?.name
+              } else {
+                await saveName()
+              }
+            }}
+          />
+        {:else}
+          <div class="input-text">
+            {automationName}
+          </div>
+        {/if}
      </div>
    </div>
    <div class="blockTitle">
@ -178,9 +187,11 @@
              <Icon on:click={addLooping} hoverable name="RotateCW" />
            </AbsTooltip>
          {/if}
-          <AbsTooltip type="negative" text="Delete step">
-            <Icon on:click={deleteStep} hoverable name="DeleteOutline" />
-          </AbsTooltip>
+          {#if !isHeaderTrigger}
+            <AbsTooltip type="negative" text="Delete step">
+              <Icon on:click={deleteStep} hoverable name="DeleteOutline" />
+            </AbsTooltip>
+          {/if}
        {/if}
        {#if !showTestStatus}
          <Icon
@ -244,18 +255,21 @@
    display: none;
  }
  input {
-    font-family: var(--font-sans);
    color: var(--ink);
    background-color: transparent;
    border: 1px solid transparent;
-    font-size: var(--spectrum-alias-font-size-default);
    width: 230px;
    box-sizing: border-box;
    overflow: hidden;
-    text-overflow: ellipsis;
    white-space: nowrap;
  }

+  .input-text {
+    font-size: var(--spectrum-alias-font-size-default);
+    font-family: var(--font-sans);
+    text-overflow: ellipsis;
+  }
+
  input:focus {
    outline: none;
  }
--- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
@ -48,6 +48,7 @@
    <div class="block" style={width ? `width: ${width}` : ""}>
      {#if block.stepId !== ActionStepID.LOOP}
        <FlowItemHeader
+          enableNaming={false}
          open={!!openBlocks[block.id]}
          on:toggle={() => (openBlocks[block.id] = !openBlocks[block.id])}
          isTrigger={idx === 0}
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
@ -56,7 +56,7 @@
    {/if}
    {#key history}
      <div class="history">
-        <TestDisplay testResults={history} width="100%" />
+        <TestDisplay testResults={history} width="320px" />
      </div>
    {/key}
  </Layout>
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@ -32,6 +32,7 @@ import {
  structures,
 } from "@budibase/backend-core/tests"
 import _ from "lodash"
+import * as uuid from "uuid"

 const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString()
 tk.freeze(timestamp)
@ -68,7 +69,7 @@ describe.each([

  const generateTableConfig: () => SaveTableRequest = () => {
    return {
-      name: generator.word(),
+      name: uuid.v4(),
      type: "table",
      primary: ["id"],
      primaryDisplay: "name",
@ -481,7 +482,7 @@ describe.each([
      })

      const createViewResponse = await config.createView({
-        name: generator.word(),
+        name: uuid.v4(),
        schema: {
          Country: {
            visible: true,
@ -816,7 +817,8 @@ describe.each([
            RelationshipType.ONE_TO_MANY,
            ["link"],
            {
-              name: generator.word(),
+              // Making sure that the combined table name + column name is within postgres limits
+              name: uuid.v4().replace(/-/g, "").substring(0, 16),
              type: "table",
              primary: ["id"],
              primaryDisplay: "id",
@ -949,7 +951,7 @@ describe.each([
  describe("view 2.0", () => {
    async function userTable(): Promise<Table> {
      return {
-        name: `users_${generator.word()}`,
+        name: `users_${uuid.v4()}`,
        sourceId: INTERNAL_TABLE_SOURCE_ID,
        sourceType: TableSourceType.INTERNAL,
        type: "table",
@ -1133,7 +1135,7 @@ describe.each([
      const viewSchema = { age: { visible: true }, name: { visible: true } }
      async function userTable(): Promise<Table> {
        return {
-          name: `users_${generator.word()}`,
+          name: `users_${uuid.v4()}`,
          sourceId: INTERNAL_TABLE_SOURCE_ID,
          sourceType: TableSourceType.INTERNAL,
          type: "table",
@ -1630,7 +1632,7 @@ describe.each([
      }),
      (tableId: string) =>
        config.api.row.save(tableId, {
-          name: generator.word(),
+          name: uuid.v4(),
          description: generator.paragraph(),
          tableId,
        }),