diff --git a/frontend/index.html b/frontend/index.html index a7f20a40..a97ee402 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,20 +1,16 @@ - - + + - - - + + + - - + + Altinn - +
diff --git a/frontend/package.json b/frontend/package.json index 4dd3b216..23bf8c54 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,9 +9,9 @@ "lint": "eslint ." }, "dependencies": { - "@digdir/designsystemet-css": "1.0.0-next.34", - "@digdir/designsystemet-react": "1.0.0-next.34", - "@digdir/designsystemet-theme": "1.0.0-next.34", + "@digdir/designsystemet-css": "1.0.0-next.39", + "@digdir/designsystemet-react": "1.0.0-next.39", + "@digdir/designsystemet-theme": "1.0.0-next.39", "@navikt/aksel-icons": "^7.0.0", "@reduxjs/toolkit": "^2.1.0", "classnames": "^2.5.1", diff --git a/frontend/src/components/ActionBar/ActionBarHeader.tsx b/frontend/src/components/ActionBar/ActionBarHeader.tsx index abf0ae74..ef5c718d 100644 --- a/frontend/src/components/ActionBar/ActionBarHeader.tsx +++ b/frontend/src/components/ActionBar/ActionBarHeader.tsx @@ -33,11 +33,11 @@ export const ActionBarHeader = forwardRef {icon}
- + {title} {subtitle && ( - + {subtitle} )} diff --git a/frontend/src/components/PageContainer/PageContainer.tsx b/frontend/src/components/PageContainer/PageContainer.tsx index ef9fcca9..a487d009 100644 --- a/frontend/src/components/PageContainer/PageContainer.tsx +++ b/frontend/src/components/PageContainer/PageContainer.tsx @@ -30,7 +30,7 @@ export const PageContainer = ({ backUrl, children }: PageContainerProps) => { title={t('common.back')} variant='tertiary' className={classes.buttonContainerButton} - size='sm' + data-size='sm' asChild > @@ -42,7 +42,7 @@ export const PageContainer = ({ backUrl, children }: PageContainerProps) => { icon={true} title={t('common.close')} className={classes.buttonContainerButton} - size='sm' + data-size='sm' asChild > diff --git a/frontend/src/components/SystemUserActionBar/SystemUserActionBar.tsx b/frontend/src/components/SystemUserActionBar/SystemUserActionBar.tsx index 9fcd0c88..2d2d1ec9 100644 --- a/frontend/src/components/SystemUserActionBar/SystemUserActionBar.tsx +++ b/frontend/src/components/SystemUserActionBar/SystemUserActionBar.tsx @@ -36,7 +36,7 @@ export const SystemUserActionBar = ({ >
- + {!systemUser?.resources.length ? t('authent_overviewpage.system_user_no_rights') : t('authent_overviewpage.system_rights_header')} diff --git a/frontend/src/features/creationpage/CreationPageContent.tsx b/frontend/src/features/creationpage/CreationPageContent.tsx index 81b988e2..d4cd1293 100644 --- a/frontend/src/features/creationpage/CreationPageContent.tsx +++ b/frontend/src/features/creationpage/CreationPageContent.tsx @@ -42,12 +42,10 @@ export const CreationPageContent = () => { return (
- + {t('authent_creationpage.sub_title')} - - {t('authent_creationpage.content_text1')} - + {t('authent_creationpage.content_text1')}
{ })} {isLoadVendorError && ( - {t('authent_creationpage.load_vendors_error')} + {t('authent_creationpage.load_vendors_error')} )}
-
diff --git a/frontend/src/features/detailpage/DetailPage.module.css b/frontend/src/features/detailpage/DetailPage.module.css index c0e2f1bd..ec29cd17 100644 --- a/frontend/src/features/detailpage/DetailPage.module.css +++ b/frontend/src/features/detailpage/DetailPage.module.css @@ -7,8 +7,6 @@ .buttonContainer { display: flex; align-items: flex-start; - margin-top: var(--ds-spacing-12); - margin-bottom: var(--ds-spacing-4); gap: var(--ds-spacing-4); } diff --git a/frontend/src/features/detailpage/DetailPage.tsx b/frontend/src/features/detailpage/DetailPage.tsx index 18125de9..47a531dc 100644 --- a/frontend/src/features/detailpage/DetailPage.tsx +++ b/frontend/src/features/detailpage/DetailPage.tsx @@ -21,9 +21,9 @@ export const DetailPage = (): React.ReactNode => { return ( } title={t('authent_detailpage.edit_systemuser')}> - {isLoadingSystemUser && } + {isLoadingSystemUser && } {isLoadSystemUserError && ( - {t('authent_detailpage.load_systemuser_error')} + {t('authent_detailpage.load_systemuser_error')} )} {systemUser && } diff --git a/frontend/src/features/detailpage/DetailPageContent.tsx b/frontend/src/features/detailpage/DetailPageContent.tsx index d1d1ea40..82380bf7 100644 --- a/frontend/src/features/detailpage/DetailPageContent.tsx +++ b/frontend/src/features/detailpage/DetailPageContent.tsx @@ -33,48 +33,50 @@ export const DetailPageContent = ({ systemUser }: DetailPageContentProps) => { return (
- - {t('authent_detailpage.delete_systemuser_header')} - + + + {t('authent_detailpage.delete_systemuser_header')} + + {t('authent_detailpage.delete_systemuser_body', { title: systemUser.integrationTitle, })} - + {isDeleteError && ( - + {t('authent_detailpage.delete_systemuser_error')} )} - - - - - + +
+ + +
+ +
- + {systemUser.integrationTitle || t('authent_detailpage.no_name')} - - {systemUser.supplierName?.toUpperCase()} - + {systemUser.supplierName?.toUpperCase()}
{IS_EDIT_NAME_ENABLED && ( setName(event.target.value)} error={ @@ -83,7 +85,7 @@ export const DetailPageContent = ({ systemUser }: DetailPageContentProps) => { /> )} {isUpdateError && ( - + {t('authent_detailpage.update_systemuser_error')} )} @@ -108,7 +110,7 @@ export const DetailPageContent = ({ systemUser }: DetailPageContentProps) => { )} -
diff --git a/frontend/src/features/vendorRequestPage/VendorRequestPage.tsx b/frontend/src/features/vendorRequestPage/VendorRequestPage.tsx index baebecd6..ba13df36 100644 --- a/frontend/src/features/vendorRequestPage/VendorRequestPage.tsx +++ b/frontend/src/features/vendorRequestPage/VendorRequestPage.tsx @@ -40,16 +40,16 @@ export const VendorRequestPage = () => { )}
{!requestId && ( - {t('vendor_request.load_creation_request_no_id')} + {t('vendor_request.load_creation_request_no_id')} )} {(isLoadingCreationRequestError || (creationRequest && !creationRequest.system)) && ( - {t('vendor_request.load_creation_request_error')} + {t('vendor_request.load_creation_request_error')} )} {isLoadUserInfoError && ( - {t('vendor_request.load_user_info_error')} + {t('vendor_request.load_user_info_error')} )} {(isLoadingUserInfo || isLoadingCreationRequest) && ( - + )} {creationRequest && creationRequest.system && userInfo && ( diff --git a/frontend/src/features/vendorRequestPage/VendorRequestPageContent.tsx b/frontend/src/features/vendorRequestPage/VendorRequestPageContent.tsx index e3aaaf99..00e5fe2e 100644 --- a/frontend/src/features/vendorRequestPage/VendorRequestPageContent.tsx +++ b/frontend/src/features/vendorRequestPage/VendorRequestPageContent.tsx @@ -80,7 +80,7 @@ export const VendorRequestPageContent = ({ request, userInfo }: VendorRequestPag const renderFooter = (): React.ReactNode => { return ( - + {t('vendor_request.org_nr', { systemName: request.system.name[currentLanguage], vendorName: request.system.systemVendorOrgName, @@ -94,12 +94,12 @@ export const VendorRequestPageContent = ({ request, userInfo }: VendorRequestPag return ( <>
- + {t('vendor_request.receipt_header')}
- + {t('vendor_request.receipt_ingress', { systemName: request.system.name[currentLanguage], })} @@ -128,26 +128,26 @@ export const VendorRequestPageContent = ({ request, userInfo }: VendorRequestPag return ( <>
- + {t('vendor_request.banner_title')}
{request.status === 'Accepted' && ( - {t('vendor_request.request_accepted')} + {t('vendor_request.request_accepted')} )} {request.status === 'Rejected' && ( - {t('vendor_request.request_rejected')} + {t('vendor_request.request_rejected')} )} {request.status === 'Timedout' && ( - {t('vendor_request.request_expired')} + {t('vendor_request.request_expired')} )} - + {t('vendor_request.creation_header', { vendorName: request.system.name[currentLanguage], })} - + +
- + {request.resources.length === 1 ? t('vendor_request.rights_list_header_single') : t('vendor_request.rights_list_header')} @@ -168,12 +169,12 @@ export const VendorRequestPageContent = ({ request, userInfo }: VendorRequestPag
{!userInfo.canCreateSystemUser && } {isAcceptCreationRequestError && ( - + {t('vendor_request.accept_error')} )} {isRejectCreationRequestError && ( - + {t('vendor_request.reject_error')} )} diff --git a/frontend/src/sites/NotFoundSite/NotFoundSite.module.css b/frontend/src/sites/NotFoundSite/NotFoundSite.module.css index 6132174d..423557e5 100644 --- a/frontend/src/sites/NotFoundSite/NotFoundSite.module.css +++ b/frontend/src/sites/NotFoundSite/NotFoundSite.module.css @@ -1,9 +1,13 @@ -.notFoundSiteWrapper { - margin: 0 var(--ds-spacing-10); +.flexWrapper { + display: flex; + flex-direction: column; + gap: var(--ds-spacing-4); } .flexContainer { display: flex; + gap: var(--ds-spacing-30); + margin-top: var(--ds-spacing-12); } @media only screen and (max-width: 576px) { diff --git a/frontend/src/sites/NotFoundSite/NotFoundSite.tsx b/frontend/src/sites/NotFoundSite/NotFoundSite.tsx index 569c9cdb..5647f769 100644 --- a/frontend/src/sites/NotFoundSite/NotFoundSite.tsx +++ b/frontend/src/sites/NotFoundSite/NotFoundSite.tsx @@ -18,36 +18,36 @@ export const NotFoundSite = () => { return ( -
- +
+ {t('common.error_status_code')}: {error.status} - + {t('common.error_message')}: {error.error.message} {error.message} - + {t('error_page.not_found_site_header')}
-
- {t('error_page.not_found_site_upper_text')} - +
+ {t('error_page.not_found_site_upper_text')} + {t('error_page.go_to_inbox')} - + {t('error_page.go_to_profile')} - + {t('error_page.find_and_submit_scheme')} - {t('error_page.not_found_site_lower_text')} + {t('error_page.not_found_site_lower_text')}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1112da82..7bd10f60 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -512,35 +512,35 @@ __metadata: languageName: node linkType: hard -"@digdir/designsystemet-css@npm:1.0.0-next.34": - version: 1.0.0-next.34 - resolution: "@digdir/designsystemet-css@npm:1.0.0-next.34" - checksum: 10c0/0516d38fb847794c3de53f6e5976d97116edbe7c118eeab107c77afb776370b1de2cdf409d40de236d6d9f38004d47df225e5c30601be1bd3b62d896dae5fa78 +"@digdir/designsystemet-css@npm:1.0.0-next.39": + version: 1.0.0-next.39 + resolution: "@digdir/designsystemet-css@npm:1.0.0-next.39" + checksum: 10c0/9fec473ec40aa9387ba87d2673a2928abf7df00f06106306b4b3894bef2d36fe6c71b462c0442848faf8eeb4847fbb930ae64cec70337d992b51588040db3a94 languageName: node linkType: hard -"@digdir/designsystemet-react@npm:1.0.0-next.34": - version: 1.0.0-next.34 - resolution: "@digdir/designsystemet-react@npm:1.0.0-next.34" +"@digdir/designsystemet-react@npm:1.0.0-next.39": + version: 1.0.0-next.39 + resolution: "@digdir/designsystemet-react@npm:1.0.0-next.39" dependencies: "@floating-ui/dom": "npm:^1.6.10" "@floating-ui/react": "npm:0.26.23" "@navikt/aksel-icons": "npm:^6.14.0" "@radix-ui/react-slot": "npm:^1.1.0" "@tanstack/react-virtual": "npm:^3.10.7" - "@u-elements/u-details": "npm:^0.0.5" + "@u-elements/u-details": "npm:^0.1.0" clsx: "npm:^2.1.1" peerDependencies: react: ">=18.3.1" react-dom: ">=18.3.1" - checksum: 10c0/020929b52f5b115c8f7fafc6f5f770d59d6adbd811baf04a3b6258fb6c31b11779e74cefbf5e0bcefc83c575c94c6bc4baad3d5dcf93c66a5f4801ee997c53b7 + checksum: 10c0/d9d7d76bb554ba58f9d2bb94e89f4c16ff5dd11484fe0cbdfadd8f15ea89ed087fb9afca717dc46448a1d386a732b014062ffe6ea7da3d05c0c88785ac8afc12 languageName: node linkType: hard -"@digdir/designsystemet-theme@npm:1.0.0-next.34": - version: 1.0.0-next.34 - resolution: "@digdir/designsystemet-theme@npm:1.0.0-next.34" - checksum: 10c0/2499f3182a354c5cd9e0830ed280f08c87f4e2990f26480b0b483b4b22c35cd329ce50975633c70a153af3ca57d1412be0d23477a0eec996f4c02e27e01c1db7 +"@digdir/designsystemet-theme@npm:1.0.0-next.39": + version: 1.0.0-next.39 + resolution: "@digdir/designsystemet-theme@npm:1.0.0-next.39" + checksum: 10c0/a9466a2c0c259517f98b5f549ea9b43ae0e88711da7e5b12975eed10f5901dd818f31e0c7ffcd4c8cd321739248cc9c2ed5da31137d5ef1d0f0685543178b6b8 languageName: node linkType: hard @@ -1754,10 +1754,10 @@ __metadata: languageName: node linkType: hard -"@u-elements/u-details@npm:^0.0.5": - version: 0.0.5 - resolution: "@u-elements/u-details@npm:0.0.5" - checksum: 10c0/cc3dc9aceeb2574cfd7e4549e9dd004bd6c48bf1f5913118dd2f4b1fe79a3bab1c4103970e6274763a108d899e1eaea7d14ad624b1e2783ab2d835a3c2a108bf +"@u-elements/u-details@npm:^0.1.0": + version: 0.1.0 + resolution: "@u-elements/u-details@npm:0.1.0" + checksum: 10c0/b4a45ed5a28fedf27688e66f8cc67ba323fe5ceae8625cf39c2b56da07fd1bb7fb666fd54ad42c4906dbf691f6de29844246e6bddf2d591c7220e847a7d9f57a languageName: node linkType: hard @@ -2023,9 +2023,9 @@ __metadata: version: 0.0.0-use.local resolution: "authentication-frontend@workspace:." dependencies: - "@digdir/designsystemet-css": "npm:1.0.0-next.34" - "@digdir/designsystemet-react": "npm:1.0.0-next.34" - "@digdir/designsystemet-theme": "npm:1.0.0-next.34" + "@digdir/designsystemet-css": "npm:1.0.0-next.39" + "@digdir/designsystemet-react": "npm:1.0.0-next.39" + "@digdir/designsystemet-theme": "npm:1.0.0-next.39" "@navikt/aksel-icons": "npm:^7.0.0" "@playwright/test": "npm:^1.45.1" "@reduxjs/toolkit": "npm:^2.1.0"