From 3587942d31e86b2180544b595b9980da58d608cc Mon Sep 17 00:00:00 2001 From: Ravinou Date: Sat, 17 Aug 2024 13:45:12 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20new=20env=20variable=20to?= =?UTF-8?q?=20hide=20the=20SSH=20port=20in=20quickcommands=20and=20wizard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #237 --- .env.sample | 3 +++ Components/Repo/QuickCommands/QuickCommands.js | 12 ++---------- helpers/functions/lanCommandOption.js | 5 +++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.env.sample b/.env.sample index 96190f2..a615b6c 100644 --- a/.env.sample +++ b/.env.sample @@ -38,6 +38,9 @@ SSH_SERVER_PORT_LAN= # Disable the integrations (API tokens to CRUD repositories) #NEXT_PUBLIC_DISABLE_INTEGRATIONS=true +# Hide the SSH port in the UI : quickcommands & wizard +#NEXT_PUBLIC_HIDE_SSH_PORT=true + # SMTP server settings MAIL_SMTP_FROM= MAIL_SMTP_HOST= diff --git a/Components/Repo/QuickCommands/QuickCommands.js b/Components/Repo/QuickCommands/QuickCommands.js index d73d4a2..d32002e 100644 --- a/Components/Repo/QuickCommands/QuickCommands.js +++ b/Components/Repo/QuickCommands/QuickCommands.js @@ -3,21 +3,13 @@ import React from 'react'; import { useState } from 'react'; import classes from './QuickCommands.module.css'; import { IconSettingsAutomation, IconCopy } from '@tabler/icons-react'; +import lanCommandOption from '../../../helpers/functions/lanCommandOption'; export default function QuickCommands(props) { ////Vars const wizardEnv = props.wizardEnv; //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled. - let FQDN; - let SSH_SERVER_PORT; - if (props.lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) { - FQDN = wizardEnv.FQDN_LAN; - SSH_SERVER_PORT = - wizardEnv.SSH_SERVER_PORT_LAN === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN; - } else { - FQDN = wizardEnv.FQDN; - SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT; - } + const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.lanCommand); //State const [isCopied, setIsCopied] = useState(false); diff --git a/helpers/functions/lanCommandOption.js b/helpers/functions/lanCommandOption.js index 5c3fc9c..e57ee92 100644 --- a/helpers/functions/lanCommandOption.js +++ b/helpers/functions/lanCommandOption.js @@ -4,10 +4,11 @@ export default function lanCommandOption(wizardEnv, lanCommand) { if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) { FQDN = wizardEnv.FQDN_LAN; SSH_SERVER_PORT = - wizardEnv.SSH_SERVER_PORT_LAN === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN; + process.env.NEXT_PUBLIC_HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN; } else { FQDN = wizardEnv.FQDN; - SSH_SERVER_PORT = wizardEnv.SSH_SERVER_PORT === 'false' ? '' : ':' + wizardEnv.SSH_SERVER_PORT; + SSH_SERVER_PORT = + process.env.NEXT_PUBLIC_HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT; } return { FQDN, SSH_SERVER_PORT };