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.

Sign up for GitHub

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

CB-4070 Migrate Project form to form template #3101

Merged
merged 8 commits into from
Dec 11, 2024
Merged

CB-4070 Migrate Project form to form template #3101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32ac844
CB-4070 small layout issues problems from the ticket comments
sergeyteleshev Nov 27, 2024
acf13db
CB-4070 ux fixes for project create/edit behavior
sergeyteleshev Nov 27, 2024
9621ff0
CB-4070 pr fixes
sergeyteleshev Nov 28, 2024
128ff60
Merge branch 'devel' into CB-4070-migrate-project-form-to-form-template
sergeyteleshev Dec 2, 2024
859b511
Merge branch 'devel' into CB-4070-migrate-project-form-to-form-template
sergeyteleshev Dec 2, 2024
1296863
Merge branch 'devel' into CB-4070-migrate-project-form-to-form-template
mr-anton-t Dec 4, 2024
055145b
Merge branch 'devel' into CB-4070-migrate-project-form-to-form-template
dariamarutkina Dec 9, 2024
2373d7d
Merge branch 'devel' into CB-4070-migrate-project-form-to-form-template
dariamarutkina Dec 10, 2024
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
15 changes: 10 additions & 5 deletions webapp/packages/core-blocks/src/StatusMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,18 @@ export const StatusMessage = observer<Props>(function StatusMessage({
const errorDetails = useErrorDetails(exception);
const isError = type === ENotificationType.Error || exception !== null;

if (Array.isArray(message)) {
message = message.map(m => translate(m)).join(', ');
} else if (message !== null) {
message = translate(message);
function translateMessage(message: string | string[] | null | undefined) {
if (Array.isArray(message)) {
message = message.map(m => translate(m)).join(', ');
} else if (message !== null) {
message = translate(message);
}

return message;
}

message = message ?? errorDetails.message;
message = translateMessage(message) || translateMessage(errorDetails.message);

let icon = '/icons/info_icon.svg';

if (isError) {
Expand Down
1 change: 1 addition & 0 deletions webapp/packages/core-ui/src/Form/FormPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export abstract class FormPart<TPartState, TFormState = any> implements IFormPar
if (this.loading) {
return;
}

this.loading = true;

try {
Expand Down
2 changes: 1 addition & 1 deletion ...tration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const GrantedUsersTableInnerHeader = observer<Props>(function GrantedUser
<TableColumnHeader min />
<TableColumnHeader>{translate('administration_teams_team_granted_users_user_id')}</TableColumnHeader>
{showUserTeamRole && (
<TableColumnHeader title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')}>
<TableColumnHeader title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')} flex centerContent>
{translate('plugin_authentication_administration_team_user_team_role_supervisor')}
</TableColumnHeader>
)}
Expand Down
2 changes: 1 addition & 1 deletion ...tion-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const GrantedUsersTableItem = observer<Props>(function GrantedUsersTableI
</TableColumnValue>
<TableColumnValue>{name}</TableColumnValue>
{teamRoles.length > 0 && (
<TableColumnValue title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')}>
<TableColumnValue title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')} centerContent flex>
<Checkbox
checked={teamRole === USER_TEAM_ROLE_SUPERVISOR}
onChange={value => onTeamRoleAssign(id, value ? USER_TEAM_ROLE_SUPERVISOR : null)}
Expand Down
Loading