docs(hubspot): update hubspot connection

.devcontainer/boot.sh

@@ -28,7 +28,7 @@ cd packages/web
 rm -rf .env
 echo "
 PORT=$WEB_PORT
-REACT_APP_BACKEND_URL=http://localhost:$BACKEND_PORT
+REACT_APP_GRAPHQL_URL=http://localhost:$BACKEND_PORT/graphql
 " >> .env
 cd $CURRENT_DIR
 

.eslintrc.js

@@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+  ],
+  overrides: [
+    {
+      files: ['**/*.test.ts', '**/test/**/*.ts'],
+      rules: {
+        '@typescript-eslint/ban-ts-comment': ['off'],
+      },
+    },
+  ],
+};

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
       - run: echo "🖥️ The workflow is now ready to test your code on the runner."
       - run: yarn --frozen-lockfile
-      - run: cd packages/backend && yarn lint
+      - run: yarn lint
       - run: echo "🍏 This job's status is ${{ job.status }}."
   start-backend-server:
     runs-on: ubuntu-latest

.github/workflows/playwright.yml

@@ -62,9 +62,8 @@ jobs:
         run: yarn && yarn lerna bootstrap
       - name: Install Playwright Browsers
         run: yarn playwright install --with-deps
-      - name: Build Automatisch web
-        working-directory: ./packages/web
-        run: yarn build
+      - name: Build Automatisch
+        run: yarn lerna run --scope=@*/{web,cli} build
         env:
           # Keep this until we clean up warnings in build processes
           CI: false

package.json

@@ -6,6 +6,7 @@
     "start": "lerna run --stream --parallel --scope=@*/{web,backend} dev",
     "start:web": "lerna run --stream --scope=@*/web dev",
     "start:backend": "lerna run --stream --scope=@*/backend dev",
+    "lint": "lerna run --no-bail --stream --parallel --scope=@*/{web,backend} lint",
     "build:docs": "cd ./packages/docs && yarn install && yarn build"
   },
   "workspaces": {
@@ -20,6 +21,8 @@
     ]
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",

packages/backend/bin/database/utils.js

@@ -18,8 +18,8 @@ async function fetchAdminRole() {
 }
 
 export async function createUser(
-  email = appConfig.seedUserEmail,
-  password = appConfig.seedUserPassword
+  email = 'user@automatisch.io',
+  password = 'sample'
 ) {
   const UNIQUE_VIOLATION_CODE = '23505';
 

packages/backend/package.json

@@ -11,7 +11,7 @@
     "start:worker": "node src/worker.js",
     "pretest": "APP_ENV=test node ./test/setup/prepare-test-env.js",
     "test": "APP_ENV=test vitest run",
-    "lint": "eslint .",
+    "lint": "eslint . --ignore-path ../../.eslintignore",
     "db:create": "node ./bin/database/create.js",
     "db:seed:user": "node ./bin/database/seed-user.js",
     "db:drop": "node ./bin/database/drop.js",
@@ -95,6 +95,7 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
+    "@typescript-eslint/utils": "^7.0.2",
     "nodemon": "^2.0.13",
     "supertest": "^6.3.3",
     "vitest": "^1.1.3"

packages/backend/src/apps/datastore/actions/get-value/index.js

@@ -1,27 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Get value',
-  key: 'getValue',
-  description: 'Get value from the persistent datastore.',
-  arguments: [
-    {
-      label: 'Key',
-      key: 'key',
-      type: 'string',
-      required: true,
-      description: 'The key of your value to get.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const keyValuePair = await $.datastore.get({
-      key: $.step.parameters.key,
-    });
-
-    $.setActionItem({
-      raw: keyValuePair,
-    });
-  },
-});

packages/backend/src/apps/datastore/actions/index.js

@@ -1,4 +0,0 @@
-import getValue from './get-value/index.js';
-import setValue from './set-value/index.js';
-
-export default [getValue, setValue];

packages/backend/src/apps/datastore/actions/set-value/index.js

@@ -1,36 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Set value',
-  key: 'setValue',
-  description: 'Set value to the persistent datastore.',
-  arguments: [
-    {
-      label: 'Key',
-      key: 'key',
-      type: 'string',
-      required: true,
-      description: 'The key of your value to set.',
-      variables: true,
-    },
-    {
-      label: 'Value',
-      key: 'value',
-      type: 'string',
-      required: true,
-      description: 'The value to set.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const keyValuePair = await $.datastore.set({
-      key: $.step.parameters.key,
-      value: $.step.parameters.value,
-    });
-
-    $.setActionItem({
-      raw: keyValuePair,
-    });
-  },
-});

packages/backend/src/apps/datastore/assets/favicon.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon">
-  <defs>
-    <style>.cls-1{fill:none;}</style>
-  </defs>
-  <title>datastore</title>
-  <circle cx="23" cy="23" r="1"/>
-  <rect x="8" y="22" width="12" height="2"/>
-  <circle cx="23" cy="9" r="1"/>
-  <rect x="8" y="8" width="12" height="2"/>
-  <path d="M26,14a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H6A2,2,0,0,0,4,6v6a2,2,0,0,0,2,2H8v4H6a2,2,0,0,0-2,2v6a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V20a2,2,0,0,0-2-2H24V14ZM6,6H26v6H6ZM26,26H6V20H26Zm-4-8H10V14H22Z"/>
-  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
-</svg>

packages/backend/src/apps/datastore/index.js

@@ -1,14 +0,0 @@
-import defineApp from '../../helpers/define-app.js';
-import actions from './actions/index.js';
-
-export default defineApp({
-  name: 'Datastore',
-  key: 'datastore',
-  iconUrl: '{BASE_URL}/apps/datastore/assets/favicon.svg',
-  authDocUrl: 'https://automatisch.io/docs/apps/datastore/connection',
-  supportsConnections: false,
-  baseUrl: '',
-  apiBaseUrl: '',
-  primaryColor: '001F52',
-  actions,
-});

packages/backend/src/apps/helix/actions/new-chat/index.js

@@ -1,3 +1,4 @@
+import FormData from 'form-data';
 import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
@@ -5,51 +6,45 @@ export default defineAction({
   key: 'newChat',
   description: 'Create a new chat session for Helix AI.',
   arguments: [
-    {
-      label: 'Session ID',
-      key: 'sessionId',
-      type: 'string',
-      required: false,
-      description:
-        'ID of the chat session to continue. Leave empty to start a new chat.',
-      variables: true,
-    },
-    {
-      label: 'System Prompt',
-      key: 'systemPrompt',
-      type: 'string',
-      required: false,
-      description:
-        'Optional system prompt to start the chat with. It will be used only for new chat sessions.',
-      variables: true,
-    },
     {
       label: 'Input',
       key: 'input',
       type: 'string',
       required: true,
-      description: 'User input to start the chat with.',
+      description: 'Prompt to start the chat with.',
       variables: true,
     },
   ],
 
   async run($) {
-    const response = await $.http.post('/api/v1/sessions/chat', {
-      session_id: $.step.parameters.sessionId,
-      system: $.step.parameters.systemPrompt,
-      messages: [
-        {
-          role: 'user',
-          content: {
-            content_type: 'text',
-            parts: [$.step.parameters.input],
-          },
-        },
-      ],
+    const formData = new FormData();
+    formData.append('input', $.step.parameters.input);
+    formData.append('mode', 'inference');
+    formData.append('type', 'text');
+
+    const sessionResponse = await $.http.post('/api/v1/sessions', formData, {
+      headers: {
+        ...formData.getHeaders(),
+      },
     });
 
-    $.setActionItem({
-      raw: response.data,
-    });
+    const sessionId = sessionResponse.data.id;
+
+    let chatGenerated = false;
+
+    while (!chatGenerated) {
+      const response = await $.http.get(`/api/v1/sessions/${sessionId}`);
+
+      const message =
+        response.data.interactions[response.data.interactions.length - 1];
+
+      if (message.creator === 'system' && message.state === 'complete') {
+        $.setActionItem({
+          raw: message,
+        });
+
+        chatGenerated = true;
+      }
+    }
   },
 });

packages/backend/src/config/app.js

@@ -94,8 +94,6 @@ const appConfig = {
   disableFavicon: process.env.DISABLE_FAVICON === 'true',
   additionalDrawerLink: process.env.ADDITIONAL_DRAWER_LINK,
   additionalDrawerLinkText: process.env.ADDITIONAL_DRAWER_LINK_TEXT,
-  seedUserEmail: process.env.SEED_USER_EMAIL || 'user@automatisch.io',
-  seedUserPassword: process.env.SEED_USER_PASSWORD || 'sample',
 };
 
 if (!appConfig.encryptionKey) {

packages/backend/src/controllers/api/v1/apps/get-action-substeps.js

@@ -1,11 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const substeps = await App.findActionSubsteps(
-    request.params.appKey,
-    request.params.actionKey
-  );
-
-  renderObject(response, substeps);
-};

packages/backend/src/controllers/api/v1/apps/get-action-substeps.test.js

@@ -1,52 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getActionSubstepsMock from '../../../../../test/mocks/rest/api/v1/apps/get-action-substeps.js';
-
-describe('GET /api/v1/apps/:appKey/actions/:actionKey/substeps', () => {
-  let currentUser, exampleApp, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-    exampleApp = await App.findOneByKey('github');
-  });
-
-  it('should return the app auth info', async () => {
-    const actions = await App.findActionsByKey('github');
-    const exampleAction = actions.find(
-      (action) => action.key === 'createIssue'
-    );
-
-    const endpointUrl = `/api/v1/apps/${exampleApp.key}/actions/${exampleAction.key}/substeps`;
-
-    const response = await request(app)
-      .get(endpointUrl)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getActionSubstepsMock(exampleAction.substeps);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key/actions/invalid-actions-key/substeps')
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return empty array for invalid action key', async () => {
-    const endpointUrl = `/api/v1/apps/${exampleApp.key}/actions/invalid-action-key/substeps`;
-
-    const response = await request(app)
-      .get(endpointUrl)
-      .set('Authorization', token)
-      .expect(200);
-
-    expect(response.body.data).toEqual([]);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-actions.js

@@ -1,8 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const actions = await App.findActionsByKey(request.params.appKey);
-
-  renderObject(response, actions, { serializer: 'Action' });
-};

packages/backend/src/controllers/api/v1/apps/get-actions.test.js

@@ -1,35 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getActionsMock from '../../../../../test/mocks/rest/api/v1/apps/get-actions.js';
-
-describe('GET /api/v1/apps/:appKey/actions', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the app actions', async () => {
-    const exampleApp = await App.findOneByKey('github');
-
-    const response = await request(app)
-      .get(`/api/v1/apps/${exampleApp.key}/actions`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getActionsMock(exampleApp.actions);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key/actions')
-      .set('Authorization', token)
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-apps.js

@@ -1,16 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  let apps = await App.findAll(request.query.name);
-
-  if (request.query.onlyWithTriggers) {
-    apps = apps.filter((app) => app.triggers?.length);
-  }
-
-  if (request.query.onlyWithActions) {
-    apps = apps.filter((app) => app.actions?.length);
-  }
-
-  renderObject(response, apps, { serializer: 'App' });
-};

packages/backend/src/controllers/api/v1/apps/get-apps.test.js

@@ -1,63 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getAppsMock from '../../../../../test/mocks/rest/api/v1/apps/get-apps.js';
-
-describe('GET /api/v1/apps', () => {
-  let currentUser, apps, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-    apps = await App.findAll();
-  });
-
-  it('should return all apps', async () => {
-    const response = await request(app)
-      .get('/api/v1/apps')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock(apps);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return all apps filtered by name', async () => {
-    const appsWithNameGit = apps.filter((app) => app.name.includes('Git'));
-
-    const response = await request(app)
-      .get('/api/v1/apps?name=Git')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock(appsWithNameGit);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return only the apps with triggers', async () => {
-    const appsWithTriggers = apps.filter((app) => app.triggers?.length > 0);
-
-    const response = await request(app)
-      .get('/api/v1/apps?onlyWithTriggers=true')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock(appsWithTriggers);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return only the apps with actions', async () => {
-    const appsWithActions = apps.filter((app) => app.actions?.length > 0);
-
-    const response = await request(app)
-      .get('/api/v1/apps?onlyWithActions=true')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock(appsWithActions);
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-auth.js

@@ -1,8 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const auth = await App.findAuthByKey(request.params.appKey);
-
-  renderObject(response, auth, { serializer: 'Auth' });
-};

packages/backend/src/controllers/api/v1/apps/get-auth.test.js

@@ -1,35 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getAuthMock from '../../../../../test/mocks/rest/api/v1/apps/get-auth.js';
-
-describe('GET /api/v1/apps/:appKey/auth', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the app auth info', async () => {
-    const exampleApp = await App.findOneByKey('github');
-
-    const response = await request(app)
-      .get(`/api/v1/apps/${exampleApp.key}/auth`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAuthMock(exampleApp.auth);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key/auth')
-      .set('Authorization', token)
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-trigger-substeps.js

@@ -1,11 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const substeps = await App.findTriggerSubsteps(
-    request.params.appKey,
-    request.params.triggerKey
-  );
-
-  renderObject(response, substeps);
-};

packages/backend/src/controllers/api/v1/apps/get-trigger-substeps.test.js

@@ -1,52 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getTriggerSubstepsMock from '../../../../../test/mocks/rest/api/v1/apps/get-trigger-substeps.js';
-
-describe('GET /api/v1/apps/:appKey/triggers/:triggerKey/substeps', () => {
-  let currentUser, exampleApp, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-    exampleApp = await App.findOneByKey('github');
-  });
-
-  it('should return the app auth info', async () => {
-    const triggers = await App.findTriggersByKey('github');
-    const exampleTrigger = triggers.find(
-      (trigger) => trigger.key === 'newIssues'
-    );
-
-    const endpointUrl = `/api/v1/apps/${exampleApp.key}/triggers/${exampleTrigger.key}/substeps`;
-
-    const response = await request(app)
-      .get(endpointUrl)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getTriggerSubstepsMock(exampleTrigger.substeps);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key/triggers/invalid-trigger-key/substeps')
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return empty array for invalid trigger key', async () => {
-    const endpointUrl = `/api/v1/apps/${exampleApp.key}/triggers/invalid-trigger-key/substeps`;
-
-    const response = await request(app)
-      .get(endpointUrl)
-      .set('Authorization', token)
-      .expect(200);
-
-    expect(response.body.data).toEqual([]);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-triggers.js

@@ -1,8 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const triggers = await App.findTriggersByKey(request.params.appKey);
-
-  renderObject(response, triggers, { serializer: 'Trigger' });
-};

packages/backend/src/controllers/api/v1/apps/get-triggers.test.js

@@ -1,35 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getTriggersMock from '../../../../../test/mocks/rest/api/v1/apps/get-triggers.js';
-
-describe('GET /api/v1/apps/:appKey/triggers', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the app triggers', async () => {
-    const exampleApp = await App.findOneByKey('github');
-
-    const response = await request(app)
-      .get(`/api/v1/apps/${exampleApp.key}/triggers`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getTriggersMock(exampleApp.triggers);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key/triggers')
-      .set('Authorization', token)
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/executions/get-execution-steps.js

@@ -1,23 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import paginateRest from '../../../../helpers/pagination-rest.js';
-
-export default async (request, response) => {
-  const execution = await request.currentUser.authorizedExecutions
-    .clone()
-    .withSoftDeleted()
-    .findById(request.params.executionId)
-    .throwIfNotFound();
-
-  const executionStepsQuery = execution
-    .$relatedQuery('executionSteps')
-    .withSoftDeleted()
-    .withGraphFetched('step')
-    .orderBy('created_at', 'asc');
-
-  const executionSteps = await paginateRest(
-    executionStepsQuery,
-    request.query.page
-  );
-
-  renderObject(response, executionSteps);
-};

packages/backend/src/controllers/api/v1/executions/get-execution-steps.test.js

@@ -1,153 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import { createFlow } from '../../../../../test/factories/flow.js';
-import { createStep } from '../../../../../test/factories/step.js';
-import { createExecution } from '../../../../../test/factories/execution.js';
-import { createExecutionStep } from '../../../../../test/factories/execution-step.js';
-import { createPermission } from '../../../../../test/factories/permission';
-import getExecutionStepsMock from '../../../../../test/mocks/rest/api/v1/executions/get-execution-steps';
-
-describe('GET /api/v1/executions/:executionId/execution-steps', () => {
-  let currentUser, currentUserRole, anotherUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    anotherUser = await createUser();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the execution steps of current user execution', async () => {
-    const currentUserFlow = await createFlow({
-      userId: currentUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'action',
-    });
-
-    const currentUserExecution = await createExecution({
-      flowId: currentUserFlow.id,
-    });
-
-    const currentUserExecutionStepOne = await createExecutionStep({
-      executionId: currentUserExecution.id,
-      stepId: stepOne.id,
-    });
-
-    const currentUserExecutionStepTwo = await createExecutionStep({
-      executionId: currentUserExecution.id,
-      stepId: stepTwo.id,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/executions/${currentUserExecution.id}/execution-steps`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionStepsMock(
-      [currentUserExecutionStepOne, currentUserExecutionStepTwo],
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return the execution steps of another user execution', async () => {
-    const anotherUserFlow = await createFlow({
-      userId: anotherUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'action',
-    });
-
-    const anotherUserExecution = await createExecution({
-      flowId: anotherUserFlow.id,
-    });
-
-    const anotherUserExecutionStepOne = await createExecutionStep({
-      executionId: anotherUserExecution.id,
-      stepId: stepOne.id,
-    });
-
-    const anotherUserExecutionStepTwo = await createExecutionStep({
-      executionId: anotherUserExecution.id,
-      stepId: stepTwo.id,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/executions/${anotherUserExecution.id}/execution-steps`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionStepsMock(
-      [anotherUserExecutionStepOne, anotherUserExecutionStepTwo],
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing execution step UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const notExistingExcecutionUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/executions/${notExistingExcecutionUUID}/execution-steps`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await request(app)
-      .get('/api/v1/executions/invalidExecutionUUID/execution-steps')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/executions/get-execution.js

@@ -1,15 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const execution = await request.currentUser.authorizedExecutions
-    .withGraphFetched({
-      flow: {
-        steps: true,
-      },
-    })
-    .withSoftDeleted()
-    .findById(request.params.executionId)
-    .throwIfNotFound();
-
-  renderObject(response, execution);
-};

packages/backend/src/controllers/api/v1/executions/get-execution.test.js

@@ -1,134 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import { createFlow } from '../../../../../test/factories/flow.js';
-import { createStep } from '../../../../../test/factories/step.js';
-import { createExecution } from '../../../../../test/factories/execution.js';
-import { createPermission } from '../../../../../test/factories/permission';
-import getExecutionMock from '../../../../../test/mocks/rest/api/v1/executions/get-execution';
-
-describe('GET /api/v1/executions/:executionId', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the execution data of current user', async () => {
-    const currentUserFlow = await createFlow({
-      userId: currentUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'action',
-    });
-
-    const currentUserExecution = await createExecution({
-      flowId: currentUserFlow.id,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/executions/${currentUserExecution.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionMock(
-      currentUserExecution,
-      currentUserFlow,
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return the execution data of another user', async () => {
-    const anotherUser = await createUser();
-
-    const anotherUserFlow = await createFlow({
-      userId: anotherUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'action',
-    });
-
-    const anotherUserExecution = await createExecution({
-      flowId: anotherUserFlow.id,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/executions/${anotherUserExecution.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionMock(
-      anotherUserExecution,
-      anotherUserFlow,
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing execution UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const notExistingExcecutionUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/executions/${notExistingExcecutionUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await request(app)
-      .get('/api/v1/executions/invalidExecutionUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/executions/get-executions.js

@@ -1,26 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import paginateRest from '../../../../helpers/pagination-rest.js';
-
-export default async (request, response) => {
-  const executionsQuery = request.currentUser.authorizedExecutions
-    .withSoftDeleted()
-    .orderBy('created_at', 'desc')
-    .withGraphFetched({
-      flow: {
-        steps: true,
-      },
-    });
-
-  const executions = await paginateRest(executionsQuery, request.query.page);
-
-  for (const execution of executions.records) {
-    const executionSteps = await execution.$relatedQuery('executionSteps');
-    const status = executionSteps.some((step) => step.status === 'failure')
-      ? 'failure'
-      : 'success';
-
-    execution.status = status;
-  }
-
-  renderObject(response, executions);
-};

packages/backend/src/controllers/api/v1/executions/get-executions.test.js

@@ -1,113 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import { createFlow } from '../../../../../test/factories/flow.js';
-import { createStep } from '../../../../../test/factories/step.js';
-import { createExecution } from '../../../../../test/factories/execution.js';
-import { createPermission } from '../../../../../test/factories/permission';
-import getExecutionsMock from '../../../../../test/mocks/rest/api/v1/executions/get-executions';
-
-describe('GET /api/v1/executions', () => {
-  let currentUser, currentUserRole, anotherUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    anotherUser = await createUser();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the executions of current user', async () => {
-    const currentUserFlow = await createFlow({
-      userId: currentUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: currentUserFlow.id,
-      type: 'action',
-    });
-
-    const currentUserExecutionOne = await createExecution({
-      flowId: currentUserFlow.id,
-    });
-
-    const currentUserExecutionTwo = await createExecution({
-      flowId: currentUserFlow.id,
-      deletedAt: new Date().toISOString(),
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .get('/api/v1/executions')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionsMock(
-      [currentUserExecutionTwo, currentUserExecutionOne],
-      currentUserFlow,
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return the executions of another user', async () => {
-    const anotherUserFlow = await createFlow({
-      userId: anotherUser.id,
-    });
-
-    const stepOne = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'trigger',
-    });
-
-    const stepTwo = await createStep({
-      flowId: anotherUserFlow.id,
-      type: 'action',
-    });
-
-    const anotherUserExecutionOne = await createExecution({
-      flowId: anotherUserFlow.id,
-    });
-
-    const anotherUserExecutionTwo = await createExecution({
-      flowId: anotherUserFlow.id,
-      deletedAt: new Date().toISOString(),
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Execution',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .get('/api/v1/executions')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getExecutionsMock(
-      [anotherUserExecutionTwo, anotherUserExecutionOne],
-      anotherUserFlow,
-      [stepOne, stepTwo]
-    );
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/users/get-current-user.test.js

@@ -2,29 +2,15 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
 import app from '../../../../app.js';
 import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createPermission } from '../../../../../test/factories/permission';
-import { createRole } from '../../../../../test/factories/role';
 import { createUser } from '../../../../../test/factories/user';
 import getCurrentUserMock from '../../../../../test/mocks/rest/api/v1/users/get-current-user';
 
 describe('GET /api/v1/users/me', () => {
-  let role, permissionOne, permissionTwo, currentUser, token;
+  let role, currentUser, token;
 
   beforeEach(async () => {
-    role = await createRole();
-
-    permissionOne = await createPermission({
-      roleId: role.id,
-    });
-
-    permissionTwo = await createPermission({
-      roleId: role.id,
-    });
-
-    currentUser = await createUser({
-      roleId: role.id,
-    });
-
+    currentUser = await createUser();
+    role = await currentUser.$relatedQuery('role');
     token = createAuthTokenByUserId(currentUser.id);
   });
 
@@ -34,11 +20,7 @@ describe('GET /api/v1/users/me', () => {
       .set('Authorization', token)
       .expect(200);
 
-    const expectedPayload = getCurrentUserMock(currentUser, role, [
-      permissionOne,
-      permissionTwo,
-    ]);
-
+    const expectedPayload = getCurrentUserMock(currentUser, role);
     expect(response.body).toEqual(expectedPayload);
   });
 });

packages/backend/src/db/migrations/20240227164849_create_datastore_model.js

@@ -1,16 +0,0 @@
-export async function up(knex) {
-  return knex.schema.createTable('datastore', (table) => {
-    table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
-    table.string('key').notNullable();
-    table.string('value');
-    table.string('scope').notNullable();
-    table.uuid('scope_id').notNullable();
-    table.index(['key', 'scope', 'scope_id']);
-
-    table.timestamps(true, true);
-  });
-}
-
-export async function down(knex) {
-  return knex.schema.dropTable('datastore');
-}

packages/backend/src/graphql/queries/get-automatisch-info.js

@@ -0,0 +1,21 @@
+import appConfig from '../../config/app.js';
+import { getLicense } from '../../helpers/license.ee.js';
+
+const getAutomatischInfo = async () => {
+  const license = await getLicense();
+
+  const computedLicense = {
+    id: license ? license.id : null,
+    name: license ? license.name : null,
+    expireAt: license ? license.expireAt : null,
+    verified: license ? true : false,
+  };
+
+  return {
+    isCloud: appConfig.isCloud,
+    isMation: appConfig.isMation,
+    license: computedLicense,
+  };
+};
+
+export default getAutomatischInfo;

packages/backend/src/graphql/queries/get-automatisch-info.test.js

@@ -0,0 +1,190 @@
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import request from 'supertest';
+import app from '../../app';
+import * as license from '../../helpers/license.ee';
+import appConfig from '../../config/app';
+
+describe('graphQL getAutomatischInfo query', () => {
+  const query = `
+    query {
+      getAutomatischInfo {
+        isCloud
+        isMation
+        license {
+          id
+          name
+          expireAt
+          verified
+        }
+      }
+    }
+  `;
+
+  describe('and without valid license', () => {
+    beforeEach(async () => {
+      vi.spyOn(license, 'getLicense').mockResolvedValue(false);
+
+      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
+      vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(false);
+    });
+
+    it('should return empty license data', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .send({ query })
+        .expect(200);
+
+      const expectedResponsePayload = {
+        data: {
+          getAutomatischInfo: {
+            isCloud: false,
+            isMation: false,
+            license: {
+              id: null,
+              name: null,
+              expireAt: null,
+              verified: false,
+            },
+          },
+        },
+      };
+
+      expect(response.body).toEqual(expectedResponsePayload);
+    });
+  });
+
+  describe('and with valid license', () => {
+    beforeEach(async () => {
+      const mockedLicense = {
+        id: '123123',
+        name: 'Test License',
+        expireAt: '2025-08-09T10:56:54.144Z',
+        verified: true,
+      };
+
+      vi.spyOn(license, 'getLicense').mockResolvedValue(mockedLicense);
+    });
+
+    describe('and with cloud flag enabled', () => {
+      beforeEach(async () => {
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
+      });
+
+      it('should return all license data', async () => {
+        const response = await request(app)
+          .post('/graphql')
+          .send({ query })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getAutomatischInfo: {
+              isCloud: true,
+              isMation: false,
+              license: {
+                expireAt: '2025-08-09T10:56:54.144Z',
+                id: '123123',
+                name: 'Test License',
+                verified: true,
+              },
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+
+    describe('and with cloud flag disabled', () => {
+      beforeEach(async () => {
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
+      });
+
+      it('should return all license data', async () => {
+        const response = await request(app)
+          .post('/graphql')
+          .send({ query })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getAutomatischInfo: {
+              isCloud: false,
+              isMation: false,
+              license: {
+                expireAt: '2025-08-09T10:56:54.144Z',
+                id: '123123',
+                name: 'Test License',
+                verified: true,
+              },
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+
+    describe('and with mation flag enabled', () => {
+      beforeEach(async () => {
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
+        vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(true);
+      });
+
+      it('should return all license data', async () => {
+        const response = await request(app)
+          .post('/graphql')
+          .send({ query })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getAutomatischInfo: {
+              isCloud: false,
+              isMation: true,
+              license: {
+                expireAt: '2025-08-09T10:56:54.144Z',
+                id: '123123',
+                name: 'Test License',
+                verified: true,
+              },
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+
+    describe('and with mation flag disabled', () => {
+      beforeEach(async () => {
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
+        vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(false);
+      });
+
+      it('should return all license data', async () => {
+        const response = await request(app)
+          .post('/graphql')
+          .send({ query })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getAutomatischInfo: {
+              isMation: false,
+              isCloud: false,
+              license: {
+                expireAt: '2025-08-09T10:56:54.144Z',
+                id: '123123',
+                name: 'Test License',
+                verified: true,
+              },
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+  });
+});

packages/backend/src/graphql/query-resolvers.js

@@ -3,6 +3,7 @@ import getAppAuthClient from './queries/get-app-auth-client.ee.js';
 import getAppAuthClients from './queries/get-app-auth-clients.ee.js';
 import getAppConfig from './queries/get-app-config.ee.js';
 import getApps from './queries/get-apps.js';
+import getAutomatischInfo from './queries/get-automatisch-info.js';
 import getBillingAndUsage from './queries/get-billing-and-usage.ee.js';
 import getConfig from './queries/get-config.ee.js';
 import getConnectedApps from './queries/get-connected-apps.js';
@@ -38,6 +39,7 @@ const queryResolvers = {
   getAppAuthClients,
   getAppConfig,
   getApps,
+  getAutomatischInfo,
   getBillingAndUsage,
   getConfig,
   getConnectedApps,

packages/backend/src/graphql/schema.graphql

@@ -40,6 +40,7 @@ type Query {
     key: String!
     parameters: JSONObject
   ): [SubstepArgument]
+  getAutomatischInfo: GetAutomatischInfo
   getBillingAndUsage: GetBillingAndUsage
   getCurrentUser: User
   getConfig(keys: [String]): JSONObject
@@ -643,6 +644,12 @@ type AppHealth {
   version: String
 }
 
+type GetAutomatischInfo {
+  isCloud: Boolean
+  isMation: Boolean
+  license: License
+}
+
 type License {
   id: String
   name: String

packages/backend/src/helpers/authentication.js

@@ -42,6 +42,7 @@ const isAuthenticatedRule = rule()(isAuthenticated);
 export const authenticationRules = {
   Query: {
     '*': isAuthenticatedRule,
+    getAutomatischInfo: allow,
     getConfig: allow,
     getNotifications: allow,
     healthcheck: allow,

packages/backend/src/helpers/authorization.js

@@ -11,18 +11,6 @@ const authorizationList = {
     action: 'read',
     subject: 'Flow',
   },
-  'GET /api/v1/executions/:executionId': {
-    action: 'read',
-    subject: 'Execution',
-  },
-  'GET /api/v1/executions/': {
-    action: 'read',
-    subject: 'Execution',
-  },
-  'GET /api/v1/executions/:executionId/execution-steps': {
-    action: 'read',
-    subject: 'Execution',
-  },
 };
 
 export const authorizeUser = async (request, response, next) => {

packages/backend/src/helpers/error-handler.js

@@ -1,6 +1,5 @@
 import logger from './logger.js';
 import objection from 'objection';
-import * as Sentry from './sentry.ee.js';
 const { NotFoundError, DataError } = objection;
 
 // Do not remove `next` argument as the function signature will not fit for an error handler middleware
@@ -18,21 +17,8 @@ const errorHandler = (error, request, response, next) => {
     response.status(400).end();
   }
 
-  const statusCode = error.statusCode || 500;
-
-  logger.error(request.method + ' ' + request.url + ' ' + statusCode);
-  logger.error(error.stack);
-
-  Sentry.captureException(error, {
-    tags: { rest: true },
-    extra: {
-      url: request?.url,
-      method: request?.method,
-      params: request?.params,
-    },
-  });
-
-  response.status(statusCode).end();
+  logger.error(error.message + '\n' + error.stack);
+  response.status(error.statusCode || 500).end();
 };
 
 const notFoundAppError = (error) => {

packages/backend/src/helpers/global-variable.js

@@ -1,7 +1,6 @@
 import createHttpClient from './http-client/index.js';
 import EarlyExitError from '../errors/early-exit.js';
 import AlreadyProcessedError from '../errors/already-processed.js';
-import Datastore from '../models/datastore.js';
 
 const globalVariable = async (options) => {
   const {
@@ -89,43 +88,6 @@ const globalVariable = async (options) => {
     setActionItem: (actionItem) => {
       $.actionOutput.data = actionItem;
     },
-    datastore: {
-      get: async ({ key }) => {
-        const datastore = await Datastore.query().findOne({
-          key,
-          scope: 'flow',
-          scope_id: $.flow.id,
-        });
-
-        return {
-          key: datastore.key,
-          value: datastore.value,
-          [datastore.key]: datastore.value,
-        };
-      },
-      set: async ({ key, value }) => {
-        let datastore = await Datastore.query()
-          .where({ key, scope: 'flow', scope_id: $.flow.id })
-          .first();
-
-        if (datastore) {
-          await datastore.$query().patchAndFetch({ value: value });
-        } else {
-          datastore = await Datastore.query().insert({
-            key,
-            value,
-            scope: 'flow',
-            scopeId: $.flow.id,
-          });
-        }
-
-        return {
-          key: datastore.key,
-          value: datastore.value,
-          [datastore.key]: datastore.value,
-        };
-      },
-    },
   };
 
   if (request) {

packages/backend/src/helpers/sentry.ee.js

@@ -3,13 +3,10 @@ import * as Tracing from '@sentry/tracing';
 
 import appConfig from '../config/app.js';
 
-const isSentryEnabled = () => {
-  if (appConfig.isDev || appConfig.isTest) return false;
-  return !!appConfig.sentryDsn;
-};
+const isSentryEnabled = !!appConfig.sentryDsn;
 
 export function init(app) {
-  if (!isSentryEnabled()) return;
+  if (!isSentryEnabled) return;
 
   return Sentry.init({
     enabled: !!appConfig.sentryDsn,
@@ -24,19 +21,19 @@ export function init(app) {
 }
 
 export function attachRequestHandler(app) {
-  if (!isSentryEnabled()) return;
+  if (!isSentryEnabled) return;
 
   app.use(Sentry.Handlers.requestHandler());
 }
 
 export function attachTracingHandler(app) {
-  if (!isSentryEnabled()) return;
+  if (!isSentryEnabled) return;
 
   app.use(Sentry.Handlers.tracingHandler());
 }
 
 export function attachErrorHandler(app) {
-  if (!isSentryEnabled()) return;
+  if (!isSentryEnabled) return;
 
   app.use(
     Sentry.Handlers.errorHandler({
@@ -49,7 +46,7 @@ export function attachErrorHandler(app) {
 }
 
 export function captureException(exception, captureContext) {
-  if (!isSentryEnabled()) return;
+  if (!isSentryEnabled) return;
 
   return Sentry.captureException(exception, captureContext);
 }

packages/backend/src/models/app.js

@@ -39,47 +39,6 @@ class App {
     return appInfoConverter(rawAppData);
   }
 
-  static async findAuthByKey(key, stripFuncs = false) {
-    const rawAppData = await getApp(key, stripFuncs);
-    const appData = appInfoConverter(rawAppData);
-
-    return appData?.auth || {};
-  }
-
-  static async findTriggersByKey(key, stripFuncs = false) {
-    const rawAppData = await getApp(key, stripFuncs);
-    const appData = appInfoConverter(rawAppData);
-
-    return appData?.triggers || [];
-  }
-
-  static async findTriggerSubsteps(appKey, triggerKey, stripFuncs = false) {
-    const rawAppData = await getApp(appKey, stripFuncs);
-    const appData = appInfoConverter(rawAppData);
-
-    const trigger = appData?.triggers?.find(
-      (trigger) => trigger.key === triggerKey
-    );
-
-    return trigger?.substeps || [];
-  }
-
-  static async findActionsByKey(key, stripFuncs = false) {
-    const rawAppData = await getApp(key, stripFuncs);
-    const appData = appInfoConverter(rawAppData);
-
-    return appData?.actions || [];
-  }
-
-  static async findActionSubsteps(appKey, actionKey, stripFuncs = false) {
-    const rawAppData = await getApp(appKey, stripFuncs);
-    const appData = appInfoConverter(rawAppData);
-
-    const action = appData?.actions?.find((action) => action.key === actionKey);
-
-    return action?.substeps || [];
-  }
-
   static async checkAppAndAction(appKey, actionKey) {
     const app = await this.findOneByKey(appKey);
 

packages/backend/src/models/datastore.js

@@ -1,24 +0,0 @@
-import Base from './base.js';
-
-class Datastore extends Base {
-  static tableName = 'datastore';
-
-  static jsonSchema = {
-    type: 'object',
-    required: ['key', 'value', 'scope', 'scopeId'],
-
-    properties: {
-      id: { type: 'string', format: 'uuid' },
-      key: { type: 'string', minLength: 1 },
-      value: { type: 'string' },
-      scope: {
-        type: 'string',
-        enum: ['flow'],
-        default: 'flow',
-      },
-      scopeId: { type: 'string', format: 'uuid' },
-    },
-  };
-}
-
-export default Datastore;

packages/backend/src/models/user.js

@@ -149,13 +149,6 @@ class User extends Base {
     return conditions.isCreator ? this.$relatedQuery('flows') : Flow.query();
   }
 
-  get authorizedExecutions() {
-    const conditions = this.can('read', 'Execution');
-    return conditions.isCreator
-      ? this.$relatedQuery('executions')
-      : Execution.query();
-  }
-
   login(password) {
     return bcrypt.compare(password, this.password);
   }

packages/backend/src/routes/api/v1/apps.js

@@ -2,41 +2,9 @@ import { Router } from 'express';
 import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../helpers/authentication.js';
 import getAppAction from '../../../controllers/api/v1/apps/get-app.js';
-import getAppsAction from '../../../controllers/api/v1/apps/get-apps.js';
-import getAuthAction from '../../../controllers/api/v1/apps/get-auth.js';
-import getTriggersAction from '../../../controllers/api/v1/apps/get-triggers.js';
-import getTriggerSubstepsAction from '../../../controllers/api/v1/apps/get-trigger-substeps.js';
-import getActionsAction from '../../../controllers/api/v1/apps/get-actions.js';
-import getActionSubstepsAction from '../../../controllers/api/v1/apps/get-action-substeps.js';
 
 const router = Router();
 
-router.get('/', authenticateUser, asyncHandler(getAppsAction));
 router.get('/:appKey', authenticateUser, asyncHandler(getAppAction));
-router.get('/:appKey/auth', authenticateUser, asyncHandler(getAuthAction));
-
-router.get(
-  '/:appKey/triggers',
-  authenticateUser,
-  asyncHandler(getTriggersAction)
-);
-
-router.get(
-  '/:appKey/triggers/:triggerKey/substeps',
-  authenticateUser,
-  asyncHandler(getTriggerSubstepsAction)
-);
-
-router.get(
-  '/:appKey/actions',
-  authenticateUser,
-  asyncHandler(getActionsAction)
-);
-
-router.get(
-  '/:appKey/actions/:actionKey/substeps',
-  authenticateUser,
-  asyncHandler(getActionSubstepsAction)
-);
 
 export default router;

packages/backend/src/routes/api/v1/executions.js

@@ -1,32 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import { authorizeUser } from '../../../helpers/authorization.js';
-import getExecutionsAction from '../../../controllers/api/v1/executions/get-executions.js';
-import getExecutionAction from '../../../controllers/api/v1/executions/get-execution.js';
-import getExecutionStepsAction from '../../../controllers/api/v1/executions/get-execution-steps.js';
-
-const router = Router();
-
-router.get(
-  '/',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getExecutionsAction)
-);
-
-router.get(
-  '/:executionId',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getExecutionAction)
-);
-
-router.get(
-  '/:executionId/execution-steps',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getExecutionStepsAction)
-);
-
-export default router;

packages/backend/src/routes/index.js

@@ -9,7 +9,6 @@ import paymentRouter from './api/v1/payment.ee.js';
 import appAuthClientsRouter from './api/v1/app-auth-clients.js';
 import flowsRouter from './api/v1/flows.js';
 import appsRouter from './api/v1/apps.js';
-import executionsRouter from './api/v1/executions.js';
 import samlAuthProvidersRouter from './api/v1/admin/saml-auth-providers.ee.js';
 import rolesRouter from './api/v1/admin/roles.ee.js';
 import permissionsRouter from './api/v1/admin/permissions.ee.js';
@@ -28,7 +27,6 @@ router.use('/api/v1/payment', paymentRouter);
 router.use('/api/v1/app-auth-clients', appAuthClientsRouter);
 router.use('/api/v1/flows', flowsRouter);
 router.use('/api/v1/apps', appsRouter);
-router.use('/api/v1/executions', executionsRouter);
 router.use('/api/v1/admin/saml-auth-providers', samlAuthProvidersRouter);
 router.use('/api/v1/admin/roles', rolesRouter);
 router.use('/api/v1/admin/permissions', permissionsRouter);

packages/backend/src/serializers/action.js

@@ -1,9 +0,0 @@
-const actionSerializer = (action) => {
-  return {
-    name: action.name,
-    key: action.key,
-    description: action.description,
-  };
-};
-
-export default actionSerializer;

packages/backend/src/serializers/action.test.js

@@ -1,21 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import App from '../models/app';
-import actionSerializer from './action';
-
-describe('actionSerializer', () => {
-  it('should return the action data', async () => {
-    const actions = await App.findActionsByKey('github');
-    const action = actions[0];
-
-    const expectedPayload = {
-      description: action.description,
-      key: action.key,
-      name: action.name,
-      pollInterval: action.pollInterval,
-      showWebhookUrl: action.showWebhookUrl,
-      type: action.type,
-    };
-
-    expect(actionSerializer(action)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/app.test.js

@@ -3,7 +3,7 @@ import App from '../models/app';
 import appSerializer from './app';
 
 describe('appSerializer', () => {
-  it('should return app data', async () => {
+  it('should return permission data', async () => {
     const app = await App.findOneByKey('deepl');
 
     const expectedPayload = {

packages/backend/src/serializers/auth.js

@@ -1,9 +0,0 @@
-const authSerializer = (auth) => {
-  return {
-    fields: auth.fields,
-    authenticationSteps: auth.authenticationSteps,
-    reconnectionSteps: auth.reconnectionSteps,
-  };
-};
-
-export default authSerializer;

packages/backend/src/serializers/auth.test.js

@@ -1,17 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import App from '../models/app';
-import authSerializer from './auth';
-
-describe('authSerializer', () => {
-  it('should return auth data', async () => {
-    const auth = await App.findAuthByKey('deepl');
-
-    const expectedPayload = {
-      fields: auth.fields,
-      authenticationSteps: auth.authenticationSteps,
-      reconnectionSteps: auth.reconnectionSteps,
-    };
-
-    expect(authSerializer(auth)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/execution-step.js

@@ -1,21 +0,0 @@
-import stepSerializer from './step.js';
-
-const executionStepSerializer = (executionStep) => {
-  let executionStepData = {
-    id: executionStep.id,
-    dataIn: executionStep.dataIn,
-    dataOut: executionStep.dataOut,
-    errorDetails: executionStep.errorDetails,
-    status: executionStep.status,
-    createdAt: executionStep.createdAt.getTime(),
-    updatedAt: executionStep.updatedAt.getTime(),
-  };
-
-  if (executionStep.step) {
-    executionStepData.step = stepSerializer(executionStep.step);
-  }
-
-  return executionStepData;
-};
-
-export default executionStepSerializer;

packages/backend/src/serializers/execution-step.test.js

@@ -1,43 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import executionStepSerializer from './execution-step';
-import stepSerializer from './step';
-import { createExecutionStep } from '../../test/factories/execution-step';
-import { createStep } from '../../test/factories/step';
-
-describe('executionStepSerializer', () => {
-  let executionStep, step;
-
-  beforeEach(async () => {
-    step = await createStep();
-
-    executionStep = await createExecutionStep({
-      stepId: step.id,
-    });
-  });
-
-  it('should return the execution step data', async () => {
-    const expectedPayload = {
-      id: executionStep.id,
-      dataIn: executionStep.dataIn,
-      dataOut: executionStep.dataOut,
-      errorDetails: executionStep.errorDetails,
-      status: executionStep.status,
-      createdAt: executionStep.createdAt.getTime(),
-      updatedAt: executionStep.updatedAt.getTime(),
-    };
-
-    expect(executionStepSerializer(executionStep)).toEqual(expectedPayload);
-  });
-
-  it('should return the execution step data with the step', async () => {
-    executionStep.step = step;
-
-    const expectedPayload = {
-      step: stepSerializer(step),
-    };
-
-    expect(executionStepSerializer(executionStep)).toMatchObject(
-      expectedPayload
-    );
-  });
-});

packages/backend/src/serializers/execution.js

@@ -1,22 +0,0 @@
-import flowSerializer from './flow.js';
-
-const executionSerializer = (execution) => {
-  let executionData = {
-    id: execution.id,
-    testRun: execution.testRun,
-    createdAt: execution.createdAt.getTime(),
-    updatedAt: execution.updatedAt.getTime(),
-  };
-
-  if (execution.status) {
-    executionData.status = execution.status;
-  }
-
-  if (execution.flow) {
-    executionData.flow = flowSerializer(execution.flow);
-  }
-
-  return executionData;
-};
-
-export default executionSerializer;

packages/backend/src/serializers/execution.test.js

@@ -1,52 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import executionSerializer from './execution';
-import flowSerializer from './flow';
-import { createExecution } from '../../test/factories/execution';
-import { createFlow } from '../../test/factories/flow';
-
-describe('executionSerializer', () => {
-  let flow, execution;
-
-  beforeEach(async () => {
-    flow = await createFlow();
-
-    execution = await createExecution({
-      flowId: flow.id,
-    });
-  });
-
-  it('should return the execution data', async () => {
-    const expectedPayload = {
-      id: execution.id,
-      testRun: execution.testRun,
-      createdAt: execution.createdAt.getTime(),
-      updatedAt: execution.updatedAt.getTime(),
-    };
-
-    expect(executionSerializer(execution)).toEqual(expectedPayload);
-  });
-
-  it('should return the execution data with status', async () => {
-    execution.status = 'success';
-
-    const expectedPayload = {
-      id: execution.id,
-      testRun: execution.testRun,
-      createdAt: execution.createdAt.getTime(),
-      updatedAt: execution.updatedAt.getTime(),
-      status: 'success',
-    };
-
-    expect(executionSerializer(execution)).toEqual(expectedPayload);
-  });
-
-  it('should return the execution data with the flow', async () => {
-    execution.flow = flow;
-
-    const expectedPayload = {
-      flow: flowSerializer(flow),
-    };
-
-    expect(executionSerializer(execution)).toMatchObject(expectedPayload);
-  });
-});

packages/backend/src/serializers/flow.js

@@ -8,7 +8,7 @@ const flowSerializer = (flow) => {
     status: flow.status,
   };
 
-  if (flow.steps?.length > 0) {
+  if (flow.steps) {
     flowData.steps = flow.steps.map((step) => stepSerializer(step));
   }
 

packages/backend/src/serializers/index.js

@@ -6,11 +6,6 @@ import appAuthClientSerializer from './app-auth-client.js';
 import flowSerializer from './flow.js';
 import stepSerializer from './step.js';
 import appSerializer from './app.js';
-import authSerializer from './auth.js';
-import triggerSerializer from './trigger.js';
-import actionSerializer from './action.js';
-import executionSerializer from './execution.js';
-import executionStepSerializer from './execution-step.js';
 
 const serializers = {
   User: userSerializer,
@@ -21,11 +16,6 @@ const serializers = {
   Flow: flowSerializer,
   Step: stepSerializer,
   App: appSerializer,
-  Auth: authSerializer,
-  Trigger: triggerSerializer,
-  Action: actionSerializer,
-  Execution: executionSerializer,
-  ExecutionStep: executionStepSerializer,
 };
 
 export default serializers;

packages/backend/src/serializers/role.js

@@ -11,7 +11,7 @@ const roleSerializer = (role) => {
     isAdmin: role.isAdmin,
   };
 
-  if (role.permissions?.length > 0) {
+  if (role.permissions) {
     roleData.permissions = role.permissions.map((permission) =>
       permissionSerializer(permission)
     );

packages/backend/src/serializers/trigger.js

@@ -1,12 +0,0 @@
-const triggerSerializer = (trigger) => {
-  return {
-    description: trigger.description,
-    key: trigger.key,
-    name: trigger.name,
-    pollInterval: trigger.pollInterval,
-    showWebhookUrl: trigger.showWebhookUrl,
-    type: trigger.type,
-  };
-};
-
-export default triggerSerializer;

packages/backend/src/serializers/trigger.test.js

@@ -1,21 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import App from '../models/app';
-import triggerSerializer from './trigger';
-
-describe('triggerSerializer', () => {
-  it('should return the trigger data', async () => {
-    const triggers = await App.findTriggersByKey('github');
-    const trigger = triggers[0];
-
-    const expectedPayload = {
-      description: trigger.description,
-      key: trigger.key,
-      name: trigger.name,
-      pollInterval: trigger.pollInterval,
-      showWebhookUrl: trigger.showWebhookUrl,
-      type: trigger.type,
-    };
-
-    expect(triggerSerializer(trigger)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/user.js

@@ -15,7 +15,7 @@ const userSerializer = (user) => {
     userData.role = roleSerializer(user.role);
   }
 
-  if (user.permissions?.length > 0) {
+  if (user.permissions) {
     userData.permissions = user.permissions.map((permission) =>
       permissionSerializer(permission)
     );

packages/backend/test/mocks/rest/api/v1/apps/get-action-substeps.js

@@ -1,14 +0,0 @@
-const getActionSubstepsMock = (substeps) => {
-  return {
-    data: substeps,
-    meta: {
-      count: substeps.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getActionSubstepsMock;

packages/backend/test/mocks/rest/api/v1/apps/get-actions.js

@@ -1,22 +0,0 @@
-const getActionsMock = (actions) => {
-  const actionsData = actions.map((trigger) => {
-    return {
-      name: trigger.name,
-      key: trigger.key,
-      description: trigger.description,
-    };
-  });
-
-  return {
-    data: actionsData,
-    meta: {
-      count: actions.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getActionsMock;

packages/backend/test/mocks/rest/api/v1/apps/get-apps.js

@@ -1,23 +0,0 @@
-const getAppsMock = (apps) => {
-  const appsData = apps.map((app) => ({
-    authDocUrl: app.authDocUrl,
-    iconUrl: app.iconUrl,
-    key: app.key,
-    name: app.name,
-    primaryColor: app.primaryColor,
-    supportsConnections: app.supportsConnections,
-  }));
-
-  return {
-    data: appsData,
-    meta: {
-      count: appsData.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getAppsMock;

packages/backend/test/mocks/rest/api/v1/apps/get-auth.js

@@ -1,18 +0,0 @@
-const getAuthMock = (auth) => {
-  return {
-    data: {
-      fields: auth.fields,
-      authenticationSteps: auth.authenticationSteps,
-      reconnectionSteps: auth.reconnectionSteps,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getAuthMock;

packages/backend/test/mocks/rest/api/v1/apps/get-trigger-substeps.js

@@ -1,14 +0,0 @@
-const getTriggerSubstepsMock = (substeps) => {
-  return {
-    data: substeps,
-    meta: {
-      count: substeps.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getTriggerSubstepsMock;

packages/backend/test/mocks/rest/api/v1/apps/get-triggers.js

@@ -1,25 +0,0 @@
-const getTriggersMock = (triggers) => {
-  const triggersData = triggers.map((trigger) => {
-    return {
-      description: trigger.description,
-      key: trigger.key,
-      name: trigger.name,
-      pollInterval: trigger.pollInterval,
-      showWebhookUrl: trigger.showWebhookUrl,
-      type: trigger.type,
-    };
-  });
-
-  return {
-    data: triggersData,
-    meta: {
-      count: triggers.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getTriggersMock;

packages/backend/test/mocks/rest/api/v1/executions/get-execution-steps.js

@@ -1,39 +0,0 @@
-const getExecutionStepsMock = async (executionSteps, steps) => {
-  const data = executionSteps.map((executionStep) => {
-    const step = steps.find((step) => step.id === executionStep.stepId);
-
-    return {
-      id: executionStep.id,
-      dataIn: executionStep.dataIn,
-      dataOut: executionStep.dataOut,
-      errorDetails: executionStep.errorDetails,
-      status: executionStep.status,
-      createdAt: executionStep.createdAt.getTime(),
-      updatedAt: executionStep.updatedAt.getTime(),
-      step: {
-        id: step.id,
-        type: step.type,
-        key: step.key,
-        appKey: step.appKey,
-        iconUrl: step.iconUrl,
-        webhookUrl: step.webhookUrl,
-        status: step.status,
-        position: step.position,
-        parameters: step.parameters,
-      },
-    };
-  });
-
-  return {
-    data: data,
-    meta: {
-      count: executionSteps.length,
-      currentPage: 1,
-      isArray: true,
-      totalPages: 1,
-      type: 'ExecutionStep',
-    },
-  };
-};
-
-export default getExecutionStepsMock;

packages/backend/test/mocks/rest/api/v1/executions/get-execution.js

@@ -1,38 +0,0 @@
-const getExecutionMock = async (execution, flow, steps) => {
-  const data = {
-    id: execution.id,
-    testRun: execution.testRun,
-    createdAt: execution.createdAt.getTime(),
-    updatedAt: execution.updatedAt.getTime(),
-    flow: {
-      id: flow.id,
-      name: flow.name,
-      active: flow.active,
-      status: flow.active ? 'published' : 'draft',
-      steps: steps.map((step) => ({
-        id: step.id,
-        type: step.type,
-        key: step.key,
-        appKey: step.appKey,
-        iconUrl: step.iconUrl,
-        webhookUrl: step.webhookUrl,
-        status: step.status,
-        position: step.position,
-        parameters: step.parameters,
-      })),
-    },
-  };
-
-  return {
-    data: data,
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Execution',
-    },
-  };
-};
-
-export default getExecutionMock;

packages/backend/test/mocks/rest/api/v1/executions/get-executions.js

@@ -1,39 +0,0 @@
-const getExecutionsMock = async (executions, flow, steps) => {
-  const data = executions.map((execution) => ({
-    id: execution.id,
-    testRun: execution.testRun,
-    createdAt: execution.createdAt.getTime(),
-    updatedAt: execution.updatedAt.getTime(),
-    status: 'success',
-    flow: {
-      id: flow.id,
-      name: flow.name,
-      active: flow.active,
-      status: flow.active ? 'published' : 'draft',
-      steps: steps.map((step) => ({
-        id: step.id,
-        type: step.type,
-        key: step.key,
-        appKey: step.appKey,
-        iconUrl: step.iconUrl,
-        webhookUrl: step.webhookUrl,
-        status: step.status,
-        position: step.position,
-        parameters: step.parameters,
-      })),
-    },
-  }));
-
-  return {
-    data: data,
-    meta: {
-      count: executions.length,
-      currentPage: 1,
-      isArray: true,
-      totalPages: 1,
-      type: 'Execution',
-    },
-  };
-};
-
-export default getExecutionsMock;

packages/backend/test/mocks/rest/api/v1/users/get-current-user.js

@@ -1,19 +1,11 @@
-const getCurrentUserMock = (currentUser, role, permissions) => {
+const getCurrentUserMock = (currentUser, role) => {
   return {
     data: {
       createdAt: currentUser.createdAt.getTime(),
       email: currentUser.email,
       fullName: currentUser.fullName,
       id: currentUser.id,
-      permissions: permissions.map((permission) => ({
-        id: permission.id,
-        roleId: permission.roleId,
-        action: permission.action,
-        subject: permission.subject,
-        conditions: permission.conditions,
-        createdAt: permission.createdAt.getTime(),
-        updatedAt: permission.updatedAt.getTime(),
-      })),
+      permissions: [],
       role: {
         createdAt: role.createdAt.getTime(),
         description: null,

packages/docs/pages/.vitepress/config.js

@@ -41,15 +41,6 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/carbone/connection' },
           ],
         },
-        {
-          text: 'Datastore',
-          collapsible: true,
-          collapsed: true,
-          items: [
-            { text: 'Actions', link: '/apps/datastore/actions' },
-            { text: 'Connection', link: '/apps/datastore/connection' },
-          ],
-        },
         {
           text: 'DeepL',
           collapsible: true,
@@ -314,7 +305,7 @@ export default defineConfig({
           collapsed: true,
           items: [
             { text: 'Actions', link: '/apps/removebg/actions' },
-            { text: 'Connection', link: '/apps/removebg/connection' },
+            { text: 'Connection', link: '/apps/removebg/connection' }
           ],
         },
         {

packages/docs/pages/apps/datastore/actions.md

@@ -1,14 +0,0 @@
----
-favicon: /favicons/datastore.svg
-items:
-  - name: Get value
-    desc: Get value from the persistent datastore.
-  - name: Set value
-    desc: Set value to the persistent datastore.
----
-
-<script setup>
-  import CustomListing from '../../components/CustomListing.vue'
-</script>
-
-<CustomListing />

packages/docs/pages/apps/datastore/connection.md

@@ -1,3 +0,0 @@
-# Datastore
-
-Datastore is a persistent key-value storage system that allows you to store and retrieve data. Currently you can use it within the scope of the flow, meaning you can store and retrieve data within the same flow.

packages/docs/pages/apps/hubspot/connection.md

@@ -5,18 +5,21 @@ This page explains the steps you need to follow to set up the Hubspot connection
 :::
 
 1. Go to the [HubSpot Developer page](https://developers.hubspot.com/).
-2. Login into your developer account.
-3. Click on the **Manage apps** button.
-4. Click on the **Create app** button.
-5. Fill the **Public app name** field with the name of your API app.
-6. Go to the **Auth** tab.
-7. Fill the **Redirect URL(s)** field with the OAuth Redirect URL from the Automatisch connection creation page.
-8. Go to the **Scopes** tab.
-9. Select the scopes you want to use with Automatisch.
-10. Click on the **Create App** button.
-11. Go back to the **Auth** tab.
-12. Copy the **Client ID** and **Client Secret** values.
-13. Paste the **Client ID** value into Automatisch as **Client ID**, respectively.
-14. Paste the **Client Secret** value into Automatisch as **Client Secret**, respectively.
-15. Click the **Submit** button on Automatisch.
-16. Now, you can start using the HubSpot connection with Automatisch.
+2. Click on the **Create a developer account** button.
+3. Click on the **Create App Developer account** button.
+4. Fill the form.
+5. Login into your developer account.
+6. Click on the **Manage apps** button.
+7. Click on the **Create app** button.
+8. Fill the **Public app name** field with the name of your API app.
+9. Go to the **Auth** tab.
+10. Fill the **Redirect URL(s)** field with the OAuth Redirect URL from the Automatisch connection creation page.
+11. Go to the **Scopes** tab.
+12. Select the scopes you want to use with Automatisch.
+13. Click on the **Create App** button.
+14. Go back to the **Auth** tab.
+15. Copy the **Client ID** and **Client Secret** values.
+16. Paste the **Client ID** value into Automatisch as **Client ID**, respectively.
+17. Paste the **Client Secret** value into Automatisch as **Client Secret**, respectively.
+18. Click the **Submit** button on Automatisch.
+19. Now, you can start using the HubSpot connection with Automatisch.

packages/docs/pages/guide/available-apps.md

@@ -3,7 +3,6 @@
 The following integrations are currently supported by Automatisch.
 
 - [Carbone](/apps/carbone/actions)
-- [Datastore](/apps/datastore/actions)
 - [DeepL](/apps/deepl/actions)
 - [Delay](/apps/delay/actions)
 - [Discord](/apps/discord/actions)

packages/docs/pages/public/favicons/datastore.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon">
-  <defs>
-    <style>.cls-1{fill:none;}</style>
-  </defs>
-  <title>datastore</title>
-  <circle cx="23" cy="23" r="1"/>
-  <rect x="8" y="22" width="12" height="2"/>
-  <circle cx="23" cy="9" r="1"/>
-  <rect x="8" y="8" width="12" height="2"/>
-  <path d="M26,14a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H6A2,2,0,0,0,4,6v6a2,2,0,0,0,2,2H8v4H6a2,2,0,0,0-2,2v6a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V20a2,2,0,0,0-2-2H24V14ZM6,6H26v6H6ZM26,26H6V20H26Zm-4-8H10V14H22Z"/>
-  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
-</svg>

packages/e2e-tests/fixtures/admin/roles-page.js

@@ -31,7 +31,7 @@ export class AdminRolesPage extends AuthenticatedPage {
     await this.roleDrawerLink.click();
     await this.isMounted();
     await this.rolesLoader.waitFor({
-      state: 'detached',
+      state: 'detached'
     });
   }
 
@@ -43,7 +43,9 @@ export class AdminRolesPage extends AuthenticatedPage {
       state: 'detached',
     });
     return this.roleRow.filter({
-      has: this.page.getByTestId('role-name').getByText(name, { exact: true }),
+      has: this.page.getByTestId('role-name').filter({
+        hasText: name,
+      }),
     });
   }
 

packages/e2e-tests/package.json

@@ -28,6 +28,8 @@
     "@playwright/test": "^1.36.2"
   },
   "dependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "dotenv": "^16.3.1",
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.3.0",

packages/e2e-tests/tests/admin/manage-roles.spec.js

@@ -197,7 +197,7 @@ test.describe('Role management page', () => {
         await adminCreateUserPage.passwordInput.fill('sample');
         await adminCreateUserPage.roleInput.click();
         await adminCreateUserPage.page
-          .getByRole('option', { name: 'Delete Role', exact: true })
+          .getByRole('option', { name: 'Delete Role' })
           .click();
         await adminCreateUserPage.createButton.click();
         await adminUsersPage.snackbar.waitFor({

packages/web/.env-example

@@ -1,4 +1,4 @@
 PORT=3001
-REACT_APP_BACKEND_URL=http://localhost:3000
+REACT_APP_GRAPHQL_URL=http://localhost:3000/graphql
 # HTTPS=true
 REACT_APP_BASE_URL=http://localhost:3001

packages/web/.eslintignore

@@ -1,4 +0,0 @@
-node_modules
-build
-source
-.eslintrc.js

packages/web/.eslintrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  extends: [
-    'react-app',
-    'plugin:@tanstack/eslint-plugin-query/recommended',
-    'prettier',
-  ],
-  rules: {
-    'react/prop-types': 'warn',
-  },
-};

packages/web/jsconfig.json

@@ -1,6 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": "src"
-  },
-  "include": ["src"]
-}

packages/web/package.json

@@ -13,10 +13,17 @@
     "@mui/icons-material": "^5.11.9",
     "@mui/lab": "^5.0.0-alpha.120",
     "@mui/material": "^5.11.10",
-    "@tanstack/react-query": "^5.24.1",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
+    "@types/jest": "^26.0.15",
+    "@types/lodash": "^4.14.182",
+    "@types/luxon": "^2.0.8",
+    "@types/node": "^12.0.0",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-window": "^1.8.5",
+    "@types/uuid": "^9.0.0",
     "clipboard-copy": "^4.0.1",
     "compare-versions": "^4.1.3",
     "graphql": "^15.6.0",
@@ -24,8 +31,8 @@
     "luxon": "^2.3.1",
     "mui-color-input": "^2.0.0",
     "notistack": "^3.0.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-hook-form": "^7.45.2",
     "react-intl": "^5.20.12",
     "react-json-tree": "^0.16.2",
@@ -35,6 +42,7 @@
     "slate": "^0.94.1",
     "slate-history": "^0.93.0",
     "slate-react": "^0.94.2",
+    "typescript": "^4.6.3",
     "uuid": "^9.0.0",
     "web-vitals": "^1.0.1",
     "yup": "^0.32.11"
@@ -46,8 +54,8 @@
     "build:watch": "yarn nodemon --exec react-scripts build --watch 'src/**/*.ts' --watch 'public/**/*' --ext ts,html",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "lint": "eslint src --ext .js,.jsx",
-    "prepack": "yarn build"
+    "lint": "eslint . --ignore-path ../../.eslintignore",
+    "prepack": "REACT_APP_GRAPHQL_URL=/graphql yarn build"
   },
   "files": [
     "/build"
@@ -79,17 +87,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "devDependencies": {
-    "@tanstack/eslint-plugin-query": "^5.20.1",
-    "@tanstack/react-query-devtools": "^5.24.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-react-app": "^7.0.1",
-    "prettier": "^3.2.5"
-  },
-  "eslintConfig": {
-    "extends": [
-      "./.eslintrc.js"
-    ]
   }
 }

packages/web/src/adminSettingsRoutes.tsx

@@ -1,5 +1,5 @@
 import { Route, Navigate } from 'react-router-dom';
-
+import AdminSettingsLayout from 'components/AdminSettingsLayout';
 import Users from 'pages/Users';
 import EditUser from 'pages/EditUser';
 import CreateUser from 'pages/CreateUser';
@@ -8,10 +8,12 @@ import CreateRole from 'pages/CreateRole/index.ee';
 import EditRole from 'pages/EditRole/index.ee';
 import Authentication from 'pages/Authentication';
 import UserInterface from 'pages/UserInterface';
+
 import * as URLS from 'config/urls';
 import Can from 'components/Can';
 import AdminApplications from 'pages/AdminApplications';
 import AdminApplication from 'pages/AdminApplication';
+
 // TODO: consider introducing redirections to `/` as fallback
 export default (
   <>
@@ -19,7 +21,9 @@ export default (
       path={URLS.USERS}
       element={
         <Can I="read" a="User">
-          <Users />
+          <AdminSettingsLayout>
+            <Users />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -28,7 +32,9 @@ export default (
       path={URLS.CREATE_USER}
       element={
         <Can I="create" a="User">
-          <CreateUser />
+          <AdminSettingsLayout>
+            <CreateUser />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -37,7 +43,9 @@ export default (
       path={URLS.USER_PATTERN}
       element={
         <Can I="update" a="User">
-          <EditUser />
+          <AdminSettingsLayout>
+            <EditUser />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -46,7 +54,9 @@ export default (
       path={URLS.ROLES}
       element={
         <Can I="read" a="Role">
-          <Roles />
+          <AdminSettingsLayout>
+            <Roles />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -55,7 +65,9 @@ export default (
       path={URLS.CREATE_ROLE}
       element={
         <Can I="create" a="Role">
-          <CreateRole />
+          <AdminSettingsLayout>
+            <CreateRole />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -64,7 +76,9 @@ export default (
       path={URLS.ROLE_PATTERN}
       element={
         <Can I="update" a="Role">
-          <EditRole />
+          <AdminSettingsLayout>
+            <EditRole />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -73,7 +87,9 @@ export default (
       path={URLS.USER_INTERFACE}
       element={
         <Can I="update" a="Config">
-          <UserInterface />
+          <AdminSettingsLayout>
+            <UserInterface />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -84,7 +100,9 @@ export default (
         <Can I="read" a="SamlAuthProvider">
           <Can I="update" a="SamlAuthProvider">
             <Can I="create" a="SamlAuthProvider">
-              <Authentication />
+              <AdminSettingsLayout>
+                <Authentication />
+              </AdminSettingsLayout>
             </Can>
           </Can>
         </Can>
@@ -95,7 +113,9 @@ export default (
       path={URLS.ADMIN_APPS}
       element={
         <Can I="update" a="App">
-          <AdminApplications />
+          <AdminSettingsLayout>
+            <AdminApplications />
+          </AdminSettingsLayout>
         </Can>
       }
     />
@@ -104,7 +124,9 @@ export default (
       path={`${URLS.ADMIN_APP_PATTERN}/*`}
       element={
         <Can I="update" a="App">
-          <AdminApplication />
+          <AdminSettingsLayout>
+            <AdminApplication />
+          </AdminSettingsLayout>
         </Can>
       }
     />

packages/web/src/components/AccountDropdownMenu/index.tsx

@@ -1,25 +1,40 @@
 import * as React from 'react';
 import { useNavigate } from 'react-router-dom';
-import PropTypes from 'prop-types';
 import MenuItem from '@mui/material/MenuItem';
-import Menu from '@mui/material/Menu';
+import Menu, { MenuProps } from '@mui/material/Menu';
 import { Link } from 'react-router-dom';
+
 import Can from 'components/Can';
 import apolloClient from 'graphql/client';
 import * as URLS from 'config/urls';
 import useAuthentication from 'hooks/useAuthentication';
 import useFormatMessage from 'hooks/useFormatMessage';
-function AccountDropdownMenu(props) {
+
+type AccountDropdownMenuProps = {
+  open: boolean;
+  onClose: () => void;
+  anchorEl: MenuProps['anchorEl'];
+  id: string;
+};
+
+function AccountDropdownMenu(
+  props: AccountDropdownMenuProps
+): React.ReactElement {
   const formatMessage = useFormatMessage();
   const authentication = useAuthentication();
   const navigate = useNavigate();
+
   const { open, onClose, anchorEl, id } = props;
+
   const logout = async () => {
     authentication.updateToken('');
     await apolloClient.clearStore();
+
     onClose();
+
     navigate(URLS.LOGIN);
   };
+
   return (
     <Menu
       anchorEl={anchorEl}
@@ -36,7 +51,7 @@ function AccountDropdownMenu(props) {
       open={open}
       onClose={onClose}
     >
-      <MenuItem component={Link} to={URLS.SETTINGS_DASHBOARD} onClick={onClose}>
+      <MenuItem component={Link} to={URLS.SETTINGS_DASHBOARD}>
         {formatMessage('accountDropdownMenu.settings')}
       </MenuItem>
 
@@ -44,7 +59,6 @@ function AccountDropdownMenu(props) {
         <MenuItem
           component={Link}
           to={URLS.ADMIN_SETTINGS_DASHBOARD}
-          onClick={onClose}
         >
           {formatMessage('accountDropdownMenu.adminSettings')}
         </MenuItem>
@@ -57,11 +71,4 @@ function AccountDropdownMenu(props) {
   );
 }
 
-AccountDropdownMenu.propTypes = {
-  open: PropTypes.bool.isRequired,
-  onClose: PropTypes.func.isRequired,
-  anchorEl: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
-  id: PropTypes.string.isRequired,
-};
-
 export default AccountDropdownMenu;

packages/web/src/components/AddAppConnection/index.tsx

@@ -1,4 +1,4 @@
-import PropTypes from 'prop-types';
+import type { IApp, IField, IJSONObject } from 'types';
 import LoadingButton from '@mui/lab/LoadingButton';
 import Alert from '@mui/material/Alert';
 import Dialog from '@mui/material/Dialog';
@@ -6,24 +6,32 @@ import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
 import * as React from 'react';
+import { FieldValues, SubmitHandler } from 'react-hook-form';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 
-import { AppPropType } from 'propTypes/propTypes';
 import AppAuthClientsDialog from 'components/AppAuthClientsDialog/index.ee';
 import InputCreator from 'components/InputCreator';
 import * as URLS from 'config/urls';
 import useAuthenticateApp from 'hooks/useAuthenticateApp.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
-import { generateExternalLink } from 'helpers/translationValues';
+import { generateExternalLink } from '../../helpers/translationValues';
 import { Form } from './style';
 
-function AddAppConnection(props) {
+type AddAppConnectionProps = {
+  onClose: (response: Record<string, unknown>) => void;
+  application: IApp;
+  connectionId?: string;
+};
+
+export default function AddAppConnection(
+  props: AddAppConnectionProps
+): React.ReactElement {
   const { application, connectionId, onClose } = props;
   const { name, authDocUrl, key, auth } = application;
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const formatMessage = useFormatMessage();
-  const [error, setError] = React.useState(null);
+  const [error, setError] = React.useState<IJSONObject | null>(null);
   const [inProgress, setInProgress] = React.useState(false);
   const hasConnection = Boolean(connectionId);
   const useShared = searchParams.get('shared') === 'true';
@@ -34,6 +42,7 @@ function AddAppConnection(props) {
     appAuthClientId,
     useShared: !!appAuthClientId,
   });
+
   React.useEffect(function relayProviderData() {
     if (window.opener) {
       window.opener.postMessage({
@@ -43,41 +52,51 @@ function AddAppConnection(props) {
       window.close();
     }
   }, []);
+
   React.useEffect(
     function initiateSharedAuthenticationForGivenAuthClient() {
       if (!appAuthClientId) return;
       if (!authenticate) return;
+
       const asyncAuthenticate = async () => {
         await authenticate();
+
         navigate(URLS.APP_CONNECTIONS(key));
       };
+
       asyncAuthenticate();
     },
-    [appAuthClientId, authenticate],
+    [appAuthClientId, authenticate]
   );
-  const handleClientClick = (appAuthClientId) =>
+
+  const handleClientClick = (appAuthClientId: string) =>
     navigate(URLS.APP_ADD_CONNECTION_WITH_AUTH_CLIENT_ID(key, appAuthClientId));
+
   const handleAuthClientsDialogClose = () =>
     navigate(URLS.APP_CONNECTIONS(key));
-  const submitHandler = React.useCallback(
+
+  const submitHandler: SubmitHandler<FieldValues> = React.useCallback(
     async (data) => {
       if (!authenticate) return;
+
       setInProgress(true);
+
       try {
         const response = await authenticate({
           fields: data,
         });
-        onClose(response);
+        onClose(response as Record<string, unknown>);
       } catch (err) {
-        const error = err;
+        const error = err as IJSONObject;
         console.log(error);
-        setError(error.graphQLErrors?.[0]);
+        setError((error.graphQLErrors as IJSONObject[])?.[0]);
       } finally {
         setInProgress(false);
       }
     },
-    [authenticate],
+    [authenticate]
   );
+
   if (useShared)
     return (
       <AppAuthClientsDialog
@@ -86,7 +105,9 @@ function AddAppConnection(props) {
         onClientClick={handleClientClick}
       />
     );
+
   if (appAuthClientId) return <React.Fragment />;
+
   return (
     <Dialog open={true} onClose={onClose} data-test="add-app-connection-dialog">
       <DialogTitle>
@@ -121,7 +142,7 @@ function AddAppConnection(props) {
       <DialogContent>
         <DialogContentText tabIndex={-1} component="div">
           <Form onSubmit={submitHandler}>
-            {auth?.fields?.map((field) => (
+            {auth?.fields?.map((field: IField) => (
               <InputCreator key={field.key} schema={field} />
             ))}
 
@@ -141,11 +162,3 @@ function AddAppConnection(props) {
     </Dialog>
   );
 }
-
-AddAppConnection.propTypes = {
-  onClose: PropTypes.func.isRequired,
-  application: AppPropType.isRequired,
-  connectionId: PropTypes.string,
-};
-
-export default AddAppConnection;

packages/web/src/components/AddAppConnection/style.ts

@@ -1,5 +1,6 @@
 import { styled } from '@mui/material/styles';
 import BaseForm from 'components/Form';
+
 export const Form = styled(BaseForm)(({ theme }) => ({
   display: 'flex',
   flexDirection: 'column',

packages/web/src/components/AddNewAppConnection/index.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
 import { useLazyQuery } from '@apollo/client';
 import { Link } from 'react-router-dom';
 import debounce from 'lodash/debounce';
@@ -20,53 +19,67 @@ import InputLabel from '@mui/material/InputLabel';
 import OutlinedInput from '@mui/material/OutlinedInput';
 import FormControl from '@mui/material/FormControl';
 import Box from '@mui/material/Box';
+import type { IApp } from 'types';
+
 import * as URLS from 'config/urls';
 import AppIcon from 'components/AppIcon';
 import { GET_APPS } from 'graphql/queries/get-apps';
 import useFormatMessage from 'hooks/useFormatMessage';
 
-function createConnectionOrFlow(appKey, supportsConnections = false) {
+function createConnectionOrFlow(appKey: string, supportsConnections = false) {
   if (!supportsConnections) {
     return URLS.CREATE_FLOW_WITH_APP(appKey);
   }
+
   return URLS.APP_ADD_CONNECTION(appKey);
 }
-function AddNewAppConnection(props) {
+
+type AddNewAppConnectionProps = {
+  onClose: () => void;
+};
+
+export default function AddNewAppConnection(
+  props: AddNewAppConnectionProps
+): React.ReactElement {
   const { onClose } = props;
   const theme = useTheme();
   const matchSmallScreens = useMediaQuery(theme.breakpoints.down('sm'));
   const formatMessage = useFormatMessage();
-  const [appName, setAppName] = React.useState(null);
+  const [appName, setAppName] = React.useState<string | null>(null);
   const [loading, setLoading] = React.useState(false);
   const [getApps, { data }] = useLazyQuery(GET_APPS, {
     onCompleted: () => {
       setLoading(false);
     },
   });
+
   const fetchData = React.useMemo(
     () => debounce((name) => getApps({ variables: { name } }), 300),
-    [getApps],
+    [getApps]
   );
+
   React.useEffect(
     function fetchAppsOnAppNameChange() {
       setLoading(true);
+
       fetchData(appName);
     },
-    [fetchData, appName],
+    [fetchData, appName]
   );
+
   React.useEffect(function cancelDebounceOnUnmount() {
     return () => {
       fetchData.cancel();
     };
   }, []);
+
   return (
     <Dialog
       open={true}
       onClose={onClose}
       maxWidth="sm"
       fullWidth
-      data-test="add-app-connection-dialog"
-    >
+      data-test="add-app-connection-dialog">
       <DialogTitle>{formatMessage('apps.addNewAppConnection')}</DialogTitle>
 
       <Box px={3}>
@@ -110,7 +123,7 @@ function AddNewAppConnection(props) {
           )}
 
           {!loading &&
-            data?.getApps?.map((app) => (
+            data?.getApps?.map((app: IApp) => (
               <ListItem disablePadding key={app.name} data-test="app-list-item">
                 <ListItemButton
                   component={Link}
@@ -138,9 +151,3 @@ function AddNewAppConnection(props) {
     </Dialog>
   );
 }
-
-AddNewAppConnection.propTypes = {
-  onClose: PropTypes.func.isRequired,
-};
-
-export default AddNewAppConnection;

packages/web/src/components/AdminApplicationAuthClientDialog/index.tsx

@@ -1,5 +1,5 @@
-import * as React from 'react';
-import PropTypes from 'prop-types';
+import React from 'react';
+import type { IField } from 'types';
 import LoadingButton from '@mui/lab/LoadingButton';
 import Alert from '@mui/material/Alert';
 import Dialog from '@mui/material/Dialog';
@@ -7,16 +7,32 @@ import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
 import CircularProgress from '@mui/material/CircularProgress';
-import { ApolloError } from '@apollo/client';
+import { FieldValues, SubmitHandler } from 'react-hook-form';
+import type { UseFormProps } from 'react-hook-form';
+import type { ApolloError } from '@apollo/client';
 
-import { FieldPropType } from 'propTypes/propTypes';
 import useFormatMessage from 'hooks/useFormatMessage';
 import InputCreator from 'components/InputCreator';
 import Switch from 'components/Switch';
 import TextField from 'components/TextField';
+
 import { Form } from './style';
 
-function AdminApplicationAuthClientDialog(props) {
+type AdminApplicationAuthClientDialogProps = {
+  title: string;
+  authFields?: IField[];
+  defaultValues: UseFormProps['defaultValues'];
+  loading: boolean;
+  submitting: boolean;
+  disabled?: boolean;
+  error?: ApolloError;
+  submitHandler: SubmitHandler<FieldValues>;
+  onClose: () => void;
+};
+
+export default function AdminApplicationAuthClientDialog(
+  props: AdminApplicationAuthClientDialogProps
+): React.ReactElement {
   const {
     error,
     onClose,
@@ -29,6 +45,7 @@ function AdminApplicationAuthClientDialog(props) {
     disabled = false,
   } = props;
   const formatMessage = useFormatMessage();
+
   return (
     <Dialog open={true} onClose={onClose}>
       <DialogTitle>{title}</DialogTitle>
@@ -63,7 +80,7 @@ function AdminApplicationAuthClientDialog(props) {
                     label={formatMessage('authClient.inputName')}
                     fullWidth
                   />
-                  {authFields?.map((field) => (
+                  {authFields?.map((field: IField) => (
                     <InputCreator key={field.key} schema={field} />
                   ))}
                   <LoadingButton
@@ -85,17 +102,3 @@ function AdminApplicationAuthClientDialog(props) {
     </Dialog>
   );
 }
-
-AdminApplicationAuthClientDialog.propTypes = {
-  error: PropTypes.instanceOf(ApolloError),
-  onClose: PropTypes.func.isRequired,
-  title: PropTypes.string.isRequired,
-  loading: PropTypes.bool.isRequired,
-  submitHandler: PropTypes.func.isRequired,
-  authFields: PropTypes.arrayOf(FieldPropType),
-  submitting: PropTypes.bool.isRequired,
-  defaultValues: PropTypes.object.isRequired,
-  disabled: PropTypes.bool,
-};
-
-export default AdminApplicationAuthClientDialog;

packages/web/src/components/AdminApplicationAuthClientDialog/style.ts

@@ -1,5 +1,6 @@
 import { styled } from '@mui/material/styles';
 import BaseForm from 'components/Form';
+
 export const Form = styled(BaseForm)(({ theme }) => ({
   display: 'flex',
   flexDirection: 'column',

packages/web/src/components/AdminApplicationAuthClients/index.tsx

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import CircularProgress from '@mui/material/CircularProgress';
 import Stack from '@mui/material/Stack';
@@ -8,17 +7,27 @@ import CardContent from '@mui/material/CardContent';
 import Typography from '@mui/material/Typography';
 import Chip from '@mui/material/Chip';
 import Button from '@mui/material/Button';
+
 import * as URLS from 'config/urls';
 import useFormatMessage from 'hooks/useFormatMessage';
 import useAppAuthClients from 'hooks/useAppAuthClients.ee';
+
 import NoResultFound from 'components/NoResultFound';
 
-function AdminApplicationAuthClients(props) {
+type AdminApplicationAuthClientsProps = {
+  appKey: string;
+};
+
+function AdminApplicationAuthClients(
+  props: AdminApplicationAuthClientsProps
+): React.ReactElement {
   const { appKey } = props;
   const formatMessage = useFormatMessage();
   const { appAuthClients, loading } = useAppAuthClients({ appKey });
+
   if (loading)
     return <CircularProgress sx={{ display: 'block', margin: '20px auto' }} />;
+
   if (!appAuthClients?.length) {
     return (
       <NoResultFound
@@ -27,6 +36,7 @@ function AdminApplicationAuthClients(props) {
       />
     );
   }
+
   const sortedAuthClients = appAuthClients.slice().sort((a, b) => {
     if (a.id < b.id) {
       return -1;
@@ -36,6 +46,7 @@ function AdminApplicationAuthClients(props) {
     }
     return 0;
   });
+
   return (
     <div>
       {sortedAuthClients.map((client) => (
@@ -56,7 +67,7 @@ function AdminApplicationAuthClients(props) {
                   label={formatMessage(
                     client?.active
                       ? 'adminAppsAuthClients.statusActive'
-                      : 'adminAppsAuthClients.statusInactive',
+                      : 'adminAppsAuthClients.statusInactive'
                   )}
                 />
               </Stack>
@@ -75,8 +86,4 @@ function AdminApplicationAuthClients(props) {
   );
 }
 
-AdminApplicationAuthClients.propTypes = {
-  appKey: PropTypes.string.isRequired,
-};
-
 export default AdminApplicationAuthClients;

packages/web/src/components/AdminApplicationCreateAuthClient/index.tsx

@@ -1,15 +1,24 @@
-import PropTypes from 'prop-types';
 import React, { useCallback, useMemo } from 'react';
+import type { IApp } from 'types';
+import { FieldValues, SubmitHandler } from 'react-hook-form';
 import { useMutation } from '@apollo/client';
-
-import { AppPropType } from 'propTypes/propTypes';
 import { CREATE_APP_CONFIG } from 'graphql/mutations/create-app-config';
 import { CREATE_APP_AUTH_CLIENT } from 'graphql/mutations/create-app-auth-client';
+
 import useAppConfig from 'hooks/useAppConfig.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
+
 import AdminApplicationAuthClientDialog from 'components/AdminApplicationAuthClientDialog';
 
-function AdminApplicationCreateAuthClient(props) {
+type AdminApplicationCreateAuthClientProps = {
+  appKey: string;
+  application: IApp;
+  onClose: () => void;
+};
+
+export default function AdminApplicationCreateAuthClient(
+  props: AdminApplicationCreateAuthClientProps
+): React.ReactElement {
   const { appKey, application, onClose } = props;
   const { auth } = application;
   const formatMessage = useFormatMessage();
@@ -28,8 +37,10 @@ function AdminApplicationCreateAuthClient(props) {
     refetchQueries: ['GetAppAuthClients'],
     context: { autoSnackbar: false },
   });
-  const submitHandler = async (values) => {
+
+  const submitHandler: SubmitHandler<FieldValues> = async (values) => {
     let appConfigId = appConfig?.id;
+
     if (!appConfigId) {
       const { data: appConfigData } = await createAppConfig({
         variables: {
@@ -43,7 +54,9 @@ function AdminApplicationCreateAuthClient(props) {
       });
       appConfigId = appConfigData.createAppConfig.id;
     }
+
     const { name, active, ...formattedAuthDefaults } = values;
+
     await createAppAuthClient({
       variables: {
         input: {
@@ -54,13 +67,17 @@ function AdminApplicationCreateAuthClient(props) {
         },
       },
     });
+
     onClose();
   };
+
   const getAuthFieldsDefaultValues = useCallback(() => {
     if (!auth?.fields) {
       return {};
     }
-    const defaultValues = {};
+    const defaultValues: {
+      [key: string]: any;
+    } = {};
     auth.fields.forEach((field) => {
       if (field.value || field.type !== 'string') {
         defaultValues[field.key] = field.value;
@@ -70,14 +87,16 @@ function AdminApplicationCreateAuthClient(props) {
     });
     return defaultValues;
   }, [auth?.fields]);
+
   const defaultValues = useMemo(
     () => ({
       name: '',
       active: false,
       ...getAuthFieldsDefaultValues(),
     }),
-    [getAuthFieldsDefaultValues],
+    [getAuthFieldsDefaultValues]
   );
+
   return (
     <AdminApplicationAuthClientDialog
       onClose={onClose}
@@ -91,11 +110,3 @@ function AdminApplicationCreateAuthClient(props) {
     />
   );
 }
-
-AdminApplicationCreateAuthClient.propTypes = {
-  appKey: PropTypes.string.isRequired,
-  application: AppPropType.isRequired,
-  onClose: PropTypes.func.isRequired,
-};
-
-export default AdminApplicationCreateAuthClient;

packages/web/src/components/AdminApplicationSettings/index.tsx

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import { useMemo } from 'react';
 import useAppConfig from 'hooks/useAppConfig.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
@@ -7,29 +6,39 @@ import Paper from '@mui/material/Paper';
 import Stack from '@mui/material/Stack';
 import LoadingButton from '@mui/lab/LoadingButton';
 import { useMutation } from '@apollo/client';
+
 import { CREATE_APP_CONFIG } from 'graphql/mutations/create-app-config';
 import { UPDATE_APP_CONFIG } from 'graphql/mutations/update-app-config';
+
 import Form from 'components/Form';
 import { Switch } from './style';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 
-function AdminApplicationSettings(props) {
+type AdminApplicationSettingsProps = {
+  appKey: string;
+};
+
+function AdminApplicationSettings(
+  props: AdminApplicationSettingsProps
+): React.ReactElement {
   const { appConfig, loading } = useAppConfig(props.appKey);
   const [createAppConfig, { loading: loadingCreateAppConfig }] = useMutation(
     CREATE_APP_CONFIG,
     {
       refetchQueries: ['GetAppConfig'],
-    },
+    }
   );
   const [updateAppConfig, { loading: loadingUpdateAppConfig }] = useMutation(
     UPDATE_APP_CONFIG,
     {
       refetchQueries: ['GetAppConfig'],
-    },
+    }
   );
+
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
-  const handleSubmit = async (values) => {
+
+  const handleSubmit = async (values: any) => {
     try {
       if (!appConfig) {
         await createAppConfig({
@@ -47,21 +56,23 @@ function AdminApplicationSettings(props) {
       enqueueSnackbar(formatMessage('adminAppsSettings.successfullySaved'), {
         variant: 'success',
         SnackbarProps: {
-          'data-test': 'snackbar-save-admin-apps-settings-success',
-        },
+          'data-test': 'snackbar-save-admin-apps-settings-success'
+        }
       });
     } catch (error) {
       throw new Error('Failed while saving!');
     }
   };
+
   const defaultValues = useMemo(
     () => ({
       allowCustomConnection: appConfig?.allowCustomConnection || false,
       shared: appConfig?.shared || false,
       disabled: appConfig?.disabled || false,
     }),
-    [appConfig],
+    [appConfig]
   );
+
   return (
     <Form
       defaultValues={defaultValues}
@@ -112,8 +123,4 @@ function AdminApplicationSettings(props) {
   );
 }
 
-AdminApplicationSettings.propTypes = {
-  appKey: PropTypes.string.isRequired,
-};
-
 export default AdminApplicationSettings;

packages/web/src/components/AdminApplicationSettings/style.ts

@@ -1,5 +1,6 @@
 import { styled } from '@mui/material/styles';
 import SwitchBase from 'components/Switch';
+
 export const Switch = styled(SwitchBase)`
   justify-content: space-between;
   margin: 0;