Merge branch 'main' into feat(form-editor)/13316-options-tabs-compone…

…nt-config
Altinn · Sep 3, 2024 · cbc2fae · cbc2fae
2 parents dd8009d + 957f1cb
commit cbc2fae
Show file tree

Hide file tree

Showing 28 changed files with 855 additions and 965 deletions.
diff --git a/.yarn/releases/yarn-4.4.0.cjs → .yarn/releases/yarn-4.4.1.cjs b/.yarn/releases/yarn-4.4.0.cjs → .yarn/releases/yarn-4.4.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -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
diff --git a/development/azure-devops-mock/package.json b/development/azure-devops-mock/package.json
@@ -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",

diff --git a/eidlogger/pom.xml b/eidlogger/pom.xml
@@ -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>

diff --git a/frontend/app-development/package.json b/frontend/app-development/package.json
@@ -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",

diff --git a/frontend/app-preview/package.json b/frontend/app-preview/package.json
@@ -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",

diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json
@@ -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",

diff --git a/frontend/libs/studio-components/package.json b/frontend/libs/studio-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studio/components",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "version": "0.1.0",
   "main": "./src/index.ts",
   "scripts": {
@@ -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",
@@ -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",

diff --git a/frontend/libs/studio-hooks/package.json b/frontend/libs/studio-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studio/hooks",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "version": "0.1.0",
   "main": "./src/index.ts",
   "scripts": {
@@ -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",

diff --git a/frontend/libs/studio-icons/package.json b/frontend/libs/studio-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studio/icons",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "version": "0.1.0",
   "main": "./src/index.ts",
   "scripts": {
@@ -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",

diff --git a/frontend/libs/studio-pure-functions/package.json b/frontend/libs/studio-pure-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studio/pure-functions",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "version": "0.1.0",
   "main": "./src/index.ts",
   "scripts": {

diff --git a/frontend/packages/policy-editor/package.json b/frontend/packages/policy-editor/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "main": "index.ts",
   "private": true,
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "scripts": {
     "test": "jest"
   },

diff --git a/frontend/packages/process-editor/package.json b/frontend/packages/process-editor/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "main": "index.ts",
   "private": true,
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "scripts": {
     "test": "jest"
   },

diff --git a/...figEndEvent/CustomReceiptContent/CreateCustomReceiptForm/CreateCustomReceiptForm.test.tsx b/...figEndEvent/CustomReceiptContent/CreateCustomReceiptForm/CreateCustomReceiptForm.test.tsx
@@ -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({

diff --git a/...l/ConfigEndEvent/CustomReceiptContent/CreateCustomReceiptForm/CreateCustomReceiptForm.tsx b/...l/ConfigEndEvent/CustomReceiptContent/CreateCustomReceiptForm/CreateCustomReceiptForm.tsx
@@ -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

diff --git a/frontend/packages/schema-editor/package.json b/frontend/packages/schema-editor/package.json
@@ -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"

diff --git a/frontend/packages/shared/package.json b/frontend/packages/shared/package.json
@@ -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",
@@ -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"
   },

diff --git a/frontend/packages/text-editor/package.json b/frontend/packages/text-editor/package.json
@@ -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"

diff --git a/frontend/packages/ux-editor-v3/package.json b/frontend/packages/ux-editor-v3/package.json
@@ -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",
@@ -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%"

diff --git a/frontend/packages/ux-editor/package.json b/frontend/packages/ux-editor/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.1",
   "author": "Altinn",
   "dependencies": {
-    "@mui/material": "5.16.7",
+    "@mui/material": "6.0.1",
     "@studio/icons": "workspace:^",
     "classnames": "2.5.1",
     "react": "18.3.1",
@@ -21,7 +21,7 @@
   "license": "3-Clause BSD",
   "main": "index.js",
   "peerDependencies": {
-    "webpack": "5.93.0"
+    "webpack": "5.94.0"
   },
   "scripts": {
     "test": "jest --maxWorkers=50%"

diff --git a/frontend/resourceadm/package.json b/frontend/resourceadm/package.json
@@ -18,7 +18,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",

diff --git a/frontend/resourceadm/testing/playwright/package.json b/frontend/resourceadm/testing/playwright/package.json
@@ -2,7 +2,7 @@
   "name": "playwright-resourceadm",
   "private": true,
   "version": "1.0.0",
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "dependencies": {
     "dotenv": "^16.3.1"
   },

diff --git a/frontend/scripts/package.json b/frontend/scripts/package.json
@@ -1,23 +1,23 @@
 {
   "name": "altinn-studio-internal-stats",
   "dependencies": {
-    "axios": "1.7.4"
+    "axios": "1.7.6"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "eslint": "8.57.0",
     "eslint-plugin-import": "2.29.1",
-    "glob": "10.4.5",
-    "husky": "9.1.4",
+    "glob": "11.0.0",
+    "husky": "9.1.5",
     "jsonpointer": "5.0.1",
     "lint-staged": "15.2.9",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.5.4"
   },
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.4.1",
   "private": true,
   "scripts": {
     "generate-config-coverage-stats": "node -r ts-node/register/transpile-only -r tsconfig-paths/register configurationStats/run.ts",