diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue index fe7851c85241f9b9dc501de8968d70d81bc7c0c6..2f9e9d8d4f7c05c931248f6b6666c2279f754eb4 100644 --- a/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue +++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue @@ -5,7 +5,7 @@ import { createAlert } from '~/alert'; import { FORM_TYPES, WIDGET_TYPE_HIERARCHY, - WORK_ITEMS_TREE_TEXT_MAP, + WORK_ITEMS_TREE_TEXT, WORK_ITEM_TYPE_VALUE_MAP, WORK_ITEMS_TYPE_MAP, WORK_ITEM_TYPE_ENUM_OBJECTIVE, @@ -26,7 +26,7 @@ import WorkItemTreeActions from './work_item_tree_actions.vue'; export default { FORM_TYPES, - WORK_ITEMS_TREE_TEXT_MAP, + WORK_ITEMS_TREE_TEXT, WORK_ITEM_TYPE_ENUM_OBJECTIVE, WORK_ITEM_TYPE_ENUM_KEY_RESULT, components: { @@ -258,7 +258,7 @@ export default { @dismissAlert="error = undefined" > <template #header> - {{ $options.WORK_ITEMS_TREE_TEXT_MAP[workItemType].title }} + {{ $options.WORK_ITEMS_TREE_TEXT.title }} <span v-if="showRolledUpWeight" ref="weightData" @@ -298,7 +298,7 @@ export default { <div class="gl-new-card-content gl-px-0"> <div v-if="showEmptyMessage" data-testid="tree-empty"> <p class="gl-new-card-empty"> - {{ $options.WORK_ITEMS_TREE_TEXT_MAP[workItemType].empty }} + {{ $options.WORK_ITEMS_TREE_TEXT.empty }} </p> </div> <work-item-links-form diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js index e3be29f5ce3f05c06f2fcc52c361fabc8e5e234e..b55487438f9f257c57b902b613b522454ff69d98 100644 --- a/app/assets/javascripts/work_items/constants.js +++ b/app/assets/javascripts/work_items/constants.js @@ -216,21 +216,11 @@ export const WORK_ITEM_TYPE_VALUE_MAP = { [WORK_ITEM_TYPE_VALUE_TASK]: WORK_ITEM_TYPE_ENUM_TASK, }; -export const WORK_ITEMS_TREE_TEXT_MAP = { - [WORK_ITEM_TYPE_VALUE_OBJECTIVE]: { - title: s__('WorkItem|Child objectives and key results'), - empty: s__('WorkItem|No objectives or key results are currently assigned.'), - }, - [WORK_ITEM_TYPE_VALUE_ISSUE]: { - title: s__('WorkItem|Tasks'), - empty: s__( - 'WorkItem|No tasks are currently assigned. Use tasks to break down this issue into smaller parts.', - ), - }, - [WORK_ITEM_TYPE_VALUE_EPIC]: { - title: s__('WorkItem|Child items'), - empty: s__('WorkItem|No epics or issues are currently assigned.'), - }, +export const WORK_ITEMS_TREE_TEXT = { + title: s__('WorkItem|Child items'), + empty: s__( + 'WorkItem|No child items are currently assigned. Use child items to break down work into smaller parts.', + ), }; export const FORM_TYPES = { diff --git a/doc/user/okrs.md b/doc/user/okrs.md index 58b1f5fb0664901fad24770c78e211d0f18171b3..8b4109883624ff28532317963097482488ad7c74 100644 --- a/doc/user/okrs.md +++ b/doc/user/okrs.md @@ -90,7 +90,7 @@ To view a key result: for `Type = key_result`. 1. Select the title of a key result from the list. -Alternatively, you can access a key result from the **Child objectives and key results** section in +Alternatively, you can access a key result from the **Child items** section in its parent's objective. ## Edit title and description @@ -296,7 +296,7 @@ In your workflow, use key results to measure the goal described in the objective You can add child objectives to a total of 9 levels. An objective can have up to 100 child OKRs. Key results are children of objectives and cannot have children items themselves. -Child objectives and key results are available in the **Child objectives and key results** section +Child objectives and key results are available in the **Child items** section below an objective's description. ### Add a child objective @@ -309,7 +309,7 @@ Prerequisites: To add a new objective to an objective: -1. In an objective, in the **Child objectives and key results** section, select **Add** and then +1. In an objective, in the **Child items** section, select **Add** and then select **New objective**. 1. Enter a title for the new objective. 1. Select a [project](project/organize_work_with_projects.md) to create the new objective in. @@ -317,7 +317,7 @@ To add a new objective to an objective: To add an existing objective to an objective: -1. In an objective, in the **Child objectives and key results** section, select **Add** and then +1. In an objective, in the **Child items** section, select **Add** and then select **Existing objective**. 1. Search for the desired objective by entering part of its title, then selecting the desired match. @@ -335,7 +335,7 @@ Prerequisites: To add a new key result to an objective: -1. In an objective, in the **Child objectives and key results** section, select **Add** and then +1. In an objective, in the **Child items** section, select **Add** and then select **New key result**. 1. Enter a title for the new key result. 1. Select a [project](project/organize_work_with_projects.md) to create the new key result in. @@ -343,7 +343,7 @@ To add a new key result to an objective: To add an existing key result to an objective: -1. In an objective, in the **Child objectives and key results** section, select **Add** and then +1. In an objective, in the **Child items** section, select **Add** and then select **Existing key result**. 1. Search for the desired OKR by entering part of its title, then selecting the desired match. diff --git a/doc/user/tasks.md b/doc/user/tasks.md index ea6033f7237b237d8d027cc9913498ea38dcf725..c316155c7dbb01b954dd1ba1840bda11c0cf55f9 100644 --- a/doc/user/tasks.md +++ b/doc/user/tasks.md @@ -38,7 +38,7 @@ to work items and adding custom work item types, see ## View tasks -View tasks in issues, in the **Tasks** section. +View tasks in issues, in the **Child items** section. You can also [filter the list of issues](project/issues/managing_issues.md#filter-the-list-of-issues) for `Type = task`. @@ -59,7 +59,7 @@ To create a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select **Add**. +1. In the issue description, in the **Child items** section, select **Add**. 1. Select **New task**. 1. Enter the task title. 1. Select the [project](project/organize_work_with_projects.md) to create the new task in. @@ -93,7 +93,7 @@ To add a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select **Add**. +1. In the issue description, in the **Child items** section, select **Add**. 1. Select **Existing task**. 1. Search tasks by title. 1. Select one or multiple tasks to add to the issue. @@ -109,7 +109,7 @@ To edit a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the task you want to edit. +1. In the issue description, in the **Child items** section, select the task you want to edit. The task window opens. 1. Optional. To edit the title, select it and make your changes. 1. Optional. To edit the description, select the edit icon (**{pencil}**), make your changes, and @@ -137,7 +137,7 @@ To edit the description of a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Description**, select the edit icon (**{pencil}**). The description text box appears. 1. Above the text box, select **Rich text**. @@ -155,7 +155,7 @@ To promote a task to an issue: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the task you want to edit. +1. In the issue description, in the **Child items** section, select the task you want to edit. The task window opens. 1. Unlink the parent issue and promote the task: In the task window, use these two [quick actions](../user/project/quick_actions.md) in a comment, on separate lines: @@ -181,7 +181,7 @@ To remove a task from an issue: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the options menu (**{ellipsis_v}**) +1. In the issue description, in the **Child items** section, select the options menu (**{ellipsis_v}**) next to the task you want to remove. 1. Select **Remove task**. @@ -197,7 +197,7 @@ To delete a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the task you want to edit. +1. In the issue description, in the **Child items** section, select the task you want to edit. 1. In the task window, in the options menu (**{ellipsis_v}**), select **Delete task**. 1. Select **OK**. @@ -230,7 +230,7 @@ To change the assignee on a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Assignees**, select **Add assignees**. 1. From the dropdown list, select the users to add as an assignee. @@ -248,7 +248,7 @@ To add [labels](project/labels.md) to a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. The task window opens. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Labels**, select **Add labels**. 1. From the dropdown list, select the labels to add. 1. Select any area outside the dropdown list. @@ -270,14 +270,14 @@ To set a due date: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. If the task already has a due date next to **Due date**, select it. Otherwise, select **Add due date**. 1. In the date picker, select the desired due date. To set a start date: -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. If the task already has a start date next to **Start date**, select it. Otherwise, select **Add start date**. 1. In the date picker, select the desired due date. @@ -304,7 +304,7 @@ To add a task to a milestone: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Milestone**, select **Add to milestone**. If a task already belongs to a milestone, the dropdown list shows the current milestone. @@ -330,7 +330,7 @@ To set issue weight of a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Weight**, select **Edit**. 1. Enter a whole, positive number. @@ -361,7 +361,7 @@ To add a task to an iteration: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Iteration**, select **Add to iteration**. 1. From the dropdown list, select the iteration to be associated with the task. @@ -401,7 +401,7 @@ To copy the task reference to your clipboard: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select your task. +1. In the issue description, in the **Child items** section, select your task. 1. In the upper-right corner, select the vertical ellipsis (**{ellipsis_v}**), then select **Copy Reference**. You can now paste the reference into another description or comment. @@ -437,7 +437,7 @@ To set an issue as a parent of a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select the title of the task you want to edit. +1. In the issue description, in the **Child items** section, select the title of the task you want to edit. The task window opens. 1. Next to **Parent**, from the dropdown list, select the parent to add. 1. Select any area outside the dropdown list. @@ -584,7 +584,7 @@ To link an item to a task: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select your task. +1. In the issue description, in the **Child items** section, select your task. 1. In the **Linked items** section of a task, select **Add**. 1. Select the relationship between the two items. Either: @@ -607,7 +607,7 @@ Prerequisites: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Plan > Issues**, then select your issue to view it. -1. In the issue description, in the **Tasks** section, select your task. +1. In the issue description, in the **Child items** section, select your task. 1. In the **Linked items** section of a task, next to each item, select the vertical ellipsis (**{ellipsis_v}**) and then select **Remove**. diff --git a/ee/spec/features/projects/work_items/okr_spec.rb b/ee/spec/features/projects/work_items/okr_spec.rb index 43438670ce7220287991dbfd6abb04cd74d05de2..d6dc9437336a062fcc292efa6bc839161a7d77c9 100644 --- a/ee/spec/features/projects/work_items/okr_spec.rb +++ b/ee/spec/features/projects/work_items/okr_spec.rb @@ -159,8 +159,8 @@ context 'in hierarchy' do it 'shows no children', :aggregate_failures do within_testid('work-item-tree') do - expect(page).to have_content('Child objectives and key results') - expect(page).to have_content('No objectives or key results are currently assigned.') + expect(page).to have_content('Child items') + expect(page).to have_content('No child items are currently assigned.') end end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8b8f1a4c4376e9aca5c92e6eb335b632dd2a228d..dea4591d6b7b20606a6359e94c66d22dac3f1731 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -60352,9 +60352,6 @@ msgstr "" msgid "WorkItem|Child items" msgstr "" -msgid "WorkItem|Child objectives and key results" -msgstr "" - msgid "WorkItem|Child removal reverted" msgstr "" @@ -60502,7 +60499,7 @@ msgstr "" msgid "WorkItem|No child items are currently assigned. Use child items to break down this issue into smaller parts." msgstr "" -msgid "WorkItem|No epics or issues are currently assigned." +msgid "WorkItem|No child items are currently assigned. Use child items to break down work into smaller parts." msgstr "" msgid "WorkItem|No iteration" @@ -60517,12 +60514,6 @@ msgstr "" msgid "WorkItem|No milestone" msgstr "" -msgid "WorkItem|No objectives or key results are currently assigned." -msgstr "" - -msgid "WorkItem|No tasks are currently assigned. Use tasks to break down this issue into smaller parts." -msgstr "" - msgid "WorkItem|None" msgstr "" @@ -60682,9 +60673,6 @@ msgstr "" msgid "WorkItem|Task reverted" msgstr "" -msgid "WorkItem|Tasks" -msgstr "" - msgid "WorkItem|Teal" msgstr ""