Update version to 0.13.0

fix: introduce fix for overflowing inputs with long parameters names

packages/backend/src/config/app.js

@@ -52,7 +52,7 @@ const appConfig = {
   isDev: appEnv === 'development',
   isTest: appEnv === 'test',
   isProd: appEnv === 'production',
-  version: '0.12.0',
+  version: '0.13.0',
   postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
   postgresSchema: process.env.POSTGRES_SCHEMA || 'public',
   postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'),

packages/backend/src/controllers/api/v1/automatisch/version.test.js

@@ -10,7 +10,7 @@ describe('GET /api/v1/automatisch/version', () => {
 
     const expectedPayload = {
       data: {
-        version: '0.12.0',
+        version: '0.13.0',
       },
       meta: {
         count: 1,

packages/backend/src/helpers/axios-with-proxy.js

@@ -3,14 +3,18 @@ import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
 import appConfig from '../config/app.js';
 
-const config = axios.defaults;
+export function createInstance(customConfig = {}, { requestInterceptor, responseErrorInterceptor } = {}) {
-const httpProxyUrl = appConfig.httpProxy;
+  const config = {
-const httpsProxyUrl = appConfig.httpsProxy;
+    ...axios.defaults,
-const supportsProxy = httpProxyUrl || httpsProxyUrl;
+    ...customConfig
-const noProxyEnv = appConfig.noProxy;
+  };
-const noProxyHosts = noProxyEnv ? noProxyEnv.split(',').map(host => host.trim()) : [];
+  const httpProxyUrl = appConfig.httpProxy;
+  const httpsProxyUrl = appConfig.httpsProxy;
+  const supportsProxy = httpProxyUrl || httpsProxyUrl;
+  const noProxyEnv = appConfig.noProxy;
+  const noProxyHosts = noProxyEnv ? noProxyEnv.split(',').map(host => host.trim()) : [];
 
-if (supportsProxy) {
+  if (supportsProxy) {
     if (httpProxyUrl) {
       config.httpAgent = new HttpProxyAgent(httpProxyUrl);
     }
@@ -20,20 +24,20 @@ if (supportsProxy) {
     }
 
     config.proxy = false;
-}
+  }
 
-const axiosWithProxyInstance = axios.create(config);
+  const instance = axios.create(config);
 
-function shouldSkipProxy(hostname) {
+  function shouldSkipProxy(hostname) {
     return noProxyHosts.some(noProxyHost => {
       return hostname.endsWith(noProxyHost) || hostname === noProxyHost;
     });
-};
+  };
 
-/**
+  /**
    * The interceptors are executed in the reverse order they are added.
    */
-axiosWithProxyInstance.interceptors.request.use(
+  instance.interceptors.request.use(
     function skipProxyIfInNoProxy(requestConfig) {
       const hostname = new URL(requestConfig.baseURL).hostname;
 
@@ -44,11 +48,25 @@ axiosWithProxyInstance.interceptors.request.use(
 
       return requestConfig;
     },
-  undefined,
+    (error) => Promise.reject(error)
-  { synchronous: true }
+  );
-);
 
-axiosWithProxyInstance.interceptors.request.use(
+  // not always we have custom request interceptors
+  if (requestInterceptor) {
+    instance.interceptors.request.use(
+      async function customInterceptor(requestConfig) {
+        let newRequestConfig = requestConfig;
+
+        for (const interceptor of requestInterceptor) {
+          newRequestConfig = await interceptor(newRequestConfig);
+        }
+
+        return newRequestConfig;
+      }
+    );
+  }
+
+  instance.interceptors.request.use(
     function removeBaseUrlForAbsoluteUrls(requestConfig) {
       /**
        * If the URL is an absolute URL, we remove its origin out of the URL
@@ -61,12 +79,24 @@ axiosWithProxyInstance.interceptors.request.use(
         requestConfig.url = url.pathname + url.search;
 
         return requestConfig;
-    } catch {
+      } catch (err) {
         return requestConfig;
       }
     },
-  undefined,
+    (error) => Promise.reject(error)
-  { synchronous: true}
+  );
-);
 
-export default axiosWithProxyInstance;
+  // not always we have custom response error interceptor
+  if (responseErrorInterceptor) {
+    instance.interceptors.response.use(
+      (response) => response,
+      responseErrorInterceptor
+    );
+  }
+
+  return instance;
+}
+
+const defaultInstance = createInstance();
+
+export default defaultInstance;

packages/backend/src/helpers/axios-with-proxy.test.js

@@ -1,6 +1,6 @@
 import { beforeEach, describe, it, expect, vi } from 'vitest';
 
-describe('Axios with proxy', () => {
+describe('Custom default axios with proxy', () => {
   beforeEach(() => {
     vi.resetModules();
   });
@@ -23,7 +23,13 @@ describe('Axios with proxy', () => {
     expect(secondRequestInterceptor.fulfilled.name).toBe('removeBaseUrlForAbsoluteUrls');
   });
 
-  describe('skipProxyIfInNoProxy', () => {
+  it('should throw with invalid url (consisting of path alone)', async () => {
+    const axios = (await import('./axios-with-proxy.js')).default;
+
+    await expect(() => axios('/just-a-path')).rejects.toThrowError('Invalid URL');
+  });
+
+  describe('with skipProxyIfInNoProxy interceptor', () => {
     let appConfig, axios;
     beforeEach(async() => {
       appConfig = (await import('../config/app.js')).default;
@@ -67,7 +73,7 @@ describe('Axios with proxy', () => {
     });
   });
 
-  describe('removeBaseUrlForAbsoluteUrls', () => {
+  describe('with removeBaseUrlForAbsoluteUrls interceptor', () => {
     let axios;
     beforeEach(async() => {
       axios = (await import('./axios-with-proxy.js')).default;
@@ -116,4 +122,48 @@ describe('Axios with proxy', () => {
       expect(interceptedRequestConfig.url).toBe('/path?query=1');
     });
   });
+
+  describe('with extra requestInterceptors', () => {
+    it('should apply extra request interceptors in the middle', async () => {
+      const { createInstance } = await import('./axios-with-proxy.js');
+
+      const interceptor = (config) => {
+        config.test = true;
+        return config;
+      }
+
+      const instance = createInstance({}, {
+        requestInterceptor: [
+          interceptor
+        ]
+      });
+      const requestInterceptors = instance.interceptors.request.handlers;
+      const customInterceptor = requestInterceptors[1].fulfilled;
+
+      expect(requestInterceptors.length).toBe(3);
+      await expect(customInterceptor({})).resolves.toStrictEqual({ test: true });
+    });
+
+    it('should work with a custom interceptor setting a baseURL and a request to path', async () => {
+      const { createInstance } = await import('./axios-with-proxy.js');
+
+      const interceptor = (config) => {
+        config.baseURL = 'http://localhost';
+        return config;
+      }
+
+      const instance = createInstance({}, {
+        requestInterceptor: [
+          interceptor
+        ]
+      });
+
+      try {
+        await instance.get('/just-a-path');
+      } catch (error) {
+        expect(error.config.baseURL).toBe('http://localhost');
+        expect(error.config.url).toBe('/just-a-path');
+      }
+    })
+  });
 });

packages/backend/src/helpers/compute-parameters.js

@@ -11,6 +11,7 @@ export default function computeParameters(parameters, executionSteps) {
       const computedValue = parts
         .map((part) => {
           const isVariable = part.match(variableRegExp);
+
           if (isVariable) {
             const stepIdAndKeyPath = part.replace(/{{step.|}}/g, '');
             const [stepId, ...keyPaths] = stepIdAndKeyPath.split('.');
@@ -20,18 +21,33 @@ export default function computeParameters(parameters, executionSteps) {
             });
             const data = executionStep?.dataOut;
             const dataValue = get(data, keyPath);
+
+            // Covers both arrays and objects
+            if (typeof dataValue === 'object') {
+              return JSON.stringify(dataValue);
+            }
+
             return dataValue;
           }
 
           return part;
-        })
+        }).join('');
-        .join('');
 
+      // challenge the input to see if it is stringifies object or array
+      try {
+        const parsedValue = JSON.parse(computedValue);
+
+        return {
+          ...result,
+          [key]: parsedValue,
+        };
+      } catch (error) {
         return {
           ...result,
           [key]: computedValue,
         };
       }
+    }
 
     if (Array.isArray(value)) {
       return {

packages/backend/src/helpers/http-client/index.js

@@ -1,41 +1,8 @@
 import HttpError from '../../errors/http.js';
-import axios from '../axios-with-proxy.js';
+import { createInstance } from '../axios-with-proxy.js';
-
-// Mutates the `toInstance` by copying the request interceptors from `fromInstance`
-const copyRequestInterceptors = (fromInstance, toInstance) => {
-  // Copy request interceptors
-  fromInstance.interceptors.request.forEach(interceptor => {
-    toInstance.interceptors.request.use(
-      interceptor.fulfilled,
-      interceptor.rejected,
-      {
-        synchronous: interceptor.synchronous,
-        runWhen: interceptor.runWhen
-      }
-    );
-  });
-}
 
 export default function createHttpClient({ $, baseURL, beforeRequest = [] }) {
-  const instance = axios.create({
+  async function interceptResponseError(error) {
-    baseURL,
-  });
-
-  // 1. apply the beforeRequest functions from the app
-  instance.interceptors.request.use((requestConfig) => {
-    const result = beforeRequest.reduce((newConfig, beforeRequestFunc) => {
-      return beforeRequestFunc($, newConfig);
-    }, requestConfig);
-
-    return result;
-  });
-
-  // 2. inherit the request inceptors from the parent instance
-  copyRequestInterceptors(axios, instance);
-
-  instance.interceptors.response.use(
-    (response) => response,
-    async (error) => {
     const { config, response } = error;
     // Do not destructure `status` from `error.response` because it might not exist
     const status = response?.status;
@@ -58,8 +25,19 @@ export default function createHttpClient({ $, baseURL, beforeRequest = [] }) {
     }
 
     throw new HttpError(error);
+  };
+
+  const instance = createInstance(
+    {
+      baseURL,
+    },
+    {
+      requestInterceptor: beforeRequest.map((originalBeforeRequest) => {
+        return async (requestConfig) => await originalBeforeRequest($, requestConfig);
+      }),
+      responseErrorInterceptor: interceptResponseError,
     }
-  );
+  )
 
   return instance;
 }

packages/backend/src/helpers/webhook-handler-sync.js

@@ -63,6 +63,8 @@ export default async (flowId, request, response) => {
     });
 
     if (testRun) {
+      response.status(204).end();
+
       // in case of testing, we do not process the whole process.
       continue;
     }
@@ -74,6 +76,12 @@ export default async (flowId, request, response) => {
         executionId,
       });
 
+      if (actionStep.appKey === 'filter' && !actionExecutionStep.dataOut) {
+        response.status(422).end();
+
+        break;
+      }
+
       if (actionStep.key === 'respondWith' && !response.headersSent) {
         const { headers, statusCode, body } = actionExecutionStep.dataOut;
 

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

@@ -14,7 +14,7 @@ connection in Automatisch. If any of the steps are outdated, please let us know!
 7. Click on the **Select all** and then click on the **Create** button.
 8. Now, copy your **API key secret** and paste the key into the **API Key** field in Automatisch.
 9. Write any screen name to be displayed in Automatisch.
-10. You can find your project ID next to your project name. Paste the id into **Project ID** field in Automatsich.
+10. You can find your project ID next to your project name. Paste the id into **Project ID** field in Automatisch.
-11. If you are using self-hosted Appwrite project, you can paste the instace url into **Appwrite instance URL** field in Automatisch.
+11. If you are using self-hosted Appwrite project, you can paste the instance url into **Appwrite instance URL** field in Automatisch.
 12. Fill the host name field with the hostname of your instance URL. It's either `cloud.appwrite.io` or hostname of your instance URL.
 13. Start using Appwrite integration with Automatisch!

packages/docs/pages/apps/appwrite/triggers.md

@@ -1,7 +1,7 @@
 ---
 favicon: /favicons/appwrite.svg
 items:
-  - name: New documets
+  - name: New documents
     desc: Triggers when a new document is created.
 ---
 

packages/web/src/components/FlowSubstep/FilterConditions/index.jsx

@@ -3,7 +3,6 @@ import * as React from 'react';
 import { v4 as uuidv4 } from 'uuid';
 import { useFormContext, useWatch } from 'react-hook-form';
 import Stack from '@mui/material/Stack';
-import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
 import Divider from '@mui/material/Divider';
 import IconButton from '@mui/material/IconButton';
@@ -12,6 +11,7 @@ import AddIcon from '@mui/icons-material/Add';
 import useFormatMessage from 'hooks/useFormatMessage';
 import InputCreator from 'components/InputCreator';
 import { EditorContext } from 'contexts/Editor';
+import { Grid } from '@mui/material';
 
 const createGroupItem = () => ({
   key: '',
@@ -122,7 +122,7 @@ function FilterConditions(props) {
     <React.Fragment>
       <Stack sx={{ width: '100%' }} direction="column" spacing={2} mt={2}>
         {groups?.map((group, groupIndex) => (
-          <>
+          <React.Fragment key={groupIndex}>
             {groupIndex !== 0 && <Divider />}
 
             <Typography variant="subtitle2" gutterBottom>
@@ -133,19 +133,16 @@ function FilterConditions(props) {
             </Typography>
 
             {group?.and?.map((groupItem, groupItemIndex) => (
-              <Stack direction="row" spacing={2} key={`item-${groupItem.id}`}>
+              <Grid container key={`item-${groupItem.id}`}>
-                <Stack
+                <Grid
-                  direction={{ xs: 'column', sm: 'row' }}
+                  container
-                  spacing={{ xs: 2 }}
+                  spacing={2}
-                  sx={{ display: 'flex', flex: 1 }}
+                  item
-                >
+                  xs={12}
-                  <Box
+                  sm={11}
-                    sx={{
+                  sx={{ order: { xs: 2, sm: 1 } }}
-                      display: 'flex',
-                      flex: '1 0 0px',
-                      maxWidth: ['100%', '33%'],
-                    }}
                 >
+                  <Grid item xs={12} md={4}>
                     <InputCreator
                       schema={createStringArgument({
                         key: `or.${groupIndex}.and.${groupItemIndex}.key`,
@@ -155,15 +152,8 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Box>
+                  </Grid>
-
+                  <Grid item xs={12} md={4}>
-                  <Box
-                    sx={{
-                      display: 'flex',
-                      flex: '1 0 0px',
-                      maxWidth: ['100%', '33%'],
-                    }}
-                  >
                     <InputCreator
                       schema={createDropdownArgument({
                         key: `or.${groupIndex}.and.${groupItemIndex}.operator`,
@@ -174,15 +164,8 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Box>
+                  </Grid>
-
+                  <Grid item xs={12} md={4}>
-                  <Box
-                    sx={{
-                      display: 'flex',
-                      flex: '1 0 0px',
-                      maxWidth: ['100%', '33%'],
-                    }}
-                  >
                     <InputCreator
                       schema={createStringArgument({
                         key: `or.${groupIndex}.and.${groupItemIndex}.value`,
@@ -192,18 +175,28 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Box>
+                  </Grid>
-                </Stack>
+                </Grid>
-
+                <Grid item xs={12} sm={1} sx={{ order: { xs: 1, sm: 2 } }}>
+                  <Stack justifyContent="center" alignItems="flex-end">
                     <IconButton
                       size="small"
                       edge="start"
-                  onClick={() => removeGroupItem(groupIndex, groupItemIndex)}
+                      onClick={() =>
-                  sx={{ width: 61, height: 61 }}
+                        removeGroupItem(groupIndex, groupItemIndex)
+                      }
+                      sx={{
+                        width: 40,
+                        height: 40,
+                        mb: { xs: 2, sm: 0 },
+                      }}
+                      disabled={groups.length === 1 && group.and.length === 1}
                     >
                       <RemoveIcon />
                     </IconButton>
                   </Stack>
+                </Grid>
+              </Grid>
             ))}
 
             <Stack spacing={1} direction="row">
@@ -227,7 +220,7 @@ function FilterConditions(props) {
                 </IconButton>
               )}
             </Stack>
-          </>
+          </React.Fragment>
         ))}
       </Stack>
     </React.Fragment>

packages/web/src/components/PowerInput/data.js

@@ -19,7 +19,13 @@ const process = ({ data, parentKey, index, parentLabel = '' }) => {
     const value = joinBy('.', parentKey, index?.toString(), name);
 
     if (Array.isArray(sampleValue)) {
-      return sampleValue.flatMap((item, index) =>
+      const arrayItself = {
+        label,
+        value,
+        sampleValue: JSON.stringify(sampleValue),
+      };
+
+      const arrayItems =  sampleValue.flatMap((item, index) =>
         process({
           data: item,
           parentKey: value,
@@ -27,6 +33,9 @@ const process = ({ data, parentKey, index, parentLabel = '' }) => {
           parentLabel: label,
         }),
       );
+
+      // TODO: remove spreading
+      return [arrayItself, ...arrayItems];
     }
 
     if (typeof sampleValue === 'object' && sampleValue !== null) {
@@ -36,6 +45,7 @@ const process = ({ data, parentKey, index, parentLabel = '' }) => {
         parentLabel: label,
       });
     }
+
     return [
       {
         label,