diff --git a/.circleci/config.yml b/.circleci/config.yml index b672554095..3a27e23dd1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -595,13 +595,13 @@ jobs: POSTGRES_DB: speckle2_test POSTGRES_PASSWORD: speckle POSTGRES_USER: speckle - command: -c 'max_connections=1000' + command: -c 'max_connections=1000' -c 'wal_level=logical' - image: 'speckle/speckle-postgres' environment: POSTGRES_DB: speckle2_test POSTGRES_PASSWORD: speckle POSTGRES_USER: speckle - command: -c 'max_connections=1000' -c 'port=5433' + command: -c 'max_connections=1000' -c 'port=5433' -c 'wal_level=logical' - image: 'minio/minio' command: server /data --console-address ":9001" environment: @@ -623,8 +623,10 @@ jobs: S3_REGION: '' # optional, defaults to 'us-east-1' AUTOMATE_ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json' FF_BILLING_INTEGRATION_ENABLED: 'true' - # These are the only 2 different env keys: + # These are the only different env keys: MULTI_REGION_CONFIG_PATH: '../../.circleci/multiregion.test-ci.json' + FF_WORKSPACES_MODULE_ENABLED: 'true' + FF_WORKSPACES_MULTI_REGION_ENABLED: 'true' RUN_TESTS_IN_MULTIREGION_MODE: true test-frontend-2: diff --git a/packages/frontend-2/components/automate/functions/page/Header.vue b/packages/frontend-2/components/automate/functions/page/Header.vue index d00fa4ac70..c0b5c83050 100644 --- a/packages/frontend-2/components/automate/functions/page/Header.vue +++ b/packages/frontend-2/components/automate/functions/page/Header.vue @@ -4,7 +4,11 @@ class="pt-4 flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between" > - +

Automate functions

diff --git a/packages/frontend-2/components/billing/Alert.vue b/packages/frontend-2/components/billing/Alert.vue new file mode 100644 index 0000000000..6f478c4e41 --- /dev/null +++ b/packages/frontend-2/components/billing/Alert.vue @@ -0,0 +1,106 @@ + + + diff --git a/packages/frontend-2/components/billing/Summary.vue b/packages/frontend-2/components/billing/Summary.vue deleted file mode 100644 index c58c417ad9..0000000000 --- a/packages/frontend-2/components/billing/Summary.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/packages/frontend-2/components/dashboard/Sidebar.vue b/packages/frontend-2/components/dashboard/Sidebar.vue index ae49f1d3cd..6e2a6cd80d 100644 --- a/packages/frontend-2/components/dashboard/Sidebar.vue +++ b/packages/frontend-2/components/dashboard/Sidebar.vue @@ -81,6 +81,12 @@