fix: fix SAML app console issues (#6970)

Author: darcyYe

packages/console/src/assets/icons/download.svg

@@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next';
 
 import Delete from '@/assets/icons/delete.svg?react';
 import Download from '@/assets/icons/download.svg?react';
-import Deactivate from '@/assets/icons/moon.svg?react';
+import Deactivate from '@/assets/icons/forbidden.svg?react';
 import More from '@/assets/icons/more.svg?react';
-import Activate from '@/assets/icons/sun.svg?react';
+import Activate from '@/assets/icons/shield.svg?react';
 import ActionMenu, { ActionMenuItem } from '@/ds-components/ActionMenu';
 import { downloadText } from '@/utils/downloader';
 
@@ -41,42 +41,38 @@ function CertificateActionMenu({
 
   return (
     <ActionMenu icon={<More className={styles.icon} />} title={t('general.more_options')}>
-      {active ? (
+      <ActionMenuItem
+        iconClassName={styles.icon}
+        icon={active ? <Deactivate /> : <Activate />}
+        onClick={() => {
+          if (active) {
+            onDeactivate(id);
+          } else {
+            onActivate(id);
+          }
+        }}
+      >
+        {t(`general.${active ? 'deactivate' : 'activate'}`)}
+      </ActionMenuItem>
+      <ActionMenuItem
+        iconClassName={styles.icon}
+        icon={<Download className={styles.icon} />}
+        onClick={onDownload}
+      >
+        {t('general.download')}
+      </ActionMenuItem>
+      {!active && (
+        // Can only delete inactive certificates.
         <ActionMenuItem
-          iconClassName={styles.icon}
-          icon={<Deactivate />}
+          type="danger"
+          icon={<Delete />}
           onClick={() => {
-            onDeactivate(id);
+            onDelete(id);
           }}
         >
-          {t('general.deactivate')}
+          {t('general.delete')}
         </ActionMenuItem>
-      ) : (
-        <>
-          {/* Can only delete inactive certificates */}
-          <ActionMenuItem
-            type="danger"
-            icon={<Delete />}
-            onClick={() => {
-              onDelete(id);
-            }}
-          >
-            {t('general.delete')}
-          </ActionMenuItem>
-          <ActionMenuItem
-            iconClassName={styles.icon}
-            icon={<Activate />}
-            onClick={() => {
-              onActivate(id);
-            }}
-          >
-            {t('general.activate')}
-          </ActionMenuItem>
-        </>
       )}
-      <ActionMenuItem iconClassName={styles.icon} icon={<Download />} onClick={onDownload}>
-        {t('general.download')}
-      </ActionMenuItem>
     </ActionMenu>
   );
 }

packages/console/src/pages/ApplicationDetails/SamlApplicationDetailsContent/CertificateActionMenu/index.tsx

@@ -208,18 +208,22 @@ function Settings({ data, mutateApplication, isDeleted }: Props) {
                   !value || uriValidator(value) || t('errors.invalid_uri_format'),
               })}
               error={Boolean(errors.acsUrl)}
-              placeholder={t('enterprise_sso.basic_info.saml.acs_url_field_name')}
+              placeholder={t('enterprise_sso.basic_info.saml.acs_url_field_placeholder')}
             />
           </FormField>
-          <FormField isRequired title="enterprise_sso.basic_info.saml.audience_uri_field_name">
+          <FormField
+            isRequired
+            title="enterprise_sso.basic_info.saml.entity_id_field_name"
+            tip={t('enterprise_sso.basic_info.saml.entity_id_field_tooltip')}
+          >
             <TextInput
               {...register('entityId', {
                 required: t('errors.required_field_missing', {
-                  field: t('enterprise_sso.basic_info.saml.audience_uri_field_name'),
+                  field: t('enterprise_sso.basic_info.saml.entity_id_field_name'),
                 }),
               })}
               error={Boolean(errors.entityId)}
-              placeholder={t('enterprise_sso.basic_info.saml.audience_uri_field_name')}
+              placeholder={t('enterprise_sso.basic_info.saml.entity_id_field_placeholder')}
             />
           </FormField>
         </FormCard>

packages/console/src/pages/ApplicationDetails/SamlApplicationDetailsContent/Settings.tsx

@@ -26,7 +26,8 @@ const enterprise_sso = {
       'قم بإنشاء تكامل تطبيق جديد باستخدام SAML 2.0 في موفر الهوية {{name}} الخاص بك. ثم قم بلصق القيمة التالية فيه.',
     saml: {
       acs_url_field_name: 'عنوان URL لخدمة المستهلك للتأكيد (رد URL)',
-      audience_uri_field_name: 'معرف الجمهور (معرف SP)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'عنوان URL لإعادة التوجيه (عنوان URL للرد)',

packages/phrases/src/locales/ar/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       'Erstellen Sie eine neue Anwendungsintegration per SAML 2.0 in Ihrem {{name}}-Identitätsanbieter. Fügen Sie dann den folgenden Wert hinzu.',
     saml: {
       acs_url_field_name: 'Zieldienst-URL für Assertionsverbrauch (Antwort-URL)',
-      audience_uri_field_name: 'Ziel-URI (SP Entity ID)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'Weiterleitungs-URI (Callback-URL)',

packages/phrases/src/locales/de/translation/admin-console/enterprise-sso.ts

@@ -28,6 +28,11 @@ const enterprise_sso = {
     saml: {
       acs_url_field_name: 'Assertion consumer service URL (Reply URL)',
       audience_uri_field_name: 'Audience URI (SP Entity ID)',
+      entity_id_field_name: 'Service Provider (SP) Entity ID',
+      entity_id_field_tooltip:
+        'The SP Entity ID can be in any string format, typically using a URI form or a URL form as an identifier, but this is not mandatory.',
+      acs_url_field_placeholder: 'https://your-domain.com/api/saml/callback',
+      entity_id_field_placeholder: 'urn:your-domain.com:sp:saml:{serviceProviderId}',
     },
     oidc: {
       redirect_uri_field_name: 'Redirect URI (Callback URL)',

packages/phrases/src/locales/en/translation/admin-console/enterprise-sso.ts

@@ -28,7 +28,8 @@ const enterprise_sso = {
       'Crea una nueva integración de aplicación mediante SAML 2.0 en tu proveedor de identidad {{name}}. Luego pega el siguiente valor en él.',
     saml: {
       acs_url_field_name: 'URL de servicio de consumidor de aserciones (URL de respuesta)',
-      audience_uri_field_name: 'URI del público (ID del SP entidad)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URI de redireccionamiento (URL de devolución de llamada)',

packages/phrases/src/locales/es/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       "Créez une nouvelle intégration d'application par SAML 2.0 dans votre fournisseur d'identité {{name}}. Ensuite, collez la valeur suivante.",
     saml: {
       acs_url_field_name: "URL de service de consommation d'assertions (URL de réponse)",
-      audience_uri_field_name: "URI de l'audience (ID de l'entité SP)",
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URI de redirection (URL de rappel)',

packages/phrases/src/locales/fr/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       "Crea una nuova integrazione dell'applicazione tramite SAML 2.0 nel tuo provider di identità {{name}}. Quindi incolla il valore seguente.",
     saml: {
       acs_url_field_name: 'URL del servizio consumer di asserzioni (URL di risposta)',
-      audience_uri_field_name: "URI dell'audience (ID entità SP)",
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URI di reindirizzamento (URL di callback)',

packages/phrases/src/locales/it/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       'IdPにてSAML 2.0の新しいアプリケーション連携を作成します。次に以下の値を貼り付けます。',
     saml: {
       acs_url_field_name: 'アサーションコンシューマサービスURL（応答URL）',
-      audience_uri_field_name: 'オーディエンスURI（SPエンティティID）',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'リダイレクトURI（コールバックURL）',

packages/phrases/src/locales/ja/translation/admin-console/enterprise-sso.ts

@@ -26,7 +26,8 @@ const enterprise_sso = {
       'SAML 2.0을 사용하여 {{name}} 신원 공급자에서 새로운 응용 프로그램 통합을 만듭니다. 그런 다음 다음 값을 붙여 넣습니다.',
     saml: {
       acs_url_field_name: '단언 소비자 서비스 URL (응답 URL)',
-      audience_uri_field_name: '대상 URI (SP 엔터티 ID)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: '리디렉션 URI (콜백 URL)',

packages/phrases/src/locales/ko/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       'Utwórz nową integrację aplikacji za pomocą SAML 2.0 w dostawcy tożsamości {{name}}. Następnie wklej poniższą wartość.',
     saml: {
       acs_url_field_name: 'Adres URL usługi konsumenta twierdzeń (Adres URL odpowiedzi)',
-      audience_uri_field_name: 'URI odbiorcy (ID podmiotu SP)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'Adres URL przekierowania (Adres URL wywołania zwrotnego)',

packages/phrases/src/locales/pl-pl/translation/admin-console/enterprise-sso.ts

@@ -28,7 +28,8 @@ const enterprise_sso = {
       'Crie uma nova integração de aplicativo por SAML 2.0 em seu provedor de identidade {{name}}. Em seguida, cole o seguinte valor nele.',
     saml: {
       acs_url_field_name: 'URL do serviço de consumidor de afirmações (URL de resposta)',
-      audience_uri_field_name: 'URI da audiência (ID da Entidade do SP)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URL de redirecionamento (URL de retorno de chamada)',

packages/phrases/src/locales/pt-br/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       'Crie uma nova integração de aplicativo usando SAML 2.0 no seu provedor de identidade {{name}}. Em seguida, cole o seguinte valor nele.',
     saml: {
       acs_url_field_name: 'URL do serviço de consumo de afirmação (URL de resposta)',
-      audience_uri_field_name: 'URI do público (ID da entidade do SP)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URI de redirecionamento (URL de retorno)',

packages/phrases/src/locales/pt-pt/translation/admin-console/enterprise-sso.ts

@@ -27,7 +27,8 @@ const enterprise_sso = {
       'Создайте новую интеграцию приложения с помощью SAML 2.0 в вашем провайдере идентичности {{name}}. Затем вставьте следующее значение в него.',
     saml: {
       acs_url_field_name: 'URL потребителя утверждений (URL ответа)',
-      audience_uri_field_name: 'Адрес аудиенции (SP Entity ID)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: 'URI перенаправления (URL обратного вызова)',

packages/phrases/src/locales/ru/translation/admin-console/enterprise-sso.ts

@@ -27,6 +27,7 @@ const enterprise_sso = {
       'Yeni bir uygulama entegrasyonu oluşturun, {{name}} kimlik sağlayıcınızda SAML 2.0 ile. Ardından aşağıdaki değeri yapıştırın.',
     saml: {
       acs_url_field_name: 'Assertion consumer service URL (Reply URL)',
+      /** UNTRANSLATED */
       audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {

packages/phrases/src/locales/tr-tr/translation/admin-console/enterprise-sso.ts

@@ -25,7 +25,8 @@ const enterprise_sso = {
     description: '在{{name}}身份提供者中通过SAML 2.0创建一个新的应用集成。然后将以下值粘贴到其中。',
     saml: {
       acs_url_field_name: '断言消费者服务URL（回复URL）',
-      audience_uri_field_name: '受众URI（SP实体ID）',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: '重定向URI（回调URL）',

packages/phrases/src/locales/zh-cn/translation/admin-console/enterprise-sso.ts

@@ -25,7 +25,8 @@ const enterprise_sso = {
     description: '在您的{{name}}身份提供者中通過 SAML 2.0 創建新應用集成。然後將以下值貼到其中。',
     saml: {
       acs_url_field_name: '斷言消費服務 URL (回複 URL)',
-      audience_uri_field_name: '受眾 URI (SP 實體 ID)',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: '重定向 URI（回調 URL）',

packages/phrases/src/locales/zh-hk/translation/admin-console/enterprise-sso.ts

@@ -26,7 +26,8 @@ const enterprise_sso = {
       '在您的 {{name}} 身份提供者中使用 SAML 2.0 建立新的應用集成。然後將以下值粘貼到其中。',
     saml: {
       acs_url_field_name: '斷言消費服務 URL（回覆 URL）',
-      audience_uri_field_name: '受眾 URI（SP 實體 ID）',
+      /** UNTRANSLATED */
+      audience_uri_field_name: 'Audience URI (SP Entity ID)',
     },
     oidc: {
       redirect_uri_field_name: '重定向 URI（回撥 URL）',