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

feat(service-portal): Parliamentary setup #15451

Merged
merged 24 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f4e17dd
feat(service-portal): Parliamentary setup
albinagu Jul 4, 2024
27c1adf
restructuring files adding parliamentary
albinagu Jul 5, 2024
acb2d91
initial view setup
albinagu Jul 5, 2024
41c3f6a
Merge branch 'main' of github.com:/island-is/island.is into sp_collec…
kksteini Jul 16, 2024
0963794
Merge branch 'main' into sp_collection_parliamentary
albinagu Aug 7, 2024
cd6ce9a
owner view update
albinagu Aug 12, 2024
0910caa
owner - view list draft
albinagu Aug 12, 2024
c2b8283
add manager draft
albinagu Aug 12, 2024
6af08e9
ui updates and cleanup
albinagu Aug 13, 2024
6a8dc39
tweaks
albinagu Aug 13, 2024
136de16
ui updates - owner view
albinagu Aug 16, 2024
e0dbb97
cleanup
albinagu Aug 16, 2024
aa14b67
chore: nx format:write update dirty files
andes-it Aug 16, 2024
4e89a64
Merge branch 'main' into sp_collection_parliamentary
albinagu Aug 16, 2024
a30a383
lint fix
albinagu Aug 16, 2024
9b21d89
Merge branch 'main' into sp_collection_parliamentary
albinagu Aug 19, 2024
ebccfee
tweaks in module for feature flagging
albinagu Aug 20, 2024
96d5e8b
review tweaks
albinagu Aug 26, 2024
7d17835
tweak
albinagu Aug 26, 2024
7ab0a80
chore: nx format:write update dirty files
andes-it Aug 26, 2024
02c83bf
import fix
albinagu Aug 26, 2024
f9387ae
Merge branch 'sp_collection_parliamentary' of https://github.com/isla…
albinagu Aug 26, 2024
90a4819
Merge branch 'main' into sp_collection_parliamentary
albinagu Aug 26, 2024
22ae599
Merge branch 'main' into sp_collection_parliamentary
kodiakhq[bot] Aug 26, 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
2 changes: 1 addition & 1 deletion libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
}

return (
<Box marginTop={2}>
<Box marginTop={2} marginRight={5}>
albinagu marked this conversation as resolved.
Show resolved Hide resolved
<ProgressMeter
progress={
Number(
Expand Down
8 changes: 8 additions & 0 deletions libs/service-portal/core/src/lib/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,14 @@ export const m = defineMessages({
id: 'service.portal:signatureCollectionLists',
defaultMessage: 'Meðmælasöfnun',
},
signatureCollectionParliamentaryLists: {
id: 'service.portal:signatureCollectionParliamentaryLists',
defaultMessage: 'Alþingiskosningar - Meðmælasöfnun',
},
signatureCollectionPresidentialLists: {
id: 'service.portal:signatureCollectionPresidentialLists',
defaultMessage: 'Forsetakosningar - Meðmælasöfnun',
},
notifications: {
id: 'service.portal:notifications',
defaultMessage: 'Tilkynningar',
Expand Down
13 changes: 12 additions & 1 deletion libs/service-portal/information/src/lib/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,18 @@ export const informationNavigation: PortalNavigationItem = {
path: InformationPaths.Lists,
children: [
{
name: m.signatureCollectionLists,
name: m.signatureCollectionParliamentaryLists,
path: SignatureCollectionPaths.SignatureCollectionParliamentaryLists,
children: [
{
name: m.viewSignatureList,
navHide: true,
path: SignatureCollectionPaths.ViewParliamentaryList,
},
],
},
{
name: m.signatureCollectionPresidentialLists,
path: SignatureCollectionPaths.SignatureCollectionLists,
children: [
{
Expand Down
14 changes: 14 additions & 0 deletions libs/service-portal/signature-collection/src/lib/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export const CollectionType = {
albinagu marked this conversation as resolved.
Show resolved Hide resolved
Presidential: 'Forsetakosningar',
Parliamentary: 'Alþingiskosningar',
}

// will be fetched later on
export const constituencies = [
'Norðvesturkjördæmi',
'Norðausturkjördæmi',
'Suðurkjördæmi',
'Suðvesturkjördæmi',
'Reykjavíkurkjördæmi suður',
'Reykjavíkurkjördæmi norður',
]
107 changes: 107 additions & 0 deletions libs/service-portal/signature-collection/src/lib/messages.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { defineMessages } from 'react-intl'

export const m = defineMessages({
/* Forsetakosningar */
pageTitle: {
id: 'sp.signatureCollection:title',
defaultMessage: 'Meðmælasöfnun',
Expand Down Expand Up @@ -245,4 +246,110 @@ export const m = defineMessages({
defaultMessage: 'Heimilisfang',
description: '',
},

/* Parliamentary */
parliamentaryElectionsTitle: {
id: 'sp.signatureCollection:parliamentaryElectionsTitle',
defaultMessage: 'Alþingiskosningar',
description: '',
},
pageTitleParliamentary: {
id: 'sp.signatureCollection:pageTitleParliamentary',
defaultMessage: 'Meðmælasöfnun fyrir Alþingiskosningar',
description: '',
},
pageDescriptionParliamentary: {
id: 'sp.signatureCollection:pageDescriptionParliamentary',
defaultMessage:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur imperdiet, dui eget iaculis vehicula, purus nibh lobortis urna, sit amet dignissim lacus metus non arcu.',
description: '',
},
managers: {
id: 'sp.signatureCollection:managers',
defaultMessage: 'Ábyrgðaraðilar',
description: '',
},
addManager: {
id: 'sp.signatureCollection:addManager',
defaultMessage: 'Bæta við ábyrgðaraðila',
description: '',
},
supervisors: {
id: 'sp.signatureCollection:supervisors',
defaultMessage: 'Umsjónaraðilar',
description: '',
},
add: {
id: 'sp.signatureCollection:add',
defaultMessage: 'Bæta við',
description: '',
},
addSupervisor: {
id: 'sp.signatureCollection:addSupervisor',
defaultMessage: 'Bæta við umsjónaraðila',
description: '',
},
personName: {
id: 'sp.signatureCollection:personName',
defaultMessage: 'Nafn',
description: '',
},
personNationalId: {
id: 'sp.signatureCollection:personNationalId',
defaultMessage: 'Kennitala',
description: '',
},
nationalIdInvalid: {
id: 'sp.signatureCollection:nationalIdInvalid',
defaultMessage: 'Ógild kennitala',
description: '',
},
constituency: {
id: 'sp.signatureCollection:constituency',
defaultMessage: 'Kjördæmi',
description: '',
},
allConstituencies: {
id: 'sp.signatureCollection:allConstituencies',
defaultMessage: 'Öll kjördæmi',
description: '',
},
addConstituency: {
id: 'sp.signatureCollection:addConstituency',
defaultMessage: 'Bæta við kjördæmi',
description: '',
},
addConstituencyDescription: {
id: 'sp.signatureCollection:addConstituencyDescription',
defaultMessage:
' Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam at semet nunc efficitur.',
description: '',
},
addConstituencyAlertInfo: {
id: 'sp.signatureCollection:addConstituencyAlertInfo',
defaultMessage:
'Athugið að skrá þarf viðeigandi ábyrgðar-/umsjónaraðila á yfirlitssíðu fyrir ný kjördæmi.',
description: '',
},
deleteManager: {
id: 'sp.signatureCollection:deleteManager',
defaultMessage: 'Eyða ábyrgðaraðila',
description: '',
},
deleteManagerDescription: {
id: 'sp.signatureCollection:deleteManagerDescription',
defaultMessage:
'Þú ert að fara að taka Nafna Nafnason af lista yfir ábyrgðaraðilum. Ertu viss um að þú viljir halda áfram?',
description: '',
},
delete: {
id: 'sp.signatureCollection:delete',
defaultMessage: 'Eyða',
description: '',
},
save: {
id: 'sp.signatureCollection:save',
defaultMessage: 'Vista',
description: '',
},
})
7 changes: 7 additions & 0 deletions libs/service-portal/signature-collection/src/lib/paths.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
export enum SignatureCollectionPaths {
RootPath = '/min-gogn/listar',
GeneralPetitions = '/min-gogn/listar/undirskriftalistar',

// Parliamentary
SignatureCollectionParliamentaryLists = '/min-gogn/listar/althingis-medmaelasofnun',
ViewParliamentaryList = '/min-gogn/listar/althingis-medmaelasofnun/:id',

// Presidential
SignatureCollectionLists = '/min-gogn/listar/medmaelasofnun',
ViewList = '/min-gogn/listar/medmaelasofnun/:id',
}
46 changes: 33 additions & 13 deletions libs/service-portal/signature-collection/src/module.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,60 @@ import { lazy } from 'react'
import { m } from '@island.is/service-portal/core'
import { PortalModule, PortalRoute } from '@island.is/portals/core'
import { SignatureCollectionPaths } from './lib/paths'
import { Features } from '@island.is/feature-flags'
import { ApiScope } from '@island.is/auth/scopes'
import { Navigate } from 'react-router-dom'

const SignatureLists = lazy(() => import('./screens'))
const ViewList = lazy(() => import('./screens/CandidateView/ViewList'))
const SignatureListsParliamentary = lazy(() =>
import('./screens/Parliamentary/'),
)
const SignatureListsPresidential = lazy(() => import('./screens/Presidential'))
const ViewListPresidential = lazy(() =>
import('./screens/Presidential/OwnerView/ViewList'),
)
const ViewListParliamentary = lazy(() =>
import('./screens/Parliamentary/OwnerView/ViewList'),
)

export const signatureCollectionModule: PortalModule = {
name: m.signatureCollectionLists,
featureFlag: Features.servicePortalSignatureCollection,
routes: ({ userInfo }) => {
const applicationRoutes: PortalRoute[] = [
{
name: m.signatureCollectionLists,
name: m.signatureCollectionParliamentaryLists,
path: SignatureCollectionPaths.RootPath,
enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
element: (
<Navigate
to={SignatureCollectionPaths.SignatureCollectionLists}
replace
/>
/* Default path to general petitions since these are always ongoing */
<Navigate to={SignatureCollectionPaths.GeneralPetitions} replace />
),
},
{
name: m.signatureCollectionLists,
name: m.signatureCollectionParliamentaryLists,
enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
path: SignatureCollectionPaths.SignatureCollectionParliamentaryLists,
key: 'ParliamentaryLists',
element: <SignatureListsParliamentary />,
},
{
name: m.signatureCollectionPresidentialLists,
path: SignatureCollectionPaths.ViewParliamentaryList,
enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
key: 'ParliamentaryLists',
element: <ViewListParliamentary />,
},
{
name: m.signatureCollectionPresidentialLists,
enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
path: SignatureCollectionPaths.SignatureCollectionLists,
element: <SignatureLists />,
key: 'PresidentialLists',
element: <SignatureListsPresidential />,
},
{
name: m.signatureCollectionLists,
name: m.signatureCollectionPresidentialLists,
path: SignatureCollectionPaths.ViewList,
key: 'PresidentialLists',
enabled: userInfo.scopes.includes(ApiScope.signatureCollection),
element: <ViewList />,
element: <ViewListPresidential />,
albinagu marked this conversation as resolved.
Show resolved Hide resolved
},
]

Expand Down
Loading