Compare commits

...

9 Commits

Author SHA1 Message Date
Ali BARIN
24bf07e068 Update version to 0.13.1 2024-08-02 15:54:26 +02:00
Ali BARIN
bae234827f Merge pull request #2006 from automatisch/use-unparsed-numbers-in-compute-parameters
fix(compute-parameters): use unparsed numbers
2024-08-02 15:42:21 +02:00
Ali BARIN
81c698f45b fix(compute-parameters): use unparsed numbers 2024-08-02 12:22:03 +00:00
Ali BARIN
c9fecec575 Merge pull request #2002 from automatisch/aut-1255
feat: expose installationCompleted in GET /v1/automatisch/info
2024-08-02 11:46:48 +02:00
Ali BARIN
2f42dfdc51 Merge pull request #2001 from automatisch/remove-pwa
feat: remove PWA
2024-08-02 11:16:44 +02:00
Ali BARIN
5afd500c26 Merge pull request #2003 from automatisch/release/v0.13.0
Update version to 0.13.0
2024-08-01 18:30:55 +02:00
Ali BARIN
cc1a924c8b feat: use installationCompleted from useAutomatischInfo hook 2024-08-01 13:38:06 +00:00
Ali BARIN
02005a3f09 feat: expose installationCompleted in GET /v1/automatisch/info 2024-08-01 13:02:21 +00:00
Ali BARIN
d9219a5a48 feat: remove PWA 2024-08-01 12:28:23 +00:00
10 changed files with 24 additions and 25 deletions

View File

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

View File

@@ -1,13 +1,17 @@
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 = {
isCloud: appConfig.isCloud,
isMation: appConfig.isMation,
isEnterprise: await hasValidLicense(),
docsUrl: appConfig.docsUrl,
installationCompleted,
isCloud: appConfig.isCloud,
isEnterprise: await hasValidLicense(),
isMation: appConfig.isMation,
};
renderObject(response, info);

View File

@@ -1,12 +1,14 @@
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);

View File

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

View File

@@ -37,6 +37,10 @@ export default function computeParameters(parameters, executionSteps) {
try {
const parsedValue = JSON.parse(computedValue);
if (typeof parsedValue === 'number') {
throw new Error('Use original unparsed value.');
}
return {
...result,
[key]: parsedValue,

View File

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

View File

@@ -8,11 +8,6 @@
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.

View File

@@ -1,9 +0,0 @@
{
"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"
}

View File

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

View File

@@ -29,14 +29,16 @@ 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: configData, isSuccess } = useAutomatischConfig();
const { data: automatischInfo, isSuccess } = useAutomatischInfo();
const { data: configData } = useAutomatischConfig();
const { isAuthenticated } = useAuthentication();
const config = configData?.data;
const installed = isSuccess ? config?.['installation.completed'] === true : true;
const installed = isSuccess ? automatischInfo.data.installationCompleted : true;
const navigate = useNavigate();
useEffect(() => {