Fix unprefixed and duplicate i18n identifiers in workspace plugin

Signed-off-by: Miki <[email protected]>
opensearch-project · Oct 1, 2024 · c7f22ec · c7f22ec
1 parent 4b56be5
commit c7f22ec
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/src/plugins/workspace/public/components/home_get_start_card/use_case_card_title.tsx b/src/plugins/workspace/public/components/home_get_start_card/use_case_card_title.tsx
@@ -51,8 +51,8 @@ export const UseCaseCardTitle = ({ filterWorkspaces, useCase, core }: UseCaseCar
 
   const iconButton = (
     <EuiButtonIcon
-      aria-label={i18n.translate(`workspace.getStartCard.{useCaseId}.icon.button`, {
-        defaultMessage: `show available workspace menu for {useCaseId}`,
+      aria-label={i18n.translate('workspace.getStartCard.{useCaseId}.icon.button', {
+        defaultMessage: 'show available workspace menu for {useCaseId}',
         values: { useCaseId: useCase.id },
       })}
       size="xs"
@@ -147,7 +147,7 @@ export const UseCaseCardTitle = ({ filterWorkspaces, useCase, core }: UseCaseCar
           anchorPosition="downCenter"
         >
           <EuiPopoverTitle paddingSize="s">
-            {i18n.translate('workspace.getStartCard.popover.title.', {
+            {i18n.translate('workspace.getStartCard.popover.title', {
               defaultMessage: 'SELECT WORKSPACE',
             })}
           </EuiPopoverTitle>

diff --git a/src/plugins/workspace/public/components/workspace_column/workspace_column.tsx b/src/plugins/workspace/public/components/workspace_column/workspace_column.tsx
@@ -35,7 +35,7 @@ export function getWorkspaceColumn(
     euiColumn: {
       align: 'left',
       field: 'workspaces',
-      name: i18n.translate('savedObjectsManagement.objectsTable.table.columnWorkspacesName', {
+      name: i18n.translate('workspace.objectsTable.table.columnWorkspacesName', {
         defaultMessage: 'Workspace',
       }),
       render: (workspaces: string[]) => {

diff --git a/src/plugins/workspace/public/components/workspace_creator_app.tsx b/src/plugins/workspace/public/components/workspace_creator_app.tsx
@@ -20,7 +20,7 @@ export const WorkspaceCreatorApp = (props: WorkspaceCreatorProps) => {
    */
   useEffect(() => {
     const homeBreadcrumb = {
-      text: i18n.translate('core.breadcrumbs.homeTitle', { defaultMessage: 'Home' }),
+      text: i18n.translate('workspace.breadcrumbs.homeTitle', { defaultMessage: 'Home' }),
       onClick: () => {
         application?.navigateToApp('home');
       },

diff --git a/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx b/src/plugins/workspace/public/components/workspace_detail/workspace_detail.tsx
@@ -369,7 +369,7 @@ export const WorkspaceDetail = (props: WorkspaceDetailPropsWithFormSubmitting) =
         {modalVisible && (
           <EuiConfirmModal
             data-test-subj="workspaceForm-cancelModal"
-            title={i18n.translate('workspace.form.cancelModal.title', {
+            title={i18n.translate('workspace.detail.cancelModal.title', {
               defaultMessage: 'Navigate away?',
             })}
             onCancel={() => setModalVisible(false)}
@@ -379,14 +379,14 @@ export const WorkspaceDetail = (props: WorkspaceDetailPropsWithFormSubmitting) =
               history.push(`?tab=${tabId}`);
               setSelectedTabId(tabId);
             }}
-            cancelButtonText={i18n.translate('workspace.form.cancelButtonText', {
+            cancelButtonText={i18n.translate('workspace.detail.cancelButtonText', {
               defaultMessage: 'Cancel',
             })}
-            confirmButtonText={i18n.translate('workspace.form.confirmButtonText', {
+            confirmButtonText={i18n.translate('workspace.detail.confirmButtonText', {
               defaultMessage: 'Confirm',
             })}
           >
-            {i18n.translate('workspace.form.cancelModal.body', {
+            {i18n.translate('workspace.detail.cancelModal.body', {
               defaultMessage: 'Any unsaved changes will be lost.',
             })}
           </EuiConfirmModal>

diff --git a/src/plugins/workspace/public/components/workspace_detail_app.tsx b/src/plugins/workspace/public/components/workspace_detail_app.tsx
@@ -99,7 +99,7 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
       }
       if (!currentWorkspace) {
         notifications?.toasts.addDanger({
-          title: i18n.translate('Cannot find current workspace', {
+          title: i18n.translate('workspace.detail.notFoundError', {
             defaultMessage: 'Cannot update workspace',
           }),
         });

diff --git a/src/plugins/workspace/public/components/workspace_fatal_error/workspace_fatal_error.tsx b/src/plugins/workspace/public/components/workspace_fatal_error/workspace_fatal_error.tsx
@@ -35,23 +35,23 @@ export function WorkspaceFatalError(props: { error?: string }) {
             title={
               <h2>
                 <FormattedMessage
-                  id="core.fatalErrors.somethingWentWrongTitle"
+                  id="workspace.fatalErrors.somethingWentWrongTitle"
                   defaultMessage="Something went wrong"
                 />
               </h2>
             }
             body={
               <p>
                 <FormattedMessage
-                  id="core.fatalErrors.tryGoBackToDefaultWorkspaceDescription"
+                  id="workspace.fatalErrors.tryGoBackToDefaultWorkspaceDescription"
                   defaultMessage="The workspace you are trying to access cannot be found. Please return to the homepage and try again."
                 />
               </p>
             }
             actions={[
               <EuiSmallButton color="primary" fill onClick={goBackToHome}>
                 <FormattedMessage
-                  id="core.fatalErrors.goBackToHome"
+                  id="workspace.fatalErrors.goBackToHome"
                   defaultMessage="Go back to homepage"
                 />
               </EuiSmallButton>,

diff --git a/src/plugins/workspace/public/components/workspace_form/fields/workspace_name_field.tsx b/src/plugins/workspace/public/components/workspace_form/fields/workspace_name_field.tsx
@@ -53,7 +53,7 @@ export const WorkspaceNameField = ({
           {showDescription && (
             <>
               <br />
-              {i18n.translate('workspace.form.workspaceDetails.name.helpText', {
+              {i18n.translate('workspace.form.workspaceDetails.name.helpTextLong', {
                 defaultMessage:
                   'Use a unique name for the workspace. Valid characters are a-z, A-Z, 0-9, (), [], _ (underscore), - (hyphen) and (space).',
               })}

diff --git a/src/plugins/workspace/public/components/workspace_form/utils.ts b/src/plugins/workspace/public/components/workspace_form/utils.ts
@@ -331,15 +331,15 @@ export const validateWorkspaceForm = (
   if (!features || !features.some((featureConfig) => isUseCaseFeatureConfig(featureConfig))) {
     formErrors.features = {
       code: WorkspaceFormErrorCode.UseCaseMissing,
-      message: i18n.translate('workspace.form.features.empty', {
+      message: i18n.translate('workspace.form.features.emptyUseCase', {
         defaultMessage: 'Use case is required. Select a use case.',
       }),
     };
   }
   if (color && !validateWorkspaceColor(color)) {
     formErrors.color = {
       code: WorkspaceFormErrorCode.InvalidColor,
-      message: i18n.translate('workspace.form.features.empty', {
+      message: i18n.translate('workspace.form.features.invalidColor', {
         defaultMessage: 'Color is invalid. Enter a valid color.',
       }),
     };

diff --git a/src/plugins/workspace/public/components/workspace_form/workspace_form_error_callout.tsx b/src/plugins/workspace/public/components/workspace_form/workspace_form_error_callout.tsx
@@ -31,11 +31,11 @@ const getSuggestionFromErrorCode = (error: WorkspaceFormError) => {
         defaultMessage: 'Enter a user group.',
       });
     case WorkspaceFormErrorCode.DuplicateUserIdPermissionSetting:
-      return i18n.translate('workspace.form.errorCallout.duplicatePermission', {
+      return i18n.translate('workspace.form.errorCallout.duplicateUserPermission', {
         defaultMessage: 'Enter a unique user.',
       });
     case WorkspaceFormErrorCode.DuplicateUserGroupPermissionSetting:
-      return i18n.translate('workspace.form.errorCallout.duplicatePermission', {
+      return i18n.translate('workspace.form.errorCallout.duplicateGroupPermission', {
         defaultMessage: 'Enter a unique user group.',
       });
     case WorkspaceFormErrorCode.PermissionSettingOwnerMissing:
@@ -112,7 +112,7 @@ export const WorkspaceFormErrorCallout = ({ errors }: WorkspaceFormErrorCalloutP
           )}
           {errors.color && (
             <WorkspaceFormErrorCalloutItem
-              errorKey={i18n.translate('workspace.form.errorCallout.nameKey', {
+              errorKey={i18n.translate('workspace.form.errorCallout.colorKey', {
                 defaultMessage: 'Color:',
               })}
               message={getSuggestionFromErrorCode(errors.color)}

diff --git a/...plugins/workspace/public/components/workspace_form/workspace_permission_setting_input.tsx b/...plugins/workspace/public/components/workspace_form/workspace_permission_setting_input.tsx
@@ -120,7 +120,7 @@ export const WorkspacePermissionSettingInput = ({
         ) : (
           <EuiSuperSelect
             compressed={true}
-            placeholder={i18n.translate('workspaceForm.permissionSetting.selectType', {
+            placeholder={i18n.translate('workspace.form.permissionSetting.selectType', {
               defaultMessage: 'Select',
             })}
             options={typeOptions}
@@ -143,10 +143,10 @@ export const WorkspacePermissionSettingInput = ({
           data-test-subj="workspaceFormUserIdOrGroupInput"
           placeholder={
             type === WorkspacePermissionItemType.User
-              ? i18n.translate('workspaceForm.permissionSetting.selectUser', {
+              ? i18n.translate('workspace.form.permissionSetting.selectUser', {
                   defaultMessage: 'Enter user name or user ID',
                 })
-              : i18n.translate('workspaceForm.permissionSetting.selectUserGroup', {
+              : i18n.translate('workspace.form.permissionSetting.selectUserGroup', {
                   defaultMessage: 'Enter group name or group ID',
                 })
           }

diff --git a/...plugins/workspace/public/components/workspace_form/workspace_permission_setting_panel.tsx b/...plugins/workspace/public/components/workspace_form/workspace_permission_setting_panel.tsx
@@ -141,21 +141,21 @@ export const WorkspacePermissionSettingPanel = ({
           <EuiFlexGroup alignItems="center" gutterSize="s">
             <EuiFlexItem style={{ maxWidth: 150 }}>
               <EuiFormLabel id={PERMISSION_TYPE_LABEL_ID}>
-                {i18n.translate('workspaceForm.permissionSetting.typeLabel', {
+                {i18n.translate('workspace.form.permissionSetting.typeLabel', {
                   defaultMessage: 'Type',
                 })}
               </EuiFormLabel>
             </EuiFlexItem>
             <EuiFlexItem style={{ maxWidth: 400 }}>
               <EuiFormLabel id={PERMISSION_COLLABORATOR_LABEL_ID}>
-                {i18n.translate('workspaceForm.permissionSetting.collaboratorLabel', {
+                {i18n.translate('workspace.form.permissionSetting.collaboratorLabel', {
                   defaultMessage: 'Collaborator',
                 })}
               </EuiFormLabel>
             </EuiFlexItem>
             <EuiFlexItem style={{ maxWidth: 150 }}>
               <EuiFormLabel id={PERMISSION_ACCESS_LEVEL_LABEL_ID}>
-                {i18n.translate('workspaceForm.permissionSetting.accessLevelLabel', {
+                {i18n.translate('workspace.form.permissionSetting.accessLevelLabel', {
                   defaultMessage: 'Access level',
                 })}
               </EuiFormLabel>

diff --git a/src/plugins/workspace/server/permission_control/client.ts b/src/plugins/workspace/server/permission_control/client.ts
@@ -184,7 +184,7 @@ export class SavedObjectsPermissionControl {
     if (!savedObjectsGet.length) {
       return {
         success: false,
-        error: i18n.translate('savedObjects.permission.notFound', {
+        error: i18n.translate('workspace.savedObjects.permission.notFound', {
           defaultMessage: 'Can not find target saved objects.',
         }),
       };

diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -48,7 +48,7 @@ const generateWorkspacePermissionError = () =>
 const generateSavedObjectsPermissionError = () =>
   SavedObjectsErrorHelpers.decorateForbiddenError(
     new Error(
-      i18n.translate('saved_objects.permission.invalidate', {
+      i18n.translate('workspace.saved_objects.permission.invalidate', {
         defaultMessage: 'Invalid saved objects permission',
       })
     )
@@ -57,7 +57,7 @@ const generateSavedObjectsPermissionError = () =>
 const generateDataSourcePermissionError = () =>
   SavedObjectsErrorHelpers.decorateForbiddenError(
     new Error(
-      i18n.translate('saved_objects.data_source.invalidate', {
+      i18n.translate('workspace.saved_objects.data_source.invalidate', {
         defaultMessage: 'Invalid data source permission, please associate it to current workspace',
       })
     )
@@ -66,7 +66,7 @@ const generateDataSourcePermissionError = () =>
 const generateOSDAdminPermissionError = () =>
   SavedObjectsErrorHelpers.decorateForbiddenError(
     new Error(
-      i18n.translate('dashboard.admin.permission.invalidate', {
+      i18n.translate('workspace.admin.permission.invalidate', {
         defaultMessage: 'Invalid permission, please contact OSD admin',
       })
     )