From 3b87e1a74ee652fb8c6ddd4ae1f9924dba093250 Mon Sep 17 00:00:00 2001 From: Manuel <manuel.geyer@rbb-online.de> Date: Fri, 19 Jan 2024 11:10:04 +0000 Subject: [PATCH] Commit --- fluentui-ard/CanvasManifest.json | 4 +- fluentui-ard/Connections/Connections.json | 44 ++-- fluentui-ard/Entropy/AppCheckerResult.sarif | 211 +----------------- fluentui-ard/Entropy/Entropy.json | 8 +- fluentui-ard/Entropy/checksum.json | 24 +- fluentui-ard/Src/BaseScreen.fx.yaml | 14 +- fluentui-ard/pkgs/Wadl/ConnectAzureOpenai.xml | 5 + 7 files changed, 52 insertions(+), 258 deletions(-) diff --git a/fluentui-ard/CanvasManifest.json b/fluentui-ard/CanvasManifest.json index 3f769c4..d9511b1 100644 --- a/fluentui-ard/CanvasManifest.json +++ b/fluentui-ard/CanvasManifest.json @@ -98,7 +98,7 @@ "zeroalltabindexes": false }, "Author": "", - "BindingErrorCount": 2, + "BindingErrorCount": 0, "ContainsThirdPartyPcfControls": false, "DefaultConnectedDataSourceMaxGetRowsCount": 500, "DocumentAppType": "Phone", @@ -117,7 +117,7 @@ "ManualOfflineProfileId": "", "Name": "ChatGPT-H-I", "OriginatingVersion": "1.335", - "ParserErrorCount": 1, + "ParserErrorCount": 0, "ShowStatusBar": false }, "PublishInfo": { diff --git a/fluentui-ard/Connections/Connections.json b/fluentui-ard/Connections/Connections.json index 490b608..611dc63 100644 --- a/fluentui-ard/Connections/Connections.json +++ b/fluentui-ard/Connections/Connections.json @@ -1,5 +1,19 @@ { - "58777019-e129-4c81-9ea2-60ba600d72f2": { + "dd997e22-3bdb-48cb-af6f-587b3b988bb4": { + "connectionRef": { + "displayName": "Office 365 Outlook", + "iconUri": "https://connectoricons-prod.azureedge.net/releases/v1.0.1669/1.0.1669.3522/office365/icon.png", + "id": "/providers/microsoft.powerapps/apis/shared_office365" + }, + "datasets": {}, + "dataSources": [ + "Office365Outlook" + ], + "dependencies": {}, + "dependents": [], + "id": "dd997e22-3bdb-48cb-af6f-587b3b988bb4" + }, + "ec936049-d96e-4f8f-b1df-4e124b5845ba": { "connectionRef": { "displayName": "Azure-openai-connector", "iconUri": "https://prodapiicons.cdn.powerappscdn.net/20240118t000000z82c5c01c912449509caae03dded4cd7e/customconnectoricon.png", @@ -9,17 +23,17 @@ "dataSources": [], "dependencies": {}, "dependents": [ - "8eb8458d-c1b8-445f-84ee-0ccad7160794" + "fc27331c-e1a7-4cdb-bf2c-bd3e13996938" ], - "id": "58777019-e129-4c81-9ea2-60ba600d72f2" + "id": "ec936049-d96e-4f8f-b1df-4e124b5845ba" }, - "8eb8458d-c1b8-445f-84ee-0ccad7160794": { + "fc27331c-e1a7-4cdb-bf2c-bd3e13996938": { "connectionRef": { "displayName": "Logic flows", "iconUri": "https://connectoricons-prod.azureedge.net/releases/v1.0.1664/1.0.1664.3477/logicflows/icon.png", "id": "/providers/microsoft.powerapps/apis/shared_logicflows", "parameterHints": { - "58777019-e129-4c81-9ea2-60ba600d72f2": { + "ec936049-d96e-4f8f-b1df-4e124b5845ba": { "value": "shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50" }, "workflowEntityId": { @@ -31,7 +45,7 @@ }, "parameterHintsV2": { "shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50": { - "value": "58777019-e129-4c81-9ea2-60ba600d72f2" + "value": "ec936049-d96e-4f8f-b1df-4e124b5845ba" }, "workflowEntityId": { "value": "921001dc-f7aa-ee11-be37-0022488291be" @@ -46,23 +60,9 @@ "ConnectAzureOpenai" ], "dependencies": { - "shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50": "58777019-e129-4c81-9ea2-60ba600d72f2" + "shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50": "ec936049-d96e-4f8f-b1df-4e124b5845ba" }, "dependents": [], - "id": "8eb8458d-c1b8-445f-84ee-0ccad7160794" - }, - "dd997e22-3bdb-48cb-af6f-587b3b988bb4": { - "connectionRef": { - "displayName": "Office 365 Outlook", - "iconUri": "https://connectoricons-prod.azureedge.net/releases/v1.0.1669/1.0.1669.3522/office365/icon.png", - "id": "/providers/microsoft.powerapps/apis/shared_office365" - }, - "datasets": {}, - "dataSources": [ - "Office365Outlook" - ], - "dependencies": {}, - "dependents": [], - "id": "dd997e22-3bdb-48cb-af6f-587b3b988bb4" + "id": "fc27331c-e1a7-4cdb-bf2c-bd3e13996938" } } \ No newline at end of file diff --git a/fluentui-ard/Entropy/AppCheckerResult.sarif b/fluentui-ard/Entropy/AppCheckerResult.sarif index ba1b0d4..fc26846 100644 --- a/fluentui-ard/Entropy/AppCheckerResult.sarif +++ b/fluentui-ard/Entropy/AppCheckerResult.sarif @@ -9,121 +9,6 @@ } ], "results": [ - { - "locations": [ - { - "logicalLocations": [ - { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect" - } - ], - "physicalLocation": { - "address": { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect", - "relativeAddress": 0 - }, - "region": { - "charLength": 1, - "charOffset": 449, - "snippet": { - "text": ")" - } - } - }, - "properties": { - "member": "OnSelect", - "module": "BaseScreen", - "type": "BaseScreen.ConSend.send1" - } - } - ], - "message": { - "id": "issue" - }, - "properties": { - "level": "High" - }, - "ruleId": "app-ErrBadToken", - "ruleIndex": 0 - }, - { - "locations": [ - { - "logicalLocations": [ - { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect" - } - ], - "physicalLocation": { - "address": { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect", - "relativeAddress": 0 - }, - "region": { - "charLength": 102, - "charOffset": 314, - "snippet": { - "text": "ConnectAzureOpenai.Run(\n textinput1.Text,\n Creativity, behave1.SelectedText.Val)" - } - } - }, - "properties": { - "member": "OnSelect", - "module": "BaseScreen", - "type": "BaseScreen.ConSend.send1" - } - } - ], - "message": { - "arguments": [ - "3", - "2" - ], - "id": "issue" - }, - "properties": { - "level": "High" - }, - "ruleId": "app-ErrBadArity", - "ruleIndex": 1 - }, - { - "locations": [ - { - "logicalLocations": [ - { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect" - } - ], - "physicalLocation": { - "address": { - "fullyQualifiedName": "BaseScreen.ConSend.send1.OnSelect", - "relativeAddress": 0 - }, - "region": { - "charLength": 5, - "charOffset": 426, - "snippet": { - "text": ".assi" - } - } - }, - "properties": { - "member": "OnSelect", - "module": "BaseScreen", - "type": "BaseScreen.ConSend.send1" - } - } - ], - "message": { - "id": "issue" - }, - "properties": { - "level": "High" - }, - "ruleId": "app-ErrInvalidDot", - "ruleIndex": 2 - }, { "locations": [ { @@ -152,37 +37,7 @@ "level": "Medium" }, "ruleId": "acc-AccessibleLabelNeeded", - "ruleIndex": 3 - }, - { - "locations": [ - { - "logicalLocations": [ - { - "fullyQualifiedName": "App.Creativity" - } - ], - "physicalLocation": { - "address": { - "fullyQualifiedName": "App.Creativity", - "relativeAddress": 0 - } - }, - "properties": { - "member": "Creativity", - "module": "App", - "type": "App" - } - } - ], - "message": { - "id": "issue" - }, - "properties": { - "level": "Medium" - }, - "ruleId": "app-UnusedVariables", - "ruleIndex": 4 + "ruleIndex": 0 }, { "locations": [ @@ -212,7 +67,7 @@ "level": "Medium" }, "ruleId": "app-UnusedMediaResources", - "ruleIndex": 5 + "ruleIndex": 1 } ], "tool": { @@ -220,51 +75,6 @@ "fullName": "PowerApps app checker", "name": "PowerApps app checker", "rules": [ - { - "id": "app-ErrBadToken", - "messageStrings": { - "issue": { - "text": "Unexpected characters. Characters are used in the formula in an unexpected way." - } - }, - "properties": { - "componentType": "app", - "howToFix": [ - "Remove or replace the unexpected characters." - ], - "level": "High", - "primaryCategory": "formula", - "whyFix": "" - } - }, - { - "id": "app-ErrBadArity", - "messageStrings": { - "issue": { - "text": "Invalid number of arguments: received {0}, expected {1}." - } - }, - "properties": { - "componentType": "app", - "level": "High", - "primaryCategory": "formula", - "whyFix": "" - } - }, - { - "id": "app-ErrInvalidDot", - "messageStrings": { - "issue": { - "text": "Invalid use of '.'" - } - }, - "properties": { - "componentType": "app", - "level": "High", - "primaryCategory": "formula", - "whyFix": "" - } - }, { "id": "acc-AccessibleLabelNeeded", "messageStrings": { @@ -282,23 +92,6 @@ "whyFix": "If there's no accessible text, people who can’t see the screen won't understand what’s in images and controls." } }, - { - "id": "app-UnusedVariables", - "messageStrings": { - "issue": { - "text": "Unused variable" - } - }, - "properties": { - "componentType": "app", - "howToFix": [ - "Remove the unused variable." - ], - "level": "Medium", - "primaryCategory": "performance", - "whyFix": "This variable is declared but is not referenced by any control, so it is not needed." - } - }, { "id": "app-UnusedMediaResources", "messageStrings": { diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json index 786779c..597ed86 100644 --- a/fluentui-ard/Entropy/Entropy.json +++ b/fluentui-ard/Entropy/Entropy.json @@ -27,12 +27,12 @@ "DoesTestStepsMetadataExist": true, "FunctionParamsInvariantScripts": {}, "FunctionParamsInvariantScriptsOnInstances": {}, - "HeaderLastSavedDateTimeUTC": "01/19/2024 11:04:46", + "HeaderLastSavedDateTimeUTC": "01/19/2024 11:10:03", "IsLegacyComponentAllowGlobalScopeCase": false, "LocalConnectionIDReferences": { - "58777019-e129-4c81-9ea2-60ba600d72f2": "\"/providers/microsoft.powerapps/apis/shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50/connections/shared-azure-2dopena-3f4cdc89-63b5-4018-882d-1f1c97eb18e0\"", - "8eb8458d-c1b8-445f-84ee-0ccad7160794": "\"/providers/microsoft.powerapps/apis/shared_logicflows/connections/ec84356e395faa1b0fdf1c7e126b562e-c1654a69e558fc9f\"", - "dd997e22-3bdb-48cb-af6f-587b3b988bb4": "\"/providers/microsoft.powerapps/apis/shared_office365/connections/shared-office365-4f712e21-7360-4723-a8e1-b17877eae069\"" + "dd997e22-3bdb-48cb-af6f-587b3b988bb4": "\"/providers/microsoft.powerapps/apis/shared_office365/connections/shared-office365-4f712e21-7360-4723-a8e1-b17877eae069\"", + "ec936049-d96e-4f8f-b1df-4e124b5845ba": "\"/providers/microsoft.powerapps/apis/shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50/connections/shared-azure-2dopena-3f4cdc89-63b5-4018-882d-1f1c97eb18e0\"", + "fc27331c-e1a7-4cdb-bf2c-bd3e13996938": "\"/providers/microsoft.powerapps/apis/shared_logicflows/connections/ec84356e395faa1b0fdf1c7e126b562e-c1654a69e558fc9f\"" }, "LocalDatabaseReferencesAsEmpty": false, "LocalResourceFileNames": { diff --git a/fluentui-ard/Entropy/checksum.json b/fluentui-ard/Entropy/checksum.json index a0175fb..9712415 100644 --- a/fluentui-ard/Entropy/checksum.json +++ b/fluentui-ard/Entropy/checksum.json @@ -4,37 +4,37 @@ "IsLocalBuild": false }, "ClientPerFileChecksums": { - "AppCheckerResult.sarif": "C8_R4bmy7CGbKyjcZJuUhx3Vrq5Nia9lSPwuPt8D8x98mA=", + "AppCheckerResult.sarif": "C8_FR+rChiYwzo+Mrrisfn1kK6viScOyF8EJFRMbwzrBP4=", "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=", "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=", "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=", "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=", - "Controls\\4.json": "C8_96kkYQlTu2VsKaq2Z4Qo/ZZD3h+FjD+i3g3ghmWP/98=", - "Header.json": "C8_HAhHC6Hr1SEgt0+Qu5JrNJYBo3VRi2IiCY4sRu3R+D0=", - "Properties.json": "C8_pDKR1GrQBglRbNVOYD/jdTxIdsgob/gLfZMJL8qaBDg=", - "References\\DataSources.json": "C8_/K7tVtiFazk17nW1lYdLoSO8zYC5PM0RNVbt7MtTeVA=", + "Controls\\4.json": "C8_Yu28L6oqw/+EuSBX6JTM2L2W0MV6aJ9GHUQGFfO0PRc=", + "Header.json": "C8_qZtN6qjY7RM1JVcM1gNnhEW78YY/hBEBEk6IXGjJS6s=", + "Properties.json": "C8_B/i041KN0CmLa7ep4b2dkF9DAEUiP/iXqCJcH1jurfc=", + "References\\DataSources.json": "C8_hBRJFWlL3J8pkjBtT1Pft05D4NCIHe3lUuLVoS3E89I=", "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=", "References\\Resources.json": "C8_wjrwChaskes02OrUNkqqoVyQNL3a5CydvOQHz8X+fuE=", "References\\Templates.json": "C8_YkZPbHeipzj9WgNTM++Bqy2uYkDiwNrCKPja6wVr3xs=", "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=", "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs=" }, - "ClientStampedChecksum": "C8_p3CzYjXlHj3uWH863KT9Moq2ReB2V7cncf4ii01xCHY=", + "ClientStampedChecksum": "C8_c1g8m1STs9iYqrsnn6O7QwPPidZnCfsHtCtXxd9onGo=", "ServerPerFileChecksums": { - "AppCheckerResult.sarif": "C8_R4bmy7CGbKyjcZJuUhx3Vrq5Nia9lSPwuPt8D8x98mA=", + "AppCheckerResult.sarif": "C8_FR+rChiYwzo+Mrrisfn1kK6viScOyF8EJFRMbwzrBP4=", "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=", "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=", "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=", "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=", - "Controls\\4.json": "C8_96kkYQlTu2VsKaq2Z4Qo/ZZD3h+FjD+i3g3ghmWP/98=", - "Header.json": "C8_HAhHC6Hr1SEgt0+Qu5JrNJYBo3VRi2IiCY4sRu3R+D0=", - "Properties.json": "C8_pDKR1GrQBglRbNVOYD/jdTxIdsgob/gLfZMJL8qaBDg=", - "References\\DataSources.json": "C8_/K7tVtiFazk17nW1lYdLoSO8zYC5PM0RNVbt7MtTeVA=", + "Controls\\4.json": "C8_Yu28L6oqw/+EuSBX6JTM2L2W0MV6aJ9GHUQGFfO0PRc=", + "Header.json": "C8_qZtN6qjY7RM1JVcM1gNnhEW78YY/hBEBEk6IXGjJS6s=", + "Properties.json": "C8_B/i041KN0CmLa7ep4b2dkF9DAEUiP/iXqCJcH1jurfc=", + "References\\DataSources.json": "C8_hBRJFWlL3J8pkjBtT1Pft05D4NCIHe3lUuLVoS3E89I=", "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=", "References\\Resources.json": "C8_wjrwChaskes02OrUNkqqoVyQNL3a5CydvOQHz8X+fuE=", "References\\Templates.json": "C8_YkZPbHeipzj9WgNTM++Bqy2uYkDiwNrCKPja6wVr3xs=", "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=", "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs=" }, - "ServerStampedChecksum": "C8_p3CzYjXlHj3uWH863KT9Moq2ReB2V7cncf4ii01xCHY=" + "ServerStampedChecksum": "C8_c1g8m1STs9iYqrsnn6O7QwPPidZnCfsHtCtXxd9onGo=" } \ No newline at end of file diff --git a/fluentui-ard/Src/BaseScreen.fx.yaml b/fluentui-ard/Src/BaseScreen.fx.yaml index a3c1e3f..e3a7917 100644 --- a/fluentui-ard/Src/BaseScreen.fx.yaml +++ b/fluentui-ard/Src/BaseScreen.fx.yaml @@ -282,22 +282,18 @@ BaseScreen As screen: OnSelect: | =If( Creativity1.Value = false, - Set( - Creativity, - 0.3 - ), - Set( - Creativity, - 0.9 - ) + Set(Creativity,0.3), + Set(Creativity,0.9) ); + Set(Behave,behave1.SelectedText.'data-ADB4D7A662F548B49FAC2B986E348A1BText'); If( !IsBlank(textinput1.Text), Set( varResp, varResp & Char(10) & "YouYou: " & Char(10) & textinput1.Text & Char(10) & Char(10) & "Assistent: " & Char(10) & ConnectAzureOpenai.Run( textinput1.Text, - Creativity, behave1.SelectedText.'data-ADB4D7A662F548B49FAC2B986E348A1BVal') + Creativity, + Behave ).assi & Char(10) ) ); diff --git a/fluentui-ard/pkgs/Wadl/ConnectAzureOpenai.xml b/fluentui-ard/pkgs/Wadl/ConnectAzureOpenai.xml index 252bf3d..3ac5355 100644 --- a/fluentui-ard/pkgs/Wadl/ConnectAzureOpenai.xml +++ b/fluentui-ard/pkgs/Wadl/ConnectAzureOpenai.xml @@ -4,9 +4,11 @@ <jsonTypes targetNamespace="https://europe-002.azure-apim.net/apim/logicflows" xmlns="http://schemas.microsoft.com/MicrosoftProjectSiena/WADL/2014/11"> <string name="ManualTriggerInput_text_def" /> <number name="ManualTriggerInput_number_def" /> + <string name="ManualTriggerInput_text_1_def" /> <object name="ManualTriggerInput"> <property name="text" type="string" /> <property name="number" type="number" /> + <property name="text_1" type="string" /> </object> <string name="ResponseActionOutput_assi_def" /> <object name="ResponseActionOutput"> @@ -31,6 +33,9 @@ <param style="plain" name="number" path="/number" type="xs:double" required="true"> <doc title="creativity1" /> </param> + <param style="plain" name="text_1" path="/text_1" type="xs:string" required="true"> + <doc title="behave1" /> + </param> </representation> </request> <response> -- GitLab