Merge pull request #2840 from MicrosoftDocs/master

Pushing changes live

Author: KumarVivek

powerapps-docs/maker/TOC.yml

@@ -1677,6 +1677,8 @@
       href: ../sample-apps/regional-emergency-response/overview.md
     - name: Deploy the solution
       href: ../sample-apps/regional-emergency-response/deploy.md
+    - name: Upgrade the solution
+      href: ../sample-apps/regional-emergency-response/upgrade.md
     - name: App and dashboard for regional admin
       href: ../sample-apps/regional-emergency-response/configure.md
     - name: Portal for admin and report viewer

powerapps-docs/sample-apps/regional-emergency-response/configure.md

@@ -6,7 +6,7 @@ manager: annbe
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 04/22/2020
+ms.date: 05/06/2020
 ms.author: kvivek
 ms.reviewer: kvivek
 searchScope:
@@ -37,12 +37,11 @@ When you sign into the admin (model-driven) app, you will see the entities in th
 
 -   **Hierarchy area**: Data for entities in this area can be added either by importing data from the sample data files or manually. The entities under the **Hierarchy** area are listed in the order you should populate data. Also, parent org admins (hospital admins) can view and manage data under the following entities for their hospital from the portal: **Systems**, **Regions**, and **Facilities**.
 
-    > [!NOTE]
-    > We provide name and FIPS code for all the counties in the Washington state as sample data that you can import. To obtain data counties in other states, visit <https://www.census.gov/geographies/reference-files/2018/demo/popest/2018-fips.html>
-
 -   **Admin Entities area**: Data in the **Supplies** entity is added by importing data from the sample data file. You can manually add and manage supplies data later.
 
--   **Customers area**: You use the **Portal Users** entity to add and manage portal users. More information: [Manage portal users](#manage-portal-users)
+-   **Customers area**: You use **Portal Users** to [manage portal users](#manage-portal-users) and **User Requests** to [manage portal user requests](#manage-portal-user-requests).
+
+-   **Resources area**: Select **Documentation** to view this document.
 
 There are two ways in which you can add master data to entities in the app:
 
@@ -295,6 +294,42 @@ Depending on the roles(s) you granted to the user, she/he will view respective a
 
 An email will be sent automatically to the newly created user with an invitation code to join portals. The portal user can redeem the invitation to sign in and start using the portal. More information: [Get started with the portal](/powerapps/sample-apps/regional-emergency-response/portals-admin-reporting#getting-started-with-the-portal)
 
+## Manage portal user requests
+
+You can view, approve, and decline portal user requests using the **User Requests** option.
+
+Use the appropriate view to view a list of approved, declined, inactive, and pending user requests.
+
+> [!div class="mx-imgBorder"] 
+> ![Select a view](media/configure-portal-request-views.png "Select a view")
+
+### Approve or decline user request
+
+To approve or decline user requests:
+
+1.  Sign into the admin app using the URL provided by your IT admin.
+
+2.  In the left pane, select **User Requests**, and then select **Pending Portal User Requests** view. You see a list of portal user requests pending for approval.
+
+3.  Double-click a user request to open it.
+
+4.  On the user request form:
+
+    1. Select the appropriate roles for the user in the **Choose roles for the user** area. To grant or deny a role, select **Yes** or **No** respectively for each role.
+
+    1. From the **Request State** list, select **Approve** or **Decline**.
+
+    1. Select the save icon in the lower-right corner.
+
+        > [!div class="mx-imgBorder"] 
+        > ![Approve or reject a user request](media/user-request-manage.png "Approve or reject a user request")
+
+Based on the approval or decline, the following happens:
+
+- If you *approve* the access request, the user record is created with selected roles and the user receives an email with invitation code. The user can redeem the invitation code to sign in to the portal. More information: [Redeem invitation](portals-admin-reporting.md#redeem-invitation)
+
+- If you *decline* the access request, the user record isn't created, and the user receives an email stating that the request is declined.
+
 ## View the Power BI dashboard
 
 Business admins in the regional organization can view the Power BI dashboard in their Power BI tenant if the regional IT admin published the report as an app and granted access to business admins. More information: [Step 5: Configure and publish Power BI dashboard](deploy.md#step-5-configure-and-publish-power-bi-dashboard) 

powerapps-docs/sample-apps/regional-emergency-response/deploy.md

@@ -50,7 +50,7 @@ Download the latest deployment package (.zip) from <https://aka.ms/rer-solution>
 
 Before extracting the .zip file, ensure that you unblock it.
 
-1.	Right click the .zip file, select **Properties**.
+1.	Right-click the .zip file, select **Properties**.
 
 2.	In the properties dialog box, select **Unblock**, and then select **Apply** followed by **OK**.
 
@@ -645,8 +645,7 @@ In this step, we will fix the **Send Password Reset To Contact** process to spec
 9.  You will return to the process definition page. Save the changes and **Activate** the process.
 
     > [!div class="mx-imgBorder"] 
-    > ![Save changes and activate process](media/deploy-save-activate-process.png "Save changes and activate process")
-    <!-- ![](media/f0a492755b69dbffb3e122724b2994bf.png) -->
+    > ![Save changes and activate process](media/deploy-save-activate-process.png "Save changes and activate process")    
 
 ## Step 12: Verify Assign Web Roles to New Users process is enabled
 
@@ -666,7 +665,7 @@ In this step, we will fix the **Send Password Reset To Contact** process to spec
 
 5.  If it’s not enabled, select the process name to open the record, and then select **Activate**. Confirm to activate the process.
 
-## Step 13: Verify the Flow supply tracking flow is enabled
+## Step 13: Enable the Flow supply tracking flow
 
 1.  Sign into [Power Automate](https://flow.microsoft.com/).
 
@@ -675,16 +674,72 @@ In this step, we will fix the **Send Password Reset To Contact** process to spec
     > [!div class="mx-imgBorder"] 
     > ![Open the solution](media/deploy-open-solution.png "Open the solution")
 
-3.  In the solution, filter on **Flow** to find the **Flow supply tracking** record. Ensure that the status is set to **On**.
+3.  In the solution, filter on **Flow** to find the **Flow supply tracking** record.
 
     > [!div class="mx-imgBorder"] 
     > ![Find the Flow Supply Tracking record](media/deploy-find-record.png "Find the Flow Supply Tracking record")
 
-4.  If it is not set to **On**, select the flow name to open the flow definition.
+4.  Select the flow name to open the flow definition. In the flow definition, select **Edit** on the toolbar.
 
-5.  In the flow definition, select **Turn On** in the toolbar.
+5.  Fix the connection to connect to Common Data Service, and save the connection information.
 
-## Step 14: Share admin app with other admin users
+6. In the flow definition, select **Turn On**.
+
+## Step 14: Update the details of flows for sending emails
+
+In this step, we are going to do the following:
+
+|Flow name|Changes|
+|--|--|
+|**Portal User Request: Send Email on Decline Request**|Update the connection to connect to Common Data Service and then specify a user account to send emails.|
+|**Portal User Request: Send Email to Admins on Request Creation**|Update the connection to connect to Common Data Service and then specify a user account to send emails. Additionally, update the portal URL in the email body as per your Portal URL.| 
+
+1.  Sign into [Power Automate](https://flow.microsoft.com/).
+
+2.  In the left pane, select **Solutions.** From the solution list, select **Regional Emergency Response Solution** to open the solution.
+
+    > [!div class="mx-imgBorder"] 
+    > ![Open the solution](media/deploy-open-solution.png "Open the solution")
+
+3.  In the solution, filter on **Flow** to find the flows. 
+
+    > [!div class="mx-imgBorder"] 
+    > ![Find the Flow Supply Tracking record](media/deploy-find-record1.png "Find the flows")
+
+4.  Select the **Portal User Request: Send Email on Decline Request** name to open the flow definition. Select **Edit** on the toolbar.
+
+5.  Specify the connection to connect to Common Data Service by selecting **Connections** and then either using the existing connection or using a new credential by selecting **Add new connection**.  
+
+    > [!div class="mx-imgBorder"] 
+    > ![Fix credential](media/deploy-specify-cred.png "Fix credentials")
+
+6.  After fixing the connection to connect to Common Data Service, select **IfRequestState ==**, and specify the user account that has a mailbox enabled account to send emails.
+
+    > [!div class="mx-imgBorder"] 
+    > ![Specify outlook credentials](media/deploy-fix-cred2.png "Specify outlook credentials")
+
+7. Select **Save** to save the changes, and then select **Turn On**.
+
+8.  Next, go to the flows list, and select the **Portal User Request: Send Email to Admins on Request Creation** name to open the flow definition. Select **Edit** on the command bar.
+
+9.  Fix the connection to connect to Common Data Service by selecting **Connections** and then either using the existing connection or using a new credential by selecting **Add new connection**.
+
+10. After fixing the connection to connect to Common Data Service:
+     1. Select **IfRequestState ==**
+     2. Select **Connections** to specify the connection to connect to Common Data Service 
+     3. Select **Connections** to specify the user account credentials that has a mailbox enabled account to send emails
+
+    > [!div class="mx-imgBorder"] 
+    > ![Specify outlook credentials](media/deploy-fix-cred3.png "Specify outlook credentials")
+
+11. In **Send an email**, ensure that you fix the URL as per your portal URL. For example, in this case, change rer6 to your URL value.
+
+    > [!div class="mx-imgBorder"] 
+    > ![Specify outlook credentials](media/deploy-fix-cred4.png "Specify outlook credentials")
+
+12. Select **Save** to save the changes, and then select **Turn On**.
+
+## Step 15: Share admin app with other admin users
 
 For your business admin users to use the admin app (model-driven app) to enter and manage data, it must be shared with them. It's easier to use Azure AD groups to easily share apps with a group of admin users.
 

powerapps-docs/sample-apps/regional-emergency-response/includes/cc-getting-started.md

@@ -1,9 +1,23 @@
 ## Getting started with the portal
 
-When you visit the portal, you have an option to log in, or for the first time, redeem an invitation:
+When you visit the portal, you have an option to sign in, or for the first time, request access:
+
+![Home screen](..\media\portal-home-screen.png)
+
+Select **Sign In** when you already have signing credentials. Select **Redeem Invitation** if you'd like to redeem an invitation. You can also choose to request access using the **Request** option if you don't have an account alread.
 
 ![Getting started](..\media\portal-user-getting-started.png)
 
+### Request access
+
+Enter your first and last names, email address and mobile phone to request access to the portal. To select the parent organization, use the search icon and then select the parent organization or search as appropriate.
+
+You can select a role when you request access. The **Parent Organization Administrator** role lets you manage administrative tasks. **Organizational HealthCare Worker** role allows you to submit healthcare related information. And **Report Viewer** role is used to view various dashboards using the Regional Government Emergency Response and Monitoring portal. For more information about roles, go to **Users** section in **Administrative Tasks**.
+
+After you submit your access request, you'll receive an acknowledgement on portal and you'll receive an email once your access request is processed.
+
+![Request access acknowledgement](..\media\request-access-ack.png)
+
 ### Redeem invitation
 
 Select **Redeem invitation** if you received an email invitation with an invitation code: