Merge branch 'main' into fix/twentyhq#5444

.github/workflows/ci-utils.yaml

@@ -5,6 +5,7 @@ on:
   # see: https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
   # and: https://github.com/facebook/react-native/pull/34370/files
   pull_request_target:
+    types: [opened, synchronize, reopened, closed]
 permissions:
   actions: write
   checks: write
@@ -19,6 +20,7 @@ concurrency:
 jobs:
   danger-js:
     runs-on: ubuntu-latest
+    if: github.event.action != 'closed'
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -27,3 +29,15 @@ jobs:
         run: cd packages/twenty-utils && npx nx danger:ci
         env:
           DANGER_GITHUB_API_TOKEN: ${{ github.token }}
+
+  congratulate:
+    runs-on: ubuntu-latest
+    if: github.event.action == 'closed' && github.event.pull_request.merged == true
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        uses: ./.github/workflows/actions/yarn-install
+      - name: Run congratulate-dangerfile.js
+        run: cd packages/twenty-utils && npx nx danger:congratulate
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

install.sh

@@ -119,7 +119,7 @@ if command -v nc &> /dev/null; then
   done
 fi
 
-# Ask user if he wants to start the project
+# Ask user if they want to start the project
 read -p "🚀 Do you want to start the project now? (Y/n) " answer
 if [ "$answer" = "n" ]; then
   echo "✅ Project setup completed. Run 'docker compose up -d' to start."
@@ -148,7 +148,7 @@ function ask_open_browser {
   fi
 }
 
-# Ask user if he wants to open the project
+# Ask user if they want to open the project
 # Running on macOS
 if [[ $(uname) == "Darwin" ]]; then
   ask_open_browser

nx.json

@@ -218,8 +218,14 @@
       "executor": "nx:run-commands",
       "options": {
         "cwd": "{projectRoot}",
-        "command": "cross-var chromatic --project-token=$CHROMATIC_PROJECT_TOKEN --build-script-name={args.targetPackageJsonScript} {args.ci}",
-        "targetPackageJsonScript": "storybook:build:chromatic"
+        "commands": [
+          {
+            "command": "nx storybook:build {projectName} --configuration=test",
+            "forwardAllArgs": false
+          },
+          "cross-var chromatic --project-token=$CHROMATIC_PROJECT_TOKEN --storybook-build-dir=storybook-static {args.ci}"
+        ],
+        "parallel": false
       },
       "configurations": {
         "ci": {

package.json

@@ -10,6 +10,7 @@
     "@chakra-ui/accordion": "^2.3.0",
     "@chakra-ui/system": "^2.6.0",
     "@codesandbox/sandpack-react": "^2.13.5",
+    "@dagrejs/dagre": "^1.1.2",
     "@docusaurus/core": "^3.1.0",
     "@docusaurus/preset-classic": "^3.1.0",
     "@emotion/react": "^11.11.1",
@@ -58,10 +59,10 @@
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.merge": "^4.6.7",
     "@types/lodash.pick": "^4.3.7",
-    "@types/mailparser": "^3.4.4",
     "@types/nodemailer": "^6.4.14",
     "@types/passport-microsoft": "^1.0.3",
     "add": "^2.0.6",
+    "addressparser": "^1.0.1",
     "afterframe": "^1.0.2",
     "apollo-server-express": "^3.12.0",
     "apollo-upload-client": "^17.0.0",
@@ -72,7 +73,7 @@
     "bullmq": "^4.14.0",
     "bytes": "^3.1.2",
     "class-transformer": "^0.5.1",
-    "clsx": "^1.2.1",
+    "clsx": "^2.1.1",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.2.0",
     "danger-plugin-todos": "^1.3.1",
@@ -95,6 +96,7 @@
     "graphql-fields": "^2.0.3",
     "graphql-middleware": "^6.1.35",
     "graphql-rate-limit": "^3.3.0",
+    "graphql-scalars": "^1.23.0",
     "graphql-subscriptions": "2.0.0",
     "graphql-tag": "^2.12.6",
     "graphql-type-json": "^0.3.2",
@@ -126,7 +128,6 @@
     "lodash.snakecase": "^4.1.1",
     "lodash.upperfirst": "^4.3.1",
     "luxon": "^3.3.0",
-    "mailparser": "^3.6.5",
     "microdiff": "^1.3.2",
     "nest-commander": "^3.12.0",
     "next": "14.0.4",
@@ -166,6 +167,7 @@
     "react-router-dom": "^6.4.4",
     "react-textarea-autosize": "^8.4.1",
     "react-tooltip": "^5.13.1",
+    "reactflow": "^11.11.3",
     "recoil": "^0.7.7",
     "rehype-slug": "^6.0.0",
     "remark-behead": "^3.1.0",
@@ -181,11 +183,12 @@
     "tsup": "^8.0.1",
     "type-fest": "4.10.1",
     "typeorm": "^0.3.17",
+    "use-context-selector": "^2.0.0",
     "use-debounce": "^10.0.0",
     "uuid": "^9.0.0",
     "vite-tsconfig-paths": "^4.2.1",
     "xlsx-ugnis": "^0.19.3",
-    "zod": "^3.22.2"
+    "zod": "3.23.8"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",
@@ -232,12 +235,14 @@
     "@swc/helpers": "~0.5.2",
     "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "14.0.0",
+    "@types/addressparser": "^1.0.3",
     "@types/apollo-upload-client": "^17.0.2",
     "@types/bcrypt": "^5.0.0",
     "@types/better-sqlite3": "^7.6.8",
     "@types/bytes": "^3.1.1",
     "@types/chrome": "^0.0.267",
     "@types/crypto-js": "^4.2.2",
+    "@types/dagre": "^0.7.52",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.13",
     "@types/graphql-fields": "^1.3.6",

packages/twenty-chrome-extension/codegen.ts

@@ -1,9 +1,17 @@
 import { CodegenConfig } from '@graphql-codegen/cli';
 
 const config: CodegenConfig = {
-  schema: ['http://localhost:3000/graphql'],
+  schema: [{
+    [`${import.meta.env.VITE_SERVER_BASE_URL}/graphql`]: {
+      // some of the mutations and queries require authorization (people or companies)
+      // so to regenrate the schema with types we need to pass a auth token
+      headers: {
+        Authorization: 'YOUR-TOKEN-HERE',
+      },
+    }
+  }],
   overwrite: true,
-  documents: ['./src/**/*.ts', '!src/generated/**/*.*'],
+  documents: ['./src/**/*.ts', '!src/generated/**/*.*' ],
   generates: {
     './src/generated/graphql.tsx': {
       plugins: [

packages/twenty-chrome-extension/options.html → packages/twenty-chrome-extension/page-inaccessible.html

@@ -7,6 +7,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/options/index.tsx"></script>
+    <script type="module" src="/src/options/page-inaccessible-index.tsx"></script>
   </body>
-</html>
+</html>

packages/twenty-chrome-extension/sidepanel.html

@@ -0,0 +1,22 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/icons/android/android-launchericon-48-48.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Twenty</title>
+    <style>
+      /* Reset margin and padding */
+      html, body {
+        margin: 0;
+        padding: 0;
+        height: 100%; /* Ensure body takes full viewport height */
+        overflow: hidden; /* Prevents scrollbars from appearing */
+      }
+    </style>
+
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/options/index.tsx"></script>
+  </body>
+</html>