Skip to content

Commit

Permalink
Merge pull request #916 from microsoft/mochs-aas-julyrelease
Browse files Browse the repository at this point in the history
ALMAcceleratorSampleSolution July Release
  • Loading branch information
mikefactorial authored Jul 27, 2021
2 parents 2ef28a9 + d21ab9e commit 0266d25
Show file tree
Hide file tree
Showing 51 changed files with 490 additions and 47 deletions.
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<CanvasApp xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>cat_devopskitsamplecanvasapp_c7ec5</Name>
<AppVersion>2021-04-30T19:36:34Z</AppVersion>
<AppVersion>2021-07-23T15:16:16Z</AppVersion>
<Status>Ready</Status>
<CreatedByClientVersion>3.21041.29.0</CreatedByClientVersion>
<MinClientVersion>3.21041.29.0</MinClientVersion>
<Tags>{"primaryDeviceWidth":"640","primaryDeviceHeight":"1136","sienaVersion":"e6eb02fd-09e1-4c12-86c7-e74694127c55","deviceCapabilities":"","supportsPortrait":"true","supportsLandscape":"false","primaryFormFactor":"Phone","publisherVersion":"3.21041.29","minimumRequiredApiVersion":"2.2.0","hasComponent":"false","hasUnlockedComponent":"false","isUnifiedRootApp":"false"}</Tags>
<CreatedByClientVersion>3.21061.19.0</CreatedByClientVersion>
<MinClientVersion>3.21061.19.0</MinClientVersion>
<Tags>{"primaryDeviceWidth":"640","primaryDeviceHeight":"1136","sienaVersion":"15981dd2-619d-4323-97f2-1bdce10f32d3","deviceCapabilities":"","supportsPortrait":"true","supportsLandscape":"false","primaryFormFactor":"Phone","publisherVersion":"3.21061.19","minimumRequiredApiVersion":"2.2.0","hasComponent":"false","hasUnlockedComponent":"false","isUnifiedRootApp":"false"}</Tags>
<IsCdsUpgraded>0</IsCdsUpgraded>
<GalleryItemId xsi:nil="true"></GalleryItemId>
<BackgroundColor>rgba(0, 176, 240, 1)</BackgroundColor>
<DisplayName>DevOpsKitSampleCanvasApp</DisplayName>
<Description xsi:nil="true"></Description>
<CommitMessage xsi:nil="true"></CommitMessage>
<Description></Description>
<CommitMessage></CommitMessage>
<Publisher></Publisher>
<AuthorizationReferences>[]</AuthorizationReferences>
<ConnectionReferences>{"2acb7d77-23a6-4589-bdf9-e9dd74f81ace":{"id":"/providers/microsoft.powerapps/apis/shared_logicflows","displayName":"Logic flows","iconUri":"https://connectoricons-prod.azureedge.net/releases/v1.0.1438/1.0.1438.2324/logicflows/icon.png","dataSources":["CallMeFromCanvasApp"],"dependencies":[],"dependents":[],"parameterHints":{"workflowName":{"value":"8284e81c-6137-4ff7-8abb-c9bec2c735f6"},"workflowEntityId":{"value":"71cc728c-2487-eb11-a812-000d3a8fe6a3"}},"isOnPremiseConnection":false,"bypassConsent":false,"dataSets":{},"apiTier":"Standard","actions":["Run"]},"d26fb9e9-8411-409d-bcb8-be83e68d1a24":{"id":"/providers/microsoft.powerapps/apis/shared_logicflows","displayName":"Logic flows","iconUri":"https://connectoricons-prod.azureedge.net/releases/v1.0.1438/1.0.1438.2324/logicflows/icon.png","dataSources":["GetEnvironmentVariables"],"dependencies":[],"dependents":[],"parameterHints":{"workflowName":{"value":"9176e467-39f5-46f1-bd3b-39117bb26ebe"},"workflowEntityId":{"value":"d2f7f0e2-a1a9-eb11-b1ac-000d3a53c3c2"}},"isOnPremiseConnection":false,"bypassConsent":false,"dataSets":{},"apiTier":"Standard","actions":["Run"]}}</ConnectionReferences>
<ConnectionReferences>{"4e3b7914-e0fd-4a71-9ea8-681b9c32d787":{"id":"/providers/microsoft.powerapps/apis/shared_logicflows","displayName":"Logic flows","iconUri":"https://connectoricons-prod.azureedge.net/releases/v1.0.1438/1.0.1438.2324/logicflows/icon.png","dataSources":["CallMeFromCanvasApp"],"dependencies":[],"dependents":[],"parameterHints":{"workflowName":{"value":"f41ff68e-bc81-4215-b718-af503bb6ce08"},"workflowEntityId":{"value":"71cc728c-2487-eb11-a812-000d3a8fe6a3"}},"isOnPremiseConnection":false,"bypassConsent":false,"dataSets":{},"apiTier":"Standard","actions":["Run"],"isCustomApiSolutionAware":false},"c2f164b3-316a-454f-99d8-7663d9df49b7":{"id":"/providers/microsoft.powerapps/apis/shared_logicflows","displayName":"Logic flows","iconUri":"https://connectoricons-prod.azureedge.net/releases/v1.0.1438/1.0.1438.2324/logicflows/icon.png","dataSources":["GetEnvironmentVariables"],"dependencies":[],"dependents":[],"parameterHints":{"workflowName":{"value":"f162f169-0fb6-4e50-a575-7add62289ccb"},"workflowEntityId":{"value":"d2f7f0e2-a1a9-eb11-b1ac-000d3a53c3c2"}},"isOnPremiseConnection":false,"bypassConsent":false,"dataSets":{},"apiTier":"Standard","actions":["Run"],"isCustomApiSolutionAware":false},"56c3c912-cadd-4845-8b9e-add12b081d6e":{"id":"/providers/Microsoft.PowerApps/apis/shared_cat-5fenvironmentvariableconnector-5f691c36f6fa56d15c","displayName":"EnvironmentVariableConnector","iconUri":"https://az787822.vo.msecnd.net/defaulticons/api-dedicated.png","dataSources":["EnvironmentVariableConnector"],"dependencies":[],"dependents":[],"parameterHints":{},"isOnPremiseConnection":false,"bypassConsent":false,"dataSets":{},"apiTier":"Standard","actions":["GetResponse"],"customApiLogicalName":"cat_5Fenvironmentvariableconnector","isCustomApiSolutionAware":true}}</ConnectionReferences>
<DatabaseReferences>{}</DatabaseReferences>
<AppComponents>[]</AppComponents>
<AppComponentDependencies>[]</AppComponentDependencies>
<CanvasAppType>0</CanvasAppType>
<BypassConsent>0</BypassConsent>
<AdminControlBypassConsent>0</AdminControlBypassConsent>
<EmbeddedApp xsi:nil="true"></EmbeddedApp>
<IntroducedVersion>1.0</IntroducedVersion>
<CdsDependencies>{"cdsdependencies":[]}</CdsDependencies>
<CdsDependencies xsi:nil="true"></CdsDependencies>
<IsCustomizable>1</IsCustomizable>
<BackgroundImageUri>/CanvasApps/cat_devopskitsamplecanvasapp_c7ec5_BackgroundImageUri</BackgroundImageUri>
<DocumentUri>/CanvasApps/cat_devopskitsamplecanvasapp_c7ec5_DocumentUri.msapp</DocumentUri>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"Content": "Image",
"FileName": "/ctrllib/image/images/SampleImage.svg",
"IsSampleData": true,
"IsWritable": false,
"Name": "SampleImage",
"Path": "/ctrllib/image/images/SampleImage.svg",
"ResourceKind": "Uri",
"RootPath": "ms-appx:///ctrllib/image/images/SampleImage.svg",
"Schema": "i",
"Type": "ResourceInfo"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"ApiId": "/providers/microsoft.powerapps/apis/shared_cat-5fenvironmentvariableconnector-5fa670974a2d15a6a4",
"Name": "EnvironmentVariableConnector",
"ServiceKind": "ConnectedWadl",
"Type": "ServiceInfo"
}
]
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"driver": {
"fullName": "PowerApps app checker",
"name": "PowerApps app checker",
"version": "1.309"
"version": "1.313"
}
}
}
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
App As appinfo:
BackEnabled: =false
OnStart: =Set(gblEnvironmentVariables, GetEnvironmentVariables.Run())
OnStart: |-
=Set(gblEnvironmentVariables, GetEnvironmentVariables.Run());
Set(gblCallFlowMessage,"Click Run Flow to set this text");
Set(gblCallCustomConnector,"Click Call Custom Connector to set this text");
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
MainScreen As screen:
OnVisible: =Set(gblCallFlowMessage,"Click Run Flow to set this text")
OnVisible: =

lblTextEnvironmentVariable As label:
Height: =70
Size: =21
Text: =gblEnvironmentVariables.textenvironmentvariable
Text: ="TextEnvironmentVariable = " & gblEnvironmentVariables.textenvironmentvariable
Width: =560
X: =40
Y: =40
Expand All @@ -14,7 +14,7 @@ MainScreen As screen:
Height: =70
Size: =21
Text: |-
=Value(gblEnvironmentVariables.decimalenvironmentvariable) //NOTE: There seems to be a bug in how Flow returns decimal environment variables, so returning as string and showing conversion using Value()
="DecimalEnvironmentVariable = " & Value(gblEnvironmentVariables.decimalenvironmentvariable) //NOTE: There seems to be a bug in how Flow returns decimal environment variables, so returning as string and showing conversion using Value()
Width: =560
X: =40
Y: =110
Expand All @@ -27,7 +27,7 @@ MainScreen As screen:
Text: ="Run Flow"
Width: =280
X: =40
Y: =406
Y: =250
ZIndex: =5

lblFlowResponse As label:
Expand All @@ -36,6 +36,25 @@ MainScreen As screen:
Text: =gblCallFlowMessage
Width: =560
X: =40
Y: =336
Y: =180
ZIndex: =6

lblCallCustomConnector As label:
Height: =70
Size: =21
Text: =gblCallCustomConnector
Width: =560
X: =40
Y: =342
ZIndex: =7

btnCallCustomConnector As button:
Height: =70
OnSelect: =Set(gblCallCustomConnector, EnvironmentVariableConnector.GetResponse(gblEnvironmentVariables.connectorhosturl,gblEnvironmentVariables.connectorbaseurl).message)
Size: =24
Text: ="Call Custom Connector"
Width: =506
X: =40
Y: =425
ZIndex: =8

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"'14ffd89e-6254-4aa3-912a-d68be74303f8' As TestSuite":
Description: =""
DisplayName: ="Suite"

"'dbb9db76-91b4-478c-b403-e563c1b62caf' As TestCase":
Description: =""
DisplayName: ="Validate Environment Variables"

Step1 As TestStep:
Description: ="Select 'lblEnvironmentVariableOne'"
Screen: =MainScreen
Value: =Select(lblTextEnvironmentVariable)

Step2 As TestStep:
Description: ="Assert"
Screen: =MainScreen
Value: =Assert(lblTextEnvironmentVariable.Text = gblEnvironmentVariableOneShouldBe, "Text should be '" & gblEnvironmentVariableOneShouldBe & "', but is '" & lblTextEnvironmentVariable.Text & "'")

Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
Test_7F478737223C4B69 As AppTest:
OnTestStart: =Set(gblEnvironmentVariableOneShouldBe, "DEV")

"'14ffd89e-6254-4aa3-912a-d68be74303f8' As TestSuite":
Description: =""
DisplayName: ="Suite"

"'dbb9db76-91b4-478c-b403-e563c1b62caf' As TestCase":
Description: =""
DisplayName: ="Validate Environment Variables"

Step1 As TestStep:
Description: ="Select 'lblEnvironmentVariableOne'"
Screen: =MainScreen
Value: =Select(lblTextEnvironmentVariable)

Step2 As TestStep:
Description: ="Assert"
Screen: =MainScreen
Value: =Assert(lblTextEnvironmentVariable.Text = gblEnvironmentVariableOneShouldBe, "Text should be '" & gblEnvironmentVariableOneShouldBe & "', but is '" & lblTextEnvironmentVariable.Text & "'")

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<application xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:service="https://unitedstates-002.azure-apim.net/apim/cat-5fenvironmentvariableconnector-5fa670974a2d15a6a4" xmlns:siena="http://schemas.microsoft.com/MicrosoftProjectSiena/WADL/2014/11" siena:serviceId="EnvironmentVariableConnector" xmlns="http://wadl.dev.java.net/2009/02">
<doc title="EnvironmentVariableConnector"></doc>
<grammars>
<jsonTypes targetNamespace="https://unitedstates-002.azure-apim.net/apim/cat-5fenvironmentvariableconnector-5fa670974a2d15a6a4" xmlns="http://schemas.microsoft.com/MicrosoftProjectSiena/WADL/2014/11">
<string name="GetResponse_responses_default_def_message_def" />
<object name="GetResponse_responses_default_def">
<property name="message" type="string" />
</object>
</jsonTypes>
</grammars>
<resources siena:authenticationProviderHref="#PowerAppAuth" base="https://unitedstates-002.azure-apim.net/apim/cat-5fenvironmentvariableconnector-5fa670974a2d15a6a4">
<resource path="/{connectionId}/api/GetResponse">
<param style="template" name="connectionId" type="xs:string" required="true" />
<method siena:requiresAuthentication="true" name="GET" id="GetResponse" siena:isDeprecated="false">
<doc title="GetResponse" />
<request>
<param style="header" name="hostUrl" type="xs:string" required="true" />
<param style="header" name="baseUrl" type="xs:string" required="true" />
</request>
<response>
<representation mediaType="application/json" element="service:GetResponse_responses_default_def" />
</response>
</method>
</resource>
</resources>
<authenticationProviders xmlns="http://schemas.microsoft.com/MicrosoftProjectSiena/WADL/2014/11">
<connectionProvider id="PowerAppAuth" siena:connectionProviderId="shared_cat-5fenvironmentvariableconnector-5fa670974a2d15a6a4" />
</authenticationProviders>
<template xmlns="http://schemas.microsoft.com/MicrosoftProjectSiena/WADL/2014/11">
<variable name="connectionId">
<modifyParams style="template" name="connectionId" attribute="fixed" />
</variable>
</template>
</application>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
<object name="ManualTriggerInput" />
<string name="ResponseActionOutput_textenvironmentvariable_def" />
<string name="ResponseActionOutput_decimalenvironmentvariable_def" />
<string name="ResponseActionOutput_connectorbaseurl_def" />
<string name="ResponseActionOutput_connectorhosturl_def" />
<object name="ResponseActionOutput">
<property name="textenvironmentvariable" type="string" />
<property name="decimalenvironmentvariable" type="string" />
<property name="connectorbaseurl" type="string" />
<property name="connectorhosturl" type="string" />
</object>
<object name="Run_responses_default_def" />
</jsonTypes>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Connector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<connectorid>b464e249-0bf7-48c0-8350-24476349bac1</connectorid>
<description></description>
<displayname>EnvironmentVariableConnector</displayname>
<iconbrandcolor>#007ee5</iconbrandcolor>
<name>cat_5Fenvironmentvariableconnector</name>
<connectortype>1</connectortype>
<openapidefinition>/Connector/cat_5Fenvironmentvariableconnector_openapidefinition.json</openapidefinition>
<connectionparameters>/Connector/cat_5Fenvironmentvariableconnector_connectionparameters.json</connectionparameters>
<policytemplateinstances>/Connector/cat_5Fenvironmentvariableconnector_policytemplateinstances.json</policytemplateinstances>
<iconblob>/Connector/cat_5Fenvironmentvariableconnector_iconblob.Png</iconblob>
</Connector>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"basePath": "/",
"consumes": [],
"definitions": {},
"host": "not-valid-subdomain.azurewebsites.net",
"info": {
"description": "",
"title": "EnvironmentVariableConnector",
"version": "1.0"
},
"parameters": {},
"paths": {
"/api/GetResponse": {
"get": {
"operationId": "GetResponse",
"parameters": [
{
"in": "header",
"name": "hostUrl",
"required": true,
"type": "string"
},
{
"in": "header",
"name": "baseUrl",
"required": true,
"type": "string"
}
],
"responses": {
"default": {
"description": "default",
"schema": {
"properties": {
"message": {
"description": "message",
"type": "string"
}
},
"type": "object"
}
}
},
"summary": "GetResponse"
}
}
},
"produces": [],
"responses": {},
"schemes": [
"https"
],
"security": [],
"securityDefinitions": {},
"swagger": "2.0",
"tags": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"Parameters": {
"x-ms-apimTemplateParameter.urlTemplate": "@headers('hostUrl')"
},
"TemplateId": "dynamichosturl",
"Title": "Set host URL"
},
{
"Parameters": {
"x-ms-apimTemplate-operationName": [
"GetResponse"
],
"x-ms-apimTemplateParameter.httpMethod": "@Request.OriginalHTTPMethod",
"x-ms-apimTemplateParameter.newPath": "/@headers('baseUrl')/GetResponse"
},
"TemplateId": "routerequesttoendpoint",
"Title": "Route GetResponse request"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<AppModules />
<EntityDataProviders />
<CanvasApps />
<Connectors />
<connectionreferences>
<connectionreference connectionreferencelogicalname="cat_CDS_Current">
<connectionreferencedisplayname>CDS_Current</connectionreferencedisplayname>
Expand Down
19 changes: 11 additions & 8 deletions ALMAcceleratorSampleSolution/SolutionPackage/Other/Solution.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml version="9.2.21034.182" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml version="9.2.21062.134" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SolutionManifest>
<UniqueName>ALMAcceleratorSampleSolution</UniqueName>
<LocalizedNames>
Expand All @@ -13,7 +13,9 @@
<LocalizedNames>
<LocalizedName description="Power CAT" languagecode="1033" />
</LocalizedNames>
<Descriptions />
<Descriptions>
<Description description="PowerCAT" languagecode="1033" />
</Descriptions>
<EMailAddress xsi:nil="true"></EMailAddress>
<SupportingWebsiteUrl xsi:nil="true"></SupportingWebsiteUrl>
<CustomizationPrefix>cat</CustomizationPrefix>
Expand Down Expand Up @@ -87,16 +89,17 @@
<RootComponent type="62" schemaName="cat_AlmAcceleratorSampleMda" behavior="0" />
<RootComponent type="80" schemaName="cat_AlmAcceleratorSampleMda" behavior="0" />
<RootComponent type="300" schemaName="cat_devopskitsamplecanvasapp_c7ec5" behavior="0" />
<RootComponent type="372" id="{b464e249-0bf7-48c0-8350-24476349bac1}" schemaName="cat_5Fenvironmentvariableconnector" behavior="0" />
</RootComponents>
<MissingDependencies>
<MissingDependency>
<Required key="0" type="1" schemaName="environmentvariabledefinition" displayName="Environment Variable Definition" solution="EnvironmentVariables (1.0.2.72)" />
<Dependent key="1" type="29" displayName="DevOpsKitSampleFlow" id="{0a43b549-50ed-ea11-a815-000d3af3a7c4}" />
<Required type="1" schemaName="environmentvariabledefinition" displayName="Environment Variable Definition" solution="EnvironmentVariables (1.0.2.80)" />
<Dependent type="29" displayName="DevOpsKitSampleFlow" id="{0a43b549-50ed-ea11-a815-000d3af3a7c4}" />
</MissingDependency>
<MissingDependency>
<Required key="2" type="61" schemaName="msdyn_/Images/AppModule_Default_Icon.png" displayName="msdyn_/Images/AppModule_Default_Icon.png" solution="AppModuleWebResources (2.5)" />
<Dependent key="3" type="80" schemaName="cat_AlmAcceleratorSampleMda" displayName="AlmAcceleratorSampleMda" />
<Required type="61" schemaName="msdyn_/Images/AppModule_Default_Icon.png" displayName="msdyn_/Images/AppModule_Default_Icon.png" solution="AppModuleWebResources (2.5)" />
<Dependent type="80" schemaName="cat_AlmAcceleratorSampleMda" displayName="AlmAcceleratorSampleMda" />
</MissingDependency>
</MissingDependencies>
</SolutionManifest>
</ImportExportXml>
</ImportExportXml>
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<RolePrivilege name="prvReadSdkMessageProcessingStepImage" level="Global" />
<RolePrivilege name="prvReadSharePointData" level="Global" />
<RolePrivilege name="prvReadSharePointDocument" level="Global" />
<RolePrivilege name="prvReadSolution" level="Global" />
<RolePrivilege name="prvReadWorkflow" level="Basic" />
<RolePrivilege name="prvSharecat_AlmAcceleratorSample" level="Global" />
<RolePrivilege name="prvWritecat_AlmAcceleratorSample" level="Global" />
<RolePrivilege name="prvWriteSharePointData" level="Global" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 0266d25

Please sign in to comment.