Skip to content

Commit

Permalink
fixes #1441 (#1484)
Browse files Browse the repository at this point in the history
  • Loading branch information
bjosttveit authored Mar 20, 2024
1 parent 902e624 commit 27cb9ef
Show file tree
Hide file tree
Showing 88 changed files with 186 additions and 177 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ An example setup of the `layout-sets.json` where `Task_1` is a data step, and `T

```json
{
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "simple",
Expand All @@ -99,7 +100,7 @@ Example `formLayout.json` file that presents data from the data model used in th

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"layout": [
{
Expand Down Expand Up @@ -284,6 +285,7 @@ App/ui/layout-sets.json

```json {hl_lines=[4,6]}
{
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "custom-receipt",
Expand All @@ -306,7 +308,7 @@ App/ui/custom-receipt/Settings.json

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layoutSettings.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layoutSettings.schema.v1.json",
"pages": {
"order": ["page1", "page2"]
}
Expand All @@ -327,7 +329,7 @@ App/ui/custom-receipt/layouts/page1.json

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"layout": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Eksempel oppsett av `layout-sets.json` hvor `Task_1` er et datasteg, og `Task_2`

```json
{
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "simple",
Expand All @@ -96,7 +97,7 @@ Eksempel `formLayout.json` som presenterer data som brukeren fylte ut i data-ste

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"layout": [
{
Expand Down Expand Up @@ -281,6 +282,7 @@ App/ui/layout-sets.json

```json {hl_lines=[4,6]}
{
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "custom-receipt",
Expand All @@ -303,7 +305,7 @@ App/ui/custom-receipt/Settings.json

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layoutSettings.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layoutSettings.schema.v1.json",
"pages": {
"order": ["side1", "side2"]
}
Expand All @@ -324,7 +326,7 @@ App/ui/custom-receipt/layouts/side1.json

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"layout": [
{
Expand Down
15 changes: 8 additions & 7 deletions content/app/development/configuration/stateless/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,14 @@ App/ui/layout-sets.json

```json
{
"sets": [
{
"id": "stateless",
"dataType": "Stateless-model"
}
]
}
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "stateless",
"dataType": "Stateless-model"
}
]
}
```

In the example above, the layout-set `stateless` is referring to the datamodel `Stateless-model`.
Expand Down
3 changes: 2 additions & 1 deletion content/app/development/configuration/stateless/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ App/ui/layout-sets.json

```json
{
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout-sets.schema.v1.json",
"sets": [
{
"id": "stateless",
Expand Down Expand Up @@ -559,4 +560,4 @@ Eksempel:
}
```

I den repeterende gruppen vil så `{0}` bli erstattet med den aktuelle indeksen på gruppen brukeren ønsker å starte fra.
I den repeterende gruppen vil så `{0}` bli erstattet med den aktuelle indeksen på gruppen brukeren ønsker å starte fra.
2 changes: 1 addition & 1 deletion content/app/development/logic/expressions/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ Expressions can be used to show/hide entire pages. In the example below, the ent

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"hidden": ["or",
["equals", ["component", "hasComplaints"], "no"],
Expand Down
2 changes: 1 addition & 1 deletion content/app/development/logic/expressions/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ Uttrykk kan brukes til å vise/skjule hele sider. I eksempelet under vil hele si

```json
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
"data": {
"hidden": ["or",
["equals", ["component", "hasComplaints"], "no"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Address/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Address/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Button/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Button/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Checkboxes/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-14"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -135,4 +135,4 @@ App/ui/layouts/{page}.json

{{< property-docs prop="grid-short" >}}

<!-- ## Examples -->
<!-- ## Examples -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Checkboxes/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-14"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -140,4 +140,4 @@ App/ui/layouts/{page}.json

{{< property-docs prop="grid-short" >}}

<!-- ## Eksempler -->
<!-- ## Eksempler -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Custom/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Custom/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Datepicker/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/Datepicker/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/FileUpload/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
4 changes: 2 additions & 2 deletions content/app/development/ux/components/FileUpload/_index.nb.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -185,4 +185,4 @@ App/ui/layouts/{page}.json

## Examples

<!-- One or more examples of configuration (if relevant) -->
<!-- One or more examples of configuration (if relevant) -->
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ App/ui/layouts/{page}.json

```json{hl_lines="6-"}
{
"$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
"$schema": "https://altinncdn.no/toolkits/altinn-app-frontend/4/schemas/json/layout/layout.schema.v1.json",
{
"data": {
"layout": [
Expand Down Expand Up @@ -186,4 +186,4 @@ App/ui/layouts/{page}.json

## Eksempler

<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
<!-- Ett eller flere eksempler på konfigurasjon (hvis relevant) -->
Loading

0 comments on commit 27cb9ef

Please sign in to comment.