diff --git a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue index 90c3fb0039d9fb9d649e4b19cd90af28d093a661..e3ed1f5bc78d40496aa52af546557fd9c902d0cc 100644 --- a/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue +++ b/app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue @@ -76,8 +76,8 @@ export default { }, permissions() { return this.isIssue - ? __('at least the Reporter role, the author, and assignees') - : __('at least the Reporter role'); + ? __('at least the Planner role, the author, and assignees') + : __('at least the Planner role'); }, issuableTypeText() { return issuableTypeText[this.issuableType]; diff --git a/app/assets/javascripts/vue_shared/constants.js b/app/assets/javascripts/vue_shared/constants.js index 8cee942cdefb3adc028cf260384d0e508d6ff041..99470991055b537b5a075ebd00102417d89e90d2 100644 --- a/app/assets/javascripts/vue_shared/constants.js +++ b/app/assets/javascripts/vue_shared/constants.js @@ -96,8 +96,8 @@ export const confidentialityInfoText = (workspaceType, issuableType) => issuableType: issuableType.toLowerCase().replaceAll('_', ' '), permissions: issuableType === TYPE_ISSUE - ? __('at least the Reporter role, the author, and assignees') - : __('at least the Reporter role'), + ? __('at least the Planner role, the author, and assignees') + : __('at least the Planner role'), }, ); diff --git a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue index 8fed8d0a23dce4804fd25477619fbeadd583c34d..b9e502cdc00995bb9e2b22fb5465694a60098c9a 100644 --- a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue +++ b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue @@ -58,7 +58,7 @@ export default { confidentialityText() { return sprintf( __( - 'This %{issuableType} is confidential and should only be visible to team members with at least Reporter access.', + 'This %{issuableType} is confidential and should only be visible to team members with at least the Planner role.', ), { issuableType: issuableTypeText[this.issuableType] }, ); diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue index dfdb66b5da52c2f18881dea1a32a9bad8c7e87fe..9aa79b3b11e701547b2ec09249ec52c16001663b 100644 --- a/app/assets/javascripts/work_items/components/create_work_item.vue +++ b/app/assets/javascripts/work_items/components/create_work_item.vue @@ -278,7 +278,7 @@ export default { makeConfidentialText() { return sprintfWorkItem( s__( - 'WorkItem|This %{workItemType} is confidential and should only be visible to users having at least Reporter access.', + 'WorkItem|This %{workItemType} is confidential and should only be visible to users having at least the Planner role.', ), this.selectedWorkItemTypeName, ); diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue index 69a285ed277cb17bde1f17861f6039963881dc69..049433364d5329456ad92fda041acc95a9a0341a 100644 --- a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue +++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue @@ -35,7 +35,7 @@ export default { i18n: { internal: s__('Notes|Make this an internal note'), internalVisibility: s__( - 'Notes|Internal notes are only visible to members with the role of Reporter or higher', + 'Notes|Internal notes are only visible to members with the role of Planner or higher', ), addInternalNote: __('Add internal note'), cancelButtonText: __('Cancel'), diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js index 959b845521850ac21e8640a4332657b557892920..a424d2847b47066c36b67fd0c35229bf38a9011e 100644 --- a/app/assets/javascripts/work_items/constants.js +++ b/app/assets/javascripts/work_items/constants.js @@ -115,7 +115,7 @@ export const I18N_WORK_ITEM_SEARCH_ERROR = s__( ); export const I18N_WORK_ITEM_NO_MATCHES_FOUND = s__('WorkItem|No matches found'); export const I18N_WORK_ITEM_CONFIDENTIALITY_CHECKBOX_LABEL = s__( - 'WorkItem|This %{workItemType} is confidential and should only be visible to team members with at least Reporter access', + 'WorkItem|This %{workItemType} is confidential and should only be visible to team members with at least the Planner role', ); export const I18N_WORK_ITEM_CONFIDENTIALITY_CHECKBOX_TOOLTIP = s__( 'WorkItem|A non-confidential %{workItemType} cannot be assigned to a confidential parent %{parentWorkItemType}.', diff --git a/app/views/shared/issuable/form/_metadata.html.haml b/app/views/shared/issuable/form/_metadata.html.haml index aeb819588688acb617413feb5e9e136bd020ec19..279c6bc53b6716ad908e698fdad12f3741dad66a 100644 --- a/app/views/shared/issuable/form/_metadata.html.haml +++ b/app/views/shared/issuable/form/_metadata.html.haml @@ -17,7 +17,7 @@ - if issuable.respond_to?(:confidential) && can?(current_user, :set_confidentiality, issuable) .form-group = form.gitlab_ui_checkbox_component :confidential, - _('This issue is confidential and should only be visible to team members with at least Reporter access.') + _('This issue is confidential and should only be visible to team members with at least the Planner role.') - if can?(current_user, :"set_#{issuable.to_ability_name}_metadata", issuable) .row.gl-pt-4 diff --git a/ee/app/assets/javascripts/epic/components/epic_form.vue b/ee/app/assets/javascripts/epic/components/epic_form.vue index 556eca1c302509431840733375cdf577093c12dd..e9b2daa43d1a40a6e6ad31d04bdf4b7c7b1dbf1f 100644 --- a/ee/app/assets/javascripts/epic/components/epic_form.vue +++ b/ee/app/assets/javascripts/epic/components/epic_form.vue @@ -28,7 +28,7 @@ import createEpic from '../queries/create_epic.mutation.graphql'; const i18n = { confidentialityLabel: s__(` Epics|This epic and any containing child epics are confidential - and should only be visible to team members with at least Reporter access. + and should only be visible to team members with at least the Planner role. `), epicDatesHint: s__('Epics|Leave empty to inherit from milestone dates'), colorHelp: s__( diff --git a/ee/spec/features/epic_boards/epic_boards_sidebar_spec.rb b/ee/spec/features/epic_boards/epic_boards_sidebar_spec.rb index cba915c7571e10a319634bd59e43fc71c5290031..1ab5aed0bf7fc2f9e934e1a1e230c6a84fe8dddd 100644 --- a/ee/spec/features/epic_boards/epic_boards_sidebar_spec.rb +++ b/ee/spec/features/epic_boards/epic_boards_sidebar_spec.rb @@ -177,7 +177,7 @@ expect(page).to have_content( _('Only group members with at least ' \ - 'the Reporter role can view or be ' \ + 'the Planner role can view or be ' \ 'notified about this epic') ) end diff --git a/ee/spec/features/projects/quality/test_case_show_spec.rb b/ee/spec/features/projects/quality/test_case_show_spec.rb index 3b916587887178385c83ff98be71bbe02355ddb2..32bf22e9e13c0f9e0d5be8da3589a387f2293348 100644 --- a/ee/spec/features/projects/quality/test_case_show_spec.rb +++ b/ee/spec/features/projects/quality/test_case_show_spec.rb @@ -146,7 +146,7 @@ expect(page).to have_content( 'You are going to turn on confidentiality. ' \ - 'Only project members with at least the Reporter role ' \ + 'Only project members with at least the Planner role ' \ 'can view or be notified about this test case.' ) @@ -156,7 +156,7 @@ expect(test_case.reload.confidential).to eq(true) expect(page).to have_content( - 'Confidential Only project members with at least the Reporter role ' \ + 'Confidential Only project members with at least the Planner role ' \ 'can view or be notified about this test case.' ) end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 752585acf3965aace1cf4419320aec06e1ea07f7..382ff76dce21b1f88ac17a5a87980f26cc54a5f8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -22065,7 +22065,7 @@ msgstr "" msgid "Epics|The color for the epic when it's visualized, such as on roadmap timeline bars." msgstr "" -msgid "Epics|This epic and any containing child epics are confidential and should only be visible to team members with at least Reporter access." +msgid "Epics|This epic and any containing child epics are confidential and should only be visible to team members with at least the Planner role." msgstr "" msgid "Epics|This will also remove any descendents of %{bStart}%{targetEpicTitle}%{bEnd} from %{bStart}%{parentEpicTitle}%{bEnd}. Are you sure?" @@ -36884,6 +36884,9 @@ msgstr "" msgid "Notes|Expand replies" msgstr "" +msgid "Notes|Internal notes are only visible to members with the role of Planner or higher" +msgstr "" + msgid "Notes|Internal notes are only visible to members with the role of Reporter or higher" msgstr "" @@ -56307,7 +56310,7 @@ msgstr "" msgid "This %{context} has been scheduled for deletion on %{strongStart}%{date}%{strongEnd}. To cancel the scheduled deletion, you can restore this %{context}, including all its resources." msgstr "" -msgid "This %{issuableType} is confidential and should only be visible to team members with at least Reporter access." +msgid "This %{issuableType} is confidential and should only be visible to team members with at least the Planner role." msgstr "" msgid "This %{issuable} is hidden because its author has been banned." @@ -56664,7 +56667,7 @@ msgstr "" msgid "This issue cannot be made public because it belongs to a confidential epic." msgstr "" -msgid "This issue is confidential and should only be visible to team members with at least Reporter access." +msgid "This issue is confidential and should only be visible to team members with at least the Planner role." msgstr "" msgid "This issue is currently blocked by the following issues:" @@ -63244,10 +63247,10 @@ msgstr "" msgid "WorkItem|This %{workItemType} has open child items. If you close this %{workItemType}, they will remain open." msgstr "" -msgid "WorkItem|This %{workItemType} is confidential and should only be visible to team members with at least Reporter access" +msgid "WorkItem|This %{workItemType} is confidential and should only be visible to team members with at least the Planner role" msgstr "" -msgid "WorkItem|This %{workItemType} is confidential and should only be visible to users having at least Reporter access." +msgid "WorkItem|This %{workItemType} is confidential and should only be visible to users having at least the Planner role." msgstr "" msgid "WorkItem|This %{workItemType} is currently blocked by the following items:" @@ -64992,10 +64995,10 @@ msgstr "" msgid "at" msgstr "" -msgid "at least the Reporter role" +msgid "at least the Planner role" msgstr "" -msgid "at least the Reporter role, the author, and assignees" +msgid "at least the Planner role, the author, and assignees" msgstr "" msgid "attach a new file" diff --git a/spec/features/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb index 4e526564571934f0b0c448a647ea3e180d2ec053..5abd02fb580fccefc93796c9d60e180acf2b9a88 100644 --- a/spec/features/issues/user_creates_issue_spec.rb +++ b/spec/features/issues/user_creates_issue_spec.rb @@ -50,7 +50,7 @@ .and have_content("Milestone") .and have_content("Labels") .and have_content("Due date") - .and have_content("This issue is confidential and should only be visible to team members with at least Reporter access.") + .and have_content("This issue is confidential and should only be visible to team members with at least the Planner role.") end end end diff --git a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_content_spec.js b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_content_spec.js index 4a2b3b30e6ddf548dab61455acf87d0f32f02af9..8a6234401ddde996a584aece8e816509e0717744 100644 --- a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_content_spec.js +++ b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_content_spec.js @@ -65,14 +65,14 @@ describe('Sidebar Confidentiality Content', () => { variant: 'warning', }); expect(alertEl.text()).toBe( - 'Only project members with at least the Reporter role, the author, and assignees can view or be notified about this issue.', + 'Only project members with at least the Planner role, the author, and assignees can view or be notified about this issue.', ); }); it('displays a correct confidential text for epic', () => { createComponent({ confidential: true, issuableType: 'epic' }); expect(findText().findComponent(GlAlert).text()).toBe( - 'Only group members with at least the Reporter role can view or be notified about this epic.', + 'Only group members with at least the Planner role can view or be notified about this epic.', ); }); }); diff --git a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js index 3588e92d5158c0a8af60776236aaf6d48c827ae4..5a94b6f9a32b2b4b4caf41f557026fc767de05d6 100644 --- a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js +++ b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js @@ -102,7 +102,7 @@ describe('Sidebar Confidentiality Form', () => { it('renders a message about making an issue confidential', () => { expect(findWarningMessage().text()).toBe( - 'You are going to turn on confidentiality. Only project members with at least the Reporter role, the author, and assignees can view or be notified about this issue.', + 'You are going to turn on confidentiality. Only project members with at least the Planner role, the author, and assignees can view or be notified about this issue.', ); }); @@ -194,7 +194,7 @@ describe('Sidebar Confidentiality Form', () => { it('renders a message about making a test case confidential', () => { expect(findWarningMessage().text()).toBe( - 'You are going to turn on confidentiality. Only project members with at least the Reporter role can view or be notified about this test case.', + 'You are going to turn on confidentiality. Only project members with at least the Planner role can view or be notified about this test case.', ); }); diff --git a/spec/frontend/vue_shared/components/confidentiality_badge_spec.js b/spec/frontend/vue_shared/components/confidentiality_badge_spec.js index b266fa102df0957c4fc3beffda8d26c73bf46bf4..8b25d4ee38ed188de06e6599091db84edd453fdd 100644 --- a/spec/frontend/vue_shared/components/confidentiality_badge_spec.js +++ b/spec/frontend/vue_shared/components/confidentiality_badge_spec.js @@ -32,8 +32,8 @@ describe('ConfidentialityBadge', () => { it.each` workspaceType | issuableType | expectedTooltip - ${WORKSPACE_PROJECT} | ${TYPE_ISSUE} | ${'Only project members with at least the Reporter role, the author, and assignees can view or be notified about this issue.'} - ${WORKSPACE_GROUP} | ${TYPE_EPIC} | ${'Only group members with at least the Reporter role can view or be notified about this epic.'} + ${WORKSPACE_PROJECT} | ${TYPE_ISSUE} | ${'Only project members with at least the Planner role, the author, and assignees can view or be notified about this issue.'} + ${WORKSPACE_GROUP} | ${TYPE_EPIC} | ${'Only group members with at least the Planner role can view or be notified about this epic.'} `( 'should render gl-badge with correct tooltip when workspaceType is $workspaceType and issuableType is $issuableType', ({ workspaceType, issuableType, expectedTooltip }) => { diff --git a/spec/frontend/vue_shared/issuable/create/components/issuable_form_spec.js b/spec/frontend/vue_shared/issuable/create/components/issuable_form_spec.js index b98553d30553831e4929b5a88cdbce0da9e251b0..9bdfe9c808303b9fc5613eaf20493f1426a9a863 100644 --- a/spec/frontend/vue_shared/issuable/create/components/issuable_form_spec.js +++ b/spec/frontend/vue_shared/issuable/create/components/issuable_form_spec.js @@ -101,7 +101,7 @@ describe('IssuableForm', () => { expect(confidentialCheckboxEl.findComponent(GlFormCheckbox).exists()).toBe(true); expect(confidentialCheckboxEl.findComponent(GlFormCheckbox).text()).toBe( - 'This test case is confidential and should only be visible to team members with at least Reporter access.', + 'This test case is confidential and should only be visible to team members with at least the Planner role.', ); }); diff --git a/spec/support/shared_examples/features/sidebar_shared_examples.rb b/spec/support/shared_examples/features/sidebar_shared_examples.rb index cd607bad671477c19eaee6d6771b20a1d9651106..14f78b042d86abea6ed06482cdab7b1df046e749 100644 --- a/spec/support/shared_examples/features/sidebar_shared_examples.rb +++ b/spec/support/shared_examples/features/sidebar_shared_examples.rb @@ -114,7 +114,7 @@ wait_for_requests expect(page).to have_content( - _('Only project members with at least the Reporter role, the author, and assignees ' \ + _('Only project members with at least the Planner role, the author, and assignees ' \ 'can view or be notified about this issue.') ) end