Merge branch 'master' of https://github.com/SharePoint/sp-dev-docs

Author: VesaJuvonen

docs/apis/alm-api-for-spfx-add-ins.md

@@ -33,7 +33,7 @@ ALM APIs are natively provided using REST APIs, but there is also additional CSO
 Adding solution to the tenant app catalog. This API is designed to be executed in the context of the tenant app catalog site.
 
 ```
-/_api/web/tenantappcatalog/Add(overwrite=true, url='test.txt')";
+url: /_api/web/tenantappcatalog/Add(overwrite=true, url='test.txt')
 method: POST
 binaryStringRequestBody: true
 body: 'byte array of the file'
@@ -44,7 +44,7 @@ body: 'byte array of the file'
 Enable solution to be available to install to specific sites. This API is designed to be executed in the context of the tenant app catalog site.
 
 ```
-/_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Deploy";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Deploy
 ```
 
 > [!NOTE]
@@ -55,7 +55,7 @@ Enable solution to be available to install to specific sites. This API is design
 Retract solution to be available from the sites. This API is designed to be executed in the context of the tenant app catalog site.
 
 ```
-/_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Retract";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Retract
 ```
 
 > [!NOTE]
@@ -66,7 +66,7 @@ Retract solution to be available from the sites. This API is designed to be exec
 Remove the solution package from the tenant app catalog. This API is designed to be executed in the context of the tenant app catalog site.
 
 ```
-/_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Remove";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Remove
 ```
 
 > [!NOTE]
@@ -95,7 +95,7 @@ method: GET
 Install a solution package with specific identifier from tenant app catalog to the site based on URL context. This REST call can be executed in the context of the site where the install operation should happen.
 
 ```
-url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Install";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Install
 method: POST
 ```
 
@@ -104,7 +104,7 @@ method: POST
 Upgrade a solution package from the site to a newer version available in the tenant app catalog. This REST call can be executed in the context of the site where the upgrade operation should happen.
 
 ```
-url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Upgrade";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Upgrade
 method: POST
 ```
 
@@ -113,7 +113,7 @@ method: POST
 Uninstall a solution package from the site. This REST call can be executed in the context of the site where the uninstall operation should happen.
 
 ```
-url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Uninstall";
+url: /_api/web/tenantappcatalog/AvailableApps/GetById('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx')/Uninstall
 method: POST
 ```
 > [!NOTE]
@@ -128,7 +128,7 @@ Using [PnP PowerShell](https://msdn.microsoft.com/en-us/pnp_powershell/pnp-power
 Adding your app (.sppkg file, .app file) to the tenant app catalog is a per-requisite to later on make your app available for use in your SharePoint sites. Doing so can be done using below simple cmdlet:
 
 ```PowerShell
-Add-PnPApp -Path ./myapp.sppkg"
+Add-PnPApp -Path ./myapp.sppkg
 ```
 
 Once added you'll need to continue with publishing your app, effectively making the app available to be used by the users of your tenant. Below PnP PowerShell cmdlets shows how this can be done:

docs/declarative-customization/column-formatting.md

@@ -594,6 +594,51 @@ This example relies on two number fields, `Before` and `After`, for which the va
 }
 ```
 
+## Create a button to launch a Flow
+The following screenshot shows a list with a Flow button added to the Action column:
+
+![screenshot of the sample](../images/sp-columnformatting-flow.png)
+
+You can use column formatting to create buttons that, when clicked, run Flows on the corresponding list item.  If the Flow is configured to gather data from the end user before running, the Flow Launch Panel will be displayed after clicking the button.  Otherwise, the Flow will just run.
+
+To use the sample below, you must substitute the ID of the Flow you want to run.  This ID is contained within the `customRowAction` attribute inside the `button` element.  To obtain a Flow's ID:
+
+1. Click Flow > See your flows in the SharePoint list where the Flow is configured.
+2. Click on the Flow you want to run
+3. Copy the ID from the end of the URL.  
+
+```
+{
+	"$schema": "http://columnformatting.sharepointpnp.com/columnFormattingSchema.json",
+	"elmType": "span",
+	"style": {
+		"color": "#0078d7"
+	},
+	"children": [
+    {
+		"elmType": "span",
+		"attributes": {
+			"iconName": "Flow"
+		}
+    },
+    {
+		"elmType": "button",
+		"style": {
+			"border": "none",
+			"background-color": "transparent",        
+			"color": "#0078d7",    
+			"cursor": "pointer"
+		},
+		"txtContent": "Send to Manager",
+		"customRowAction": {
+			"action": "executeFlow",
+			"actionParams": "{\"id\": \"183bedd4-6f2b-4264-855c-9dc7617b4dbe\"}"
+		}          
+    }        
+  ]
+}
+```
+
 ## Supported Column Types
 The following column types support column formatting:
 * Single line of text 
@@ -667,6 +712,7 @@ Specifies the type of element to create. Valid elements include:
 - img
 - svg
 - path
+- button
 
 Any other value will result in an error.
 

docs/declarative-customization/images/pnpprovisioning-kudu-create-folder.png

@@ -185,6 +185,7 @@ You'll need to download the PnP PowerShell module so that you can upload it for
     ```powershell
     Save-Module -Name SharePointPnPPowerShellOnline -Path [pathtoyourfolder]
     ```
+
 The PowerShell module files will download to a folder within the folder that you created. 
 
 Next, upload the files so that your Azure Function can use the module.
@@ -254,24 +255,24 @@ To create a site design, you first need to create a site script. A site design i
 
     `https://prod-27.westus.logic.azure.com:443/workflows/ef7434cf0d704dd48ef5fb6...oke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun`
 
-        ```json
+    ```json
+    {
+        "$schema": "schema.json",
+        "actions": [
         {
-            "$schema": "schema.json",
-            "actions": [
-            {
-                    "verb": "triggerFlow",
-                    "url": "[paste the workflow trigger URL here]",
-                    "name": "Apply Template",
-                    "parameters": {
-                        "event":"",
-                        "product":""
-                    }
-            }
-            ],
-            "bindata": {},
-            "version": 1
+                "verb": "triggerFlow",
+                "url": "[paste the workflow trigger URL here]",
+                "name": "Apply Template",
+                "parameters": {
+                    "event":"",
+                    "product":""
+                }
         }
-        ```
+        ],
+        "bindata": {},
+        "version": 1
+    }
+    ```
 
 1. Select the JSON again and copy it again to your clipboard.
 1. Open PowerShell and enter the following to copy the script into a variable and create the site script:

docs/declarative-customization/site-design-pnp-provisioning.md

@@ -11,12 +11,12 @@ ms.date: 12/14/2017
 
 You can use the the SharePoint REST interface to perform basic create, read, update, and delete (CRUD) operations on site designs and site scripts.
 
-The SharePoint Online (and SharePoint 2016 and later on-premises) REST service supports combining multiple requests into a single call to the service by using the OData $batch query option. For details and links to code samples, see [Make batch requests with the REST APIs](https://dev.office.com/sharepoint/docs/apis/rest/make-batch-requests-with-the-rest-apis.md).
+The SharePoint Online (and SharePoint 2016 and later on-premises) REST service supports combining multiple requests into a single call to the service by using the OData $batch query option. For details and links to code samples, see [Make batch requests with the REST APIs](https://docs.microsoft.com/en-us/sharepoint/dev/sp-add-ins/make-batch-requests-with-the-rest-apis).
 
 ## Prerequisites
 Before you get started, make sure that you're familiar with the following:
-- [Get to know the SharePoint REST service](https://dev.office.com/sharepoint/docs/apis/rest/get-to-know-the-sharepoint-rest-service.md) 
-- [Complete basic operations using SharePoint REST endpoints](https://dev.office.com/sharepoint/docs/apis/rest/complete-basic-operations-using-sharepoint-rest-endpoints.md)
+- [Get to know the SharePoint REST service](https://docs.microsoft.com/en-us/sharepoint/dev/sp-add-ins/get-to-know-the-sharepoint-rest-service) 
+- [Complete basic operations using SharePoint REST endpoints](https://docs.microsoft.com/en-us/sharepoint/dev/apis/rest/complete-basic-operations-using-sharepoint-rest-endpoints)
 
 ## REST commands
 

docs/declarative-customization/site-design-rest-api.md

@@ -16,7 +16,12 @@ The challenge with Global CSS styles is explained in the following presentation
 
 To achieve reliability, one of the main problems we need to solve is that of **Global CSS styles**. This accounts to not using global class names in the HTML markup and instead using Fabric Core mixins and variables in the Sass declaration file. This involves importing the Fabric Core's Sass declarations in your Sass file and then consuming the variables and mixins appropriately. 
 
-The goal of the SharePoint Framework is to allow both Microsoft and customers to build rich, beautiful, and consistent user experiences on top of SharePoint. In accordance with these goals, following are the key design principles:
+In order to achieve reliability, one of the main problems we need to solve is that of **Global CSS styles**. This accounts to not using global class names in the HTML markup and instead using Fabric Core mixins and variables in the SASS declaration file. This involves importing the Fabric Core's SASS declarations in your SASS file and then consuming the variables and mixins appropriately. 
+
+## Goals
+
+The goal of the SharePoint Framework is to allow both Microsoft and customers to build rich, beautiful, and consistent user experiences on top of SharePoint. 
+In accordance with these goals, following are the key design principles:
 
 * Customers should be able to smoothly and reliably consume Fabric Core and Fabric React in their solutions.
 * Microsoft will roll out updated experiences that consume updated versions of Fabric Core and Fabric React in SharePoint without conflicting with customer's solutions.

docs/spfx/office-ui-fabric-integration.md

@@ -86,13 +86,13 @@ You can also add this custom task to be executed before or after certain availab
 The SharePoint Framework tasks are available in the default build rig. The build rig is a collection of tasks defined for a specific purpose. In our case, building client-side packages. You can access this default rig using the `build.rig` object and get access to the pre and post task functions:
 
 ```js
-//execute before the typescript subtask
+// execute before the TypeScript subtask
 build.rig.addPreBuildTask(helloWorldTask);
 
-// execute after TypeScript task
+// execute after TypeScript subtask
 build.rig.addPostTypescriptTask(helloWorldTask);
 
-//execute after all tasks
+// execute after all tasks
 build.rig.addPostBuildTask(helloWorldTask);
 ```