[Fleet]: Beta label is shown inconsistently while selecting proxy und…

…er Fleet settings. (#170634) ## What does this PR do? * It fixes the consistency of displaying the "Beta" label in the proxies under the Fleet Server settings page. ## Issue References * Closes #168333 ## Screenshot Demo ##### Before: ![image](https://github.com/GitStartHQ/client-kibana-oss/assets/50892465/f411779f-760b-4bc1-a6f1-17da5586ad53) ##### Fix: ![image](https://github.com/GitStartHQ/client-kibana-oss/assets/50892465/8dffe98c-fb39-48dd-badf-37be2dbdb863) ___ This code was written and reviewed by GitStart Community. Growing future engineers, one PR at a time. --------- Co-authored-by: KlingerMatheus <[email protected]> Co-authored-by: Kyle Pollich <[email protected]> Co-authored-by: Kibana Machine <[email protected]>
elastic · Jan 24, 2024 · 0dd0664 · 0dd0664
1 parent 765cf24
commit 0dd0664
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/...fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx b/...fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
@@ -335,7 +335,21 @@ export const EditOutputFlyout: React.FunctionComponent<EditOutputFlyoutProps> =
               label={
                 <FormattedMessage
                   id="xpack.fleet.settings.editOutputFlyout.proxyIdLabel"
-                  defaultMessage="Proxy"
+                  defaultMessage="Proxy {badge}"
+                  values={{
+                    badge: (
+                      <EuiBetaBadge
+                        size="s"
+                        className="eui-alignTop"
+                        label={i18n.translate(
+                          'xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdBetaBadge',
+                          {
+                            defaultMessage: 'Beta',
+                          }
+                        )}
+                      />
+                    ),
+                  }}
                 />
               }
             >

diff --git a/...ublic/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx b/...ublic/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/index.tsx
@@ -26,6 +26,7 @@ import {
   EuiSwitch,
   EuiComboBox,
   EuiCallOut,
+  EuiBetaBadge,
 } from '@elastic/eui';
 
 import { MultiRowInput } from '../multi_row_input';
@@ -158,7 +159,21 @@ export const FleetServerHostsFlyout: React.FunctionComponent<FleetServerHostsFly
             label={
               <FormattedMessage
                 id="xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel"
-                defaultMessage="Proxy"
+                defaultMessage="Proxy {badge}"
+                values={{
+                  badge: (
+                    <EuiBetaBadge
+                      size="s"
+                      className="eui-alignTop"
+                      label={i18n.translate(
+                        'xpack.fleet.settings.editDownloadSourcesFlyout.proxyIdBetaBadge',
+                        {
+                          defaultMessage: 'Beta',
+                        }
+                      )}
+                    />
+                  ),
+                }}
               />
             }
           >

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -17730,7 +17730,6 @@
     "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "Indiquer le nom",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "La plupart des actions liées à cette sortie sont indisponibles. Reportez-vous à votre configuration Kibana pour en savoir plus.",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "Cette sortie est gérée en dehors de Fleet.",
-    "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "Proxy",
     "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "Sélectionner un proxy",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "À l'expiration, la file d'attente de sortie est vidée, et les données sont écrites dans la sortie.",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "Délai de vidage",
@@ -17795,7 +17794,6 @@
     "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "Nom",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "Indiquer le nom",
-    "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "Proxy",
     "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "Sélectionner un proxy",
     "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "Enregistrer et appliquer les paramètres",
     "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "Hôte du serveur Fleet enregistré",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -17743,7 +17743,6 @@
     "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "名前を指定",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "この出力に関連するほとんどのアクションは使用できません。詳細については、Kibana構成を参照してください。",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "この出力はFleet外で管理されます",
-    "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "プロキシ",
     "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "プロキシを選択",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "有効期限切れになると、出力キューがフラッシュされ、データが出力に書き込まれます。",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "フラッシュタイムアウト",
@@ -17808,7 +17807,6 @@
     "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "名前",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "名前を指定",
-    "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "プロキシ",
     "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "プロキシを選択",
     "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "設定を保存して適用",
     "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "Fleetサーバーホストが保存されました",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -17837,7 +17837,6 @@
     "xpack.fleet.settings.editOutputFlyout.nameInputPlaceholder": "指定名称",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutDescription": "与此输出相关的操作多数不可用。请参阅 Kibana 配置了解详情。",
     "xpack.fleet.settings.editOutputFlyout.preconfiguredOutputCalloutTitle": "此输出在 Fleet 外部进行管理",
-    "xpack.fleet.settings.editOutputFlyout.proxyIdLabel": "代理",
     "xpack.fleet.settings.editOutputFlyout.proxyIdPlaceholder": "选择代理",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutDescription": "过期后，将清空此输出队列，并将数据写入到输出。",
     "xpack.fleet.settings.editOutputFlyout.queueFlushTimeoutLabel": "清空超时",
@@ -17902,7 +17901,6 @@
     "xpack.fleet.settings.fleetServerHostsFlyout.hostUrlLabel": "URL",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputLabel": "名称",
     "xpack.fleet.settings.fleetServerHostsFlyout.nameInputPlaceholder": "指定名称",
-    "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdLabel": "代理",
     "xpack.fleet.settings.fleetServerHostsFlyout.proxyIdPlaceholder": "选择代理",
     "xpack.fleet.settings.fleetServerHostsFlyout.saveButton": "保存并应用设置",
     "xpack.fleet.settings.fleetServerHostsFlyout.successToastTitle": "已保存 Fleet 服务器主机",