gergo/automateBackendModule

.circleci/config.yml

@@ -348,7 +348,7 @@ jobs:
         type: string
     docker:
       - image: speckle/pre-commit-runner:latest
-    resource_class: medium
+    resource_class: large
     working_directory: *work-dir
     steps:
       - checkout
@@ -416,6 +416,8 @@ jobs:
       S3_CREATE_BUCKET: 'true'
       REDIS_URL: 'redis://127.0.0.1:6379'
       S3_REGION: '' # optional, defaults to 'us-east-1'
+      FF_AUTOMATE_MODULE_ENABLED: 'true'
+      AUTOMATE_ENCRYPTION_KEYS_PATH: 'test/assets/automate/encryptionKeys.json'
     steps:
       - checkout
       - restore_cache:

.husky/pre-commit

@@ -6,7 +6,10 @@ if [ -n "$CI" ]
 then
   echo "running eslint"
   yarn lint
+  echo "...eslint done"
+  echo "running prettier"
   yarn prettier:check
+  echo "...prettier done"
 else
 # shellcheck disable=SC1090
   . "$(dirname "$0")/_/husky.sh"

docker-compose-ingress.yml

@@ -0,0 +1,9 @@
+services:
+  nginx:
+    restart: always
+    image: nginx:1-alpine
+    ports:
+      - 8080:8080
+    volumes:
+      - ./utils/docker-compose-ingress/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    network_mode: host

package.json

@@ -13,7 +13,7 @@
     "build:public": "yarn workspaces foreach -ptv --no-private run build",
     "build:tailwind-deps": "yarn workspaces foreach -iv -j unlimited --include '{@speckle/shared,@speckle/tailwind-theme,@speckle/ui-components}' run build",
     "ensure:tailwind-deps": "node ./utils/ensure-tailwind-deps.mjs",
-    "lint": "eslint . --ext .js,.ts,.vue --max-warnings=0",
+    "lint": "node --max-old-space-size=4096 ./node_modules/eslint/bin/eslint.js . --ext .js,.ts,.vue --max-warnings=0",
     "helm:readme:generate": "./utils/helm/update-schema-json.sh",
     "prettier:check": "prettier --check .",
     "prettier:fix": "prettier --write .",
@@ -45,6 +45,7 @@
     "@types/eslint": "^8.4.1",
     "@types/lockfile": "^1.0.2",
     "commitizen": "^4.2.5",
+    "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.11.0",
     "eslint-config-prettier": "^8.5.0",

packages/frontend-2/components/auth/LoginPanel.vue

@@ -1,6 +1,7 @@
 <template>
   <Component
     :is="concreteComponent"
+    v-if="!isLoggedIn"
     fancy-glow
     no-shadow
     class="max-w-lg mx-auto w-full"
@@ -43,6 +44,7 @@
       </div>
     </div>
   </Component>
+  <div v-else />
 </template>
 <script setup lang="ts">
 import { useQuery } from '@vue/apollo-composable'
@@ -67,6 +69,7 @@ const props = withDefaults(
   }
 )
 
+const { isLoggedIn } = useActiveUser()
 const { inviteToken } = useAuthManager()
 const router = useRouter()
 

packages/frontend-2/components/automate/automation/CreateDialog.vue

@@ -25,6 +25,7 @@
         v-else-if="
           enumStep === AutomationCreateSteps.FunctionParameters && selectedFunction
         "
+        ref="parametersStep"
         v-model:parameters="functionParameters"
         v-model:has-errors="hasParameterErrors"
         :fn="selectedFunction"
@@ -69,10 +70,15 @@ import {
 import { useForm } from 'vee-validate'
 import {
   useCreateAutomation,
-  useCreateAutomationRevision
+  useCreateAutomationRevision,
+  useUpdateAutomation
 } from '~/lib/projects/composables/automationManagement'
 import { formatJsonFormSchemaInputs } from '~/lib/automate/helpers/jsonSchema'
 import { projectAutomationRoute } from '~/lib/common/helpers/route'
+import {
+  useAutomationInputEncryptor,
+  type AutomationInputEncryptor
+} from '~/lib/automate/composables/automations'
 
 enum AutomationCreateSteps {
   SelectFunction,
@@ -124,7 +130,9 @@ const stepsWidgetData = computed(() => [
   }
 ])
 
+const inputEncryption = useAutomationInputEncryptor({ ensureWhen: open })
 const logger = useLogger()
+const updateAutomation = useUpdateAutomation()
 const createAutomation = useCreateAutomation()
 const createRevision = useCreateAutomationRevision()
 const { enumStep, step } = useEnumSteps({ order: stepsOrder })
@@ -134,6 +142,8 @@ const {
   shouldShowWidget: shouldShowStepsWidget
 } = useEnumStepsWidgetSetup({ enumStep, widgetStepsMap: stepsWidgetData })
 
+const parametersStep = ref<{ submit: () => Promise<void> }>()
+
 const creationLoading = ref(false)
 const automationId = ref<string>()
 const automationName = ref<string>()
@@ -148,6 +158,7 @@ const buttons = computed((): LayoutDialogButton[] => {
     case AutomationCreateSteps.SelectFunction:
       return [
         {
+          id: 'selectFnNext',
           text: 'Next',
           props: {
             iconRight: ChevronRightIcon,
@@ -161,6 +172,7 @@ const buttons = computed((): LayoutDialogButton[] => {
     case AutomationCreateSteps.FunctionParameters:
       return [
         {
+          id: 'fnParamsPrev',
           text: 'Previous',
           props: {
             color: 'secondary',
@@ -170,17 +182,19 @@ const buttons = computed((): LayoutDialogButton[] => {
           onClick: () => step.value--
         },
         {
+          id: 'fnParamsNext',
           text: 'Next',
           props: {
             iconRight: ChevronRightIcon,
             disabled: hasParameterErrors.value
           },
-          onClick: () => step.value++
+          submit: true
         }
       ]
     case AutomationCreateSteps.AutomationDetails:
       return [
         {
+          id: 'detailsPrev',
           text: 'Previous',
           props: {
             color: 'secondary',
@@ -190,6 +204,7 @@ const buttons = computed((): LayoutDialogButton[] => {
           onClick: () => step.value--
         },
         {
+          id: 'detailsCreate',
           text: 'Create',
           submit: true,
           disabled: creationLoading.value
@@ -198,6 +213,7 @@ const buttons = computed((): LayoutDialogButton[] => {
     case AutomationCreateSteps.Done:
       return [
         {
+          id: 'doneClose',
           text: 'Close',
           props: {
             color: 'secondary',
@@ -206,6 +222,7 @@ const buttons = computed((): LayoutDialogButton[] => {
           onClick: () => (open.value = false)
         },
         {
+          id: 'doneGoToAutomation',
           text: 'Go to Automation',
           props: {
             iconRight: ArrowRightIcon,
@@ -273,6 +290,8 @@ const onDetailsSubmit = handleDetailsSubmit(async () => {
   }
 
   creationLoading.value = true
+  let aId: Optional<string> = undefined
+  let automationEncrypt: Optional<AutomationInputEncryptor> = undefined
   try {
     const createRes = await createAutomation({
       projectId: project.id,
@@ -281,29 +300,33 @@ const onDetailsSubmit = handleDetailsSubmit(async () => {
         enabled: false
       }
     })
-    const aId = (automationId.value = createRes?.id)
+    aId = automationId.value = createRes?.id
     if (!aId) {
       logger.error('Failed to create automation', { createRes })
       return
     }
 
-    const parametersString = parameters
-      ? JSON.stringify(
-          formatJsonFormSchemaInputs(parameters, fnRelease.inputSchema, {
-            clone: true
-          })
-        )
-      : null
+    automationEncrypt = await inputEncryption.forAutomation({
+      automationId: aId,
+      projectId: project.id
+    })
+
+    const cleanParams =
+      formatJsonFormSchemaInputs(parameters, fnRelease.inputSchema) || null
+    const encryptedParams = automationEncrypt.encryptInputs({
+      inputs: cleanParams
+    })
+
     const revisionRes = await createRevision(
       {
         projectId: project.id,
         input: {
           automationId: aId,
           functions: [
             {
+              functionReleaseId: fnRelease.id,
               functionId: fn.id,
-              releaseId: fnRelease.id,
-              parameters: parametersString
+              parameters: encryptedParams
             }
           ],
           triggerDefinitions: <Automate.AutomateTypes.TriggerDefinitionsSchema>{
@@ -319,17 +342,37 @@ const onDetailsSubmit = handleDetailsSubmit(async () => {
       },
       { hideSuccessToast: true }
     )
-    if (revisionRes?.id) {
-      step.value++
+
+    if (!revisionRes?.id) {
+      logger.error('Failed to create revision', { revisionRes })
+      return
     }
+
+    // Enable
+    await updateAutomation({
+      projectId: project.id,
+      input: {
+        id: aId,
+        enabled: true
+      }
+    })
+
+    step.value++
   } finally {
     creationLoading.value = false
+    automationEncrypt?.dispose()
   }
 })
 
-const onDialogSubmit = (e: SubmitEvent) => {
-  if (enumStep.value !== AutomationCreateSteps.AutomationDetails) return
-  onDetailsSubmit(e)
+const onDialogSubmit = async (e: SubmitEvent) => {
+  if (enumStep.value === AutomationCreateSteps.AutomationDetails) {
+    await onDetailsSubmit(e)
+  } else if (enumStep.value === AutomationCreateSteps.FunctionParameters) {
+    await parametersStep.value?.submit()
+    if (!hasParameterErrors.value) {
+      step.value++
+    }
+  }
 }
 
 watch(

packages/frontend-2/components/automate/automation/create-dialog/FunctionParametersStep.vue

@@ -2,9 +2,11 @@
   <div>
     <template v-if="finalParams">
       <FormJsonForm
+        ref="jsonForm"
         v-model:data="parameters"
         :schema="finalParams"
         class="space-y-4"
+        :validate-on-mount="false"
         @change="handler"
       />
     </template>
@@ -16,6 +18,7 @@
   </div>
 </template>
 <script setup lang="ts">
+import type { JsonFormsChangeEvent } from '@jsonforms/vue'
 import type { Optional } from '@speckle/shared'
 import { useJsonFormsChangeHandler } from '~/lib/automate/composables/jsonSchema'
 import { formatVersionParams } from '~/lib/automate/helpers/jsonSchema'
@@ -38,6 +41,8 @@ const props = defineProps<{
   fn: AutomateAutomationCreateDialogFunctionParametersStep_AutomateFunctionFragment
 }>()
 
+const jsonForm = ref<{ triggerChange: () => Promise<Optional<JsonFormsChangeEvent>> }>()
+
 const finalParams = computed(() => formatVersionParams(release.value?.inputSchema))
 const { handler, hasErrors: hasJsonFormErrors } = useJsonFormsChangeHandler({
   schema: finalParams
@@ -52,6 +57,10 @@ const release = computed(() =>
   props.fn.releases.items.length ? props.fn.releases.items[0] : undefined
 )
 
+const submit = async () => {
+  await jsonForm.value?.triggerChange()
+}
+
 // watch(
 //   release,
 //   () => {
@@ -69,4 +78,6 @@ watch(
   },
   { immediate: true }
 )
+
+defineExpose({ submit })
 </script>

packages/frontend-2/components/automate/function/Card.vue

@@ -20,7 +20,12 @@
               {{ fn.name }}
             </RouterLink>
           </div>
-          <div class="label-light">by {{ fn.creator?.name || 'Deleted User' }}</div>
+          <div class="label-light flex items-center space-x-1">
+            <span>by</span>
+            <CommonTextLink external :to="fn.repo.url" size="sm">
+              {{ fn.repo.owner }}
+            </CommonTextLink>
+          </div>
         </div>
       </div>
       <div class="label-light text-foreground-2 line-clamp-3 h-16">
@@ -52,10 +57,14 @@
       <div class="absolute top-0 right-0">
         <div
           v-if="hasLabel"
-          class="rounded-bl-lg rounded-tr-[7px] text-xs px-2 py-1 text-foreground"
-          :class="{ 'bg-foundation-focus': fn.isFeatured }"
+          class="rounded-bl-lg rounded-tr-[7px] text-xs px-2 py-1"
+          :class="{
+            'bg-foundation-focus text-foreground': fn.isFeatured,
+            'bg-warning text-foreground-on-primary': isOutdated
+          }"
         >
-          <template v-if="fn.isFeatured">Featured</template>
+          <template v-if="isOutdated">Outdated</template>
+          <template v-else-if="fn.isFeatured">Featured</template>
         </div>
       </div>
     </div>
@@ -75,8 +84,10 @@ graphql(`
     isFeatured
     description
     logo
-    creator {
+    repo {
       id
+      url
+      owner
       name
     }
   }
@@ -93,10 +104,11 @@ const props = defineProps<{
   noButtons?: boolean
   externalMoreInfo?: boolean
   selected?: boolean
+  isOutdated?: boolean
 }>()
 
 const NuxtLink = resolveComponent('NuxtLink')
-const hasLabel = computed(() => props.fn.isFeatured)
+const hasLabel = computed(() => props.fn.isFeatured || props.isOutdated)
 const { html: plaintextDescription } = useMarkdown(
   computed(() => props.fn.description || ''),
   { plaintext: true }