Merge branch 'main' of github.com:specklesystems/speckle-server into …

…gergo/previews
specklesystems · Jan 7, 2025 · febb0bf · febb0bf
2 parents 9590220 + c252339
commit febb0bf
Show file tree

Hide file tree

Showing 334 changed files with 12,979 additions and 6,014 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -496,6 +496,7 @@ jobs:
       S3_REGION: '' # optional, defaults to 'us-east-1'
       ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json'
       FF_BILLING_INTEGRATION_ENABLED: 'true'
+      RATELIMITER_ENABLED: 'false'
     steps:
       - checkout
       - restore_cache:
@@ -578,6 +579,7 @@ jobs:
       S3_REGION: '' # optional, defaults to 'us-east-1'
       ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json'
       DISABLE_ALL_FFS: 'true'
+      RATELIMITER_ENABLED: 'false'
 
   test-server-multiregion:
     <<: *test-server-job
@@ -623,8 +625,8 @@ jobs:
       MULTI_REGION_CONFIG_PATH: '../../.circleci/multiregion.test-ci.json'
       FF_WORKSPACES_MODULE_ENABLED: 'true'
       FF_WORKSPACES_MULTI_REGION_ENABLED: 'true'
-      FF_WORKSPACES_MULTI_REGION_BLOB_STORAGE_ENABLED: 'true'
       RUN_TESTS_IN_MULTIREGION_MODE: true
+      RATELIMITER_ENABLED: 'false'
 
   test-frontend-2:
     docker: &docker-node-browsers-image
@@ -1049,7 +1051,6 @@ jobs:
   docker-build-monitor-container:
     <<: *build-job
     environment:
-      FOLDER: utils
       SPECKLE_SERVER_PACKAGE: monitor-deployment
 
   docker-build-docker-compose-ingress:
@@ -1119,7 +1120,6 @@ jobs:
   docker-publish-monitor-container:
     <<: *publish-job
     environment:
-      FOLDER: utils
       SPECKLE_SERVER_PACKAGE: monitor-deployment
 
   docker-publish-docker-compose-ingress:

diff --git a/.gitignore b/.gitignore
@@ -74,7 +74,9 @@ redis-data/
 .tshy-build
 obj/
 bin/
-
+!packages/monitor-deployment/bin
+!packages/preview-service/bin
+!packages/server/bin
 
 # Server
 multiregion.json

diff --git a/packages/dui3/lib/common/generated/gql/graphql.ts b/packages/dui3/lib/common/generated/gql/graphql.ts
@@ -68,6 +68,16 @@ export type AdminInviteList = {
   totalCount: Scalars['Int']['output'];
 };
 
+export type AdminMutations = {
+  __typename?: 'AdminMutations';
+  updateWorkspacePlan: Scalars['Boolean']['output'];
+};
+
+
+export type AdminMutationsUpdateWorkspacePlanArgs = {
+  input: AdminUpdateWorkspacePlanInput;
+};
+
 export type AdminQueries = {
   __typename?: 'AdminQueries';
   inviteList: AdminInviteList;
@@ -108,6 +118,12 @@ export type AdminQueriesWorkspaceListArgs = {
   query?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type AdminUpdateWorkspacePlanInput = {
+  plan: WorkspacePlans;
+  status: WorkspacePlanStatuses;
+  workspaceId: Scalars['ID']['input'];
+};
+
 export type AdminUserList = {
   __typename?: 'AdminUserList';
   cursor?: Maybe<Scalars['String']['output']>;
@@ -1240,6 +1256,7 @@ export type Mutation = {
   _?: Maybe<Scalars['String']['output']>;
   /** Various Active User oriented mutations */
   activeUserMutations: ActiveUserMutations;
+  admin: AdminMutations;
   adminDeleteUser: Scalars['Boolean']['output'];
   /** Creates an personal api token. */
   apiTokenCreate: Scalars['String']['output'];
@@ -4535,9 +4552,16 @@ export type WorkspaceSubscription = {
   billingInterval: BillingInterval;
   createdAt: Scalars['DateTime']['output'];
   currentBillingCycleEnd: Scalars['DateTime']['output'];
+  seats: WorkspaceSubscriptionSeats;
   updatedAt: Scalars['DateTime']['output'];
 };
 
+export type WorkspaceSubscriptionSeats = {
+  __typename?: 'WorkspaceSubscriptionSeats';
+  guest: Scalars['Int']['output'];
+  plan: Scalars['Int']['output'];
+};
+
 export type WorkspaceTeamFilter = {
   /** Limit team members to provided role(s) */
   roles?: InputMaybe<Array<Scalars['String']['input']>>;

diff --git a/packages/fileimport-service/Dockerfile b/packages/fileimport-service/Dockerfile
@@ -20,7 +20,7 @@ RUN chmod +x /usr/bin/tini
 RUN apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
      --no-install-recommends \
-     curl=8.5.0-2ubuntu10.5 \
+     curl=8.5.0-2ubuntu10.6 \
     && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
      --no-install-recommends \

diff --git a/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj b/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-      <PackageReference Include="Speckle.WebIfc.Importer" Version="0.0.5" />
+      <PackageReference Include="Speckle.WebIfc.Importer" Version="0.0.7" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
 

diff --git a/packages/fileimport-service/knex.js b/packages/fileimport-service/knex.js
@@ -14,16 +14,25 @@ const isDevEnv = process.env.NODE_ENV !== 'production'
 let dbClients
 const getDbClients = async () => {
   if (dbClients) return dbClients
-  const maxConnections =
-    parseInt(process.env.POSTGRES_MAX_CONNECTIONS_FILE_IMPORT_SERVICE) || 1
+  const maxConnections = parseInt(
+    process.env['POSTGRES_MAX_CONNECTIONS_FILE_IMPORT_SERVICE'] || '1'
+  )
+  const connectionAcquireTimeoutMillis = parseInt(
+    process.env['POSTGRES_CONNECTION_ACQUIRE_TIMEOUT_MILLIS'] || '16000'
+  )
+  const connectionCreateTimeoutMillis = parseInt(
+    process.env['POSTGRES_CONNECTION_CREATE_TIMEOUT_MILLIS'] || '5000'
+  )
 
   const configArgs = {
     migrationDirs: [],
     isTestEnv: isDevEnv,
     isDevOrTestEnv: isDevEnv,
     logger,
     maxConnections,
-    applicationName: 'speckle_fileimport_service'
+    applicationName: 'speckle_fileimport_service',
+    connectionAcquireTimeoutMillis,
+    connectionCreateTimeoutMillis
   }
   if (!FF_WORKSPACES_MULTI_REGION_ENABLED) {
     const mainClient = configureKnexClient(

diff --git a/packages/fileimport-service/package.json b/packages/fileimport-service/package.json
@@ -26,7 +26,7 @@
     "@speckle/shared": "workspace:^",
     "bcrypt": "^5.0.1",
     "crypto-random-string": "^3.3.1",
-    "knex": "^2.4.1",
+    "knex": "^2.5.1",
     "pg": "^8.7.3",
     "pino": "^8.7.0",
     "pino-http": "^8.0.0",

diff --git a/packages/frontend-2/components/automate/runs/StatusBadge.vue b/packages/frontend-2/components/automate/runs/StatusBadge.vue
@@ -1,5 +1,9 @@
 <template>
-  <CommonBadge :color-classes="[runStatusClasses(run), 'shrink-0 grow-0'].join(' ')">
+  <CommonBadge
+    :color-classes="
+      [runStatusClasses(run), 'shrink-0 grow-0 text-foreground'].join(' ')
+    "
+  >
     {{ run.status.toUpperCase() }}
   </CommonBadge>
 </template>

diff --git a/packages/frontend-2/components/billing/Alert.vue b/packages/frontend-2/components/billing/Alert.vue
@@ -1,13 +1,29 @@
 <template>
   <div>
-    <CommonAlert v-if="!hasValidPlan" :color="alertColor" :actions="actions">
-      <template #title>
+    <template v-if="!hasValidPlan">
+      <div
+        v-if="condensed"
+        class="flex items-center justify-between rounded-md p-2 pl-3 text-body-3xs font-medium bg-info-lighter text-primary-focus gap-x-2"
+      >
         {{ title }}
-      </template>
-      <template #description>
-        {{ description }}
-      </template>
-    </CommonAlert>
+        <FormButton
+          v-if="actions.length > 0"
+          size="sm"
+          :disabled="actions[0].disabled"
+          @click="actions[0].onClick"
+        >
+          {{ actions[0].title }}
+        </FormButton>
+      </div>
+      <CommonAlert v-else :color="alertColor" :actions="actions">
+        <template #title>
+          {{ title }}
+        </template>
+        <template #description>
+          {{ description }}
+        </template>
+      </CommonAlert>
+    </template>
   </div>
 </template>
 
@@ -39,6 +55,7 @@ graphql(`
 const props = defineProps<{
   workspace: BillingAlert_WorkspaceFragment
   actions?: Array<AlertAction>
+  condensed?: boolean
 }>()
 
 const { billingPortalRedirect } = useBillingActions()
@@ -62,9 +79,17 @@ const trialDaysLeft = computed(() => {
 })
 const title = computed(() => {
   if (isTrial.value) {
-    return `You have ${trialDaysLeft.value} day${
-      trialDaysLeft.value !== 1 ? 's' : ''
-    } left on your free trial`
+    if (trialDaysLeft.value === 0) {
+      return 'Final day of free trial'
+    }
+    if (props.condensed) {
+      return `${trialDaysLeft.value} day${
+        trialDaysLeft.value !== 1 ? 's' : ''
+      } left in trial`
+    } else
+      return `You have ${trialDaysLeft.value} day${
+        trialDaysLeft.value !== 1 ? 's' : ''
+      } left on your free trial`
   }
   switch (planStatus.value) {
     case WorkspacePlanStatuses.CancelationScheduled:
@@ -98,6 +123,8 @@ const description = computed(() => {
       return ''
   }
 })
+const hasValidPlan = computed(() => planStatus.value === WorkspacePlanStatuses.Valid)
+
 const alertColor = computed<AlertColor>(() => {
   switch (planStatus.value) {
     case WorkspacePlanStatuses.PaymentFailed:
@@ -110,6 +137,7 @@ const alertColor = computed<AlertColor>(() => {
       return 'neutral'
   }
 })
+
 const actions = computed((): AlertAction[] => {
   const actions: Array<AlertAction> = props.actions ?? []
 
@@ -129,5 +157,4 @@ const actions = computed((): AlertAction[] => {
 
   return actions
 })
-const hasValidPlan = computed(() => planStatus.value === WorkspacePlanStatuses.Valid)
 </script>
diff --git a/packages/frontend-2/components/dashboard/Sidebar.vue b/packages/frontend-2/components/dashboard/Sidebar.vue
@@ -58,8 +58,8 @@
               v-if="isWorkspacesEnabled"
               collapsible
               title="Workspaces"
-              :plus-click="isNotGuest ? handlePlusClick : undefined"
-              plus-text="Create workspace"
+              :icon-click="isNotGuest ? handlePlusClick : undefined"
+              icon-text="Create workspace"
             >
               <NuxtLink :to="workspacesRoute" @click="handleIntroducingWorkspacesClick">
                 <LayoutSidebarMenuGroupItem
@@ -83,6 +83,7 @@
                     :active="isActive(item.to)"
                     :tag="
                       item.plan.status === WorkspacePlanStatuses.Trial ||
+                      item.plan.status === WorkspacePlanStatuses.Expired ||
                       !item.plan.status
                         ? 'TRIAL'
                         : undefined

diff --git a/...tend-2/components/dashboard/Blog/Card.vue → ...2/components/dashboard/tutorials/Card.vue b/...tend-2/components/dashboard/Blog/Card.vue → ...2/components/dashboard/tutorials/Card.vue
@@ -1,5 +1,5 @@
 <template>
-  <NuxtLink :to="webflowItem.url" target="_blank">
+  <NuxtLink :to="webflowItem.url" target="_blank" @click="trackClick">
     <div
       class="bg-foundation border border-outline-3 rounded-xl flex flex-col overflow-hidden hover:border-outline-5 transition"
     >
@@ -17,33 +17,29 @@
       >
         <HeaderLogoBlock no-link minimal class="scale-150" />
       </div>
-      <div class="p-5 pb-4">
+      <div class="p-5">
         <h3 class="text-body-2xs text-foreground truncate">
           {{ webflowItem.title }}
         </h3>
-        <p class="text-body-3xs text-foreground-2 mt-2">
-          <span v-tippy="createdOn.full">
-            {{ createdOn.relative }}
-          </span>
-          <template v-if="webflowItem.readTime">
-            <span class="pl-1 pr-2">•</span>
-            {{ webflowItem.readTime }}m read
-          </template>
-        </p>
       </div>
     </div>
   </NuxtLink>
 </template>
 
 <script lang="ts" setup>
 import type { WebflowItem } from '~/lib/dashboard/helpers/types'
+import { useMixpanel } from '~~/lib/core/composables/mp'
+
+const mixpanel = useMixpanel()
 
 const props = defineProps<{
   webflowItem: WebflowItem
 }>()
 
-const createdOn = computed(() => ({
-  full: formattedFullDate(props.webflowItem.createdOn),
-  relative: formattedRelativeDate(props.webflowItem.createdOn, { capitalize: true })
-}))
+const trackClick = () => {
+  mixpanel.track('Tutorial clicked', {
+    title: props.webflowItem.title,
+    id: props.webflowItem.id
+  })
+}
 </script>
diff --git a/...d-2/components/dashboard/Blog/Wrapper.vue → ...omponents/dashboard/tutorials/Wrapper.vue b/...d-2/components/dashboard/Blog/Wrapper.vue → ...omponents/dashboard/tutorials/Wrapper.vue
@@ -1,8 +1,8 @@
 <template>
   <section v-if="!error">
-    <h2 class="text-heading-sm text-foreground-2 mb-4">Blog</h2>
+    <h2 class="text-heading-sm text-foreground-2 mb-4">Tutorials</h2>
     <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
-      <DashboardBlogCard
+      <DashboardTutorialsCard
         v-for="webflowItem in webflowItems"
         :key="webflowItem.id"
         :webflow-item="webflowItem"

diff --git a/packages/frontend-2/components/form/select/ServerRoles.vue b/packages/frontend-2/components/form/select/ServerRoles.vue
@@ -7,7 +7,7 @@
     :disabled-item-tooltip="
       !allowGuest ? 'The Guest role isn\'t enabled on the server' : ''
     "
-    name="serverRoles"
+    :name="name ?? 'serverRoles'"
     label="Role"
     :show-label="showLabel"
     class="min-w-[110px]"
@@ -75,7 +75,8 @@ const props = defineProps({
   allowAdmin: Boolean,
   allowArchived: Boolean,
   fullyControlValue: Boolean,
-  showLabel: Boolean
+  showLabel: Boolean,
+  name: String
 })
 
 const elementToWatchForChanges = ref(null as Nullable<HTMLElement>)

diff --git a/packages/frontend-2/components/form/select/WorkspaceRoles.vue b/packages/frontend-2/components/form/select/WorkspaceRoles.vue
@@ -96,6 +96,11 @@ const props = defineProps({
   hideDescription: {
     required: false,
     type: Boolean
+  },
+  allowUnset: {
+    required: false,
+    type: Boolean,
+    default: true
   }
 })