Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-91556 || Filter organization #4116

Merged
merged 11 commits into from
Dec 10, 2024
29 changes: 29 additions & 0 deletions app/localization/translated/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,18 @@
"Filter.name": "Назва",
"Filter.namePlaceholder": "Увядзіце назву фільтра",
"FilterAdd.addTitle": "Дадаць новы фільтр",
"FilterButton.any": "Нейкі",
"FilterButton.contains": "Змяшчае",
"FilterButton.equals": "Раўняецца",
"FilterButton.greaterOrEqual": "Больш або роўна",
"FilterButton.helpText": "Дазволеныя толькі лічбы",
"FilterButton.lessOrEqual": "Менш або роўна",
"FilterButton.last2days": "Апошнія 2 дні",
"FilterButton.last7days": "Апошнія 7 дзён",
"FilterButton.last30days": "Апошнія 30 дзён",
"FilterButton.notContains": "Не змяшчае",
"FilterButton.notEqual": "Не роўна",
"FilterButton.today": "Сёння",
"FilterEdit.editTitle": "Рэдагаваць фільтр",
"FilterNameById.statistics$defects$automation_bug": "Automation Bug",
"FilterNameById.statistics$defects$no_defect": "No Defect",
Expand Down Expand Up @@ -1572,6 +1584,14 @@
"OrganizationsControl.all": "Усе",
"OrganizationsControl.allOrganizations": "Усе арганізацыі",
"OrganizationsControl.organization": "Арганізацыя",
"OrganizationsFilter.lastRunDate": "Дата апошняга запуску",
"OrganizationsFilter.lastRunDatePlaceholder": "Любая",
"OrganizationsFilter.launches": "Запускі",
"OrganizationsFilter.launchesPlaceholder": "Увядзіце колькасць запускаў",
"OrganizationsFilter.name": "Назва Арганізацыі",
"OrganizationsFilter.namePlaceholder": "Увядзіце частку імя",
"OrganizationsFilter.users": "Карыстальнік",
"OrganizationsFilter.usersPlaceholder": "Увядзіце колькасць удзельнікаў",
"OrganizationsItem.open": "адкрыць",
"OrganizationsPage.title": "Усе арганізацыі",
"OrganizationsPage.description": "Спіс даступных вам арганізацый у дадзены момант пусты. Калі ласка, звяжыцеся са сваім адміністратарам, каб атрымаць прызначэнне ва ўжо існуючую арганізацыю.",
Expand Down Expand Up @@ -1801,6 +1821,15 @@
"ProjectsGrid.nameCol": "Назва",
"ProjectsGrid.organizationCol": "Арганізацыя",
"ProjectsGrid.projectTypeCol": "Тып праекта",
"ProjectsFilter.lastRunDate": "Дата апошняга запуску",
"ProjectsFilter.lastRunDatePlaceholder": "Любая",
"ProjectsFilter.launches": "Запускі",
"ProjectsFilter.launchesPlaceholder": "Увядзіце колькасць запускаў",
"ProjectsFilter.name": "Назва Праекта",
"ProjectsFilter.namePlaceholder": "Увядзіце частку імя",
"ProjectsFilter.users": "Таварышы па камандзе",
"ProjectsFilter.usersPlaceholder": "Увядзіце колькасць удзельнікаў",
"ProjectsFilterPopover.clearAllFilters": "Ачысціць усе фільтры",
"ProjectsPage.addProject": "Дадаць Праект",
"ProjectsPage.addProjectSuccess": "Праект ''{name}'' быў паспяхова створаны",
"ProjectsPage.addProjectTitle": "Дадаць Праект",
Expand Down
29 changes: 29 additions & 0 deletions app/localization/translated/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,18 @@
"Filter.name": "Nombre",
"Filter.namePlaceholder": "Introduce el nombre del filtro",
"FilterAdd.addTitle": "Agregar nuevo filtro",
"FilterButton.any": "Any",
"FilterButton.contains": "Contains",
"FilterButton.equals": "Equals",
"FilterButton.greaterOrEqual": "Greater or equal",
"FilterButton.helpText": "Only digits are allowed",
"FilterButton.lessOrEqual": "Less or equal",
"FilterButton.last2days": "Last 2 days",
"FilterButton.last7days": "Last 7 days",
"FilterButton.last30days": "Last 30 days",
"FilterButton.notContains": "Not contains",
"FilterButton.notEqual": "Not equal",
"FilterButton.today": "Today",
"FilterEdit.editTitle": "Editar filtro",
"FilterNameById.statistics$defects$automation_bug": "Error de automatización",
"FilterNameById.statistics$defects$no_defect": "Sin defecto",
Expand Down Expand Up @@ -1571,6 +1583,14 @@
"OrganizationsControl.all": "All",
"OrganizationsControl.allOrganizations": "All organizations",
"OrganizationsControl.organization": "Organization",
"OrganizationsFilter.lastRunDate": "Last Run Date",
"OrganizationsFilter.lastRunDatePlaceholder": "Any",
"OrganizationsFilter.launches": "Launches",
"OrganizationsFilter.launchesPlaceholder": "Enter the number of launches",
"OrganizationsFilter.name": "Organization Name",
"OrganizationsFilter.namePlaceholder": "Enter part of the name",
"OrganizationsFilter.users": "Users",
"OrganizationsFilter.usersPlaceholder": "Enter the number of members",
"OrganizationsItem.open": "open",
"OrganizationsPage.title": "All Organizations",
"OrganizationsPage.description": "The list of organizations available to you is currently empty. Please contact your Administrator to be assigned to an existing one.",
Expand Down Expand Up @@ -1800,6 +1820,15 @@
"ProjectsGrid.nameCol": "Nombre",
"ProjectsGrid.organizationCol": "Organización",
"ProjectsGrid.projectTypeCol": "Tipo de proyecto",
"ProjectsFilter.lastRunDate": "Last Run Date",
"ProjectsFilter.lastRunDatePlaceholder": "Any",
"ProjectsFilter.launches": "Launches",
"ProjectsFilter.launchesPlaceholder": "Enter the number of launches",
"ProjectsFilter.name": "Project Name",
"ProjectsFilter.namePlaceholder": "Enter part of the name",
"ProjectsFilter.users": "Teammates",
"ProjectsFilter.usersPlaceholder": "Enter the number of members",
"ProjectsFilterPopover.clearAllFilters": "Clear all filters",
"ProjectsPage.addProject": "Crear Proyecto",
"ProjectsPage.addProjectSuccess": "El proyecto ''{name}'' ha sido creado exitosamente",
"ProjectsPage.addProjectTitle": "Agregar Proyecto",
Expand Down
29 changes: 29 additions & 0 deletions app/localization/translated/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,18 @@
"Filter.name": "Имя",
"Filter.namePlaceholder": "Ввести имя фильтра",
"FilterAdd.addTitle": "Добавить новый фильтр",
"FilterButton.any": "Любой",
"FilterButton.contains": "Содержит",
"FilterButton.equals": "Равняется",
"FilterButton.greaterOrEqual": "Больше или равно",
"FilterButton.helpText": "Разрешены только цифры",
"FilterButton.lessOrEqual": "Меньше или равно",
"FilterButton.last2days": "Последние 2 дня",
"FilterButton.last7days": "Последние 7 дней",
"FilterButton.last30days": "Последние 30 дней",
"FilterButton.notContains": "Не содержит",
"FilterButton.notEqual": "Не равны",
"FilterButton.today": "Сегодня",
"FilterEdit.editTitle": "Редактировать фильтр",
"FilterNameById.statistics$defects$automation_bug": "Automation Bug",
"FilterNameById.statistics$defects$no_defect": "No Defect",
Expand Down Expand Up @@ -1568,6 +1580,14 @@
"OrganizationsControl.all": "Все",
"OrganizationsControl.allOrganizations": "Все организации",
"OrganizationsControl.organization": "Организация",
"OrganizationsFilter.lastRunDate": "Дата последнего запуска",
"OrganizationsFilter.lastRunDatePlaceholder": "Любой",
"OrganizationsFilter.launches": "Запуски",
"OrganizationsFilter.launchesPlaceholder": "Введите количество запусков",
"OrganizationsFilter.name": "Название Организации",
"OrganizationsFilter.namePlaceholder": "Введите часть имени",
"OrganizationsFilter.users": "Пользователи",
"OrganizationsFilter.usersPlaceholder": "Введите количество участников",
"OrganizationsItem.open": "открыть",
"OrganizationsPage.title": "Все организации",
"OrganizationsPage.description": "Список доступных вам организаций в данный момент пуст. Пожалуйста, свяжитесь со своим администратором, чтобы получить назначение в уже существующую организацию.",
Expand Down Expand Up @@ -1797,6 +1817,15 @@
"ProjectsGrid.nameCol": "Название",
"ProjectsGrid.organizationCol": "Организация",
"ProjectsGrid.projectTypeCol": "Тип проекта",
"ProjectsFilter.lastRunDate": "Дата последнего запуска",
"ProjectsFilter.lastRunDatePlaceholder": "Любой",
"ProjectsFilter.launches": "Запуски",
"ProjectsFilter.launchesPlaceholder": "Введите количество запусков",
"ProjectsFilter.name": "Название проекта",
"ProjectsFilter.namePlaceholder": "Введите часть имени",
"ProjectsFilter.users": "Товарищи по команде",
"ProjectsFilter.usersPlaceholder": "Введите количество участников",
"ProjectsFilterPopover.clearAllFilters": "Очистить все фильтры",
"ProjectsPage.addProject": "Создать Проект",
"ProjectsPage.addProjectSuccess": "Проект ''{name}'' успешно создан",
"ProjectsPage.addProjectTitle": "Добавить Проект",
Expand Down
29 changes: 29 additions & 0 deletions app/localization/translated/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,18 @@
"Filter.name": "Ім’я",
"Filter.namePlaceholder": "Ввести ім’я фільтра",
"FilterAdd.addTitle": "Додати новий фільтр",
"FilterButton.any": "Будь-який",
"FilterButton.contains": "Містити",
"FilterButton.equals": "Дорівнювати",
"FilterButton.greaterOrEqual": "Більше або дорівнює",
"FilterButton.helpText": "Дозволені лише цифри",
"FilterButton.lessOrEqual": "Менше або дорівнює",
"FilterButton.last2days": "Останні 2 дні",
"FilterButton.last7days": "Останні 7 днів",
"FilterButton.last30days": "Останні 30 днів",
"FilterButton.notContains": "Не містить",
"FilterButton.notEqual": "Не рівні",
"FilterButton.today": "Сьогодні",
"FilterEdit.editTitle": "Редагувати фільтр",
"FilterNameById.statistics$defects$automation_bug": "Помилка Автоматизації",
"FilterNameById.statistics$defects$no_defect": "Ніякої Дефект",
Expand Down Expand Up @@ -1570,6 +1582,14 @@
"OrganizationsControl.all": "Всі",
"OrganizationsControl.allOrganizations": "Всі організації",
"OrganizationsControl.organization": "Організація",
"OrganizationsFilter.lastRunDate": "Last Run Date",
"OrganizationsFilter.lastRunDatePlaceholder": "Будь-який",
"OrganizationsFilter.launches": "Запуски",
"OrganizationsFilter.launchesPlaceholder": "Введіть кількість запусків",
"OrganizationsFilter.name": "Назва організації",
"OrganizationsFilter.namePlaceholder": "Введіть частину імені",
"OrganizationsFilter.users": "Користувачі",
"OrganizationsFilter.usersPlaceholder": "Введіть кількість учасників",
"OrganizationsItem.open": "відкрити",
"OrganizationsPage.title": "Всі організації",
"OrganizationsPage.description": "Список доступних вам організацій в даний момент порожній. Будь ласка, зв'яжіться зі своїм адміністратором, щоб отримати призначення в уже існуючу організацію.",
Expand Down Expand Up @@ -1799,6 +1819,15 @@
"ProjectsGrid.nameCol": "Назва",
"ProjectsGrid.organizationCol": "Організація",
"ProjectsGrid.projectTypeCol": "Тип проекту",
"ProjectsFilter.lastRunDate": "Дата останнього запуску",
"ProjectsFilter.lastRunDatePlaceholder": "Будь-який",
"ProjectsFilter.launches": "Запуски",
"ProjectsFilter.launchesPlaceholder": "Введіть кількість запусків",
"ProjectsFilter.name": "Назва проекту",
"ProjectsFilter.namePlaceholder": "Введіть частину імені",
"ProjectsFilter.users": "Товариші по команді",
"ProjectsFilter.usersPlaceholder": "Введіть кількість учасників",
"ProjectsFilterPopover.clearAllFilters": "Очистити всі фільтри",
"ProjectsPage.addProject": "Створити Проект",
"ProjectsPage.addProjectSuccess": "Проект ''{name}'' успешно создан",
"ProjectsPage.addProjectTitle": "Проект Додати",
Expand Down
29 changes: 29 additions & 0 deletions app/localization/translated/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,18 @@
"Filter.name": "名称",
"Filter.namePlaceholder": "请输入过滤器名称",
"FilterAdd.addTitle": "添加新过滤器",
"FilterButton.any": "Any",
"FilterButton.contains": "Contains",
"FilterButton.equals": "Equals",
"FilterButton.greaterOrEqual": "Greater or equal",
"FilterButton.helpText": "Only digits are allowed",
"FilterButton.lessOrEqual": "Less or equal",
"FilterButton.last2days": "Last 2 days",
"FilterButton.last7days": "Last 7 days",
"FilterButton.last30days": "Last 30 days",
"FilterButton.notContains": "Not contains",
"FilterButton.notEqual": "Not equal",
"FilterButton.today": "Today",
"FilterEdit.editTitle": "编辑过滤器",
"FilterNameById.statistics$defects$automation_bug": "自动化错误",
"FilterNameById.statistics$defects$no_defect": "无缺陷",
Expand Down Expand Up @@ -1570,6 +1582,14 @@
"OrganizationsControl.all": "All",
"OrganizationsControl.allOrganizations": "All organizations",
"OrganizationsControl.organization": "组织",
"OrganizationsFilter.lastRunDate": "Last Run Date",
"OrganizationsFilter.lastRunDatePlaceholder": "Any",
"OrganizationsFilter.launches": "Launches",
"OrganizationsFilter.launchesPlaceholder": "Enter the number of launches",
"OrganizationsFilter.name": "Organization Name",
"OrganizationsFilter.namePlaceholder": "Enter part of the name",
"OrganizationsFilter.users": "Users",
"OrganizationsFilter.usersPlaceholder": "Enter the number of members",
"OrganizationsItem.open": "open",
"OrganizationsPage.title": "All Organizations",
"OrganizationsPage.description": "The list of organizations available to you is currently empty. Please contact your Administrator to be assigned to an existing one.",
Expand Down Expand Up @@ -1799,6 +1819,15 @@
"ProjectsGrid.nameCol": "名称",
"ProjectsGrid.organizationCol": "组织",
"ProjectsGrid.projectTypeCol": "项目类型",
"ProjectsFilter.lastRunDate": "Last Run Date",
"ProjectsFilter.lastRunDatePlaceholder": "Any",
"ProjectsFilter.launches": "Launches",
"ProjectsFilter.launchesPlaceholder": "Enter the number of launches",
"ProjectsFilter.name": "Project Name",
"ProjectsFilter.namePlaceholder": "Enter part of the name",
"ProjectsFilter.users": "Teammates",
"ProjectsFilter.usersPlaceholder": "Enter the number of members",
"ProjectsFilterPopover.clearAllFilters": "Clear all filters",
"ProjectsPage.addProject": "Create Project",
"ProjectsPage.addProjectSuccess": "项目“{name}”创建成功",
"ProjectsPage.addProjectTitle": "创建项目",
Expand Down
8 changes: 4 additions & 4 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@formatjs/intl-pluralrules": "1.3.9",
"@formatjs/intl-relativetimeformat": "4.5.1",
"@formatjs/intl-utils": "1.6.0",
"@reportportal/ui-kit": "^0.0.1-alpha.34",
"@reportportal/ui-kit": "^0.0.1-alpha.35",
"axios": "1.6.4",
"c3": "0.7.20",
"chart.js": "2.9.4",
Expand Down
4 changes: 4 additions & 0 deletions app/src/common/constants/localization.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ export const COMMON_LOCALE_KEYS = defineMessages({
id: 'Common.cancel',
defaultMessage: 'Cancel',
},
APPLY: {
id: 'Common.apply',
defaultMessage: 'Apply',
},
RENAME: {
id: 'Common.rename',
defaultMessage: 'Rename',
Expand Down
3 changes: 0 additions & 3 deletions app/src/common/img/newIcons/filters-outline-inline.svg

This file was deleted.

3 changes: 3 additions & 0 deletions app/src/common/urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,11 @@ export const URLS = {

organizationList: (preferencesObj = {}) =>
`${urlCommonBase}organizations${getQueryParams(preferencesObj)}`,
organizationSearches: () => `${urlCommonBase}organizations/searches`,
organizationProjects: (organizationId, preferencesObj = {}) =>
`${urlCommonBase}organizations/${organizationId}/projects${getQueryParams(preferencesObj)}`,
organizationProjectsSearches: (organizationId) =>
`${urlCommonBase}organizations/${organizationId}/projects/searches`,
AmsterGet marked this conversation as resolved.
Show resolved Hide resolved
organizationUsers: (organizationId, preferencesObj = {}) =>
`${urlCommonBase}organizations/${organizationId}/users${getQueryParams(preferencesObj)}`,
projectDelete: ({ organizationId, projectId }) =>
Expand Down
Loading
Loading