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

Agregando componente de Editar grupo #4818

Merged
merged 16 commits into from Nov 26, 2020
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/templates/en.lang
Expand Up @@ -417,6 +417,7 @@ groupEditScoreboardsAdded = "Scoreboard successfully added!"
groupEditScoreboardsContests = "Contests"
groupEditScoreboardsContestsAdded = "Contest successfully added!"
groupEditScoreboardsContestsRemoved = "Contest successfully removed!"
groupEditTitleWithName = "Edit group %(name)"
groupNewFormCreateGroup = "Create group"
groupNewFormDescription = "Group description"
groupNewFormOnlyAC = "Only count ACs"
Expand Down
1 change: 1 addition & 0 deletions frontend/templates/es.lang
Expand Up @@ -417,6 +417,7 @@ groupEditScoreboardsAdded = "Scoreboard agregado correctamente."
groupEditScoreboardsContests = "Concursos"
groupEditScoreboardsContestsAdded = "Concurso agregado correctamente."
groupEditScoreboardsContestsRemoved = "Concurso eliminado correctamente."
groupEditTitleWithName = "Editar grupo %(name)"
groupNewFormCreateGroup = "Crear grupo"
groupNewFormDescription = "Descripción del grupo"
groupNewFormOnlyAC = "Contar sólo ACs"
Expand Down
1 change: 1 addition & 0 deletions frontend/templates/pseudo.lang
Expand Up @@ -417,6 +417,7 @@ groupEditScoreboardsAdded = "(Sc0r3b0ard 5ucc355fu11y add3d!)"
groupEditScoreboardsContests = "(C0n73575)"
groupEditScoreboardsContestsAdded = "(C0n7357 5ucc355fu11y add3d!)"
groupEditScoreboardsContestsRemoved = "(C0n7357 5ucc355fu11y r3m0v3d!)"
groupEditTitleWithName = "(Edi7 gr0up %(name))"
groupNewFormCreateGroup = "(Cr3a73 gr0up)"
groupNewFormDescription = "(Gr0up d35crip7i0n)"
groupNewFormOnlyAC = "(On1y c0un7 AC5)"
Expand Down
1 change: 1 addition & 0 deletions frontend/templates/pt.lang
Expand Up @@ -417,6 +417,7 @@ groupEditScoreboardsAdded = "Painel adicionado com sucesso!"
groupEditScoreboardsContests = "Concursos"
groupEditScoreboardsContestsAdded = "Concurso adicionado com sucesso!"
groupEditScoreboardsContestsRemoved = "Concurso removido com sucesso!"
groupEditTitleWithName = "Editar grupo %(name)"
groupNewFormCreateGroup = "Criar grupo"
groupNewFormDescription = "Descrição do Grupo"
groupNewFormOnlyAC = "Contar só ACs"
Expand Down
42 changes: 42 additions & 0 deletions frontend/www/js/omegaup/components/group/Edit.test.ts
@@ -0,0 +1,42 @@
import { mount, shallowMount } from '@vue/test-utils';
import expect from 'expect';

import T from '../../lang';

import group_Edit from './Edit.vue';

describe('Edit.vue', () => {
it('Should handle edit view with empty scoreboards and identities', () => {
const wrapper = shallowMount(group_Edit, {
propsData: {
groupAlias: 'Hello',
groupName: 'Hello omegaUp',
countries: [{ country_id: 'MX', name: 'Mexico' }],
isOrganizer: true,
initialTab: 'members',
initialIdentities: [],
initialIdentitiesCsv: [],
initialScoreboards: [],
},
});

expect(wrapper.text()).toContain('Hello omegaUp');
});

it('Should handle edit view getting the subcomponents info', () => {
const wrapper = mount(group_Edit, {
propsData: {
groupAlias: 'Hello',
groupName: 'Hello omegaUp',
countries: [{ country_id: 'MX', name: 'Mexico' }],
isOrganizer: true,
initialTab: 'members',
initialIdentities: [],
initialIdentitiesCsv: [],
initialScoreboards: [],
},
});

expect(wrapper.text()).toContain(T.groupEditMembers);
});
});
200 changes: 200 additions & 0 deletions frontend/www/js/omegaup/components/group/Edit.vue
@@ -0,0 +1,200 @@
<template>
<div class="group-edit">
<div class="page-header">
<h1>
<span>
lhchavez marked this conversation as resolved.
Show resolved Hide resolved
{{ ui.formatString(T.groupEditTitleWithName, { name: groupName }) }}
</span>
</h1>
</div>
<ul class="nav nav-pills">
<li class="nav-item" role="presentation">
<a
href="#"
class="nav-link"
data-tab-members
:class="{ active: showTab === 'members' }"
@click="showTab = 'members'"
>{{ T.groupEditMembers }}</a
>
</li>
<li class="nav-item" role="presentation">
<a
href="#"
class="nav-link"
data-tab-scoreboards
:class="{ active: showTab === 'scoreboards' }"
@click="showTab = 'scoreboards'"
>{{ T.groupEditScoreboards }}</a
>
</li>
<li class="nav-item" role="presentation">
<a
href="#"
class="nav-link"
data-tab-identities
:class="{ active: showTab === 'identities' }"
@click="showTab = 'identities'"
>{{ T.groupCreateIdentities }}</a
>
</li>
</ul>

<div class="tab-content">
<div v-if="showTab === 'members'" class="tab-pane active" role="tabpanel">
<omegaup-group-members
:identities="identities"
:identities-csv="identitiesCsv"
:group-alias="groupAlias"
:countries="countries"
@add-member="
(memberComponent, username) =>
$emit('add-member', memberComponent, username)
"
@edit-identity="
(memberComponent, identity) =>
$emit('edit-identity', memberComponent, identity)
"
@edit-identity-member="
(
memberComponent,
originalUsername,
username,
name,
country,
state,
school,
schoolId,
) =>
$emit(
'edit-identity-member',
memberComponent,
originalUsername,
username,
name,
country,
state,
school,
schoolId,
)
"
@change-password-identity="
(memberComponent, username) =>
$emit('change-password-identity', memberComponent, username)
"
@change-password-identity-member="
(memberComponent, username, password, repeatPassword) =>
$emit(
'change-password-identity-member',
memberComponent,
username,
password,
repeatPassword,
)
"
@remove="(username) => $emit('remove', username)"
@cancel="(memberComponent) => $emit('cancel', memberComponent)"
></omegaup-group-members>
</div>

<div
v-if="showTab === 'scoreboards'"
class="tab-pane active"
role="tabpanel"
>
<omegaup-group-scoreboards
:group-alias="groupAlias"
:scoreboards.sync="scoreboards"
@create-scoreboard="
(title, alias, description) =>
$emit('create-scoreboard', title, alias, description)
"
></omegaup-group-scoreboards>
</div>

<div
v-if="showTab === 'identities'"
class="tab-pane active"
role="tabpanel"
>
<omegaup-group-create-identities
:group-alias="groupAlias"
:user-error-row="userErrorRow"
@bulk-identities="
(identitiesComponent, identities) =>
$emit('bulk-identities', identitiesComponent, identities)
"
@download-identities="
(identities) => $emit('download-identities', identities)
"
@read-csv="
(identitiesComponent, fileUpload) =>
$emit('read-csv', identitiesComponent, fileUpload)
"
></omegaup-group-create-identities>
</div>
</div>
</div>
</template>

<script lang="ts">
import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
import group_Identities from './Identities.vue';
import group_Members from './Members.vue';
import group_Scoreboards from './Scoreboards.vue';
import T from '../../lang';
import { dao, types } from '../../api_types';
import * as ui from '../../ui';

const availableTabs = ['memebers', 'scoreboards', 'identities'];

@Component({
components: {
'omegaup-group-create-identities': group_Identities,
'omegaup-group-members': group_Members,
'omegaup-group-scoreboards': group_Scoreboards,
},
})
export default class GroupEdit extends Vue {
@Prop() groupAlias!: string;
@Prop() groupName!: string;
@Prop() countries!: dao.Countries[];
@Prop() isOrganizer!: boolean;
@Prop() initialTab!: string;
lhchavez marked this conversation as resolved.
Show resolved Hide resolved
@Prop() initialIdentities!: types.Identity[];
@Prop() initialIdentitiesCsv!: types.Identity[];
@Prop() initialScoreboards!: types.GroupScoreboard[];
lhchavez marked this conversation as resolved.
Show resolved Hide resolved

T = T;
ui = ui;
showTab = this.initialTab;
userErrorRow = null;
lhchavez marked this conversation as resolved.
Show resolved Hide resolved
identities = this.initialIdentities;
identitiesCsv = this.initialIdentitiesCsv;
scoreboards = this.initialScoreboards;

@Watch('initialTab')
onInitialTabChanged(newValue: string): void {
if (!availableTabs.includes(this.initialTab)) {
this.showTab = 'members';
return;
}
this.showTab = newValue;
}

@Watch('initialIdentities')
onInitialIdentitiesChanged(newValue: types.Identity[]): void {
this.identities = newValue;
}

@Watch('initialIdentitiesCsv')
onInitialIdentitiesCsvChanged(newValue: types.Identity[]): void {
this.identitiesCsv = newValue;
}

@Watch('initialScoreboards')
onInitialScoreboardsChanged(newValue: types.GroupScoreboard[]): void {
this.scoreboards = newValue;
}
}
</script>
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.en.json
Expand Up @@ -418,6 +418,7 @@
"groupEditScoreboardsContests": "Contests",
"groupEditScoreboardsContestsAdded": "Contest successfully added!",
"groupEditScoreboardsContestsRemoved": "Contest successfully removed!",
"groupEditTitleWithName": "Edit group %(name)",
"groupNewFormCreateGroup": "Create group",
"groupNewFormDescription": "Group description",
"groupNewFormOnlyAC": "Only count ACs",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.en.ts
Expand Up @@ -419,6 +419,7 @@ const translations: { [key: string]: string; } = {
groupEditScoreboardsContests: "Contests",
groupEditScoreboardsContestsAdded: "Contest successfully added!",
groupEditScoreboardsContestsRemoved: "Contest successfully removed!",
groupEditTitleWithName: "Edit group %(name)",
groupNewFormCreateGroup: "Create group",
groupNewFormDescription: "Group description",
groupNewFormOnlyAC: "Only count ACs",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.es.json
Expand Up @@ -418,6 +418,7 @@
"groupEditScoreboardsContests": "Concursos",
"groupEditScoreboardsContestsAdded": "Concurso agregado correctamente.",
"groupEditScoreboardsContestsRemoved": "Concurso eliminado correctamente.",
"groupEditTitleWithName": "Editar grupo %(name)",
"groupNewFormCreateGroup": "Crear grupo",
"groupNewFormDescription": "Descripci\u00f3n del grupo",
"groupNewFormOnlyAC": "Contar s\u00f3lo ACs",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.es.ts
Expand Up @@ -419,6 +419,7 @@ const translations: { [key: string]: string; } = {
groupEditScoreboardsContests: "Concursos",
groupEditScoreboardsContestsAdded: "Concurso agregado correctamente.",
groupEditScoreboardsContestsRemoved: "Concurso eliminado correctamente.",
groupEditTitleWithName: "Editar grupo %(name)",
groupNewFormCreateGroup: "Crear grupo",
groupNewFormDescription: "Descripci\u00f3n del grupo",
groupNewFormOnlyAC: "Contar s\u00f3lo ACs",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.pseudo.json
Expand Up @@ -418,6 +418,7 @@
"groupEditScoreboardsContests": "(C0n73575)",
"groupEditScoreboardsContestsAdded": "(C0n7357 5ucc355fu11y add3d!)",
"groupEditScoreboardsContestsRemoved": "(C0n7357 5ucc355fu11y r3m0v3d!)",
"groupEditTitleWithName": "(Edi7 gr0up %(name))",
"groupNewFormCreateGroup": "(Cr3a73 gr0up)",
"groupNewFormDescription": "(Gr0up d35crip7i0n)",
"groupNewFormOnlyAC": "(On1y c0un7 AC5)",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.pseudo.ts
Expand Up @@ -419,6 +419,7 @@ const translations: { [key: string]: string; } = {
groupEditScoreboardsContests: "(C0n73575)",
groupEditScoreboardsContestsAdded: "(C0n7357 5ucc355fu11y add3d!)",
groupEditScoreboardsContestsRemoved: "(C0n7357 5ucc355fu11y r3m0v3d!)",
groupEditTitleWithName: "(Edi7 gr0up %(name))",
groupNewFormCreateGroup: "(Cr3a73 gr0up)",
groupNewFormDescription: "(Gr0up d35crip7i0n)",
groupNewFormOnlyAC: "(On1y c0un7 AC5)",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.pt.json
Expand Up @@ -418,6 +418,7 @@
"groupEditScoreboardsContests": "Concursos",
"groupEditScoreboardsContestsAdded": "Concurso adicionado com sucesso!",
"groupEditScoreboardsContestsRemoved": "Concurso removido com sucesso!",
"groupEditTitleWithName": "Editar grupo %(name)",
"groupNewFormCreateGroup": "Criar grupo",
"groupNewFormDescription": "Descri\u00e7\u00e3o do Grupo",
"groupNewFormOnlyAC": "Contar s\u00f3 ACs",
Expand Down
1 change: 1 addition & 0 deletions frontend/www/js/omegaup/lang.pt.ts
Expand Up @@ -419,6 +419,7 @@ const translations: { [key: string]: string; } = {
groupEditScoreboardsContests: "Concursos",
groupEditScoreboardsContestsAdded: "Concurso adicionado com sucesso!",
groupEditScoreboardsContestsRemoved: "Concurso removido com sucesso!",
groupEditTitleWithName: "Editar grupo %(name)",
groupNewFormCreateGroup: "Criar grupo",
groupNewFormDescription: "Descri\u00e7\u00e3o do Grupo",
groupNewFormOnlyAC: "Contar s\u00f3 ACs",
Expand Down