Skip to content

Commit

Permalink
EPMRPP-91556 || Code Review fix - 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlazarQSO
BlazarQSO committed Dec 9, 2024
1 parent 8ef4f2a commit b7bf220
Show file tree
Hide file tree
Showing 33 changed files with 219 additions and 169 deletions.
56 changes: 29 additions & 27 deletions app/localization/translated/be.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,17 +774,18 @@
"Filter.name": "Назва",
"Filter.namePlaceholder": "Увядзіце назву фільтра",
"FilterAdd.addTitle": "Дадаць новы фільтр",
"FilterButton.any": "Any",
"FilterButton.contains": "Contains",
"FilterButton.equals": "Equals",
"FilterButton.greaterOrEqual": "Greater or equal",
"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",
"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 @@ -1577,14 +1578,14 @@
"OrganizationsControl.all": "Усе",
"OrganizationsControl.allOrganizations": "Усе арганізацыі",
"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",
"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 @@ -1813,14 +1814,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",
"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
2 changes: 2 additions & 0 deletions app/localization/translated/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@
"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",
Expand Down Expand Up @@ -1819,6 +1820,7 @@
"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
56 changes: 29 additions & 27 deletions app/localization/translated/ru.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,17 +774,18 @@
"Filter.name": "Имя",
"Filter.namePlaceholder": "Ввести имя фильтра",
"FilterAdd.addTitle": "Добавить новый фильтр",
"FilterButton.any": "Any",
"FilterButton.contains": "Contains",
"FilterButton.equals": "Equals",
"FilterButton.greaterOrEqual": "Greater or equal",
"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",
"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,14 +1573,14 @@
"OrganizationsControl.all": "Все",
"OrganizationsControl.allOrganizations": "Все организации",
"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",
"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 @@ -1808,14 +1809,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",
"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
54 changes: 28 additions & 26 deletions app/localization/translated/uk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,17 +774,18 @@
"Filter.name": "Ім’я",
"Filter.namePlaceholder": "Ввести ім’я фільтра",
"FilterAdd.addTitle": "Додати новий фільтр",
"FilterButton.any": "Any",
"FilterButton.contains": "Contains",
"FilterButton.equals": "Equals",
"FilterButton.greaterOrEqual": "Greater or equal",
"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",
"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 @@ -1575,13 +1576,13 @@
"OrganizationsControl.allOrganizations": "Всі організації",
"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",
"OrganizationsFilter.lastRunDatePlaceholder": "Будь-який",
"OrganizationsFilter.launches": "Запуски",
"OrganizationsFilter.launchesPlaceholder": "Введіть кількість запусків",
"OrganizationsFilter.name": "Назва організації",
"OrganizationsFilter.namePlaceholder": "Введіть частину імені",
"OrganizationsFilter.users": "Користувачі",
"OrganizationsFilter.usersPlaceholder": "Введіть кількість учасників",
"OrganizationsItem.open": "відкрити",
"OrganizationsPage.title": "Всі організації",
"OrganizationsPage.description": "Список доступних вам організацій в даний момент порожній. Будь ласка, зв'яжіться зі своїм адміністратором, щоб отримати призначення в уже існуючу організацію.",
Expand Down Expand Up @@ -1810,14 +1811,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",
"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
2 changes: 2 additions & 0 deletions app/localization/translated/zh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,7 @@
"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",
Expand Down Expand Up @@ -1818,6 +1819,7 @@
"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
30 changes: 15 additions & 15 deletions app/src/common/urls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ export const URLS = {
login: () => `${uatBase}sso/oauth/token`,
sessionToken: () => `${uatBase}sso/me`,

apiKeys: (userId) => `${urlCommonBase}users/${userId}/api-keys`,
apiKeyById: (userId, apiKeyId) => `${urlCommonBase}users/${userId}/api-keys/${apiKeyId}`,
apiKeys: (userId) => `${urlBase}users/${userId}/api-keys`,
apiKeyById: (userId, apiKeyId) => `${urlBase}users/${userId}/api-keys/${apiKeyId}`,

organizationList: (preferencesObj = {}) =>
`${urlCommonBase}organizations${getQueryParams(preferencesObj)}`,
organizationSearch: () => `${urlCommonBase}organizations/searches`,
organizationSearches: () => `${urlCommonBase}organizations/searches`,
organizationProjects: (organizationId, preferencesObj = {}) =>
`${urlCommonBase}organizations/${organizationId}/projects${getQueryParams(preferencesObj)}`,
filterOrganizationProjects: (organizationId) =>
organizationProjectsSearches: (organizationId) =>
`${urlCommonBase}organizations/${organizationId}/projects/searches`,
organizationUsers: (organizationId, preferencesObj = {}) =>
`${urlCommonBase}organizations/${organizationId}/users${getQueryParams(preferencesObj)}`,
Expand All @@ -155,7 +155,7 @@ export const URLS = {
term: searchTerm,
})}`,
searchUsers: (term) =>
`${urlCommonBase}users/search${getQueryParams({
`${urlBase}users/search${getQueryParams({
term,
})}`,
projectAddPattern: (projectKey) => `${urlBase}${projectKey}/settings/pattern`,
Expand Down Expand Up @@ -245,17 +245,17 @@ export const URLS = {
})}`,
logSearch: (projectKey, itemId) => `${urlBase}${projectKey}/log/search/${itemId}`,
bulkLastLogs: (projectKey) => `${urlBase}${projectKey}/log/under`,
users: (ids = []) => `${urlCommonBase}users?ids=${ids.join(',')}`,
userRegistration: () => `${urlCommonBase}users/registration`,
userValidateRegistrationInfo: () => `${urlCommonBase}users/registration/info`,
userPasswordReset: () => `${urlCommonBase}users/password/reset`,
userPasswordResetToken: (token) => `${urlCommonBase}users/password/reset/${token}`,
userPasswordRestore: () => `${urlCommonBase}users/password/restore`,
userChangePassword: () => `${urlCommonBase}users/password/change`,
users: (ids = []) => `${urlBase}users?ids=${ids.join(',')}`,
userRegistration: () => `${urlBase}users/registration`,
userValidateRegistrationInfo: () => `${urlBase}users/registration/info`,
userPasswordReset: () => `${urlBase}users/password/reset`,
userPasswordResetToken: (token) => `${urlBase}users/password/reset/${token}`,
userPasswordRestore: () => `${urlBase}users/password/restore`,
userChangePassword: () => `${urlBase}users/password/change`,
userSynchronize: (type) => `${uatBase}sso/me/${type}/synchronize`,
userInfo: (userId) => `${urlCommonBase}users/${userId}`,
userInfo: (userId) => `${urlBase}users/${userId}`,
userInviteInternal: (projectKey) => `${urlBase}project/${projectKey}/assign`,
userInviteExternal: () => `${urlCommonBase}users/bid`,
userInviteExternal: () => `${urlBase}users/bid`,
userUnassign: (projectKey) => `${urlBase}project/${projectKey}/unassign`,

generateDemoData: (projectKey) => `${urlBase}demo/${projectKey}/generate`,
Expand All @@ -268,7 +268,7 @@ export const URLS = {
events: () => `${urlBase}activities/searches`,
searchEventsBySubjectName: (projectName) => (searchTerm = '') =>
`${urlBase}activities/${projectName}/subjectName?filter.cnt.subjectName=${searchTerm}`,
allUsers: () => `${urlCommonBase}users/all`,
allUsers: () => `${urlBase}users/all`,

exportUsers: (filterEntities) =>
`${urlCommonBase}users/export${getQueryParams({
Expand Down
1 change: 0 additions & 1 deletion app/src/components/filterEntities/containers/filterEntitiesURLContainer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const FilterEntitiesURL = ({
}
const filterQuery = createFilterQuery(newEntities, entities, prefixQueryKey);
if (!isEmptyObject(filterQuery)) {
console.log('filterQuery', filterQuery);
updateFilters(filterQuery, defaultPagination[PAGE_KEY]);
}
},
Expand Down
0 ...ponents/buttons/filterButton/constants.js → ...components/main/filterButton/constants.js
View file
File renamed without changes.
Loading

0 comments on commit b7bf220

Please sign in to comment.