Merge branch 'master' into chore/document-payment-setup-in-apps

content/altinn-studio/designer/resourcemanagement/_index.en.md

@@ -18,15 +18,15 @@ The resource document contains the title, description, and other relevant metada
 In Altinn Studio the service owners can do the following for standalone Resource
 
 - List their resources.
-- Create new and update existing resources and register all relevant [attributes](/authorization/modules/resourceregistry/#resource-attributes) for that resource.
+- Create new and update existing resources and register all relevant [attributes](/authorization/what-do-you-get/resourceregistry/#resource-attributes) for that resource.
 - Set and update the authorization policy with the various required rules for each resource
 - Validate resources metadata and authorization policy if they follow the required standards
 - Publish new resources to TT02 or the production environment
 - Update existing resources in TT02 or the production environment
 
 ## Functionality in Altinn Studio Designer for Resource metadata for App created in Altinn Studio
 
-- Create new and update existing all relevant [attributes](/authorization/modules/resourceregistry/#resource-attributes) for that resource.
+- Create new and update existing all relevant [attributes](/authorization/what-do-you-get/resourceregistry/#resource-attributes) for that resource.
 - Set and update the authorization policy with the various required rules for each resource
 - Validate resources metadata and authorization policy if they follow the required standards
 - Publish new resources to TT02 or the production environment

content/altinn-studio/designer/resourcemanagement/_index.nb.md

@@ -17,15 +17,15 @@ En ressurs i denne sammenhengen er et JSON-dokument som beskriver en typisk tjen
 I Altinn Studio kan tjenesteeiere gjøre følgende for selvstendige ressurser:
 
 - Liste opp ressursene sine.
-- Opprette nye og oppdatere eksisterende ressurser og registrere alle relevante [attributter](/authorization/modules/resourceregistry/#resource-attributes) for den ressursen.
+- Opprette nye og oppdatere eksisterende ressurser og registrere alle relevante [attributter](/authorization/what-do-you-get/resourceregistry/#resource-attributes) for den ressursen.
 - Sette og oppdatere autorisasjonspolicyen med de ulike nødvendige reglene for hver ressurs.
 - Validere metadata for ressurser og autorisasjonspolicy for å sikre at de følger de nødvendige standardene.
 - Publisere nye ressurser til TT02 eller produksjonsmiljøet.
 - Oppdatere eksisterende ressurser i TT02 eller produksjonsmiljøet.
 
 ## Funksjonalitet i Altinn Studio Designer for metadata for app-ressurser opprettet i Altinn Studio
 
-- Opprette nye og oppdatere eksisterende alle relevante [attributter](/authorization/modules/resourceregistry/#resource-attributes) for den ressursen.
+- Opprette nye og oppdatere eksisterende alle relevante [attributter](/authorization/what-do-you-get/resourceregistry/#resource-attributes) for den ressursen.
 - Sette og oppdatere autorisasjonspolicyen med de ulike nødvendige reglene for hver ressurs.
 - Validere metadata for ressurser og autorisasjonspolicy for å sikre at de følger de nødvendige standardene.
 - Publisere nye ressurser til TT02 eller produksjonsmiljøet.

content/altinn-studio/guides/options/_index.en.md

@@ -141,7 +141,7 @@ For nested groups follows the same pattern but with an additional index indicato
 },
 ```
 
-For a complete example on how this is setup see our [demo app.](https://altinn.studio/repos/ttd/dynamic-options-rep)
+For a complete example of how this is setup see our [demo app.](https://altinn.studio/repos/ttd/dynamic-options-rep)
 
 {{%notice warning%}}
 

content/altinn-studio/repos/structure/application-metadata/_index.md

@@ -15,7 +15,7 @@ This is located at `/App/config/applicationmetadata.json` in the app repo.
 
 ## Application Metadata Format
 
-Below is an example of application metadata json format
+Below is an example of application metadata in json format
 
 ```json
 {

content/altinn-studio/repos/structure/form-layout/_index.md

@@ -16,9 +16,9 @@ tags: [app-structure, todo]
 - *Containers*: describes the layout containers used in the schema and the configurations connected to them. E.g if the container is a repeating group
 - *Order*: this object specify the order of the containers and components in the schema.
 
-## Eksempel
+## Example
 
-Here is an example on how the form layout file could look like:
+Here is an example of what the form layout file could look like:
 
 ```json
 "components": {

content/api/apps/process/_index.en.md

@@ -33,9 +33,14 @@ Returns the bpmn file defining the process.
     <bpmn2:startEvent id="StartEvent_1">
         <bpmn2:outgoing>Flow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:task id="Task_1" name="Utfylling" altinn:tasktype="data">
+    <bpmn2:task id="Task_1" name="Utfylling">
         <bpmn2:incoming>Flow_1</bpmn2:incoming>
         <bpmn2:outgoing>Flow_2</bpmn2:outgoing>
+        <bpmn2:extensionElements>
+            <altinn:taskExtension>
+                <altinn:taskType>data</altinn:taskType>
+            </altinn:taskExtension>
+        </bpmn2:extensionElements>
     </bpmn2:task>
     <bpmn2:endEvent id="EndEvent_1">
         <bpmn2:incoming>Flow_2</bpmn2:incoming>
@@ -47,7 +52,7 @@ Returns the bpmn file defining the process.
 
 ## Altinn specific task types
 
-Application developers can in their BPMN Definition specify some altinn specific task types, see `altinn:tasktype`,
+Application developers can in their BPMN Definition specify some altinn specific task types, see `altinn:taskType`,
 which signify the behaviour of the task. So far we have defined the following:
 
 - *data* - user is asked to fill inn one or more data elements, e.g. upload data or fill in forms

content/api/apps/process/_index.nb.md

@@ -14,7 +14,7 @@ creates a current task object to hold the process state.
 
 ![Flowchart for process](mvp-process.png "Process")
 
-A process is represented by an process modell in BPMN/XML notation. Each task has an unique id, which is used to refer to the task in the api.
+A process is represented by an process model in BPMN/XML notation. Each task has an unique id, which is used to refer to the task in the api.
 
 ### Process model
 
@@ -31,9 +31,14 @@ Returns the bpmn file defining the process.
     <bpmn2:startEvent id="StartEvent_1">
         <bpmn2:outgoing>Flow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:task id="Task_1" name="Utfylling" altinn:tasktype="data">
+   <bpmn2:task id="Task_1" name="Utfylling">
         <bpmn2:incoming>Flow_1</bpmn2:incoming>
         <bpmn2:outgoing>Flow_2</bpmn2:outgoing>
+        <bpmn2:extensionElements>
+            <altinn:taskExtension>
+                <altinn:taskType>data</altinn:taskType>
+            </altinn:taskExtension>
+        </bpmn2:extensionElements>
     </bpmn2:task>
     <bpmn2:endEvent id="EndEvent_1">
         <bpmn2:incoming>Flow_2</bpmn2:incoming>
@@ -45,8 +50,8 @@ Returns the bpmn file defining the process.
 
 ## Altinn specific task types
 
-Application developers can in their BPMN Definition specify some altinn specific task types, see `altinn:tasktype`,
-which signify the behaviour of the task. So far we have defined the following:
+Application developers can in their BPMN Definition specify some altinn specific task types, see `altinn:taskType`,
+which signify the behavior of the task. So far we have defined the following:
 
 - *data* - user is asked to fill inn one or more data elements, e.g. upload data or fill in forms
 - *confirmation* - user is asked to confirm the correctness of the information which has been filled in on previous tasks

content/api/resourceregistry/resource/_index.en.md

@@ -143,7 +143,7 @@ The below shows a complete resource from [production](https://platform.altinn.no
   }
   ```
 
-See more functional descriptions [here](/authorization/modules/resourceregistry/)
+See more functional descriptions [here](/authorization/what-do-you-get/resourceregistry/)
 
 
 #### Resource Policy M

content/api/resourceregistry/resource/_index.nb.md

@@ -139,7 +139,7 @@ The below shows a complete resource from [production](https://platform.altinn.no
   }
   ```
 
-See more functional descriptions [here](/authorization/modules/resourceregistry/)
+See more functional descriptions [here](/authorization/what-do-you-get/resourceregistry/)
 
 
 #### Resource Policy M

content/app/app-dev-course/modul5/_index.en.md

@@ -55,7 +55,7 @@ If you're up for an extra challenge, you can manually edit the process flow or u
 
 ### Knowledge check
 {{% expandsmall id="m5t1q1" header="What Altinn-specific properties are set on each process task?" %}}
-`altinn:tasktype` is defined for each task.
+`altinn:taskType` is defined for each task.
 {{% /expandsmall %}}
 
 {{% expandsmall id="m5t1q2" header="What limitations would an external BPMN editing tool have when editing the process description of an Altinn app?" %}}
@@ -88,7 +88,7 @@ The policy file for your application is tailored to the standard process flow an
 
 ### Knowledge check
 {{% expandsmall id="m5t2q1" header="What will happen when the process flow proceeds to the confirmation step without the authorization rules being updated?" %}}
-The application will display an "Unknown error" when the user presses the "submit" button.
+The application will display the confirmation step, but the submit button will be disabled.
 {{% /expandsmall %}}
 
 {{% expandsmall id="m5t2q2" header="What happens if you do not specify which roles are allowed to perform an action in an authorization rule?" %}}

content/app/app-dev-course/modul5/_index.nb.md

@@ -55,7 +55,7 @@ Du kan da bruke malen som fasit.
 ### Forståelsessjekk
 
 {{% expandsmall id="m5t1q1" header="Hvilke Altinn-spesifikke egenskaper er satt på hver prosessoppgave?" %}}
-`altinn:tasktype` er definert for hver oppgave.
+`altinn:taskType` er definert for hver oppgave.
 {{% /expandsmall %}}
 
 {{% expandsmall id="m5t1q2" header="Hvilke begrensninger vil et eksternt BPMN-redigeringsverktøy ha når man skal redigere prosessbeskrivelsen til en Altinn-app?" %}}
@@ -91,7 +91,7 @@ Policy-filen til applikasjonen din er tilpasset standard prosessflyt og må oppd
 ### Forståelsessjekk
 
 {{% expandsmall id="m5t2q1" header="Hva vil skje når prosessflyten går videre til bekreftelsessteget uten at autoriasjonsreglene er blitt oppdatert?" %}}
-Applikasjonen vil vise "Ukjent feil" når brukeren trykker på "send inn"-knappen.
+Applikasjonen vil vise bekreftelsessteget, men knappen for å sende inn skjemaet er deaktivert.
 {{% /expandsmall %}}
 
 {{% expandsmall id="m5t2q2" header="Hva skjer dersom du ikke spesifiserer hvilke roller som har lov til å utføre en aksjon i en autorisasjonsregel?" %}}

content/app/app-dev-course/modul7/_index.en.md

@@ -37,7 +37,7 @@ The municipality of Sogndal wants to use the categories **Personalia** for the u
 - [Categories in summary](/app/development/ux/pages/summary/#categories)
 
 ### Knowledge check
-- Why should the summary page be ignore in the PDF generation?
+- Why should the summary page be ignored in the PDF generation?
 
 {{% /expandlarge %}}
 

content/app/deployment/_index.en.md

@@ -21,6 +21,9 @@ This routine just needs to be followed once. When the cluster is set up, the sol
 ## Deployment of app
 
 Deploy of an application to production is done in [the same way as for test environments](/app/testing/deploy).
+The user that will deploy an application to production must be a member of the `Deploy-Production` group in Altinn Studio.
+Access to groups in Altinn Studio is administrated by each organization in Altinn Studio.
+[Read more about access in Altinn Studio](../guides/access-management/studio/).
 
 ## Order "About form"-page on altinn.no
 

content/app/deployment/_index.nb.md

@@ -19,6 +19,9 @@ Denne rutinen trenger bare å følges en gang. Når clusteret er satt opp, er l
 ## Produksjonssette en app
 
 Produksjonssetting av applikasjonen gjøres på [samme måte som for testmiljøer](/nb/app/testing/deploy).
+Den som skal produksjonssette app'en må være medlem av gruppen `Deploy-Production` for sin organisasjon i Altinn Studio.
+Tilgang til grupper i Altinn Studio administreres av hver enkelt organisasjon i Altinn Studio.
+[Les mer om tilganger i Altinn Studio](../guides/access-management/studio/).
 
 ## Bestille Om skjema-side
 

content/app/development/configuration/authorization/guidelines_authorization/roles_and_rights/roles_ER/_index.nb.md

@@ -10,7 +10,7 @@ I Enhetsregisteret er det offisielle registeret over virksomheter i Norge. I reg
 
 Når man velger roller er det derfor viktig å vurdere hvilke typer organisasjoner som skal benytte tjenesten og med det hvilke roller man må knytte til tjenesten for å gi disse tilgang
 
-Fullstendig oversikt over organisasjonsformer og roller som leses inn fra Enhetsregisteret finner du på [Fullmakter fra Enhetsregisteret](/authorization/modules/accessgroups/register_er/)
+Fullstendig oversikt over organisasjonsformer og roller som leses inn fra Enhetsregisteret finner du på [Fullmakter fra Enhetsregisteret](/authorization/what-do-you-get/accessgroups/register_er/)
 
 
 ## Nøkkelroller

content/app/development/configuration/process/Data_Confirmation_Process.bpmn

@@ -5,20 +5,32 @@
   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
   xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
   xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
-  xmlns:altinn="http://altinn.no"
+  xmlns:altinn="http://altinn.no/process"
   xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
   targetNamespace="http://bpmn.io/schema/bpmn" >
   <bpmn2:process id="Altinn_Data_Confirmation_Process" isExecutable="false">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:task id="Task_1" name="Fyll ut skjema" altinn:tasktype="data">
+    <bpmn2:task id="Task_1" name="Fyll ut skjema">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:taskType>data</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
     </bpmn2:task>
-    <bpmn2:task id="Task_2" name="Bekreft skjemadata" altinn:tasktype="confirmation">
+    </bpmn2:task>
+    <bpmn2:task id="Task_2" name="Bekreft skjemadata">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <altinn:taskExtension>
+        <altinn:taskType>confirmation</altinn:taskType>
+        <altinn:actions>
+          <altinn:action>confirm</altinn:action>
+        </altinn:actions>
+      </altinn:taskExtension>
     </bpmn2:task>
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

content/app/development/configuration/process/Data_Data_Data_Process.bpmn

@@ -12,17 +12,32 @@
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:task id="Task_1" name="Fyll ut skjema 1" altinn:tasktype="data">
+    <bpmn2:task id="Task_1" name="Fyll ut skjema 1">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:taskType>data</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
     </bpmn2:task>
-    <bpmn2:task id="Task_2" name="Fyll ut skjema 2" altinn:tasktype="data">
+    <bpmn2:task id="Task_2" name="Fyll ut skjema 2">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:taskType>data</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
     </bpmn2:task>
-	<bpmn2:task id="Task_3" name="Fyll ut skjema 3" altinn:tasktype="data">
+	<bpmn2:task id="Task_3" name="Fyll ut skjema 3">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:taskType>data</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
     </bpmn2:task>
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

content/app/development/configuration/process/Data_Process.bpmn

@@ -11,9 +11,14 @@ targetNamespace="http://bpmn.io/schema/bpmn" >
 		<bpmn:startEvent id="StartEvent_1">
 			<bpmn:outgoing>SequenceFlow_1</bpmn:outgoing>
 		</bpmn:startEvent>
-		<bpmn:task id="Task_1" name="Fyll ut skjema" altinn:tasktype="data">
+		<bpmn:task id="Task_1" name="Fyll ut skjema">
 			<bpmn:incoming>SequenceFlow_1</bpmn:incoming>
 			<bpmn:outgoing>SequenceFlow_2</bpmn:outgoing>
+			<bpmn2:extensionElements>
+				<altinn:taskExtension>
+				<altinn:taskType>data</altinn:taskType>
+				</altinn:taskExtension>
+			</bpmn2:extensionElements>
 		</bpmn:task>
 		<bpmn:endEvent id="EndEvent_1">
 			<bpmn:incoming>SequenceFlow_2</bpmn:incoming>

content/app/development/configuration/process/exclusive-gateways/_index.en.md

@@ -12,6 +12,64 @@ tags: [gateways,bpmn,process]
 
 ## Example process with exclusive gateways
 
+{{<content-version-selector classes="border-box">}}
+
+{{<content-version-container version-label="v8">}}
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:altinn="http://altinn.no" id="Altinn_SingleDataTask_Process_Definition" targetNamespace="http://bpmn.io/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="10.2.0">
+  <bpmn:process id="SingleDataTask" isExecutable="false">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_s_t1</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_s_t1" sourceRef="StartEvent_1" targetRef="Task_1" />
+    <bpmn:task id="Task_1" name="Utfylling">
+      <bpmn:incoming>Flow_s_t1</bpmn:incoming>
+      <bpmn:outgoing>Flow_t1_g1</bpmn:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:taskType>data</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
+    </bpmn:task>
+    <bpmn:sequenceFlow id="Flow_t1_g1" sourceRef="Task_1" targetRef="Gateway_1" />
+    <bpmn:exclusiveGateway id="Gateway_1">
+      <bpmn:incoming>Flow_t1_g1</bpmn:incoming>
+      <bpmn:outgoing>Flow_g1_g2</bpmn:outgoing>
+      <bpmn:outgoing>Flow_g1_t2</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_g1_g2" sourceRef="Gateway_1" targetRef="Gateway_2" />
+    <bpmn:sequenceFlow id="Flow_g1_t2" sourceRef="Gateway_1" targetRef="Task_2" />
+    <bpmn:task id="Task_2" name="Bekreftelse">
+      <bpmn:incoming>Flow_g1_t2</bpmn:incoming>
+      <bpmn:outgoing>Flow_t2_g2</bpmn:outgoing>
+      <bpmn2:extensionElements>
+        <altinn:taskExtension>
+          <altinn:actions>
+              <altinn:action>confirm</altinn:action>
+          </altinn:actions>
+          <altinn:taskType>confirmation</altinn:taskType>
+        </altinn:taskExtension>
+      </bpmn2:extensionElements>
+    </bpmn:task>
+    <bpmn:sequenceFlow id="Flow_t2_g2" sourceRef="Task_2" targetRef="Gateway_2" />
+    <bpmn:exclusiveGateway id="Gateway_2">
+      <bpmn:incoming>Flow_g1_g2</bpmn:incoming>
+      <bpmn:incoming>Flow_t2_g2</bpmn:incoming>
+      <bpmn:outgoing>Flow_g2_end</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_g2_end" sourceRef="Gateway_2" targetRef="EndEvent_1" />
+    <bpmn:endEvent id="EndEvent_1">
+      <bpmn:incoming>Flow_g2_end</bpmn:incoming>
+    </bpmn:endEvent>
+  </bpmn:process>
+  <!-- BPMN Diagram part is omitted for brevity -->
+</bpmn:definitions>
+```
+
+{{</content-version-container>}}
+
+{{<content-version-container version-label="v7">}}
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:altinn="http://altinn.no" id="Altinn_SingleDataTask_Process_Definition" targetNamespace="http://bpmn.io/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="10.2.0">
@@ -51,6 +109,11 @@ tags: [gateways,bpmn,process]
 </bpmn:definitions>
 ```
 
+{{</content-version-container>}}
+
+{{</content-version-selector>}}
+
+
 Visual representation of the bpmn definition
 
 ![BPMN definition diagram](process-definition.svg "BPMN definition diagram")