Revert Role Mappings union type removal

- but shenanigans it a bit to take our i18n'd shared product names (requires as const assertion) - done to reduce merge conflicts for Scotty / make his life (hopefully) a bit easier between ent-search and Kibana
elastic · Jun 16, 2021 · b747586 · b747586
1 parent aaf3705
commit b747586
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
@@ -7,6 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { ProductName } from '../types';
+
 export const ANY_AUTH_PROVIDER = '*';
 
 export const ANY_AUTH_PROVIDER_OPTION_LABEL = i18n.translate(
@@ -182,7 +184,7 @@ export const ROLE_MAPPINGS_HEADING_TITLE = i18n.translate(
   { defaultMessage: 'Role mappings' }
 );
 
-export const ROLE_MAPPINGS_HEADING_DESCRIPTION = (productName: string) =>
+export const ROLE_MAPPINGS_HEADING_DESCRIPTION = (productName: ProductName) =>
   i18n.translate('xpack.enterpriseSearch.roleMapping.roleMappingsHeadingDescription', {
     defaultMessage:
       'Role mappings provide an interface to associate native or SAML-governed role attributes with {productName} permissions.',

diff --git a/...ugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx b/...ugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx
@@ -17,6 +17,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
+import { ProductName } from '../types';
+
 import {
   ROLE_MAPPINGS_HEADING_TITLE,
   ROLE_MAPPINGS_HEADING_DESCRIPTION,
@@ -25,7 +27,7 @@ import {
 } from './constants';
 
 interface Props {
-  productName: string;
+  productName: ProductName;
   onClick(): void;
 }
 

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../common/constants';
+
 import { ADD, UPDATE } from './constants/operations';
 
 export type TOperation = typeof ADD | typeof UPDATE;
@@ -35,3 +37,6 @@ export interface RoleMapping {
     content: string;
   };
 }
+
+const productNames = [APP_SEARCH_PLUGIN.NAME, WORKPLACE_SEARCH_PLUGIN.NAME] as const;
+export type ProductName = typeof productNames[number];