Skip to content

Commit

Permalink
Merge branch 'main' into fix/root-header-display-without-elements
Browse files Browse the repository at this point in the history
  • Loading branch information
lassopicasso committed Sep 4, 2024
2 parents fb3105d + df11bd5 commit ac85f5d
Show file tree
Hide file tree
Showing 33 changed files with 936 additions and 977 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/lint-pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: "Lint PR"
on:
pull_request:
branches: [ main ]
types: [ opened, synchronize, reopened, edited ]

permissions:
pull-requests: read

jobs:
main:
name: Validate PR title to be semantic
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
scopes: |
accessibility
analytics
app-deploy
app-preview
attachments
authentication
authorization
contact
content-library
codelist
dashboard
data-modeling
data-storage
dependencies
deps
designer
designsystem
documentation
form-layout
header
infrastructure
language
login
message
message-box
overview
pdf
prefill
process
receipt
register
resource-adm
resource-registry
settings
subform
testing
text
text-editor
ui-component
ui-editor
ux
workspace
348 changes: 174 additions & 174 deletions .yarn/releases/yarn-4.4.0.cjs → .yarn/releases/yarn-4.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ enableTelemetry: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.4.0.cjs
yarnPath: .yarn/releases/yarn-4.4.1.cjs
2 changes: 1 addition & 1 deletion development/azure-devops-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.0",
"author": "The Altinn Studio Team",
"dependencies": {
"axios": "1.7.4",
"axios": "1.7.6",
"cors": "2.8.5",
"express": "4.19.2",
"morgan": "1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion eidlogger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.2</version>
<version>3.3.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>no.altinn</groupId>
Expand Down
8 changes: 4 additions & 4 deletions frontend/app-development/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
"@studio/hooks": "workspace:^",
"@studio/icons": "workspace:^",
"@studio/pure-functions": "workspace:^",
"axios": "1.7.4",
"axios": "1.7.6",
"classnames": "2.5.1",
"i18next": "23.13.0",
"i18next": "23.14.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-i18next": "14.1.3",
"react-i18next": "15.0.1",
"react-router-dom": "6.26.1"
},
"devDependencies": {
"cross-env": "7.0.3",
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.93.0",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
},
"license": "3-Clause BSD",
Expand Down
2 changes: 1 addition & 1 deletion frontend/app-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"cross-env": "7.0.3",
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.93.0",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
},
"license": "3-Clause BSD",
Expand Down
2 changes: 1 addition & 1 deletion frontend/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"cross-env": "7.0.3",
"jest": "29.7.0",
"typescript": "5.5.4",
"webpack": "5.93.0",
"webpack": "5.94.0",
"webpack-dev-server": "5.0.4"
},
"license": "3-Clause BSD",
Expand Down
16 changes: 8 additions & 8 deletions frontend/language/src/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"app_create_release.build_version": "Bygg versjon",
"app_create_release.check_status": "Sjekker status på appen din...",
"app_create_release.loading": "Laster...",
"app_create_release.local_changes_can_build": "Alle endringene er ikke delt med master-versjonen. Du må dele dine lokale endringer med masteren for å få dem med i en ny versjon.",
"app_create_release.local_changes_cant_build": "Alle endringene er ikke delt med master-versjonen. Du må dele dine lokale endringer med masteren før du kan bygge en ny versjon.",
"app_create_release.local_changes_can_build": "Alle endringene er ikke delt med master-versjonen. Du må dele dine lokale endringer med master for å få dem med i en ny versjon.",
"app_create_release.local_changes_cant_build": "Alle endringene er ikke delt med master-versjonen. Du må dele dine lokale endringer med master før du kan bygge en ny versjon.",
"app_create_release.no_changes_on_current_release": "Det er ingen endringer på nåværende lansering",
"app_create_release.ok": "Ok",
"app_create_release.release_creating": "Bygger en ny versjon av appen, startet av",
Expand Down Expand Up @@ -82,7 +82,7 @@
"app_release.release_built_on_version_link": "siste endringstransaksjon hentet fra master",
"app_release.release_see_commit": "Se endringstransaksjonen",
"app_release.release_tab_versions": "Versjoner",
"app_release.release_title": "Appen bygges på ut fra",
"app_release.release_title": "Appen bygges basert på",
"app_release.release_title_link": "siste endringstransaksjon til master",
"app_release.release_version": "Versjon:",
"contact.email.content": "Du kan skrive en e-post til Altinn servicedesk hvis du har spørsmål om å opprette organisasjoner eller miljøer, opplever tekniske problemer eller har spørsmål om dokumentasjonen eller andre ting.",
Expand All @@ -93,7 +93,7 @@
"contact.slack.content": "Hvis du har spørsmål om hvordan du bygger en app, kan du snakke direkte med utviklingsteamet i Altinn Studio på Slack. De hjelper deg med å",
"contact.slack.content_list": "<0>bygge appene slik du ønsker</0><0>svare på spørsmål og veilede deg</0><0>ta imot innspill på ny funksjonalitet</0>",
"contact.slack.heading": "Skriv melding til oss Slack",
"contact.slack.link": "<0 href=\"https://altinn.slack.com\">altinn.slack.com</0>",
"contact.slack.link": "altinn.slack.com",
"dashboard.all_apps": "Alle apper",
"dashboard.all_data_models": "Alle datamodeller",
"dashboard.all_resources": "Alle ressurser",
Expand Down Expand Up @@ -548,7 +548,7 @@
"policy_editor.action_read": "Les",
"policy_editor.action_sign": "Signer",
"policy_editor.action_write": "Skriv",
"policy_editor.alert": "Du må ha minst en regel for å publisere {{usageType}}.",
"policy_editor.alert": "Du må ha minst én regel for å publisere {{usageType}}.",
"policy_editor.alert_app": "appen",
"policy_editor.alert_resource": "ressursen",
"policy_editor.auth_level_option_0": "0 - Selvidentifisert bruker i Altinn. (Eget passord og brukernavn)",
Expand Down Expand Up @@ -580,7 +580,7 @@
"policy_editor.rule_card_sub_resource_button": "Legg til en sub-ressurs",
"policy_editor.rule_card_sub_resource_error": "Du må legge til minimum en sub-ressurs.",
"policy_editor.rule_card_sub_resource_title": "Hvilken sub-ressurser skal regelen gjelde for?",
"policy_editor.rule_card_subjects_error": "Du må velge minst en rolle.",
"policy_editor.rule_card_subjects_error": "Du må velge minst én rolle.",
"policy_editor.rule_card_subjects_select_add": "Legg til rolle",
"policy_editor.rule_card_subjects_select_all_selected": "Alle roller er valgt",
"policy_editor.rule_card_subjects_title": "Hvem skal ha disse rettighetene?",
Expand Down Expand Up @@ -634,15 +634,15 @@
"process_editor.configuration_panel_custom_receipt_textfield_label": "Navn på sidegruppe",
"process_editor.configuration_panel_data_model_selection_description": "Velg en datamodell å knytte til prosessteget",
"process_editor.configuration_panel_data_task": "Oppgave: Utfylling",
"process_editor.configuration_panel_data_types_to_sign_required": "Du må velge minst en datatype",
"process_editor.configuration_panel_data_types_to_sign_required": "Du må velge minst én datatype",
"process_editor.configuration_panel_element_not_supported_message": "Foreløpig kan du kun se detaljene på oppgaver, ikke redigere dem. Velg en oppgave for å se detaljer.",
"process_editor.configuration_panel_element_not_supported_title": "Elementet du har valgt, støttes ikke",
"process_editor.configuration_panel_end_event": "Slutthendelse",
"process_editor.configuration_panel_feedback_task": "Oppgave: Tilbakemelding",
"process_editor.configuration_panel_header_help_text_confirmation": "Du bruker oppgaven Bekreftelse (confirmation) til å vise sluttbrukerne en oppsummering som de kan bekrefte.",
"process_editor.configuration_panel_header_help_text_data": "Du bruker oppgaven Utfylling (data) hvis du skal samle inn eller vise data.",
"process_editor.configuration_panel_header_help_text_feedback": "Du bruker oppgaven Tilbakemelding (feedback) når du vil at sluttbrukerne skal vente på en tilbakemelding fra tjenesteeier før de kan gå videre i prosessen eller avslutte den.",
"process_editor.configuration_panel_header_help_text_payment": "",
"process_editor.configuration_panel_header_help_text_payment": "Du bruker oppgaven Betaling (payment) når du vil at sluttbrukerne skal betale for noe.",
"process_editor.configuration_panel_header_help_text_signing": "Du bruker oppgaven Signering (signing) når du vil at sluttbrukerne skal bekrefte med signatur.",
"process_editor.configuration_panel_header_help_text_title": "Informasjon om valgt oppgave",
"process_editor.configuration_panel_id_label": "ID:",
Expand Down
8 changes: 4 additions & 4 deletions frontend/libs/studio-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studio/components",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"version": "0.1.0",
"main": "./src/index.ts",
"scripts": {
Expand All @@ -18,7 +18,7 @@
"uuid": "10.0.0"
},
"devDependencies": {
"@chromatic-com/storybook": "1.6.1",
"@chromatic-com/storybook": "1.8.0",
"@storybook/addon-essentials": "^8.0.4",
"@storybook/addon-interactions": "^8.0.4",
"@storybook/addon-links": "^8.0.4",
Expand All @@ -28,8 +28,8 @@
"@storybook/react": "^8.0.4",
"@storybook/react-webpack5": "^8.0.4",
"@storybook/test": "^8.0.4",
"@testing-library/jest-dom": "6.4.8",
"@testing-library/react": "16.0.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@types/jest": "^29.5.5",
"eslint": "8.57.0",
"eslint-plugin-storybook": "^0.8.0",
Expand Down
6 changes: 3 additions & 3 deletions frontend/libs/studio-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studio/hooks",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"version": "0.1.0",
"main": "./src/index.ts",
"scripts": {
Expand All @@ -14,8 +14,8 @@
"uuid": "10.0.0"
},
"devDependencies": {
"@testing-library/jest-dom": "6.4.8",
"@testing-library/react": "16.0.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@types/jest": "^29.5.5",
"eslint": "8.57.0",
"jest": "^29.7.0",
Expand Down
6 changes: 3 additions & 3 deletions frontend/libs/studio-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studio/icons",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"version": "0.1.0",
"main": "./src/index.ts",
"scripts": {
Expand All @@ -12,8 +12,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@testing-library/jest-dom": "6.4.8",
"@testing-library/react": "16.0.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@types/jest": "^29.5.5",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
2 changes: 1 addition & 1 deletion frontend/libs/studio-pure-functions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studio/pure-functions",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"version": "0.1.0",
"main": "./src/index.ts",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/policy-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"main": "index.ts",
"private": true,
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"scripts": {
"test": "jest"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/process-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"main": "index.ts",
"private": true,
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"scripts": {
"test": "jest"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,41 @@ describe('CreateCustomReceiptForm', () => {
expect(mockOnCloseForm).toHaveBeenCalledTimes(0);
});

it('Displays error when there is just one character present for layouSetId', async () => {
const user = userEvent.setup();
renderCreateCustomReceiptForm();

const layoutSetInput = screen.getByLabelText(
textMock('process_editor.configuration_panel_custom_receipt_textfield_label'),
);
await user.type(layoutSetInput, 'a');

const combobox = screen.getByRole('combobox', {
name: textMock('process_editor.configuration_panel_custom_receipt_select_data_model_label'),
});
await user.click(combobox);

const optionElement = screen.getByRole('option', { name: mockAllDataModelIds[0] });
await user.click(optionElement);
await user.keyboard('{Escape}');

const createButton = screen.getByRole('button', {
name: textMock('process_editor.configuration_panel_custom_receipt_create_button'),
});
await user.click(createButton);

const layoutIdError = screen.getByText(
textMock('process_editor.configuration_panel_custom_receipt_layout_set_name_validation'),
);
expect(layoutIdError).toBeInTheDocument();

const dataModelIdError = screen.queryByText(
textMock('process_editor.configuration_panel_custom_receipt_create_data_model_error'),
);
expect(dataModelIdError).not.toBeInTheDocument();
expect(mockOnCloseForm).toHaveBeenCalledTimes(0);
});

it('shows correct errormessage when layoutSetId is empty when typing in the textbox', async () => {
const user = userEvent.setup();
renderCreateCustomReceiptForm({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ export const CreateCustomReceiptForm = ({
const updateErrors = (customReceiptForm: CustomReceiptType) => {
const { layoutSetId, dataModelId } = customReceiptForm;
setLayoutSetError(!layoutSetId ? t('validation_errors.required') : null);
layoutSetId.length === 1 &&
setLayoutSetError(
t('process_editor.configuration_panel_custom_receipt_layout_set_name_validation'),
);

setDataModelError(
!dataModelId
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/schema-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"jest": "29.7.0"
},
"peerDependencies": {
"axios": "1.7.4",
"axios": "1.7.6",
"classnames": "2.5.1",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"author": "Altinn",
"dependencies": {
"@mui/material": "5.16.7",
"@mui/material": "6.0.1",
"classnames": "2.5.1",
"qs": "6.13.0",
"react": "18.3.1",
Expand All @@ -14,7 +14,7 @@
"react-router-dom": "6.26.1"
},
"devDependencies": {
"@types/react": "18.3.3",
"@types/react": "18.3.5",
"jest": "29.7.0",
"typescript": "5.5.4"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/text-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@altinn/text-editor",
"version": "0.1.0",
"dependencies": {
"iso-639-1": "3.1.2"
"iso-639-1": "3.1.3"
},
"devDependencies": {
"jest": "29.7.0"
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/ux-editor-v3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"author": "Altinn",
"dependencies": {
"@mui/material": "5.16.7",
"@mui/material": "6.0.1",
"@reduxjs/toolkit": "1.9.7",
"@studio/icons": "workspace:^",
"classnames": "2.5.1",
Expand All @@ -25,7 +25,7 @@
"license": "3-Clause BSD",
"main": "index.js",
"peerDependencies": {
"webpack": "5.93.0"
"webpack": "5.94.0"
},
"scripts": {
"test": "jest --maxWorkers=50%"
Expand Down
Loading

0 comments on commit ac85f5d

Please sign in to comment.