Skip to content

Commit

Permalink
Add hakijaryhmät to tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
SalamaGofore committed May 8, 2024
1 parent eb5df93 commit 044be01
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function HakijaryhmatPage({

return (
<TabContainer>
<h3>Hakijaryhmat</h3>
<h3>Hakijaryhmät</h3>
<p>Hakukohde oid: {hakukohde.oid}</p>
</TabContainer>
);
Expand Down
10 changes: 4 additions & 6 deletions src/app/haku/[oid]/hakukohde/[hakukohde]/hakukohde-tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,21 @@ export type BasicTab = {
route: string;
};

const ToinenAsteTabs: BasicTab[] = [
const Tabs: BasicTab[] = [
{ title: 'Perustiedot', route: 'perustiedot' },
{ title: 'Hakeneet', route: 'hakeneet' },
{ title: 'Valinnan hallinta', route: 'valinnan-hallinta' },
{ title: 'Valintakoekutsut', route: 'valintakoekutsut' },
{ title: 'Pistesyöttö', route: 'pistesyotto' },
{ title: 'Harkinnanvaraiset', route: 'harkinnanvaraiset' },
{ title: 'Hakijaryhmät', route: 'hakijaryhmat' },
{ title: 'Valintalaskennan tulos', route: 'valintalaskennan-tulos' },
{ title: 'Sijoittelun tulokset', route: 'sijoittelun-tulokset' },
];

function getPathMatchingTab(pathName: string) {
const lastPath = pathName.split('/').reverse()[0];
return (
ToinenAsteTabs.find((tab) => tab.route.startsWith(lastPath)) ||
ToinenAsteTabs[0]
);
return Tabs.find((tab) => tab.route.startsWith(lastPath)) || Tabs[0];
}

export const HakukohdeTabs = ({ hakukohdeOid }: { hakukohdeOid: string }) => {
Expand Down Expand Up @@ -91,7 +89,7 @@ export const HakukohdeTabs = ({ hakukohdeOid }: { hakukohdeOid: string }) => {
</h2>
</StyledHeader>
<StyledTabs>
{ToinenAsteTabs.map((tab, index) => (
{Tabs.map((tab, index) => (
<div
key={'hakukohde-tab-' + index}
className={
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/hakukohde.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const ToinenAsteTabs: BasicTab[] = [
{ title: 'Valintakoekutsut', route: 'valintakoekutsut' },
{ title: 'Pistesyöttö', route: 'pistesyotto' },
{ title: 'Harkinnanvaraiset', route: 'harkinnanvaraiset' },
{ title: 'Hakijaryhmät', route: 'hakijaryhmat' },
{ title: 'Valintalaskennan tulos', route: 'valintalaskennan-tulos' },
{ title: 'Sijoittelun tulokset', route: 'sijoittelun-tulokset' },
];
Expand Down

0 comments on commit 044be01

Please sign in to comment.