Merge master.

packages/account-portal

@@ -1 +1 @@
-Subproject commit 7f388799c023c37b9e13663819f3ee402ade4adf
+Subproject commit 6465dc9c2a38e1380b32204cad4ae0c1f33e065a

packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte

@@ -24,6 +24,13 @@
     navigationStore,
   } from "stores/builder"
   import { DefaultAppTheme } from "constants"
+  import BarButtonList from "/src/components/design/settings/controls/BarButtonList.svelte"
+
+  $: alignmentOptions = [
+    { value: "Left", barIcon: "TextAlignLeft" },
+    { value: "Center", barIcon: "TextAlignCenter" },
+    { value: "Right", barIcon: "TextAlignRight" },
+  ]
 
   $: screenRouteOptions = $screenStore.screens
     .map(screen => screen.routing?.route)
@@ -46,6 +53,10 @@
       notifications.error("Error updating navigation settings")
     }
   }
+
+  const updateTextAlign = textAlignValue => {
+    navigationStore.syncAppNavigation({ textAlign: textAlignValue })
+  }
 </script>
 
 <Panel
@@ -133,6 +144,15 @@
             on:change={e => update("title", e.detail)}
             updateOnChange={false}
           />
+
+          <div class="label">
+            <Label size="M">Text align</Label>
+          </div>
+          <BarButtonList
+            options={alignmentOptions}
+            value={$navigationStore.textAlign}
+            onChange={updateTextAlign}
+          />
         {/if}
         <div class="label">
           <Label>Background</Label>

packages/builder/src/stores/builder/navigation.js

@@ -11,6 +11,7 @@ export const INITIAL_NAVIGATION_STATE = {
   hideLogo: null,
   logoUrl: null,
   hideTitle: null,
+  textAlign: "Left",
   navBackground: null,
   navWidth: null,
   navTextColor: null,

packages/client/src/components/app/Layout.svelte

@@ -36,6 +36,7 @@
   export let pageWidth
   export let logoLinkUrl
   export let openLogoLinkInNewTab
+  export let textAlign
 
   export let embedded = false
 
@@ -226,7 +227,7 @@
                   {/if}
                 {/if}
                 {#if !hideTitle && title}
-                  <Heading size="S">{title}</Heading>
+                  <Heading size="S" {textAlign}>{title}</Heading>
                 {/if}
               </div>
               {#if !embedded}

packages/pro

@@ -1 +1 @@
-Subproject commit 4f183993af024e5ddec1b90981fb9049a3c6c412
+Subproject commit 993b9f010f619b7f8b50c89105c645e3d874929e

packages/server/__mocks__/airtable.ts

@@ -1,8 +1,5 @@
-module AirtableMock {
+class Airtable {
-  const Airtable = () => {
+  base = jest.fn()
-    // @ts-ignore
-    this.base = jest.fn()
 }
 
 module.exports = Airtable
-}

packages/server/__mocks__/aws-sdk.ts

@@ -1,25 +1,19 @@
 import fs from "fs"
 import { join } from "path"
 
-module AwsMock {
-  const aws: any = {}
-
 const response = (body: any, extra?: any) => () => ({
   promise: () => body,
   ...extra,
 })
 
-  const DocumentClient = () => {
+class DocumentClient {
-    // @ts-ignore
+  put = jest.fn(response({}))
-    this.put = jest.fn(response({}))
+  query = jest.fn(
-    // @ts-ignore
-    this.query = jest.fn(
     response({
       Items: [],
     })
   )
-    // @ts-ignore
+  scan = jest.fn(
-    this.scan = jest.fn(
     response({
       Items: [
         {
@@ -28,57 +22,41 @@ module AwsMock {
       ],
     })
   )
-    // @ts-ignore
+  get = jest.fn(response({}))
-    this.get = jest.fn(response({}))
+  update = jest.fn(response({}))
-    // @ts-ignore
+  delete = jest.fn(response({}))
-    this.update = jest.fn(response({}))
-    // @ts-ignore
-    this.delete = jest.fn(response({}))
 }
 
-  const S3 = () => {
+class S3 {
-    // @ts-ignore
+  listObjects = jest.fn(
-    this.listObjects = jest.fn(
     response({
       Contents: [],
     })
   )
-
+  createBucket = jest.fn(
-    // @ts-ignore
-    this.createBucket = jest.fn(
     response({
       Contents: {},
     })
   )
-
+  deleteObjects = jest.fn(
-    // @ts-ignore
-    this.deleteObjects = jest.fn(
     response({
       Contents: {},
     })
   )
-
+  getSignedUrl = jest.fn((operation, params) => {
-    // @ts-ignore
-    this.getSignedUrl = (operation, params) => {
     return `http://example.com/${params.Bucket}/${params.Key}`
-    }
+  })
-
+  headBucket = jest.fn(
-    // @ts-ignore
-    this.headBucket = jest.fn(
     response({
       Contents: {},
     })
   )
-
+  upload = jest.fn(
-    // @ts-ignore
-    this.upload = jest.fn(
     response({
       Contents: {},
     })
   )
-
+  getObject = jest.fn(
-    // @ts-ignore
-    this.getObject = jest.fn(
     response(
       {
         Body: "",
@@ -86,17 +64,18 @@ module AwsMock {
       {
         createReadStream: jest
           .fn()
-            .mockReturnValue(
+          .mockReturnValue(fs.createReadStream(join(__dirname, "aws-sdk.ts"))),
-              fs.createReadStream(join(__dirname, "aws-sdk.ts"))
-            ),
       }
     )
   )
 }
 
-  aws.DynamoDB = { DocumentClient }
+module.exports = {
-  aws.S3 = S3
+  DynamoDB: {
-  aws.config = { update: jest.fn() }
+    DocumentClient,
-
+  },
-  module.exports = aws
+  S3,
+  config: {
+    update: jest.fn(),
+  },
 }

packages/server/__mocks__/mssql.ts

@@ -1,24 +1,17 @@
-module MsSqlMock {
+module.exports = {
-  const mssql: any = {}
+  ConnectionPool: jest.fn(() => ({
-
+    connect: jest.fn(() => ({
-  mssql.query = jest.fn(() => ({
+      request: jest.fn(() => ({
+        query: jest.fn(sql => ({ recordset: [sql] })),
+      })),
+    })),
+  })),
+  query: jest.fn(() => ({
     recordset: [
       {
         a: "string",
         b: 1,
       },
     ],
-  }))
-
-  // mssql.connect = jest.fn(() => ({ recordset: [] }))
-
-  mssql.ConnectionPool = jest.fn(() => ({
-    connect: jest.fn(() => ({
-      request: jest.fn(() => ({
-        query: jest.fn(sql => ({ recordset: [sql] })),
   })),
-    })),
-  }))
-
-  module.exports = mssql
 }

packages/server/__mocks__/mysql2.ts

@@ -1,6 +1,3 @@
-module MySQLMock {
-  const mysql: any = {}
-
 const client = {
   connect: jest.fn(),
   query: jest.fn((query, bindings, fn) => {
@@ -8,7 +5,7 @@ module MySQLMock {
   }),
 }
 
-  mysql.createConnection = jest.fn(() => client)
+module.exports = {
-
+  createConnection: jest.fn(() => client),
-  module.exports = mysql
+  client,
 }

packages/server/__mocks__/oracledb.ts

@@ -1,6 +1,4 @@
-module OracleDbMock {
+const executeMock = jest.fn(() => ({
-  // mock execute
-  const execute = jest.fn(() => ({
   rows: [
     {
       a: "string",
@@ -9,23 +7,15 @@ module OracleDbMock {
   ],
 }))
 
-  const close = jest.fn()
+const closeMock = jest.fn()
 
-  // mock connection
+class Connection {
-  const Connection = () => {}
+  execute = executeMock
-  Connection.prototype.execute = execute
+  close = closeMock
-  Connection.prototype.close = close
+}
-
+
-  // mock oracledb
+module.exports = {
-  const oracleDb: any = {}
+  getConnection: jest.fn(() => new Connection()),
-  oracleDb.getConnection = jest.fn(() => {
+  executeMock,
-    // @ts-ignore
+  closeMock,
-    return new Connection()
-  })
-
-  // expose mocks
-  oracleDb.executeMock = execute
-  oracleDb.closeMock = close
-
-  module.exports = oracleDb
 }

packages/server/__mocks__/pg.ts

@@ -1,6 +1,3 @@
-module PgMock {
-  const pg: any = {}
-
 const query = jest.fn(() => ({
   rows: [
     {
@@ -10,20 +7,19 @@ module PgMock {
   ],
 }))
 
-  // constructor
+class Client {
-  const Client = () => {}
+  query = query
-  Client.prototype.query = query
+  end = jest.fn(cb => {
-  Client.prototype.end = jest.fn(cb => {
     if (cb) cb()
   })
-  Client.prototype.connect = jest.fn()
+  connect = jest.fn()
-  Client.prototype.release = jest.fn()
+  release = jest.fn()
+}
 
 const on = jest.fn()
 
-  pg.Client = Client
+module.exports = {
-  pg.queryMock = query
+  Client,
-  pg.on = on
+  queryMock: query,
-
+  on,
-  module.exports = pg
 }

packages/server/src/api/routes/tests/queries/query.seq.spec.ts

@@ -330,6 +330,7 @@ describe("/queries", () => {
           ],
         },
       ]
+
       pg.queryMock.mockImplementation(() => ({
         rows,
       }))

packages/server/src/integrations/tests/sqlAlias.spec.ts

@@ -294,7 +294,7 @@ describe("Captures of real examples", () => {
           type: "datasource",
           isSQL: false,
         })
-      ).toEqual(true)
+      ).toEqual(false)
     })
 
     it("should disable when no fields", () => {