From 02005a3f097b5c9930268f17347720c60db29fa4 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Thu, 1 Aug 2024 13:02:21 +0000
Subject: [PATCH 1/2] feat: expose installationCompleted in GET
 /v1/automatisch/info

---
 .../backend/src/controllers/api/v1/automatisch/info.js | 10 +++++++---
 .../src/controllers/api/v1/automatisch/info.test.js    |  2 ++
 .../backend/test/mocks/rest/api/v1/automatisch/info.js |  7 ++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/controllers/api/v1/automatisch/info.js b/packages/backend/src/controllers/api/v1/automatisch/info.js
index cf436994..07bbd6bc 100644
--- a/packages/backend/src/controllers/api/v1/automatisch/info.js
+++ b/packages/backend/src/controllers/api/v1/automatisch/info.js
@@ -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);
diff --git a/packages/backend/src/controllers/api/v1/automatisch/info.test.js b/packages/backend/src/controllers/api/v1/automatisch/info.test.js
index 83e82092..b48a7283 100644
--- a/packages/backend/src/controllers/api/v1/automatisch/info.test.js
+++ b/packages/backend/src/controllers/api/v1/automatisch/info.test.js
@@ -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);
diff --git a/packages/backend/test/mocks/rest/api/v1/automatisch/info.js b/packages/backend/test/mocks/rest/api/v1/automatisch/info.js
index 1bdf89d2..e1da6889 100644
--- a/packages/backend/test/mocks/rest/api/v1/automatisch/info.js
+++ b/packages/backend/test/mocks/rest/api/v1/automatisch/info.js
@@ -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,

From cc1a924c8bfea347c5d71173461fa69d4f474eae Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Thu, 1 Aug 2024 13:38:06 +0000
Subject: [PATCH 2/2] feat: use installationCompleted from useAutomatischInfo
 hook

---
 packages/web/src/components/InstallationForm/index.jsx | 2 +-
 packages/web/src/routes.jsx                            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/web/src/components/InstallationForm/index.jsx b/packages/web/src/components/InstallationForm/index.jsx
index a21eefda..07b5cac7 100644
--- a/packages/web/src/components/InstallationForm/index.jsx
+++ b/packages/web/src/components/InstallationForm/index.jsx
@@ -44,7 +44,7 @@ function InstallationForm() {
 
   const handleOnRedirect = () => {
     queryClient.invalidateQueries({
-      queryKey: ['automatisch', 'config'],
+      queryKey: ['automatisch', 'info'],
     });
   };
 
diff --git a/packages/web/src/routes.jsx b/packages/web/src/routes.jsx
index 3c832d86..1f634275 100644
--- a/packages/web/src/routes.jsx
+++ b/packages/web/src/routes.jsx
@@ -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(() => {