Merge branch 'main' into Fixing-standard-object-records

.cursorrules

@@ -65,6 +65,13 @@
 - Types in types/
 - PascalCase components, camelCase others
 
+## Translation
+- Use @lingui/react/macro
+- Use <Trans> within components
+- Use t`string` elsewhere (from useLingui hook)
+- Don't translate metadata (field names, object names, etc)
+- Don't translate mocks
+
 ## Code Style
 - Early returns
 - No nested ternaries

.eslintrc.cjs

@@ -1,7 +1,14 @@
 module.exports = {
   root: true,
-  extends: ['plugin:prettier/recommended'],
-  plugins: ['@nx', 'prefer-arrow', 'import', 'unused-imports', 'unicorn'],
+  extends: ['plugin:prettier/recommended', 'plugin:lingui/recommended'],
+  plugins: [
+    '@nx',
+    'prefer-arrow',
+    'import',
+    'unused-imports',
+    'unicorn',
+    'lingui',
+  ],
   rules: {
     'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
     'no-console': ['warn', { allow: ['group', 'groupCollapsed', 'groupEnd'] }],
@@ -29,6 +36,10 @@ module.exports = {
             sourceTag: 'scope:frontend',
             onlyDependOnLibsWithTags: ['scope:shared', 'scope:frontend'],
           },
+          {
+            sourceTag: 'scope:zapier',
+            onlyDependOnLibsWithTags: ['scope:shared'],
+          },
         ],
       },
     ],
@@ -96,7 +107,11 @@ module.exports = {
       rules: {},
     },
     {
-      files: ['*.spec.@(ts|tsx|js|jsx)', '*.test.@(ts|tsx|js|jsx)'],
+      files: [
+        '*.spec.@(ts|tsx|js|jsx)',
+        '*.integration-spec.@(ts|tsx|js|jsx)',
+        '*.test.@(ts|tsx|js|jsx)',
+      ],
       env: {
         jest: true,
       },

.github/workflows/actions/nx-affected/action.yaml

@@ -2,14 +2,11 @@ name: Nx Affected CI
 inputs:
   parallel:
     required: false
-    types: [number]
-    default: 3
+    default: '3'
   tag:
     required: false
-    types: [string]
   tasks:
     required: true
-    types: [string]
 
 runs:
   using: "composite"

.github/workflows/actions/restore-cache/action.yaml

@@ -0,0 +1,35 @@
+name: Restore cache
+inputs:
+  key:
+    required: true
+    description: Prefix to the cache key
+  additional-paths:
+    required: false
+outputs:
+  cache-primary-key:
+    description: actions/cache/restore cache-primary-key outputs proxy
+    value: ${{ steps.restore-cache.outputs.cache-primary-key }}
+  cache-hit:
+    description: String bool indicating whether cache has been directly or indirectly hit
+    value: ${{ steps.restore-cache.outputs.cache-hit == 'true' || steps.restore-cache.outputs.cache-matched-key != '' }}
+
+runs:
+  using: composite
+  steps:
+    - name: Cache primary key builder
+      id: cache-primary-key-builder
+      shell: bash
+      run: |
+        echo "CACHE_PRIMARY_KEY_PREFIX=${{ inputs.key }}-${{ github.ref_name }}" >> "${GITHUB_OUTPUT}"
+    - name: Restore cache
+      uses: actions/cache/restore@v4
+      id: restore-cache
+      with:
+        key:  ${{ steps.cache-primary-key-builder.outputs.CACHE_PRIMARY_KEY_PREFIX }}-${{ github.sha }}
+        restore-keys: ${{ steps.cache-primary-key-builder.outputs.CACHE_PRIMARY_KEY_PREFIX }}-
+        path: |
+          .cache
+          .nx/cache
+          node_modules/.cache
+          packages/*/node_modules/.cache
+          ${{ inputs.additional-paths }}

.github/workflows/actions/save-cache/action.yaml

@@ -0,0 +1,21 @@
+name: Save cache
+inputs:
+  key:
+    required: true
+    description: Primary key to the cache, should be retrieved from `cache-restore` composite action outputs.
+  additional-paths:
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Save cache
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ inputs.key }}
+        path: |
+          .cache
+          .nx/cache
+          node_modules/.cache
+          packages/*/node_modules/.cache
+          ${{ inputs.additional-paths }}

.github/workflows/actions/yarn-install/action.yaml

@@ -1,23 +1,43 @@
 name: Yarn Install
+inputs:
+  node-version:
+    required: false
+    default: '18'
 
 runs:
   using: "composite"
   steps:
+    - name: Cache primary key builder
+      id: globals
+      shell: bash
+      run: |
+        echo "ACTION_SHELL=bash" >> "${GITHUB_OUTPUT}"
+        echo "CACHE_KEY_PREFIX=node_modules-cache-node-${{ inputs.node-version }}-${{ hashFiles('yarn.lock') }}"  >> "${GITHUB_OUTPUT}"
+        echo 'PATH_TO_CACHE<<EOF' >> $GITHUB_OUTPUT
+        echo "node_modules" >> $GITHUB_OUTPUT
+        echo "packages/*/node_modules" >> $GITHUB_OUTPUT
+        echo 'EOF' >> $GITHUB_OUTPUT
     - name: Setup Node.js and get yarn cache
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: "18"
-        cache: yarn
-    - name: Cache node modules
-      id: node-modules-cache
-      uses: actions/cache@v3
+        node-version: ${{ inputs.node-version }}
+    - name: Restore node_modules
+      id: cache-node-modules
+      uses: actions/cache/restore@v4
       with:
-        path: |
-          node_modules
-          packages/*/node_modules
-        key: root-node_modules-${{ hashFiles('yarn.lock') }}
-        restore-keys: root-node_modules-
+        key: ${{ steps.globals.outputs.CACHE_KEY_PREFIX }}-${{github.sha}}
+        restore-keys: ${{ steps.globals.outputs.CACHE_KEY_PREFIX }}-
+        path: ${{ steps.globals.outputs.PATH_TO_CACHE }}
     - name: Install Dependencies
-      shell: bash
-      run: yarn --immutable --check-cache
-      if: steps.node-modules-cache.outputs.cache-hit != 'true'
+      if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' && steps.cache-node-modules.outputs.cache-matched-key == '' }}
+      shell: ${{ steps.globals.outputs.ACTION_SHELL }}
+      run: |
+        yarn config set enableHardenedMode true
+        yarn --immutable --check-cache
+    - name: Save cache
+      if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' && steps.cache-node-modules.outputs.cache-matched-key == '' }}
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ steps.cache-node-modules.outputs.cache-primary-key }}
+        path: ${{ steps.globals.outputs.PATH_TO_CACHE }}
+

.github/workflows/changed-files.yaml

@@ -0,0 +1,27 @@
+name: Changed files reusable workflow
+on:
+  workflow_call:
+    inputs:
+      files:
+        required: true
+        type: string
+    outputs:
+      any_changed:
+        value: ${{ jobs.changed-files.outputs.any_changed }}
+
+jobs:
+  changed-files:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    outputs:
+      any_changed: ${{ steps.changed-files.outputs.any_changed }}
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check for changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: ${{ inputs.files }}

.github/workflows/ci-chrome-extension.yaml

@@ -3,15 +3,23 @@ on:
   push:
     branches:
       - main
-  
+
   pull_request:
-    
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        package.json
+        packages/twenty-chrome-extension/**
   chrome-extension-build:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
@@ -25,23 +33,16 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-chrome-extension/**
-             
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
       - name: Chrome Extension / Run build
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx build twenty-chrome-extension
-
-      - name: Mark as Valid if No Changes
-        if: steps.changed-files.outputs.changed != 'true'
-        run: |
-          echo "No relevant changes detected. Marking as valid."  
+  ci-chrome-extension-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, chrome-extension-build]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1