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

Feature/epmrpp 98540 merge dev to orgs #4148

Merged
merged 12 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions app/localization/translated/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -2190,5 +2190,39 @@
"launchPatternAnalysisModal.title": "Патэрн-аналіз запускаў",
"notFoundPage.oops": "Упс. Здаецца, Вы згубіліся.",
"notFoundPage.pageNotExist": "Старонка, якую Вы шукаеце, не існуе.",
"notFoundPage.toHome": "Забярыце мяне адсюль"
}
"notFoundPage.toHome": "Забярыце мяне адсюль",
"projectsAndRolesColumn.addProject": "+ Дадаць Праект",
"projectsAndRolesColumn.anassignBtn": "Вывести",
"projectsAndRolesColumn.anassignUser": "Карыстальнік быў выведзены з праекту!",
"projectsAndRolesColumn.assignToProject": "Прызначыць на праект",
"projectsAndRolesColumn.unAssignTitle": "Вывесці карыстальніка з праекта",
"projectsAndRolesColumn.updateUserRole": "Карыстальнік ''{user}'' абноўлены",
"projectsGrid.contains": "Змяшчае",
"projectsGrid.lastRun": "Апошні запуск",
"projectsGrid.numberOfLaunches": "Запускі",
"projectsGrid.numberOfMembers": "Удзельнікі",
"projectsGrid.organizationName": "Арганізацыя",
"projectsGrid.projectName": "Праект",
"projectsGrid.projectTypeInternal": "Ўнутраны",
"projectsGrid.projectTypePersonal": "Персанальны",
"projectsGrid.projectTypeUpsa": "UPSA",
"projectsGrid.type": "Тып",
"rolesRow.projectSearchPlaceholder": "Проект",
"rolesRow.unAssignFromPersonalProject": "Немагчыма вывесці карыстальніка з персанальнага праекта",
"usersGrid.accountTypeGithub": "Github",
"usersGrid.accountTypeInternal": "Унутраны",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "Змяшчае",
"usersGrid.email": "Эл. пошта",
"usersGrid.lastLogin": "Апошні ўваход",
"usersGrid.name": "Iмя",
"usersGrid.project": "Праект",
"usersGrid.role": "Роль",
"usersGrid.roleAdmin": "Адмін",
"usersGrid.roleNonAdmin": "Не Адмін",
"usersGrid.type": "Тып",
"usersGrid.user": "Лагін"
}
38 changes: 36 additions & 2 deletions app/localization/translated/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -2190,5 +2190,39 @@
"launchPatternAnalysisModal.title": "Análisis de patrones de ejecuciones",
"notFoundPage.oops": "Ups. Página no encontrada.",
"notFoundPage.pageNotExist": "La página que busca no existe.",
"notFoundPage.toHome": "Llévame de aquí"
}
"notFoundPage.toHome": "Llévame de aquí",
"projectsAndRolesColumn.addProject": "+ Añadir Proyecto",
"projectsAndRolesColumn.anassignBtn": "Desasignar",
"projectsAndRolesColumn.anassignUser": "¡El usuario ha sido desasignado del proyecto!",
"projectsAndRolesColumn.assignToProject": "Asignar al proyecto",
"projectsAndRolesColumn.unAssignTitle": "Desasignar usuario del proyecto",
"projectsAndRolesColumn.updateUserRole": "Usuario ''{user}'' actualizado",
"projectsGrid.contains": "Contiene",
"projectsGrid.lastRun": "Última ejecución",
"projectsGrid.numberOfLaunches": "Ejecuciones",
"projectsGrid.numberOfMembers": "Miembros",
"projectsGrid.organizationName": "Organización",
"projectsGrid.projectName": "Proyectos",
"projectsGrid.projectTypeInternal": "Interno",
"projectsGrid.projectTypePersonal": "Personal",
"projectsGrid.projectTypeUpsa": "UPSA",
"projectsGrid.type": "Tipo",
"rolesRow.projectSearchPlaceholder": "Proyecto",
"rolesRow.unAssignFromPersonalProject": "No se puede desasignar al usuario de un proyecto personal",
"usersGrid.accountTypeGithub": "Github",
"usersGrid.accountTypeInternal": "Interno",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "Contiene",
"usersGrid.email": "Correo electrónico",
"usersGrid.lastLogin": "Último acceso",
"usersGrid.name": "Nombre",
"usersGrid.project": "Proyecto",
"usersGrid.role": "Rol",
"usersGrid.roleAdmin": "Admin",
"usersGrid.roleNonAdmin": "No Admin",
"usersGrid.type": "Tipo",
"usersGrid.user": "Usuario"
}
38 changes: 36 additions & 2 deletions app/localization/translated/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -2190,5 +2190,39 @@
"launchPatternAnalysisModal.title": "Паттерн-анализ запусков",
"notFoundPage.oops": "Упс. Страница не найдена.",
"notFoundPage.pageNotExist": "Страница, которую Вы ищете, не существует.",
"notFoundPage.toHome": "Заберите меня отсюда"
}
"notFoundPage.toHome": "Заберите меня отсюда",
"projectsAndRolesColumn.addProject": "+ Добавить Проект",
"projectsAndRolesColumn.anassignBtn": "Вывести",
"projectsAndRolesColumn.anassignUser": "Пользователь был выведен из проекта!",
"projectsAndRolesColumn.assignToProject": "Назначить на проект",
"projectsAndRolesColumn.unAssignTitle": "Вывести пользователя из проекта",
"projectsAndRolesColumn.updateUserRole": "Пользователь ''{user}'' обновлен",
"projectsGrid.contains": "Содержит",
"projectsGrid.lastRun": "Последний запуск",
"projectsGrid.numberOfLaunches": "Запуски",
"projectsGrid.numberOfMembers": "Участники",
"projectsGrid.organizationName": "Организация",
"projectsGrid.projectName": "Проекты",
"projectsGrid.projectTypeInternal": "Внутренний",
"projectsGrid.projectTypePersonal": "Персональный",
"projectsGrid.projectTypeUpsa": "UPSA",
"projectsGrid.type": "Тип",
"rolesRow.projectSearchPlaceholder": "Проект",
"rolesRow.unAssignFromPersonalProject": "Невозможно вывести пользователя из персонального проекта",
"usersGrid.accountTypeGithub": "Github",
"usersGrid.accountTypeInternal": "Внутренний",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "Содержит",
"usersGrid.email": "Эл. почта",
"usersGrid.lastLogin": "Последний вход",
"usersGrid.name": "Имя",
"usersGrid.project": "Проект",
"usersGrid.role": "Роль",
"usersGrid.roleAdmin": "Админ",
"usersGrid.roleNonAdmin": "Не Админ",
"usersGrid.type": "Тип",
"usersGrid.user": "Логин"
}
38 changes: 36 additions & 2 deletions app/localization/translated/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -2190,5 +2190,39 @@
"launchPatternAnalysisModal.title": "Патерн-аналіз запусків",
"notFoundPage.oops": "Упс. Сторінка не знайдена.",
"notFoundPage.pageNotExist": "Сторінка, яку Ви шукаєте, не існує.",
"notFoundPage.toHome": "Заберіть мене звідси"
}
"notFoundPage.toHome": "Заберіть мене звідси",
"projectsAndRolesColumn.addProject": "+ Додати Проект",
"projectsAndRolesColumn.anassignBtn": "Вивести",
"projectsAndRolesColumn.anassignUser": "Користувач був виведений з проекту!",
"projectsAndRolesColumn.assignToProject": "Призначити на проект",
"projectsAndRolesColumn.unAssignTitle": "Вивести користувача з проекту",
"projectsAndRolesColumn.updateUserRole": "Користувач ''{user}'' оновлений",
"projectsGrid.contains": "Містить",
"projectsGrid.lastRun": "Останній запуск",
"projectsGrid.numberOfLaunches": "Запуски",
"projectsGrid.numberOfMembers": "Учасники",
"projectsGrid.organizationName": "Організація",
"projectsGrid.projectName": "Проекти",
"projectsGrid.projectTypeInternal": "Внутрішній",
"projectsGrid.projectTypePersonal": "Персональний",
"projectsGrid.projectTypeUpsa": "УПСА",
"projectsGrid.type": "Тип",
"rolesRow.projectSearchPlaceholder": "Проект",
"rolesRow.unAssignFromPersonalProject": "Неможливо вивести з персонального проекту",
"usersGrid.accountTypeGithub": "На GitHub",
"usersGrid.accountTypeInternal": "Внутрішній",
"usersGrid.accountTypeLdap": "У LDAP",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "УПСА",
"usersGrid.contains": "Містить",
"usersGrid.email": "Ел. пошта",
"usersGrid.lastLogin": "Останній вхід",
"usersGrid.name": "Ім’я",
"usersGrid.project": "Проект",
"usersGrid.role": "Роль",
"usersGrid.roleAdmin": "Адмін",
"usersGrid.roleNonAdmin": "Не Адмін",
"usersGrid.type": "Тип",
"usersGrid.user": "Логін"
}
38 changes: 36 additions & 2 deletions app/localization/translated/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -2190,5 +2190,39 @@
"launchPatternAnalysisModal.title": "模板分析测试任务",
"notFoundPage.oops": "哎呀,看起来您迷路了。",
"notFoundPage.pageNotExist": "您要查找的页面不存在。",
"notFoundPage.toHome": "带我离开这里"
}
"notFoundPage.toHome": "带我离开这里",
"projectsAndRolesColumn.addProject": "+添加项目",
"projectsAndRolesColumn.anassignBtn": "移除",
"projectsAndRolesColumn.anassignUser": "用户已从项目中移除!",
"projectsAndRolesColumn.assignToProject": "分配至项目",
"projectsAndRolesColumn.unAssignTitle": "从项目中移除用户",
"projectsAndRolesColumn.updateUserRole": "用户“{user}”已更新",
"projectsGrid.contains": "包含",
"projectsGrid.lastRun": "上次运行",
"projectsGrid.numberOfLaunches": "测试任务",
"projectsGrid.numberOfMembers": "成员",
"projectsGrid.organizationName": "组织 ",
"projectsGrid.projectName": "项目",
"projectsGrid.projectTypeInternal": "内部",
"projectsGrid.projectTypePersonal": "个人",
"projectsGrid.projectTypeUpsa": "UPSA",
"projectsGrid.type": "类型",
"rolesRow.projectSearchPlaceholder": "项目",
"rolesRow.unAssignFromPersonalProject": "无法从个人项目中移除用户",
"usersGrid.accountTypeGithub": "Github",
"usersGrid.accountTypeInternal": "内部",
"usersGrid.accountTypeLdap": "Ldap",
"usersGrid.accountTypeSaml": "Saml",
"usersGrid.accountTypeScim": "SCIM",
"usersGrid.accountTypeUpsa": "UPSA",
"usersGrid.contains": "包含",
"usersGrid.email": "电子邮箱",
"usersGrid.lastLogin": "上次登录",
"usersGrid.name": "姓名",
"usersGrid.project": "项目",
"usersGrid.role": "角色",
"usersGrid.roleAdmin": "管理",
"usersGrid.roleNonAdmin": "非管理",
"usersGrid.type": "类型",
"usersGrid.user": "登录"
}
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.35",
"@reportportal/ui-kit": "^0.0.1-alpha.38",
"axios": "1.6.4",
"c3": "0.7.20",
"chart.js": "2.9.4",
Expand Down
1 change: 1 addition & 0 deletions app/src/common/constants/accountType.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ export const LDAP = 'LDAP';
export const UPSA = 'UPSA';
export const GITHUB = 'GITHUB';
export const SAML = 'SAML';
export const SCIM = 'SCIM';
1 change: 1 addition & 0 deletions app/src/common/utils/validation/commonValidators.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const descriptionEntity = bindMessageToValidator(
);

export const btsUrl = bindMessageToValidator(validate.url, 'btsUrlHint');
export const btsRallyUrl = bindMessageToValidator(validate.rallyUrl, 'btsUrlHint');
export const btsIntegrationName = bindMessageToValidator(
validate.btsIntegrationName,
'btsIntegrationNameHint',
Expand Down
4 changes: 4 additions & 0 deletions app/src/common/utils/validation/validate.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ import {
export const required = isNotEmpty;
export const isNotEmptyArray = composeValidators([isNotEmpty, minLength(1)]);
export const url = composeValidators([isNotEmpty, regex(/^(ftp|http|https):\/\/[^ "]+$/)]);
export const rallyUrl = composeValidators([
isNotEmpty,
regex(/^(https:\/\/rally1.rallydev.com).*/),
]);
export const email = composeValidators([regex(/^[a-z0-9.+_-]+@[a-z0-9_.-]+?\.[a-z0-9]{2,}$/i)]);
export const requiredEmail = composeValidators([isNotEmpty, email]);
export const login = composeValidators([isNotEmpty, regex(/^[0-9a-zA-Z-_.]{1,128}$/)]);
Expand Down
12 changes: 12 additions & 0 deletions app/src/common/utils/validation/validate.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ describe('validate.url', () => {
});
});

describe('validate.rallyUrl', () => {
test('validation should be correct', () => {
expect(validate.rallyUrl('https://rally1.rallydev.com/8888')).toBe(true);
});
test('Validation should not be correct', () => {
expect(validate.rallyUrl(undefined)).toBe(false);
expect(validate.rallyUrl('')).toBe(false);
expect(validate.rallyUrl(' ')).toBe(false);
expect(validate.rallyUrl('example')).toBe(false);
});
});

describe('validate.email', () => {
test('validation should be correct', () => {
expect(validate.email('[email protected]')).toBe(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class RallyConnectionFormFields extends Component {
</FieldElement>
<FieldElement
name="url"
validate={commonValidators.btsUrl}
validate={commonValidators.btsRallyUrl}
disabled={disabled || editAuthMode}
label={formatMessage(COMMON_BTS_MESSAGES.linkToBtsLabel)}
className={cx('fields')}
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/main/analytics/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export {
} from './launchesPageEvents';
export { LOGIN_PAGE_EVENTS, LOGIN_PAGE } from './loginPageEvents';
export { SIDEBAR_EVENTS, ADMIN_SIDEBAR_EVENTS, FOOTER_EVENTS } from './sidebarFooterEvents';
export { MEMBERS_PAGE, MEMBERS_PAGE_EVENTS } from './membersPageEvents';
export { MEMBERS_PAGE, MEMBERS_PAGE_EVENTS, MEMBERS_PAGE_VIEWS } from './membersPageEvents';
export {
PLUGINS_PAGE_EVENTS,
PLUGINS_PAGE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
*/

export const MEMBERS_PAGE = 'members';
export const MEMBERS_PAGE_VIEWS = {
MEMBERS_PAGE: {
page: MEMBERS_PAGE,
place: MEMBERS_PAGE,
},
};
export const MEMBERS_PAGE_EVENTS = {
ENTER_SEARCH_PARAM: {
category: MEMBERS_PAGE,
Expand Down
Loading
Loading