Skip to content

Commit 275c929

Browse files
authored
Merge branch 'main' into 18175-options-and-datalists-upstream-main
2 parents 6fe786d + a55c181 commit 275c929

780 files changed

Lines changed: 23268 additions & 13370 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/skills/tekstforfatter-docs/SKILL.md

Lines changed: 414 additions & 0 deletions
Large diffs are not rendered by default.

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
!src/App/frontend/package.json
99
!src/App/template/src
1010
!libs/form-component
11+
!libs/form-engine
1112

1213
# Test-apps are built in its own container, so they need to be included
1314
!src/App/backend

.github/workflows/designer-frontend-run-playwright-on-pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'src/Designer/compose.yaml'
1212
- 'src/Designer/Dockerfile'
1313
- 'src/gitea/**'
14+
- 'src/gitea-runner/**'
1415
- 'package.json'
1516
- 'src/Designer/development/**'
1617
- 'src/App/template/**'
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Gitea Proxy - Test
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, synchronize, ready_for_review, converted_to_draft, closed]
6+
paths:
7+
- 'src/gitea-proxy/**'
8+
- '.github/workflows/gitea-proxy-test.yml'
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref || github.run_id }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
if: ${{ github.event_name != 'pull_request' || (github.event.action != 'closed' && !github.event.pull_request.draft) }}
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 15
19+
20+
steps:
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
22+
23+
- name: Install hurl
24+
run: |
25+
HURL_VERSION=8.0.1
26+
curl -fsSL "https://github.com/Orange-OpenSource/hurl/releases/download/${HURL_VERSION}/hurl_${HURL_VERSION}_amd64.deb" -o /tmp/hurl.deb
27+
sudo dpkg -i /tmp/hurl.deb
28+
hurl --version
29+
30+
- name: Run proxy integration tests
31+
run: make test
32+
working-directory: src/gitea-proxy/test

charts/altinn-designer/values.yaml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,15 @@ environmentVariables:
7575
- name: StudioOidcLoginSettings__AccountLinkUrl
7676
value: https://dev.altinn.studio/repos/user/oauth2/ansattporten
7777
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Type
78-
value: "ansattporten:altinn:service"
78+
value: "ansattporten:altinn:resource"
7979
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Resource
80-
value: "urn:altinn:resource:2480:40"
80+
value: "urn:altinn:resource:digdir-selvbetjening-klienter"
8181
- name: StudioOidcLoginSettings__AuthorizationDetails__0__OrganizationForm
8282
value: "enterprise"
83-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Type
84-
value: "ansattporten:altinn:service"
85-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Resource
86-
value: "urn:altinn:resource:5613:1"
83+
- name: StudioOidcLoginSettings__AuthorizationDetails__0__RepresentationIsRequired
84+
value: "false"
8785
- name: MaskinPortenHttpClientSettings__BaseUrl
88-
value: "https://api.samarbeid.digdir.no"
86+
value: "https://api.test.samarbeid.digdir.no"
8987
- name: FeatureManagement__StudioOidc
9088
value: "true"
9189
- name: FeatureManagement__GitOpsDeploy
@@ -165,17 +163,15 @@ environmentVariables:
165163
- name: StudioOidcLoginSettings__AccountLinkUrl
166164
value: https://staging.altinn.studio/repos/user/oauth2/ansattporten
167165
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Type
168-
value: "ansattporten:altinn:service"
166+
value: "ansattporten:altinn:resource"
169167
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Resource
170-
value: "urn:altinn:resource:2480:40"
168+
value: "urn:altinn:resource:digdir-selvbetjening-klienter"
171169
- name: StudioOidcLoginSettings__AuthorizationDetails__0__OrganizationForm
172170
value: "enterprise"
173-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Type
174-
value: "ansattporten:altinn:service"
175-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Resource
176-
value: "urn:altinn:resource:5613:1"
171+
- name: StudioOidcLoginSettings__AuthorizationDetails__0__RepresentationIsRequired
172+
value: "false"
177173
- name: MaskinPortenHttpClientSettings__BaseUrl
178-
value: "https://api.samarbeid.digdir.no"
174+
value: "https://api.test.samarbeid.digdir.no"
179175
- name: FeatureManagement__StudioOidc
180176
value: "true"
181177
- name: FeatureManagement__GitOpsDeploy
@@ -243,7 +239,7 @@ environmentVariables:
243239
- name: StudioOidcLoginSettings__RequireHttpsMetadata
244240
value: "true"
245241
- name: StudioOidcLoginSettings__CookieExpiryTimeInMinutes
246-
value: "59"
242+
value: "359"
247243
- name: StudioOidcLoginSettings__Scopes__0
248244
value: openid
249245
- name: StudioOidcLoginSettings__Scopes__1
@@ -253,19 +249,17 @@ environmentVariables:
253249
- name: StudioOidcLoginSettings__AccountLinkUrl
254250
value: https://altinn.studio/repos/user/oauth2/ansattporten
255251
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Type
256-
value: "ansattporten:altinn:service"
252+
value: "ansattporten:altinn:resource"
257253
- name: StudioOidcLoginSettings__AuthorizationDetails__0__Resource
258-
value: "urn:altinn:resource:2480:40"
254+
value: "urn:altinn:resource:digdir-selvbetjening-klienter"
259255
- name: StudioOidcLoginSettings__AuthorizationDetails__0__OrganizationForm
260256
value: "enterprise"
261-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Type
262-
value: "ansattporten:altinn:service"
263-
- name: StudioOidcLoginSettings__AuthorizationDetails__1__Resource
264-
value: "urn:altinn:resource:5613:1"
257+
- name: StudioOidcLoginSettings__AuthorizationDetails__0__RepresentationIsRequired
258+
value: "false"
265259
- name: MaskinPortenHttpClientSettings__BaseUrl
266260
value: "https://api.samarbeid.digdir.no"
267261
- name: FeatureManagement__StudioOidc
268-
value: "false"
262+
value: "true"
269263
- name: FeatureManagement__GitOpsDeploy
270264
value: "false"
271265
- name: RedisCacheSettings__UseRedisCache

charts/altinn-repositories/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ proxy:
172172
value: "on"
173173
prod:
174174
- name: STUDIO_OIDC_ENABLED
175-
value: "false"
175+
value: "true"
176176
- name: OTEL_ENDPOINT
177177
value: http://otel-router.observability.svc.cluster.local:4317
178178
- name: OTEL_SERVICE_NAME

charts/gitea-org-runner-config/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ runners:
4141
- name: skm
4242
replicas: 1
4343
registrationTokenSecretName: altinn-gitea-runner-skm-secret
44+
- name: sfvt
45+
replicas: 1
46+
registrationTokenSecretName: altinn-gitea-runner-sfvt-secret

docs/diagrams/kata-runners.excalidraw.svg

Lines changed: 2 additions & 0 deletions
Loading

libs/form-engine/eslint.config.mjs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import js from '@eslint/js';
2+
import tsPlugin from '@typescript-eslint/eslint-plugin';
3+
import tsParser from '@typescript-eslint/parser';
4+
import globals from 'globals';
5+
6+
export default [
7+
{
8+
ignores: ['dist/**', 'node_modules/**'],
9+
},
10+
js.configs.recommended,
11+
{
12+
files: ['src/**/*.{ts,tsx}'],
13+
languageOptions: {
14+
parser: tsParser,
15+
parserOptions: {
16+
ecmaVersion: 2022,
17+
sourceType: 'module',
18+
},
19+
globals: {
20+
...globals.browser,
21+
...globals.node,
22+
...globals.vitest,
23+
},
24+
},
25+
plugins: {
26+
'@typescript-eslint': tsPlugin,
27+
},
28+
rules: {
29+
...tsPlugin.configs.recommended.rules,
30+
'no-unused-vars': 'off',
31+
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
32+
},
33+
},
34+
];

libs/form-engine/package.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "@app/form-engine",
3+
"packageManager": "yarn@4.12.0",
4+
"version": "0.1.0",
5+
"main": "./src/index.ts",
6+
"private": true,
7+
"engines": {
8+
"node": ">=22.12"
9+
},
10+
"scripts": {
11+
"test": "vitest",
12+
"test:ci": "vitest run",
13+
"lint": "eslint \"src/**/*.ts*\"",
14+
"typecheck": "tsc --noEmit -p ./"
15+
},
16+
"peerDependencies": {
17+
"react": "^19.0.0",
18+
"react-dom": "^19.0.0"
19+
},
20+
"devDependencies": {
21+
"@testing-library/jest-dom": "6.9.1",
22+
"@testing-library/react": "16.3.2",
23+
"@testing-library/user-event": "14.6.1",
24+
"@types/react": "19.2.14",
25+
"@types/react-dom": "19.2.3",
26+
"@vitejs/plugin-react": "^5.0.0",
27+
"jsdom": "^26.1.0",
28+
"typescript": "5.9.3",
29+
"vitest": "^3.0.0"
30+
}
31+
}

0 commit comments

Comments
 (0)