From c17ab9f82ab4780ec641b3205e08814ef3f3dffb Mon Sep 17 00:00:00 2001 From: Andy Vo <121371226+andvvo@users.noreply.github.com> Date: Thu, 4 Jul 2024 04:06:52 -0700 Subject: [PATCH] feat(console): add tooltip for indicator on inherit button in feature settings (#8238) # Which Problems Are Solved - Bubble indicator on inherit button in feature settings is not clear on what system default behavior is inherited # How the Problems Are Solved - Creates tooltip to show what system default behavior is inherited when cursor hovers over indicator. When indicator is red "Disabled" is inherited and when the indicator is green "Enabled" is inherited. ![Zitadel_Inherit_Indicator_Disabled](https://github.com/zitadel/zitadel/assets/121371226/2b90cd79-09bf-499f-bf85-f499dccf5b96) ![Zitadel_Inherit_Indicator_Enabled](https://github.com/zitadel/zitadel/assets/121371226/98a838ec-d228-4974-b251-96e548163222) # Additional Changes - Adds translations for indicator tooltip message # Additional Context - Closes #8129 - https://discord.com/channels/927474939156643850/1250477939431178363 Co-authored-by: Elio Bischof --- .../app/components/features/features.component.html | 12 ++++++++++++ console/src/assets/i18n/bg.json | 4 ++++ console/src/assets/i18n/cs.json | 4 ++++ console/src/assets/i18n/de.json | 4 ++++ console/src/assets/i18n/en.json | 4 ++++ console/src/assets/i18n/es.json | 4 ++++ console/src/assets/i18n/fr.json | 4 ++++ console/src/assets/i18n/it.json | 4 ++++ console/src/assets/i18n/ja.json | 4 ++++ console/src/assets/i18n/mk.json | 4 ++++ console/src/assets/i18n/nl.json | 4 ++++ console/src/assets/i18n/pl.json | 4 ++++ console/src/assets/i18n/pt.json | 4 ++++ console/src/assets/i18n/ru.json | 4 ++++ console/src/assets/i18n/sv.json | 4 ++++ console/src/assets/i18n/zh.json | 4 ++++ 16 files changed, 72 insertions(+) diff --git a/console/src/app/components/features/features.component.html b/console/src/app/components/features/features.component.html index 801264fa8..05113c17f 100644 --- a/console/src/app/components/features/features.component.html +++ b/console/src/app/components/features/features.component.html @@ -45,6 +45,7 @@ featureData.loginDefaultOrg?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
@@ -99,6 +101,7 @@ featureData.oidcLegacyIntrospection?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
@@ -152,6 +156,7 @@ featureData.oidcTokenExchange?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
@@ -205,6 +211,7 @@ featureData.oidcTriggerIntrospectionProjections?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
@@ -258,6 +266,7 @@ featureData.userSchema?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
@@ -311,6 +321,7 @@ featureData.actions?.source === Source.SOURCE_UNSPECIFIED) " class="current-dot enabled" + matTooltip="{{ 'SETTING.FEATURES.INHERITEDINDICATOR_DESCRIPTION.ENABLED' | translate }}" >
diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json index 11822b075..07af07af1 100644 --- a/console/src/assets/i18n/bg.json +++ b/console/src/assets/i18n/bg.json @@ -1474,6 +1474,10 @@ "DISABLED": "Деактивирано" }, "INHERITED_DESCRIPTION": "Тази настройка задава стойността по подразбиране на системата.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "„Активирано“ се наследява", + "DISABLED": "„Деактивирано“ се наследява" + }, "RESET": "Задай всички на наследено" }, "DIALOG": { diff --git a/console/src/assets/i18n/cs.json b/console/src/assets/i18n/cs.json index ca9529cc0..e0a828289 100644 --- a/console/src/assets/i18n/cs.json +++ b/console/src/assets/i18n/cs.json @@ -1475,6 +1475,10 @@ "DISABLED": "Zakázáno" }, "INHERITED_DESCRIPTION": "Toto nastavení nastaví hodnotu na výchozí hodnotu systému.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "„Povoleno“ je zděděno", + "DISABLED": "„Zakázáno“ je zděděno" + }, "RESET": "Nastavit vše na děděné" }, "DIALOG": { diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index d5d82e65f..7d1011084 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -1475,6 +1475,10 @@ "DISABLED": "Deaktiviert" }, "INHERITED_DESCRIPTION": "Diese Einstellung setzt den Wert auf den Standardwert des Systems.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "„Aktiviert“ wird vererbt", + "DISABLED": "„Deaktiviert“ wird vererbt" + }, "RESET": "Alle auf Erben setzen" }, "DIALOG": { diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index f5a915536..aa0497e4f 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -1475,6 +1475,10 @@ "DISABLED": "Disabled" }, "INHERITED_DESCRIPTION": "This sets the value to the default value of the system.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Enabled\" is inherited", + "DISABLED": "\"Disabled\" is inherited" + }, "RESET": "Set all to inherit" }, "DIALOG": { diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json index d27e8b39b..5110fcc17 100644 --- a/console/src/assets/i18n/es.json +++ b/console/src/assets/i18n/es.json @@ -1476,6 +1476,10 @@ "DISABLED": "Deshabilitado" }, "INHERITED_DESCRIPTION": "Esta configuración establece el valor al valor predeterminado del sistema.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Habilitado\" se hereda", + "DISABLED": "\"Deshabilitado\" se hereda" + }, "RESET": "Establecer todo a heredado" }, "DIALOG": { diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index 7779e9d8e..5e744e01f 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -1475,6 +1475,10 @@ "DISABLED": "Désactivé" }, "INHERITED_DESCRIPTION": "Ce paramètre définit la valeur par défaut du système.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Activé\" est hérité", + "DISABLED": "\"Désactivé\" est hérité" + }, "RESET": "Réinitialiser tout sur hérité" }, "DIALOG": { diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index a09ab6516..a4963e68d 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -1475,6 +1475,10 @@ "DISABLED": "Disabilitato" }, "INHERITED_DESCRIPTION": "Questa impostazione imposta il valore predefinito del sistema.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Abilitato\" viene ereditato", + "DISABLED": "\"Disabilitato\" viene ereditato" + }, "RESET": "Imposta tutto su predefinito" }, "DIALOG": { diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json index 658c0d73e..64513d560 100644 --- a/console/src/assets/i18n/ja.json +++ b/console/src/assets/i18n/ja.json @@ -1475,6 +1475,10 @@ "DISABLED": "無効" }, "INHERITED_DESCRIPTION": "この設定は、値をシステムのデフォルト値に設定します。", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "有効は継承されます", + "DISABLED": "無効は継承されます" + }, "RESET": "すべて継承に設定" }, "DIALOG": { diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json index a48e52b54..c4649f79d 100644 --- a/console/src/assets/i18n/mk.json +++ b/console/src/assets/i18n/mk.json @@ -1476,6 +1476,10 @@ "DISABLED": "Оневозможено" }, "INHERITED_DESCRIPTION": "Оваа поставка ја постави вредноста на стандардната вредност на системот.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "„Овозможено“ е наследено", + "DISABLED": "„Оневозможено“ е наследено" + }, "RESET": "Поставете ги сите да наследат" }, "DIALOG": { diff --git a/console/src/assets/i18n/nl.json b/console/src/assets/i18n/nl.json index 3a6b07f33..01b912d74 100644 --- a/console/src/assets/i18n/nl.json +++ b/console/src/assets/i18n/nl.json @@ -1475,6 +1475,10 @@ "DISABLED": "Uitgeschakeld" }, "INHERITED_DESCRIPTION": "Deze instelling stelt de waarde in op de standaardwaarde van het systeem.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Ingeschakeld\" wordt overgenomen", + "DISABLED": "\"Uitgeschakeld\" wordt overgenomen" + }, "RESET": "Alles instellen op overgenomen" }, "DIALOG": { diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json index 3e8ad1c1e..da45d4851 100644 --- a/console/src/assets/i18n/pl.json +++ b/console/src/assets/i18n/pl.json @@ -1474,6 +1474,10 @@ "DISABLED": "Wyłączony" }, "INHERITED_DESCRIPTION": "To ustawienie przypisuje wartość do wartości domyślnej systemu.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "„Włączony” jest dziedziczone", + "DISABLED": "„Wyłączony” jest dziedziczone" + }, "RESET": "Ustaw wszystko na dziedziczone" }, "DIALOG": { diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json index a2350cc5a..5ea5f0fc8 100644 --- a/console/src/assets/i18n/pt.json +++ b/console/src/assets/i18n/pt.json @@ -1476,6 +1476,10 @@ "DISABLED": "Desabilitado" }, "INHERITED_DESCRIPTION": "Essa configuração define o valor para o padrão do sistema.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Habilitado\" é herdado", + "DISABLED": "\"Desabilitado\" é herdado" + }, "RESET": "Definir tudo para herdar" }, "DIALOG": { diff --git a/console/src/assets/i18n/ru.json b/console/src/assets/i18n/ru.json index 456796d10..1c500d7a9 100644 --- a/console/src/assets/i18n/ru.json +++ b/console/src/assets/i18n/ru.json @@ -1526,6 +1526,10 @@ "DISABLED": "Выключено" }, "INHERITED_DESCRIPTION": "Эта настройка устанавливает значение по умолчанию для системы.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "«Включено» наследуется", + "DISABLED": "«Выключено» передается по наследству" + }, "RESET": "Установить все по умолчанию" }, "DIALOG": { diff --git a/console/src/assets/i18n/sv.json b/console/src/assets/i18n/sv.json index 32e9004e2..111c66dff 100644 --- a/console/src/assets/i18n/sv.json +++ b/console/src/assets/i18n/sv.json @@ -1479,6 +1479,10 @@ "DISABLED": "Inaktiverad" }, "INHERITED_DESCRIPTION": "Detta ställer in värdet till systemets standardvärde.", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "\"Aktiverad\" ärvs", + "DISABLED": "\"Inaktiverad\" ärvs" + }, "RESET": "Återställ allt till arv" }, "DIALOG": { diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index 8bfe18b55..b7ecd9159 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -1475,6 +1475,10 @@ "DISABLED": "已禁用" }, "INHERITED_DESCRIPTION": "此设置将值设置为系统默认值。", + "INHERITEDINDICATOR_DESCRIPTION": { + "ENABLED": "“已启用” 是继承的", + "DISABLED": "“已禁用” 是继承的" + }, "RESET": "全部设置为继承" }, "DIALOG": {