From 6d6c9d94bdfab3e016b7288813f1b12bd174a5c9 Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Wed, 25 Mar 2026 11:46:38 +0100 Subject: [PATCH 1/6] add missing helpers to gateway adoption form --- web/messages/en/gateway_wizard.json | 2 ++ .../pages/GatewaySetupPage/steps/SetupGatewayComponentStep.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/web/messages/en/gateway_wizard.json b/web/messages/en/gateway_wizard.json index aff4778c25..e2b9f8d010 100644 --- a/web/messages/en/gateway_wizard.json +++ b/web/messages/en/gateway_wizard.json @@ -22,7 +22,9 @@ "gateway_setup_step_confirmation_label": "Configuration confirmation", "gateway_setup_step_confirmation_description": "Your configuration was successful. You're all set.", "gateway_setup_component_label_common_name": "Common Name", + "gateway_setup_component_label_common_name_help": "This name will be visible in the Gateways list and is used to identify a deployed instance, as there may be multiple instances for High Availability (HA).", "gateway_setup_component_label_ip_or_domain": "IP or Domain", + "gateway_setup_component_label_ip_or_domain_help": "Enter the IP or domain name of the server where the Gateway component is deployed. Core will then connect to it and perform the adoption automatically.", "gateway_setup_component_label_grpc_port": "gRPC Port", "gateway_setup_component_label_grpc_port_help": "If you have changed the default Gateway gRPC port, please change it here.", "gateway_setup_component_error_common_name_required": "Common Name is required", diff --git a/web/src/pages/GatewaySetupPage/steps/SetupGatewayComponentStep.tsx b/web/src/pages/GatewaySetupPage/steps/SetupGatewayComponentStep.tsx index c4e6cdd58e..f42c208b3c 100644 --- a/web/src/pages/GatewaySetupPage/steps/SetupGatewayComponentStep.tsx +++ b/web/src/pages/GatewaySetupPage/steps/SetupGatewayComponentStep.tsx @@ -99,6 +99,7 @@ export const SetupGatewayComponentStep = () => { )} @@ -109,6 +110,7 @@ export const SetupGatewayComponentStep = () => { )} From 1c5e64fc5982737109bf41a07ae9741f10f58f02 Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Wed, 25 Mar 2026 13:43:27 +0100 Subject: [PATCH 2/6] fix license expiration notice spacing --- tu | 42 +++++++++++++++++++ .../SettingsLicenseExpiredNotice.tsx | 6 ++- .../tabs/SettingsLicenseTab/style.scss | 9 ++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 tu diff --git a/tu b/tu new file mode 100644 index 0000000000..f701ba302e --- /dev/null +++ b/tu @@ -0,0 +1,42 @@ +─────────────────────────────────────────────────────────────────────────────── +modified: web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseExpiredNotice/SettingsLicenseExpiredNotice.tsx +─────────────────────────────────────────────────────────────────────────────── +@ web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseExpiredNotice/SettingsLicenseExpiredNotice.tsx:36 @ export const SettingsLicenseExpiredNotice = ({ licenseInfo, state }: Props) => { +  +  +
 +

{m.settings_license_expired_notice_title()}

 +

{description}

 +
 +

{m.settings_license_expired_notice_title()}

 +

{description}

 +
 + {
-

{m.settings_license_expired_notice_title()}

-

{description}

+
+

{m.settings_license_expired_notice_title()}

+

{description}

+
Date: Wed, 25 Mar 2026 13:49:13 +0100 Subject: [PATCH 3/6] fix spacing for upsell sections --- .../SettingsLicenseTab/SettingsLicenseTab.tsx | 2 +- .../SettingsLicenseBusinessUpsellSection.tsx | 13 +++--- .../SettingsLicenseNoLicenseSection.tsx | 42 ++++++++++--------- .../tabs/SettingsLicenseTab/style.scss | 20 ++++++++- 4 files changed, 49 insertions(+), 28 deletions(-) diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx index d08548f85e..369cd5e989 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx @@ -45,7 +45,7 @@ export const SettingsLicenseTab = () => { subtitle={m.settings_license_subtitle()} /> {isPresent(settings) && ( - + {isPresent(licenseInfo) && isPresent(licenseState) && licenseState !== 'noLicense' && ( diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx index 61af7ec4b1..b1906e82d3 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx @@ -27,13 +27,14 @@ export const SettingsLicenseBusinessUpsellSection = () => {
-
-

{m.settings_license_plan_enterprise_title()}

+
+
+

{m.settings_license_plan_enterprise_title()}

+
+

+ {m.settings_license_plan_enterprise_description()} +

-

- {m.settings_license_plan_enterprise_description()} -

-
-
-

{m.settings_license_plan_business_title()}

- +
+
+

{m.settings_license_plan_business_title()}

+ +
+

+ {m.settings_license_plan_business_description()} +

+ +

+ {m.settings_license_plan_business_promotional_copy()} +

-

- {m.settings_license_plan_business_description()} -

- -

- {m.settings_license_plan_business_promotional_copy()} -

-
-
-

{m.settings_license_plan_enterprise_title()}

+
+
+

{m.settings_license_plan_enterprise_title()}

+
+

+ {m.settings_license_plan_enterprise_description()} +

-

- {m.settings_license_plan_enterprise_description()} -

-
.content { display: flex; flex-flow: column; - row-gap: var(--spacing-xs); + row-gap: var(--spacing-md); + + .text-track { + display: flex; + flex-flow: column; + row-gap: var(--spacing-xs); + + &.with-divider { + row-gap: var(--spacing-md); + } + } .top { width: 100%; From 6f37837a1268e7bf27da6aa3f91ca4bf267168d2 Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Wed, 25 Mar 2026 13:50:58 +0100 Subject: [PATCH 4/6] remove leftover file --- tu | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 tu diff --git a/tu b/tu deleted file mode 100644 index f701ba302e..0000000000 --- a/tu +++ /dev/null @@ -1,42 +0,0 @@ -─────────────────────────────────────────────────────────────────────────────── -modified: web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseExpiredNotice/SettingsLicenseExpiredNotice.tsx -─────────────────────────────────────────────────────────────────────────────── -@ web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseExpiredNotice/SettingsLicenseExpiredNotice.tsx:36 @ export const SettingsLicenseExpiredNotice = ({ licenseInfo, state }: Props) => { -  -
 -
 -

{m.settings_license_expired_notice_title()}

 -

{description}

 -
 -

{m.settings_license_expired_notice_title()}

 -

{description}

 -
 - Date: Wed, 25 Mar 2026 14:15:53 +0100 Subject: [PATCH 5/6] use SizedBoxes instead of wrappers for vertical spacing --- .../SettingsLicenseBusinessUpsellSection.tsx | 14 +++--- .../SettingsLicenseExpiredNotice.tsx | 10 ++-- .../SettingsLicenseNoLicenseSection.tsx | 46 ++++++++++--------- .../tabs/SettingsLicenseTab/style.scss | 19 -------- 4 files changed, 37 insertions(+), 52 deletions(-) diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx index b1906e82d3..dfa0b7ffe3 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/components/SettingsLicenseBusinessUpsellSection/SettingsLicenseBusinessUpsellSection.tsx @@ -27,14 +27,14 @@ export const SettingsLicenseBusinessUpsellSection = () => {
-
-
-

{m.settings_license_plan_enterprise_title()}

-
-

- {m.settings_license_plan_enterprise_description()} -

+
+

{m.settings_license_plan_enterprise_title()}

+ +

+ {m.settings_license_plan_enterprise_description()} +

+
-
-
-

{m.settings_license_plan_business_title()}

- -
-

- {m.settings_license_plan_business_description()} -

- -

- {m.settings_license_plan_business_promotional_copy()} -

+
+

{m.settings_license_plan_business_title()}

+
+ +

+ {m.settings_license_plan_business_description()} +

+ + + +

+ {m.settings_license_plan_business_promotional_copy()} +

+
-
-
-

{m.settings_license_plan_enterprise_title()}

-
-

- {m.settings_license_plan_enterprise_description()} -

+
+

{m.settings_license_plan_enterprise_title()}

+ +

+ {m.settings_license_plan_enterprise_description()} +

+
.content { display: flex; flex-flow: column; - row-gap: var(--spacing-md); - - .text-track { - display: flex; - flex-flow: column; - row-gap: var(--spacing-xs); - - &.with-divider { - row-gap: var(--spacing-md); - } - } .top { width: 100%; @@ -105,14 +94,6 @@ display: flex; flex-flow: column; align-items: flex-start; - gap: var(--spacing-md); - - .text-track { - display: flex; - flex-flow: column; - align-items: flex-start; - gap: var(--spacing-xs); - } .title { color: var(--fg-critical); From d036653e6c163eefc501ddcbf8604643811a2f9c Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Wed, 25 Mar 2026 14:25:33 +0100 Subject: [PATCH 6/6] make license-main-card an id --- .../tabs/SettingsLicenseTab/SettingsLicenseTab.tsx | 2 +- .../SettingsIndexPage/tabs/SettingsLicenseTab/style.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx index 369cd5e989..c18703c826 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/SettingsLicenseTab.tsx @@ -45,7 +45,7 @@ export const SettingsLicenseTab = () => { subtitle={m.settings_license_subtitle()} /> {isPresent(settings) && ( - + {isPresent(licenseInfo) && isPresent(licenseState) && licenseState !== 'noLicense' && ( diff --git a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/style.scss b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/style.scss index 62a361e057..5f3e912171 100644 --- a/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/style.scss +++ b/web/src/pages/settings/SettingsIndexPage/tabs/SettingsLicenseTab/style.scss @@ -1,5 +1,5 @@ #settings-license-tab { - .license-main-card { + #license-main-card { padding: var(--spacing-lg); } }