refactor(http-client): inherit interceptors from parent instance

packages/backend/src/config/app.js

@@ -52,7 +52,7 @@ const appConfig = {
   isDev: appEnv === 'development',
   isTest: appEnv === 'test',
   isProd: appEnv === 'production',
-  version: '0.13.1',
+  version: '0.12.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/info.js

@@ -1,17 +1,13 @@
 import appConfig from '../../../../config/app.js';
 import { hasValidLicense } from '../../../../helpers/license.ee.js';
 import { renderObject } from '../../../../helpers/renderer.js';
-import Config from '../../../../models/config.js';
 
 export default async (request, response) => {
-  const installationCompleted = await Config.isInstallationCompleted();
-
   const info = {
-    docsUrl: appConfig.docsUrl,
-    installationCompleted,
     isCloud: appConfig.isCloud,
-    isEnterprise: await hasValidLicense(),
     isMation: appConfig.isMation,
+    isEnterprise: await hasValidLicense(),
+    docsUrl: appConfig.docsUrl,
   };
 
   renderObject(response, info);

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

@@ -1,14 +1,12 @@
 import { vi, expect, describe, it } from 'vitest';
 import request from 'supertest';
 import appConfig from '../../../../config/app.js';
-import Config from '../../../../models/config.js';
 import app from '../../../../app.js';
 import infoMock from '../../../../../test/mocks/rest/api/v1/automatisch/info.js';
 import * as license from '../../../../helpers/license.ee.js';
 
 describe('GET /api/v1/automatisch/info', () => {
   it('should return Automatisch info', async () => {
-    vi.spyOn(Config, 'isInstallationCompleted').mockResolvedValue(true);
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
     vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(false);
     vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);

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.13.1',
+        version: '0.12.0',
       },
       meta: {
         count: 1,

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

@@ -3,11 +3,7 @@ import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
 import appConfig from '../config/app.js';
 
-export function createInstance(customConfig = {}, { requestInterceptor, responseErrorInterceptor } = {}) {
+const config = axios.defaults;
-  const config = {
-    ...axios.defaults,
-    ...customConfig
-  };
 const httpProxyUrl = appConfig.httpProxy;
 const httpsProxyUrl = appConfig.httpsProxy;
 const supportsProxy = httpProxyUrl || httpsProxyUrl;
@@ -26,7 +22,7 @@ export function createInstance(customConfig = {}, { requestInterceptor, response
   config.proxy = false;
 }
 
-  const instance = axios.create(config);
+const axiosWithProxyInstance = axios.create(config);
 
 function shouldSkipProxy(hostname) {
   return noProxyHosts.some(noProxyHost => {
@@ -37,7 +33,7 @@ export function createInstance(customConfig = {}, { requestInterceptor, response
 /**
  * The interceptors are executed in the reverse order they are added.
  */
-  instance.interceptors.request.use(
+axiosWithProxyInstance.interceptors.request.use(
   function skipProxyIfInNoProxy(requestConfig) {
     const hostname = new URL(requestConfig.baseURL).hostname;
 
@@ -48,25 +44,11 @@ export function createInstance(customConfig = {}, { requestInterceptor, response
 
     return requestConfig;
   },
-    (error) => Promise.reject(error)
+  undefined,
+  { synchronous: true }
 );
 
-  // not always we have custom request interceptors
+axiosWithProxyInstance.interceptors.request.use(
-  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
@@ -79,24 +61,12 @@ export function createInstance(customConfig = {}, { requestInterceptor, response
       requestConfig.url = url.pathname + url.search;
 
       return requestConfig;
-      } catch (err) {
+    } catch {
       return requestConfig;
     }
   },
-    (error) => Promise.reject(error)
+  undefined,
+  { synchronous: true}
 );
 
-  // not always we have custom response error interceptor
+export default axiosWithProxyInstance;
-  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('Custom default axios with proxy', () => {
+describe('Axios with proxy', () => {
   beforeEach(() => {
     vi.resetModules();
   });
@@ -23,13 +23,7 @@ describe('Custom default axios with proxy', () => {
     expect(secondRequestInterceptor.fulfilled.name).toBe('removeBaseUrlForAbsoluteUrls');
   });
 
-  it('should throw with invalid url (consisting of path alone)', async () => {
+  describe('skipProxyIfInNoProxy', () => {
-    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;
@@ -73,7 +67,7 @@ describe('Custom default axios with proxy', () => {
     });
   });
 
-  describe('with removeBaseUrlForAbsoluteUrls interceptor', () => {
+  describe('removeBaseUrlForAbsoluteUrls', () => {
     let axios;
     beforeEach(async() => {
       axios = (await import('./axios-with-proxy.js')).default;
@@ -122,48 +116,4 @@ describe('Custom default 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,7 +11,6 @@ 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('.');
@@ -21,37 +20,18 @@ 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);
-
-        if (typeof parsedValue === 'number') {
-          throw new Error('Use original unparsed value.');
-        }
-
-        return {
-          ...result,
-          [key]: parsedValue,
-        };
-      } catch (error) {
       return {
         ...result,
         [key]: computedValue,
       };
     }
-    }
 
     if (Array.isArray(value)) {
       return {

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

@@ -1,8 +1,41 @@
 import HttpError from '../../errors/http.js';
-import { createInstance } from '../axios-with-proxy.js';
+import axios 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 = [] }) {
-  async function interceptResponseError(error) {
+  const instance = axios.create({
+    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;
@@ -25,19 +58,8 @@ 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,8 +63,6 @@ export default async (flowId, request, response) => {
     });
 
     if (testRun) {
-      response.status(204).end();
-
       // in case of testing, we do not process the whole process.
       continue;
     }
@@ -76,12 +74,6 @@ 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/backend/test/mocks/rest/api/v1/automatisch/info.js

@@ -1,11 +1,10 @@
 const infoMock = () => {
   return {
     data: {
-      docsUrl: 'https://automatisch.io/docs',
-      installationCompleted: true,
       isCloud: false,
-      isEnterprise: true,
       isMation: false,
+      isEnterprise: true,
+      docsUrl: 'https://automatisch.io/docs',
     },
     meta: {
       count: 1,

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 Automatisch.
+10. You can find your project ID next to your project name. Paste the id into **Project ID** field in Automatsich.
-11. If you are using self-hosted Appwrite project, you can paste the instance url into **Appwrite instance URL** 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.
 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 documents
+  - name: New documets
     desc: Triggers when a new document is created.
 ---
 

packages/web/public/index.html

@@ -8,6 +8,11 @@
       name="description"
       content="Build workflow automation without spending time and money. No code is required."
     />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

packages/web/public/manifest.json

@@ -0,0 +1,9 @@
+{
+  "short_name": "automatisch",
+  "name": "automatisch",
+  "description": "Build workflow automation without spending time and money. No code is required.",
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

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

@@ -3,6 +3,7 @@ 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';
@@ -11,7 +12,6 @@ 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,16 +133,19 @@ function FilterConditions(props) {
             </Typography>
 
             {group?.and?.map((groupItem, groupItemIndex) => (
-              <Grid container key={`item-${groupItem.id}`}>
+              <Stack direction="row" spacing={2} key={`item-${groupItem.id}`}>
-                <Grid
+                <Stack
-                  container
+                  direction={{ xs: 'column', sm: 'row' }}
-                  spacing={2}
+                  spacing={{ xs: 2 }}
-                  item
+                  sx={{ display: 'flex', flex: 1 }}
-                  xs={12}
+                >
-                  sm={11}
+                  <Box
-                  sx={{ order: { xs: 2, sm: 1 } }}
+                    sx={{
+                      display: 'flex',
+                      flex: '1 0 0px',
+                      maxWidth: ['100%', '33%'],
+                    }}
                   >
-                  <Grid item xs={12} md={4}>
                     <InputCreator
                       schema={createStringArgument({
                         key: `or.${groupIndex}.and.${groupItemIndex}.key`,
@@ -152,8 +155,15 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Grid>
+                  </Box>
-                  <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`,
@@ -164,8 +174,15 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Grid>
+                  </Box>
-                  <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`,
@@ -175,28 +192,18 @@ function FilterConditions(props) {
                       stepId={stepId}
                       disabled={editorContext.readOnly}
                     />
-                  </Grid>
+                  </Box>
-                </Grid>
+                </Stack>
-                <Grid item xs={12} sm={1} sx={{ order: { xs: 1, sm: 2 } }}>
+
-                  <Stack justifyContent="center" alignItems="flex-end">
                 <IconButton
                   size="small"
                   edge="start"
-                      onClick={() =>
+                  onClick={() => removeGroupItem(groupIndex, groupItemIndex)}
-                        removeGroupItem(groupIndex, groupItemIndex)
+                  sx={{ width: 61, height: 61 }}
-                      }
-                      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">
@@ -220,7 +227,7 @@ function FilterConditions(props) {
                 </IconButton>
               )}
             </Stack>
-          </React.Fragment>
+          </>
         ))}
       </Stack>
     </React.Fragment>

packages/web/src/components/InstallationForm/index.jsx

@@ -44,7 +44,7 @@ function InstallationForm() {
 
   const handleOnRedirect = () => {
     queryClient.invalidateQueries({
-      queryKey: ['automatisch', 'info'],
+      queryKey: ['automatisch', 'config'],
     });
   };
 

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

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

packages/web/src/routes.jsx

@@ -29,16 +29,14 @@ import adminSettingsRoutes from './adminSettingsRoutes';
 import Notifications from 'pages/Notifications';
 import useAutomatischConfig from 'hooks/useAutomatischConfig';
 import useAuthentication from 'hooks/useAuthentication';
-import useAutomatischInfo from 'hooks/useAutomatischInfo';
 import Installation from 'pages/Installation';
 
 function Routes() {
-  const { data: automatischInfo, isSuccess } = useAutomatischInfo();
+  const { data: configData, isSuccess } = useAutomatischConfig();
-  const { data: configData } = useAutomatischConfig();
   const { isAuthenticated } = useAuthentication();
   const config = configData?.data;
 
-  const installed = isSuccess ? automatischInfo.data.installationCompleted : true;
+  const installed = isSuccess ? config?.['installation.completed'] === true : true;
   const navigate = useNavigate();
 
   useEffect(() => {