From 4201ff5d7e082e7b253a225fb7d1c87fec215d24 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Thu, 30 Dec 2021 17:25:07 +0100 Subject: [PATCH 01/14] Validate correctly server address Most of the time server address will be domain name. Alternatively it might be IPv4 or IPv6 address (both are valid although probably minor use-cases). --- js/src/clientRegistration/Clients.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/js/src/clientRegistration/Clients.js b/js/src/clientRegistration/Clients.js index 82d2a06..0eb5445 100644 --- a/js/src/clientRegistration/Clients.js +++ b/js/src/clientRegistration/Clients.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2020-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -15,6 +15,8 @@ import { useForm, useWSForisModule, validateIPv4Address, + validateIPv6Address, + validateDomain, withErrorMessage, withSpinnerOnSending, API_STATE, @@ -145,8 +147,11 @@ function Configurations({ clients }) { } function serverAddressValidator(formData) { - const error = validateIPv4Address(formData.address); - if (error) { + const { address } = formData; + + const error = validateDomain(address); + + if (error && validateIPv4Address(address) && validateIPv6Address(address)) { return { address: error }; } return undefined; @@ -170,7 +175,7 @@ function ServerOverride({ address, error, handleChange }) { /> {serverOverride && ( ({ -- GitLab From fc952e589935a797dedf7fdf06dec205d94dfdb6 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Thu, 27 Jan 2022 19:01:10 +0300 Subject: [PATCH 02/14] Replace server address's Checkbox with Switch --- js/src/clientRegistration/Clients.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/clientRegistration/Clients.js b/js/src/clientRegistration/Clients.js index 0eb5445..6571eee 100644 --- a/js/src/clientRegistration/Clients.js +++ b/js/src/clientRegistration/Clients.js @@ -10,7 +10,7 @@ import PropTypes from "prop-types"; import { TextInput, - CheckBox, + Switch, useAPIGet, useForm, useWSForisModule, @@ -168,8 +168,8 @@ function ServerOverride({ address, error, handleChange }) { return ( <> - setServerOverride(event.target.checked)} /> -- GitLab From e16990aa703d8dfacb90c84522aab6d972f79328 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Thu, 27 Jan 2022 19:02:22 +0300 Subject: [PATCH 03/14] Add help text to the router's public address input --- js/src/clientRegistration/Clients.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/src/clientRegistration/Clients.js b/js/src/clientRegistration/Clients.js index 6571eee..66558aa 100644 --- a/js/src/clientRegistration/Clients.js +++ b/js/src/clientRegistration/Clients.js @@ -181,6 +181,9 @@ function ServerOverride({ address, error, handleChange }) { onChange={handleChange((value) => ({ address: { $set: value }, }))} + helpText={_( + "Make sure that this device is accessible from the public internet using this domain name, IPv4 or IPv6 address." + )} /> )} -- GitLab From 729a44a354c3770452bb42a3396ed968feb3b43f Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Thu, 27 Jan 2022 19:12:22 +0300 Subject: [PATCH 04/14] Capitalize principal letters in headings --- js/src/clientRegistration/AddClientForm.js | 4 ++-- js/src/clientRegistration/Clients.js | 2 +- js/src/clientSettings/AddSettingsForm.js | 4 ++-- js/src/clientSettings/SettingsTable.js | 4 ++-- js/src/serverSettings/AuthorityReady.js | 2 +- js/src/serverSettings/ServerSettingsForm.js | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/src/clientRegistration/AddClientForm.js b/js/src/clientRegistration/AddClientForm.js index 1d39f48..30e16ec 100644 --- a/js/src/clientRegistration/AddClientForm.js +++ b/js/src/clientRegistration/AddClientForm.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2020-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -58,7 +58,7 @@ export default function AddClientForm({ generating, setGenerating }) { const addButtonDisabled = undefinedIfEmpty(formErrors) || generating; return ( <> -

{_("Add new client")}

+

{_("Add New Client")}

-

{_("Client configurations")}

+

{_("Client Configurations")}

-

{_("Add settings")}

+

{_("Add Settings")}

{_( "Please select a file with OpenVPN client settings you wish to add. New settings will be enabled after uploading. Please note that network will be restarted automatically." diff --git a/js/src/clientSettings/SettingsTable.js b/js/src/clientSettings/SettingsTable.js index 4178f6e..0d90ef1 100644 --- a/js/src/clientSettings/SettingsTable.js +++ b/js/src/clientSettings/SettingsTable.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2020-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -33,7 +33,7 @@ export default function SettingsTable() { return ( <> -

{_("Available settings")}

+

{_("Available Settings")}

{_( "For each uploaded file a new OpenVPN client instance is created. Please check settings file for errors if instance is enabled and not running few minutes after setup." diff --git a/js/src/serverSettings/AuthorityReady.js b/js/src/serverSettings/AuthorityReady.js index d341e41..71f2685 100644 --- a/js/src/serverSettings/AuthorityReady.js +++ b/js/src/serverSettings/AuthorityReady.js @@ -31,7 +31,7 @@ export default function AuthorityReady({ serverEnabled, onReload }) { return (

-

{_("Certificate authority")}

+

{_("Certificate Authority")}

{serverEnabled ? (

{_( diff --git a/js/src/serverSettings/ServerSettingsForm.js b/js/src/serverSettings/ServerSettingsForm.js index 84e5387..873001a 100644 --- a/js/src/serverSettings/ServerSettingsForm.js +++ b/js/src/serverSettings/ServerSettingsForm.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -79,7 +79,7 @@ export default function ServerSettingsForm({ settingsData }) { return ( <>

-

{_("Server settings")}

+

{_("Server Settings")}

{_( "Please note that you need a public (preferably static) IP address and your network configured to make use of VPN server." -- GitLab From 5be5a9e47d9c116cccfa5b6794acfdf1082211e1 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Thu, 27 Jan 2022 19:13:04 +0300 Subject: [PATCH 05/14] Add dots to the end of AddClient error messages --- js/src/clientRegistration/AddClientForm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/clientRegistration/AddClientForm.js b/js/src/clientRegistration/AddClientForm.js index 30e16ec..1ff371a 100644 --- a/js/src/clientRegistration/AddClientForm.js +++ b/js/src/clientRegistration/AddClientForm.js @@ -88,13 +88,13 @@ export default function AddClientForm({ generating, setGenerating }) { function addClientFormValidator(formData) { const { name } = formData; if (!name) { - return { name: _("Name cannot be empty") }; + return { name: _("Name cannot be empty.") }; } if (name.length > 64) { - return { name: _("Name is too long") }; + return { name: _("Name is too long.") }; } if (!/^[a-zA-Z0-9.\-_]+$/.test(name)) { - return { name: _("Name contains invalid characters") }; + return { name: _("Name contains invalid characters.") }; } return undefined; } -- GitLab From 191840db43794ce1a3800ab01363fa5117a6d050 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Thu, 27 Jan 2022 19:29:02 +0300 Subject: [PATCH 06/14] Fix spelling and grammar mistakes --- js/src/clientRegistration/ClientRegistration.js | 4 ++-- js/src/clientRegistration/Clients.js | 2 +- js/src/clientSettings/AddSettingsForm.js | 2 +- js/src/clientSettings/ClientSettings.js | 4 ++-- js/src/clientSettings/SettingsTable.js | 2 +- js/src/serverSettings/AuthorityReady.js | 6 +++--- js/src/serverSettings/ServerSettingsForm.js | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/src/clientRegistration/ClientRegistration.js b/js/src/clientRegistration/ClientRegistration.js index 9173434..f240d9d 100644 --- a/js/src/clientRegistration/ClientRegistration.js +++ b/js/src/clientRegistration/ClientRegistration.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -72,7 +72,7 @@ function Registration({ ws, certificateAuthority }) {

{_( - "To apply the client configuration you need to download it and put it into the OpenVPN configuration directory or alternatively open it using your OpenVPN client. You might need to restart your client afterwards." + "To apply the client configuration, you need to download it and put it into the OpenVPN configuration directory or open it using your OpenVPN client. You might need to restart your client afterward." )}

diff --git a/js/src/clientRegistration/Clients.js b/js/src/clientRegistration/Clients.js index 6622687..7950336 100644 --- a/js/src/clientRegistration/Clients.js +++ b/js/src/clientRegistration/Clients.js @@ -127,7 +127,7 @@ function Configurations({ clients }) {

not stored anywhere and is applicable only to the configuration being currently downloaded." + "Be sure to check if the server's IP address provided in the configuration file matches the public IP address of your router. You can set this address manually if the autodetection fails. This change is not stored anywhere and applies only to the configuration being currently downloaded." ), }} /> diff --git a/js/src/clientSettings/AddSettingsForm.js b/js/src/clientSettings/AddSettingsForm.js index 70f6fbf..4bef048 100644 --- a/js/src/clientSettings/AddSettingsForm.js +++ b/js/src/clientSettings/AddSettingsForm.js @@ -55,7 +55,7 @@ export default function AddSettingsForm() {

{_("Add Settings")}

{_( - "Please select a file with OpenVPN client settings you wish to add. New settings will be enabled after uploading. Please note that network will be restarted automatically." + "Please select a file with OpenVPN client settings you wish to add. New settings will be enabled after uploading. Please note that the network will be restarted automatically." )}

diff --git a/js/src/clientSettings/ClientSettings.js b/js/src/clientSettings/ClientSettings.js index b761d13..c0ff703 100644 --- a/js/src/clientSettings/ClientSettings.js +++ b/js/src/clientSettings/ClientSettings.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2020-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -19,7 +19,7 @@ export default function ClientSettings() {

{_("Client Settings")}

{_( - 'In order to use OpenVPN client you need to prepare text file with client settings. If you want to connect to another Turris device, download appropriate file from "Client Registration" page.' + 'To use the OpenVPN client, you need to prepare a text file with client settings. If you want to connect to another Turris device, download the appropriate file from the "Client Registration" page.' )}

diff --git a/js/src/clientSettings/SettingsTable.js b/js/src/clientSettings/SettingsTable.js index 0d90ef1..9ab6c71 100644 --- a/js/src/clientSettings/SettingsTable.js +++ b/js/src/clientSettings/SettingsTable.js @@ -36,7 +36,7 @@ export default function SettingsTable() {

{_("Available Settings")}

{_( - "For each uploaded file a new OpenVPN client instance is created. Please check settings file for errors if instance is enabled and not running few minutes after setup." + "For each uploaded file, a new OpenVPN client instance is created. Please check the settings file for errors if the instance is enabled and not running a few minutes after setup." )}

{_( - "You can't delete the CA while the OpenVPN server is enabled. To delete the CA you need to disable the server configuration first." + "You can't delete the CA while the OpenVPN server is enabled. To delete the CA, you need to disable the server configuration first." )}

) : (

{_( - "Your certificate authority (CA) is set up properly. Please note that if you delete it all clients will have their access revoked." + "Your certificate authority (CA) is set up properly. Please note that if you delete it, all clients will have their access revoked." )}

)} diff --git a/js/src/serverSettings/ServerSettingsForm.js b/js/src/serverSettings/ServerSettingsForm.js index 873001a..b28a2ed 100644 --- a/js/src/serverSettings/ServerSettingsForm.js +++ b/js/src/serverSettings/ServerSettingsForm.js @@ -82,12 +82,12 @@ export default function ServerSettingsForm({ settingsData }) {

{_("Server Settings")}

{_( - "Please note that you need a public (preferably static) IP address and your network configured to make use of VPN server." + "Please note that you need a public (preferably static) IP address and your network configured to make use of a VPN server." )}

({ enabled: { $set: value }, @@ -184,7 +184,7 @@ export default function ServerSettingsForm({ settingsData }) {

Advanced users: if you already configured OpenVPN server manually your configuration will be extended (rather than overwritten). In case of conflict you must fix previous settings by yourself." + "Advanced users: if you already configured the OpenVPN server manually, your configuration will be extended rather than overwritten. In case of conflict, you must fix previous settings by yourself." ), }} /> -- GitLab From be41c47ad130d10fe07e9108a87ce4b72cce53f8 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Fri, 28 Jan 2022 00:51:24 +0300 Subject: [PATCH 07/14] Fix test --- .../__tests__/AddClientForm.test.js | 10 ++++++---- .../__tests__/ClientRegistration.test.js | 20 +++++++------------ .../__tests__/SettingsTable.test.js | 4 ++-- .../__tests__/ServerSettings.test.js | 4 ++-- .../__tests__/ServerSettingsForm.test.js | 4 ++-- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/js/src/clientRegistration/__tests__/AddClientForm.test.js b/js/src/clientRegistration/__tests__/AddClientForm.test.js index e950ada..40748cc 100644 --- a/js/src/clientRegistration/__tests__/AddClientForm.test.js +++ b/js/src/clientRegistration/__tests__/AddClientForm.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -47,19 +47,21 @@ describe("", () => { // Empty name fireEvent.change(nameInput, { target: { value: "" } }); expect( - getByText(componentContainer, "Name cannot be empty") + getByText(componentContainer, "Name cannot be empty.") ).toBeDefined(); expect(submitButton.disabled).toBe(true); // Name too long fireEvent.change(nameInput, { target: { value: "q".repeat(65) } }); - expect(getByText(componentContainer, "Name is too long")).toBeDefined(); + expect( + getByText(componentContainer, "Name is too long.") + ).toBeDefined(); expect(submitButton.disabled).toBe(true); // Invalid characters fireEvent.change(nameInput, { target: { value: "!@#$%" } }); expect( - getByText(componentContainer, "Name contains invalid characters") + getByText(componentContainer, "Name contains invalid characters.") ).toBeDefined(); expect(submitButton.disabled).toBe(true); }); diff --git a/js/src/clientRegistration/__tests__/ClientRegistration.test.js b/js/src/clientRegistration/__tests__/ClientRegistration.test.js index 6fc92cb..5aab887 100644 --- a/js/src/clientRegistration/__tests__/ClientRegistration.test.js +++ b/js/src/clientRegistration/__tests__/ClientRegistration.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -118,7 +118,7 @@ describe("", () => { function enableOverride() { const checkbox = getByLabelText( componentContainer, - "Override server address" + "Override Server Address" ); fireEvent.click(checkbox); } @@ -129,22 +129,16 @@ describe("", () => { getByText(componentContainer, "Client Registration") ); mockAxios.mockResponse({ data: clients }); - await wait(() => getByText(componentContainer, "Add new client")); + await wait(() => getByText(componentContainer, "Add New Client")); }); it("should display address input when checkbox is selected", () => { expect( - queryByLabelText( - componentContainer, - "Router's public IPv4 address" - ) + queryByLabelText(componentContainer, /Router's public/) ).toBeNull(); enableOverride(); expect( - getByLabelText( - componentContainer, - "Router's public IPv4 address" - ) + getByLabelText(componentContainer, /Router's public/) ).toBeDefined(); }); @@ -155,7 +149,7 @@ describe("", () => { enableOverride(); const addressInput = getByLabelText( componentContainer, - "Router's public IPv4 address" + /Router's public/ ); // Since "a" element is replaced with "button" we have to query for "Download" anew expect(getFirstDownload().href).toBe( @@ -192,7 +186,7 @@ describe("", () => { expect.anything() ); mockAxios.mockResponse({ data: { task_id: "1234" } }); - await wait(() => getByText(componentContainer, "Add new client")); + await wait(() => getByText(componentContainer, "Add New Client")); expect(queryByText(componentContainer, name)).toBeDefined(); // New client not yet visible // Generating new client diff --git a/js/src/clientSettings/__tests__/SettingsTable.test.js b/js/src/clientSettings/__tests__/SettingsTable.test.js index fcb36c4..88cce3e 100644 --- a/js/src/clientSettings/__tests__/SettingsTable.test.js +++ b/js/src/clientSettings/__tests__/SettingsTable.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -26,7 +26,7 @@ describe("", () => { async function renderTable(clients = []) { const { container } = render(); mockAxios.mockResponse({ data: clients }); - await waitForElement(() => getByText(container, "Available settings")); + await waitForElement(() => getByText(container, "Available Settings")); return container; } diff --git a/js/src/serverSettings/__tests__/ServerSettings.test.js b/js/src/serverSettings/__tests__/ServerSettings.test.js index ef7260e..ce88a30 100644 --- a/js/src/serverSettings/__tests__/ServerSettings.test.js +++ b/js/src/serverSettings/__tests__/ServerSettings.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -60,7 +60,7 @@ describe("", () => { ); mockAxios.mockResponse({ data: { enabled: false } }); await waitForElement(() => - getByText(componentContainer, "Certificate authority") + getByText(componentContainer, "Certificate Authority") ); fireEvent.click(getByText(componentContainer, "Delete CA")); diff --git a/js/src/serverSettings/__tests__/ServerSettingsForm.test.js b/js/src/serverSettings/__tests__/ServerSettingsForm.test.js index 10b495f..d46dbac 100644 --- a/js/src/serverSettings/__tests__/ServerSettingsForm.test.js +++ b/js/src/serverSettings/__tests__/ServerSettingsForm.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -102,7 +102,7 @@ describe("", () => { it("should disable server", async () => { const container = renderSettings(enabledFormData); - fireEvent.click(getByLabelText(container, "Server enabled")); + fireEvent.click(getByLabelText(container, "Enable Server")); submitForm(container); expect(mockAxios.put).toBeCalledWith( "/reforis/openvpn/api/server-settings", -- GitLab From 0c826651561d75eb34b4b9e4bc57325d22ed2844 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Fri, 28 Jan 2022 00:52:20 +0300 Subject: [PATCH 08/14] Update Snapshots --- .../__snapshots__/AddClientForm.test.js.snap | 4 +-- .../ClientRegistration.test.js.snap | 20 +++++------ .../AddSettingsForm.test.js.snap | 4 +-- .../__snapshots__/SettingsTable.test.js.snap | 12 +++---- .../__snapshots__/AuthorityReady.test.js.snap | 8 ++--- .../AuthorityStatus.test.js.snap | 4 +-- .../__snapshots__/ServerSettings.test.js.snap | 18 +++++----- .../ServerSettingsForm.test.js.snap | 36 +++++++++---------- 8 files changed, 53 insertions(+), 53 deletions(-) diff --git a/js/src/clientRegistration/__tests__/__snapshots__/AddClientForm.test.js.snap b/js/src/clientRegistration/__tests__/__snapshots__/AddClientForm.test.js.snap index 871817c..f69ec77 100644 --- a/js/src/clientRegistration/__tests__/__snapshots__/AddClientForm.test.js.snap +++ b/js/src/clientRegistration/__tests__/__snapshots__/AddClientForm.test.js.snap @@ -3,7 +3,7 @@ exports[` should be rendered 1`] = `

- Add new client + Add New Client

should be rendered 1`] = `
- Name cannot be empty + Name cannot be empty.
should display clients 1`] = ` You need to generate a configuration file for each client that you wish to connect to your OpenVPN server.

- To apply the client configuration you need to download it and put it into the OpenVPN configuration directory or alternatively open it using your OpenVPN client. You might need to restart your client afterwards. + To apply the client configuration, you need to download it and put it into the OpenVPN configuration directory or open it using your OpenVPN client. You might need to restart your client afterward.

- Add new client + Add New Client

should display clients 1`] = `
- Name cannot be empty + Name cannot be empty.
should display clients 1`] = `

- Client configurations + Client Configurations

- Be sure to check if server's IP address provided in configuration file actually matches the public IP address of your router. You can set this address manually if the autodetection fails. This change is - + Be sure to check if the server's IP address provided in the configuration file matches the public IP address of your router. You can set this address manually if the autodetection fails. This change is + not - - stored anywhere and is applicable only to the configuration being currently downloaded. + + stored anywhere and applies only to the configuration being currently downloaded.

should display clients 1`] = ` class="custom-control-label" for="2" > - Override server address + Override Server Address
diff --git a/js/src/clientSettings/__tests__/__snapshots__/AddSettingsForm.test.js.snap b/js/src/clientSettings/__tests__/__snapshots__/AddSettingsForm.test.js.snap index 711d987..a5908ae 100644 --- a/js/src/clientSettings/__tests__/__snapshots__/AddSettingsForm.test.js.snap +++ b/js/src/clientSettings/__tests__/__snapshots__/AddSettingsForm.test.js.snap @@ -3,10 +3,10 @@ exports[` should be rendered 1`] = `

- Add settings + Add Settings

- Please select a file with OpenVPN client settings you wish to add. New settings will be enabled after uploading. Please note that network will be restarted automatically. + Please select a file with OpenVPN client settings you wish to add. New settings will be enabled after uploading. Please note that the network will be restarted automatically.

should display spinner 1`] = `

- Available settings + Available Settings

- For each uploaded file a new OpenVPN client instance is created. Please check settings file for errors if instance is enabled and not running few minutes after setup. + For each uploaded file, a new OpenVPN client instance is created. Please check the settings file for errors if the instance is enabled and not running a few minutes after setup.