{sortBy(tags, tag => tag.name?.toLowerCase()).map(tag => {
@@ -61,9 +62,7 @@ export default function TagsList() {
color: getTagColor(tag),
}}
>
-
+
{tag.name}{' '}
diff --git a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
index 9a942ae2ef..b597e4746d 100644
--- a/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/project-tools/buttons/tags-dropdown.tsx
@@ -4,6 +4,7 @@ import { Button, Dropdown } from 'react-bootstrap'
import { useTranslation } from 'react-i18next'
import ControlledDropdown from '../../../../../../shared/components/controlled-dropdown'
import Icon from '../../../../../../shared/components/icon'
+import MaterialIcon from '../../../../../../shared/components/material-icon'
import { useProjectListContext } from '../../../../context/project-list-context'
import useTag from '../../../../hooks/use-tag'
import { addProjectsToTag, removeProjectsFromTag } from '../../../../util/api'
@@ -90,11 +91,11 @@ function TagsDropdown() {
title={t('tags')}
aria-label={t('tags')}
>
-
+
- {t('add_to_folder')}
+ {t('add_to_tag')}
{sortBy(tags, tag => tag.name?.toLowerCase()).map(tag => {
return (
@@ -137,7 +138,7 @@ function TagsDropdown() {
className="tag-dropdown-button"
onClick={handleOpenCreateTagModal}
>
- {t('create_new_folder')}
+ {t('create_new_tag')}
diff --git a/services/web/frontend/js/features/project-list/components/tags-list.tsx b/services/web/frontend/js/features/project-list/components/tags-list.tsx
index 36982c9423..d86dd877e9 100644
--- a/services/web/frontend/js/features/project-list/components/tags-list.tsx
+++ b/services/web/frontend/js/features/project-list/components/tags-list.tsx
@@ -1,5 +1,6 @@
import { Button } from 'react-bootstrap'
import { useTranslation } from 'react-i18next'
+import MaterialIcon from '../../../shared/components/material-icon'
import { getTagColor } from '../util/tag'
import MenuItemButton from './dropdown/menu-item-button'
import Icon from '../../../shared/components/icon'
@@ -65,9 +66,7 @@ function TagsList({ onTagClick, onEditClick }: TagsListProps) {
color: getTagColor(tag),
}}
>
-
+
{tag.name}{' '}
@@ -100,7 +99,7 @@ function TagsList({ onTagClick, onEditClick }: TagsListProps) {
>
- {t('new_folder')}
+ {t('new_tag')}
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 74990b17c5..0302fdd320 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -13,6 +13,7 @@
"about_to_archive_projects": "You are about to archive the following projects:",
"about_to_delete_folder": "You are about to delete the following folders (any projects in them will not be deleted):",
"about_to_delete_projects": "You are about to delete the following projects:",
+ "about_to_delete_tag": "You are about to delete the following tag (any projects in them will not be deleted):",
"about_to_delete_the_following": "You are about to delete the following ",
"about_to_leave_projects": "You are about to leave the following projects:",
"about_to_trash_projects": "You are about to trash the following projects:",
@@ -55,6 +56,7 @@
"add_role_and_department": "Add role and department",
"add_to_folder": "Add to folder",
"add_to_folders": "Add to folders",
+ "add_to_tag": "Add to tag",
"add_your_comment_here": "Add your comment here",
"add_your_first_group_member_now": "Add your first group members now",
"added": "added",
@@ -288,6 +290,7 @@
"create_new_account": "Create new account",
"create_new_folder": "Create New Folder",
"create_new_subscription": "Create New Subscription",
+ "create_new_tag": "Create new tag",
"create_project_in_github": "Create a GitHub repository",
"create_your_first_project": "Create your first project!",
"created_at": "Created at",
@@ -323,6 +326,7 @@
"delete_and_leave_projects": "Delete and Leave Projects",
"delete_folder": "Delete Folder",
"delete_projects": "Delete Projects",
+ "delete_tag": "Delete Tag",
"delete_your_account": "Delete your account",
"deleted_at": "Deleted At",
"deleted_files": "Deleted Files",
@@ -394,9 +398,9 @@
"edit_dictionary": "Edit Dictionary",
"edit_dictionary_empty": "Your custom dictionary is empty.",
"edit_dictionary_remove": "Remove from dictionary",
- "edit_folder": "Edit Folder",
"edit_in_source_to_see_your_entire_latex_code": "Edit in <0>Source to see your entire LaTeX code, or choose <0>Rich Text for something more visual.",
"edit_in_the_left_pane_click_recompile": "Edit in the left pane. Click <0>Recompile to see the PDF output on the right.",
+ "edit_tag": "Edit Tag",
"editing": "Editing",
"editor_and_pdf": "Editor <0> PDF",
"editor_disconected_click_to_reconnect": "Editor disconnected, click anywhere to reconnect.",
@@ -508,7 +512,6 @@
"first_name": "First Name",
"first_x_days_free_after_that_y_per_month": "First <0>__trialLen__ days free, after that <0>__price__ per month",
"fold_line": "Fold line",
- "folder_color": "Folder color",
"folders": "Folders",
"following_paths_conflict": "The following files and folders conflict with the same path",
"font_family": "Font Family",
@@ -954,6 +957,8 @@
"new_project": "New Project",
"new_snippet_project": "Untitled",
"new_subscription_will_be_billed_immediately": "Your new subscription will be billed immediately to your current payment method.",
+ "new_tag": "New Tag",
+ "new_tag_name": "New tag name",
"new_to_latex_look_at": "New to LaTeX? Start by having a look at our",
"newsletter": "Newsletter",
"newsletter-accept": "I’d like emails about product offers and company news and events.",
@@ -1447,6 +1452,7 @@
"syntax_validation": "Code check",
"tab_connecting": "Connecting with the editor",
"tab_no_longer_connected": "This tab is no longer connected with the editor",
+ "tag_color": "Tag color",
"tag_name_cannot_exceed_characters": "Tag name cannot exceed __maxLength__ characters",
"tag_name_is_already_used": "Tag \"__tagName__\" already exists",
"tagline_collaborator": "Great for shared projects",
diff --git a/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx b/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
index 4d06030cc4..e899a62c23 100644
--- a/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
@@ -645,9 +645,9 @@ describe('', function () {
const tagsDropdown = within(actionsToolbar).getByLabelText('Tags')
fireEvent.click(tagsDropdown)
})
- screen.getByText('Add to folder')
+ screen.getByText('Add to tag')
- const newTagButton = screen.getByText('Create New Folder')
+ const newTagButton = screen.getByText('Create new tag')
fireEvent.click(newTagButton)
const modal = screen.getAllByRole('dialog')[0]
@@ -685,7 +685,7 @@ describe('', function () {
const tagsDropdown = within(actionsToolbar).getByLabelText('Tags')
fireEvent.click(tagsDropdown)
- within(actionsToolbar).getByText('Add to folder')
+ within(actionsToolbar).getByText('Add to tag')
const tagButton = within(actionsToolbar).getByLabelText(
`Add or remove project from tag ${this.tagName}`
@@ -718,7 +718,7 @@ describe('', function () {
const tagsDropdown = within(actionsToolbar).getByLabelText('Tags')
fireEvent.click(tagsDropdown)
- within(actionsToolbar).getByText('Add to folder')
+ within(actionsToolbar).getByText('Add to tag')
const tagButton = within(actionsToolbar).getByLabelText(
`Add or remove project from tag ${this.tagName}`
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
index bb4bbf1c6e..f9a081f8e6 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
@@ -43,10 +43,10 @@ describe('', function () {
it('displays the tags list', function () {
screen.getByRole('heading', {
- name: 'Tags/Folders',
+ name: 'Tags',
})
screen.getByRole('button', {
- name: 'New Folder',
+ name: 'New Tag',
})
screen.getByRole('button', {
name: 'Tag 1 (1)',
@@ -82,7 +82,7 @@ describe('', function () {
describe('Create modal', function () {
beforeEach(async function () {
const newTagButton = screen.getByRole('button', {
- name: 'New Folder',
+ name: 'New Tag',
})
await fireEvent.click(newTagButton)
@@ -90,7 +90,7 @@ describe('', function () {
it('modal is open', async function () {
const modal = screen.getAllByRole('dialog', { hidden: false })[0]
- within(modal).getByRole('heading', { name: 'Create New Folder' })
+ within(modal).getByRole('heading', { name: 'Create new tag' })
})
it('click on cancel closes the modal', async function () {
@@ -171,7 +171,7 @@ describe('', function () {
it('modal is open', async function () {
const modal = screen.getAllByRole('dialog', { hidden: false })[0]
- within(modal).getByRole('heading', { name: 'Edit Folder' })
+ within(modal).getByRole('heading', { name: 'Edit Tag' })
})
it('click on cancel closes the modal', async function () {
@@ -264,7 +264,7 @@ describe('', function () {
it('modal is open', async function () {
const modal = screen.getAllByRole('dialog', { hidden: false })[0]
- within(modal).getByRole('heading', { name: 'Delete Folder' })
+ within(modal).getByRole('heading', { name: 'Delete Tag' })
})
it('click on Cancel closes the modal', async function () {
diff --git a/services/web/test/frontend/features/project-list/components/table/project-tools/project-tools.test.tsx b/services/web/test/frontend/features/project-list/components/table/project-tools/project-tools.test.tsx
index 5fed1e962c..ab8caf15a4 100644
--- a/services/web/test/frontend/features/project-list/components/table/project-tools/project-tools.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/table/project-tools/project-tools.test.tsx
@@ -18,6 +18,6 @@ describe('', function () {
screen.getByLabelText('Archive')
screen.getByLabelText('Trash')
screen.getByTitle('Tags')
- screen.getByRole('button', { name: 'Create New Folder' })
+ screen.getByRole('button', { name: 'Create new tag' })
})
})