diff --git a/Scripts/SAPSetupAssistantValidationScripts.zip b/Scripts/SAPSetupAssistantValidationScripts.zip index fe3ea15..99910b8 100644 Binary files a/Scripts/SAPSetupAssistantValidationScripts.zip and b/Scripts/SAPSetupAssistantValidationScripts.zip differ diff --git a/Scripts/SAPSetupAssistantValidationScripts/SetupAssistantSAPValidateNetworkConnection.ps1 b/Scripts/SAPSetupAssistantValidationScripts/SetupAssistantSAPValidateNetworkConnection.ps1 index 6de5235..026cbe8 100644 --- a/Scripts/SAPSetupAssistantValidationScripts/SetupAssistantSAPValidateNetworkConnection.ps1 +++ b/Scripts/SAPSetupAssistantValidationScripts/SetupAssistantSAPValidateNetworkConnection.ps1 @@ -22,7 +22,7 @@ $job = Start-Job -ScriptBlock { Test-NetConnection -ComputerName $hostName -Port $port } -ArgumentList $hostName, $port -if (Wait-Job -Job $job -Timeout 10) { +if (Wait-Job -Job $job -Timeout 15) { $result = Receive-Job -Job $job if ($result.TcpTestSucceeded) { @@ -33,7 +33,7 @@ if (Wait-Job -Job $job -Timeout 10) { } } else { - Write-Host -NoNewLine "[{'step': 'CheckNetworkConnection', 'status': 'Error', 'message': 'The connection to $hostName over port $port timed out after 5 seconds.'}]" + Write-Host -NoNewLine "[{'step': 'CheckNetworkConnection', 'status': 'Error', 'message': 'The connection to $hostName over port $port timed out after 15 seconds.'}]" } Remove-Job -Force -Job $job \ No newline at end of file diff --git a/Solution Packages For Manual Install/SAP Setup Assistant/mpa_SAPSetupAssistantDropDownValues_managed.zip b/Solution Packages For Manual Install/SAP Setup Assistant/mpa_SAPSetupAssistantDropDownValues_managed.zip index 9f92baa..4cfa0e8 100644 Binary files a/Solution Packages For Manual Install/SAP Setup Assistant/mpa_SAPSetupAssistantDropDownValues_managed.zip and b/Solution Packages For Manual Install/SAP Setup Assistant/mpa_SAPSetupAssistantDropDownValues_managed.zip differ diff --git a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Customizations.xml b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Customizations.xml index 247015d..a13c0ce 100644 --- a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Customizations.xml +++ b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Customizations.xml @@ -13,7 +13,7 @@ - Template Installer SAP ERP + SAP Setup Assistant - SAP ERP /providers/Microsoft.PowerApps/apis/shared_saperp 1 0 @@ -21,13 +21,21 @@ 1 - Power Query Dataflows mpa_SAPTemplateInstallerDropDownValues-39423 + SAP Setup Assistant - Power Query Dataflows /providers/Microsoft.PowerApps/apis/shared_dataflows 1 0 0 1 + + SAP Setup Assistant - Office 365 Outlook + /providers/Microsoft.PowerApps/apis/shared_office365 + 1 + 0 + 0 + 1 + diff --git a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Solution.xml b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Solution.xml index f4f411d..52d9168 100644 --- a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Solution.xml +++ b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Other/Solution.xml @@ -1,5 +1,5 @@  - + mpa_SAPSetupAssistantDropDownValues @@ -108,6 +108,10 @@ + + + + diff --git a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Workflows/InstallTemplateSAPDropDownSyncBatchRun-0BE5C436-AAC6-EE11-9079-000D3A33D5A1.json b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Workflows/InstallTemplateSAPDropDownSyncBatchRun-0BE5C436-AAC6-EE11-9079-000D3A33D5A1.json index 8caa571..49057c4 100644 --- a/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Workflows/InstallTemplateSAPDropDownSyncBatchRun-0BE5C436-AAC6-EE11-9079-000D3A33D5A1.json +++ b/Solutions/mpa_SAPSetupAssistantDropDownValues/src/Workflows/InstallTemplateSAPDropDownSyncBatchRun-0BE5C436-AAC6-EE11-9079-000D3A33D5A1.json @@ -18,6 +18,24 @@ "api": { "name": "shared_dataflows" } + }, + "shared_office365users_1": { + "runtimeSource": "embedded", + "connection": { + "connectionReferenceLogicalName": "mpa_sharedoffice365users_f61b7" + }, + "api": { + "name": "shared_office365users" + } + }, + "shared_office365": { + "runtimeSource": "embedded", + "connection": { + "connectionReferenceLogicalName": "mpa_sharedoffice365_fbe3e" + }, + "api": { + "name": "shared_office365" + } } }, "definition": { @@ -316,6 +334,129 @@ "name": "Status Message", "value": "The batch process has completed." } + }, + "Get_Created_By_User": { + "runAfter": { + "Set_variable": [ + "Succeeded" + ] + }, + "metadata": { + "operationMetadataId": "3605041d-c700-4967-970c-088dc9750143" + }, + "type": "OpenApiConnection", + "inputs": { + "host": { + "connectionName": "shared_commondataserviceforapps_1", + "operationId": "GetItem", + "apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps" + }, + "parameters": { + "entityName": "systemusers", + "recordId": "@triggerOutputs()?['body/_createdby_value']" + }, + "authentication": "@parameters('$authentication')" + } + }, + "Get_user_profile_(V2)": { + "runAfter": { + "Get_Created_By_User": [ + "Succeeded" + ] + }, + "metadata": { + "operationMetadataId": "f7ff8395-33b7-470f-9d5a-7d4d63337b52" + }, + "type": "OpenApiConnection", + "inputs": { + "host": { + "connectionName": "shared_office365users_1", + "operationId": "UserProfile_V2", + "apiId": "/providers/Microsoft.PowerApps/apis/shared_office365users" + }, + "parameters": { + "id": "@outputs('Get_Created_By_User')?['body/domainname']" + }, + "authentication": "@parameters('$authentication')" + } + }, + "Get_Refreshed_Batch_Items": { + "runAfter": { + "Get_user_profile_(V2)": [ + "Succeeded" + ] + }, + "metadata": { + "operationMetadataId": "c5bcae0d-09d2-4aa7-a9f6-0edac398de65" + }, + "type": "OpenApiConnection", + "inputs": { + "host": { + "connectionName": "shared_commondataserviceforapps_1", + "operationId": "ListRecords", + "apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps" + }, + "parameters": { + "entityName": "mpa_installtemplatebatchprocessitems", + "$filter": "_mpa_batchprocess_value eq '@{triggerOutputs()?['body/mpa_installtemplatebatchprocessid']}'", + "$orderby": "mpa_name asc" + }, + "authentication": "@parameters('$authentication')" + } + }, + "Create_HTML_table": { + "runAfter": { + "Get_Refreshed_Batch_Items": [ + "Succeeded" + ] + }, + "metadata": { + "operationMetadataId": "6f5c0218-ae0b-413e-9b4f-7bb788255c2d" + }, + "type": "Table", + "inputs": { + "from": "@outputs('Get_Refreshed_Batch_Items')?['body/value']", + "format": "HTML", + "columns": [ + { + "header": "Domain", + "value": "@item()?['mpa_name']" + }, + { + "header": "Status", + "value": "@If(equals(item()?['mpa_processingstatus'], 865420000), 'Not Started', If(equals(item()?['mpa_processingstatus'], 865420001), 'In Progress', If(equals(item()?['mpa_processingstatus'], 865420002), 'Completed', 'Error')))" + }, + { + "header": "Message", + "value": "@item()?['mpa_message']" + } + ] + } + }, + "Send_an_email_(V2)": { + "runAfter": { + "Create_HTML_table": [ + "Succeeded" + ] + }, + "metadata": { + "operationMetadataId": "0cf5f93b-c822-4d69-8a59-3aa55f726a50" + }, + "type": "OpenApiConnection", + "inputs": { + "host": { + "connectionName": "shared_office365", + "operationId": "SendEmailV2", + "apiId": "/providers/Microsoft.PowerApps/apis/shared_office365" + }, + "parameters": { + "emailMessage/To": "@outputs('Get_user_profile_(V2)')?['body/mail']", + "emailMessage/Subject": "SAP domain sync process completed", + "emailMessage/Body": "

The following SAP domains have completed syncing to Microsoft Dataverse as part of the SAP Procurement template installation.
\n
\n@{outputs('Compose_-_CSS_Table_Style')}@{body('Create_HTML_table')}
\n
\n

", + "emailMessage/Importance": "Normal" + }, + "authentication": "@parameters('$authentication')" + } } }, "runAfter": {