From a003d9430aec935732687ef2378484b42049f592 Mon Sep 17 00:00:00 2001
From: Manuel <manuel.ruwe@bluewin.ch>
Date: Tue, 17 Jan 2023 21:39:29 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20config=20changer=20and=20c?=
 =?UTF-8?q?ritical=20bug=20in=20copy=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/settings/general/config-changer.json   |  1 +
 src/components/Config/ConfigChanger.tsx       | 20 ++++++++++---------
 .../Settings/Common/Config/ConfigActions.tsx  |  1 -
 src/tools/config/getFrontendConfig.ts         |  4 ++++
 .../mutations/useCopyConfigMutation.tsx       |  3 +++
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/locales/en/settings/general/config-changer.json b/public/locales/en/settings/general/config-changer.json
index 256f82bd9..7a5cf7988 100644
--- a/public/locales/en/settings/general/config-changer.json
+++ b/public/locales/en/settings/general/config-changer.json
@@ -1,6 +1,7 @@
 {
   "configSelect": {
     "label": "Config changer",
+    "description": "{{configCount}} configurations are available",
     "loadingNew": "Loading your config...",
     "pleaseWait": "Please wait until your new config is loaded!"
   },
diff --git a/src/components/Config/ConfigChanger.tsx b/src/components/Config/ConfigChanger.tsx
index c4c499154..faa60f1f0 100644
--- a/src/components/Config/ConfigChanger.tsx
+++ b/src/components/Config/ConfigChanger.tsx
@@ -3,15 +3,17 @@ import { useToggle } from '@mantine/hooks';
 import { useQuery } from '@tanstack/react-query';
 import { setCookie } from 'cookies-next';
 import { useTranslation } from 'next-i18next';
+import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { useConfigContext } from '../../config/provider';
 
 export default function ConfigChanger() {
-  const { t } = useTranslation('settings/general/config-changer');
-  const { name: configName } = useConfigContext();
-  // const loadConfig = useConfigStore((x) => x.loadConfig);
+  const router = useRouter();
 
-  const { data: configs, isLoading, isError } = useConfigsQuery();
+  const { t } = useTranslation('settings/general/config-changer');
+  const { name: configName, setConfigName } = useConfigContext();
+
+  const { data: configs, isLoading } = useConfigsQuery();
   const [activeConfig, setActiveConfig] = useState(configName);
   const [isRefreshing, toggle] = useToggle();
 
@@ -22,14 +24,13 @@ export default function ConfigChanger() {
     });
     setActiveConfig(value);
     toggle();
-    // Use timeout to wait for the cookie to be set
-    setTimeout(() => {
-      window.location.reload();
-    }, 1000);
+
+    router.push(`/${value}`);
+    setConfigName(value);
   };
 
   // If configlist is empty, return a loading indicator
-  if (isLoading || !configs || configs?.length === 0 || !configName) {
+  if (isLoading || !configs || configs.length === 0 || !configName) {
     return (
       <Tooltip label={"Loading your configs. This doesn't load in vercel."}>
         <Center>
@@ -43,6 +44,7 @@ export default function ConfigChanger() {
     <>
       <Select
         label={t('configSelect.label')}
+        description={t('configSelect.description', { configCount: configs.length })}
         value={activeConfig}
         onChange={onConfigChange}
         data={configs}
diff --git a/src/components/Settings/Common/Config/ConfigActions.tsx b/src/components/Settings/Common/Config/ConfigActions.tsx
index 77db31618..200811564 100644
--- a/src/components/Settings/Common/Config/ConfigActions.tsx
+++ b/src/components/Settings/Common/Config/ConfigActions.tsx
@@ -20,7 +20,6 @@ export default function ConfigActions() {
   if (!config) return null;
 
   const handleDownload = () => {
-    // TODO: remove secrets
     fileDownload(JSON.stringify(config, null, '\t'), `${config?.configProperties.name}.json`);
   };
 
diff --git a/src/tools/config/getFrontendConfig.ts b/src/tools/config/getFrontendConfig.ts
index e736c298f..c968c9b28 100644
--- a/src/tools/config/getFrontendConfig.ts
+++ b/src/tools/config/getFrontendConfig.ts
@@ -1,9 +1,13 @@
+import Consola from 'consola';
+
 import { ConfigType } from '../../types/config';
 import { getConfig } from './getConfig';
 
 export const getFrontendConfig = (name: string): ConfigType => {
   const config = getConfig(name);
 
+  Consola.info(`Requested frontend content of configuration '${name}'`);
+
   return {
     ...config,
     apps: config.apps.map((app) => ({
diff --git a/src/tools/config/mutations/useCopyConfigMutation.tsx b/src/tools/config/mutations/useCopyConfigMutation.tsx
index c3af88e56..2aad78a68 100644
--- a/src/tools/config/mutations/useCopyConfigMutation.tsx
+++ b/src/tools/config/mutations/useCopyConfigMutation.tsx
@@ -40,6 +40,9 @@ const fetchCopy = async (configName: string, config: ConfigType | undefined) =>
     throw new Error('config is not defiend');
   }
 
+  const copiedConfig = config;
+  copiedConfig.configProperties.name = configName;
+
   const response = await fetch(`/api/configs/${configName}`, {
     method: 'PUT',
     headers: {