Merge branch 'main' into andrew/web-899-sort-models-and-scene-explore…

…r-the-same
specklesystems · May 29, 2024 · c5e613e · c5e613e
2 parents e2f557b + c3676a9
commit c5e613e
Show file tree

Hide file tree

Showing 41 changed files with 901 additions and 651 deletions.
diff --git a/docker-compose-deps.yml b/docker-compose-deps.yml
@@ -3,7 +3,9 @@ services:
   # Actual Speckle Server dependencies
 
   postgres:
-    image: 'postgres:14.5-alpine'
+    build:
+      context: .
+      dockerfile: docker/postgres/Dockerfile
     restart: always
     environment:
       POSTGRES_DB: speckle

diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
@@ -0,0 +1,25 @@
+FROM postgres:14.5-alpine as builder
+
+RUN apk add --no-cache 'git=~2.36' \
+    'build-base=~0.5' \
+    'clang=~13.0' \
+    'llvm13=~13.0'
+
+WORKDIR /
+RUN git clone --branch 1.1.9 https://github.com/aiven/aiven-extras.git aiven-extras
+
+WORKDIR /aiven-extras
+RUN git checkout 36598ab \
+  && git clean -df \
+  && make \
+  && make install
+
+FROM postgres:14.5-alpine
+
+COPY --from=builder /aiven-extras/aiven_extras.control /usr/local/share/postgresql/extension/aiven_extras.control
+COPY --from=builder /aiven-extras/sql/aiven_extras.sql /usr/local/share/postgresql/extension/aiven_extras--1.1.9.sql
+COPY --from=builder /aiven-extras/aiven_extras.so /usr/local/lib/postgresql/aiven_extras.so
+
+EXPOSE 5432
+
+CMD ["postgres"]
diff --git a/packages/frontend-2/components/auth/LoginWithEmailBlock.vue b/packages/frontend-2/components/auth/LoginWithEmailBlock.vue
@@ -1,5 +1,5 @@
 <template>
-  <form @submit="onSubmit">
+  <form method="post" @submit="onSubmit">
     <div class="flex flex-col space-y-2">
       <FormTextInput
         type="email"

diff --git a/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue b/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue
@@ -1,6 +1,6 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
-  <form @submit="onSubmit">
+  <form method="post" @submit="onSubmit">
     <div class="flex flex-col space-y-2">
       <FormTextInput
         type="text"

diff --git a/packages/frontend-2/components/automate/automation/CreateDialog.vue b/packages/frontend-2/components/automate/automation/CreateDialog.vue
@@ -2,12 +2,17 @@
   <LayoutDialog
     v-model:open="open"
     max-width="lg"
-    title="Create Automation"
+    :title="title"
     :buttons-wrapper-classes="buttonsWrapperClasses"
     :buttons="buttons"
     :on-submit="onDialogSubmit"
     prevent-close-on-click-outside
   >
+    <template v-if="isTestAutomation" #header>
+      Create
+      <span class="font-extrabold text-fancy-gradient">Test</span>
+      Automation
+    </template>
     <div class="flex flex-col gap-11">
       <CommonStepsNumber
         v-if="shouldShowStepsWidget"
@@ -57,7 +62,8 @@ import {
 import {
   ArrowRightIcon,
   ChevronLeftIcon,
-  ChevronRightIcon
+  ChevronRightIcon,
+  CodeBracketIcon
 } from '@heroicons/vue/24/outline'
 import { graphql } from '~/lib/common/generated/gql'
 import { Automate, type Optional } from '@speckle/shared'
@@ -106,6 +112,12 @@ const props = defineProps<{
   preselectedProject?: Optional<FormSelectProjects_ProjectFragment>
 }>()
 const open = defineModel<boolean>('open', { required: true })
+
+const config = useRuntimeConfig()
+const enableCreateTestAutomation = computed(() => {
+  return config.public.FF_TEST_AUTOMATIONS_ENABLED
+})
+
 const { handleSubmit: handleDetailsSubmit } = useForm<DetailsFormValues>()
 
 const stepsOrder = computed(() => [
@@ -139,7 +151,7 @@ const { enumStep, step } = useEnumSteps({ order: stepsOrder })
 const {
   items: stepsWidgetSteps,
   model: stepsWidgetModel,
-  shouldShowWidget: shouldShowStepsWidget
+  shouldShowWidget
 } = useEnumStepsWidgetSetup({ enumStep, widgetStepsMap: stepsWidgetData })
 
 const parametersStep = ref<{ submit: () => Promise<void> }>()
@@ -152,23 +164,51 @@ const selectedModel = ref<FormSelectModels_ModelFragment>()
 const selectedFunction = ref<Optional<CreateAutomationSelectableFunction>>()
 const functionParameters = ref<Record<string, unknown>>()
 const hasParameterErrors = ref(false)
+const isTestAutomation = ref(false)
+
+const shouldShowStepsWidget = computed(() => {
+  return !!shouldShowWidget.value && !isTestAutomation.value
+})
+
+const title = computed(() => {
+  return isTestAutomation.value ? undefined : 'Create Automation'
+})
 
 const buttons = computed((): LayoutDialogButton[] => {
   switch (enumStep.value) {
-    case AutomationCreateSteps.SelectFunction:
-      return [
-        {
-          id: 'selectFnNext',
-          text: 'Next',
-          props: {
-            iconRight: ChevronRightIcon,
-            disabled: !selectedFunction.value
-          },
-          onClick: () => {
-            step.value++
-          }
+    case AutomationCreateSteps.SelectFunction: {
+      const selectFnNextButton: LayoutDialogButton = {
+        id: 'selectFnNext',
+        text: 'Next',
+        props: {
+          iconRight: ChevronRightIcon,
+          disabled: !selectedFunction.value
+        },
+        onClick: () => {
+          step.value++
         }
-      ]
+      }
+
+      const createTestAutomationButton: LayoutDialogButton = {
+        id: 'createTestAutomation',
+        text: 'Create test automation',
+        props: {
+          color: 'secondary',
+          iconLeft: CodeBracketIcon,
+          textColor: 'primary'
+        },
+        onClick: () => {
+          isTestAutomation.value = true
+          step.value = 2
+        }
+      }
+
+      const stepButtons = enableCreateTestAutomation.value
+        ? [createTestAutomationButton, selectFnNextButton]
+        : [selectFnNextButton]
+
+      return stepButtons
+    }
     case AutomationCreateSteps.FunctionParameters:
       return [
         {
@@ -191,8 +231,8 @@ const buttons = computed((): LayoutDialogButton[] => {
           submit: true
         }
       ]
-    case AutomationCreateSteps.AutomationDetails:
-      return [
+    case AutomationCreateSteps.AutomationDetails: {
+      const automationButtons: LayoutDialogButton[] = [
         {
           id: 'detailsPrev',
           text: 'Previous',
@@ -210,6 +250,30 @@ const buttons = computed((): LayoutDialogButton[] => {
           disabled: creationLoading.value
         }
       ]
+
+      const testAutomationButtons: LayoutDialogButton[] = [
+        {
+          id: 'detailsPrev',
+          text: 'Back',
+          props: {
+            color: 'secondary',
+            iconLeft: ChevronLeftIcon,
+            textColor: 'primary'
+          },
+          onClick: reset
+        },
+        {
+          id: 'submitTestAutomation',
+          text: 'Create',
+          disabled: !automationName.value,
+          onClick: () => {
+            // TODO: Make request
+          }
+        }
+      ]
+
+      return isTestAutomation.value ? testAutomationButtons : automationButtons
+    }
     case AutomationCreateSteps.Done:
       return [
         {
@@ -242,7 +306,7 @@ const buttons = computed((): LayoutDialogButton[] => {
 const buttonsWrapperClasses = computed(() => {
   switch (enumStep.value) {
     case AutomationCreateSteps.SelectFunction:
-      return 'justify-end'
+      return enableCreateTestAutomation.value ? 'justify-between' : 'justify-end'
     case AutomationCreateSteps.Done:
       return 'flex-col sm:flex-row sm:justify-between'
     default:
@@ -267,6 +331,7 @@ const reset = () => {
   selectedModel.value = undefined
   automationName.value = undefined
   automationId.value = undefined
+  isTestAutomation.value = false
 }
 
 const onDetailsSubmit = handleDetailsSubmit(async () => {

diff --git a/packages/frontend-2/components/automate/function/Card.vue b/packages/frontend-2/components/automate/function/Card.vue
@@ -28,7 +28,7 @@
           </div>
         </div>
       </div>
-      <div class="label-light text-foreground-2 line-clamp-3 h-16">
+      <div class="label-light text-foreground-2 line-clamp-3 h-16 whitespace-normal">
         {{ plaintextDescription }}
       </div>
       <div v-if="!noButtons" class="flex flex-col sm:flex-row sm:self-end gap-2">

diff --git a/packages/frontend-2/components/automate/function/CardView.vue b/packages/frontend-2/components/automate/function/CardView.vue
@@ -12,12 +12,12 @@ const props = defineProps<{
 const classes = computed(() => {
   const classParts = ['grid gap-4 lg:gap-6']
 
-  if (!props.vertical) {
-    classParts.push('sm:grid-cols-2')
-
-    if (!props.smallView) {
-      classParts.push('lg:grid-cols-3')
-    }
+  if (props.vertical) {
+    classParts.push('grid-cols-1')
+  } else if (props.smallView) {
+    classParts.push('grid-cols-1 sm:grid-cols-2')
+  } else {
+    classParts.push('grid-cols-1 sm:grid-cols-2 lg:grid-cols-3')
   }
 
   return classParts.join(' ')

diff --git a/packages/frontend-2/components/automate/function/create-dialog/DetailsStep.vue b/packages/frontend-2/components/automate/function/create-dialog/DetailsStep.vue
@@ -20,6 +20,7 @@
           show-required
           :rules="nameRules"
           validate-on-value-update
+          autocomplete="off"
         />
       </div>
     </div>

diff --git a/packages/frontend-2/components/automate/functions/page/Header.vue b/packages/frontend-2/components/automate/functions/page/Header.vue
@@ -21,7 +21,7 @@
           v-on="on"
         />
         <FormButton
-          v-if="canCreateFunction"
+          v-if="canCreateFunction && false"
           :icon-left="PlusIcon"
           @click="() => (createDialogOpen = true)"
         >

diff --git a/packages/frontend-2/components/project/VisibilitySelect.vue b/packages/frontend-2/components/project/VisibilitySelect.vue
@@ -10,6 +10,11 @@
     :label-id="labelId"
     :button-id="buttonId"
     by="id"
+    :help="
+      disabled
+        ? 'You must be an Owner of this project to change this setting'
+        : undefined
+    "
   >
     <template #something-selected="{ value }">
       <div class="text-sm">