Merge pull request #1888 from microsoft/mochs-aa4pp-1877

Fixing issue with trailing slash in Deployment Environments
microsoft · Jan 31, 2022 · 838c39e · 838c39e
2 parents ff4dddb + 717cf7d
commit 838c39e
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 139 deletions.
diff --git a/...ellenceALMAccelerator/SolutionPackage/CanvasApps/cat_poweropsdevopsedition_7f3f4.meta.xml b/...ellenceALMAccelerator/SolutionPackage/CanvasApps/cat_poweropsdevopsedition_7f3f4.meta.xml
diff --git a/...kage/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/CanvasManifest.json b/...kage/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/CanvasManifest.json
@@ -1,8 +1,8 @@
 {
   "FormatVersion": "0.24",
   "Header": {
-    "DocVersion": "1.320",
-    "MinVersionToLoad": "1.320",
+    "DocVersion": "1.321",
+    "MinVersionToLoad": "1.321",
     "MSAppStructureVersion": "2.0"
   },
   "Properties": {
@@ -25,6 +25,7 @@
       "dynamicschema": false,
       "enableaimodelsindatapane": false,
       "enableappembeddingux": false,
+      "enablecomponentnamemaps": true,
       "enablecomponentscopeoldbehavior": true,
       "enableexcelonlinebusinessv2connector": false,
       "enableideaspanel": false,

diff --git a/...e/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/DataSources/Users.json b/...e/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/DataSources/Users.json
@@ -768,6 +768,10 @@
       "lk_datalakeworkspacepermission_createdonbehalfby": "Data Lake Workspace Permissions (lk_datalakeworkspacepermission_createdonbehalfby)",
       "lk_datalakeworkspacepermission_modifiedby": "Data Lake Workspace Permissions (lk_datalakeworkspacepermission_modifiedby)",
       "lk_datalakeworkspacepermission_modifiedonbehalfby": "Data Lake Workspace Permissions (lk_datalakeworkspacepermission_modifiedonbehalfby)",
+      "lk_datasyncstate_createdby": "datasyncstates (lk_datasyncstate_createdby)",
+      "lk_datasyncstate_createdonbehalfby": "datasyncstates (lk_datasyncstate_createdonbehalfby)",
+      "lk_datasyncstate_modifiedby": "datasyncstates (lk_datasyncstate_modifiedby)",
+      "lk_datasyncstate_modifiedonbehalfby": "datasyncstates (lk_datasyncstate_modifiedonbehalfby)",
       "lk_DisplayStringbase_createdby": "Display Strings (lk_DisplayStringbase_createdby)",
       "lk_DisplayStringbase_createdonbehalfby": "Display Strings (lk_DisplayStringbase_createdonbehalfby)",
       "lk_DisplayStringbase_modifiedby": "Display Strings (lk_DisplayStringbase_modifiedby)",
@@ -1192,6 +1196,10 @@
       "lk_postfollow_createdonbehalfby": "Follows (lk_postfollow_createdonbehalfby)",
       "lk_postlike_createdby": "Likes (lk_postlike_createdby)",
       "lk_postlike_createdonbehalfby": "Likes (lk_postlike_createdonbehalfby)",
+      "lk_privilegesremovalsetting_createdby": "Privileges Removal Settings (lk_privilegesremovalsetting_createdby)",
+      "lk_privilegesremovalsetting_createdonbehalfby": "Privileges Removal Settings (lk_privilegesremovalsetting_createdonbehalfby)",
+      "lk_privilegesremovalsetting_modifiedby": "Privileges Removal Settings (lk_privilegesremovalsetting_modifiedby)",
+      "lk_privilegesremovalsetting_modifiedonbehalfby": "Privileges Removal Settings (lk_privilegesremovalsetting_modifiedonbehalfby)",
       "lk_processsession_canceledby": "Process Sessions (lk_processsession_canceledby)",
       "lk_processsession_completedby": "Process Sessions (lk_processsession_completedby)",
       "lk_processsession_createdby": "Process Sessions (lk_processsession_createdby)",
@@ -1648,6 +1656,7 @@
       "user_customapiresponseproperty": "Custom API Response Properties (user_customapiresponseproperty)",
       "user_datalakefolder": "Data Lake Folders (user_datalakefolder)",
       "user_datalakefolderpermission": "Data Lake Folder Permissions (user_datalakefolderpermission)",
+      "user_datasyncstate": "datasyncstates (user_datasyncstate)",
       "user_email": "Email Messages (user_email)",
       "user_environmentvariabledefinition": "Environment Variable Definitions (user_environmentvariabledefinition)",
       "user_environmentvariablevalue": "Environment Variable Values (user_environmentvariablevalue)",

diff --git a/...Apps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/AppCheckerResult.sarif b/...Apps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/AppCheckerResult.sarif
@@ -3643,7 +3643,7 @@
               }
             }
           ],
-          "version": "1.320"
+          "version": "1.321"
         }
       }
     }

diff --git a/...age/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/Entropy.json b/...age/CanvasApps/cat_poweropsdevopsedition_7f3f4_DocumentUri_msapp_src/Entropy/Entropy.json
@@ -49,7 +49,7 @@
     "drpConnectionReferenceConnections": 227,
     "drpDeleteDeploymentProfiles": 86,
     "drpDeployEnvironments": 186,
-    "drpDeploymentSteps": 72,
+    "drpDeploymentSteps": 70,
     "drpFlowOwnerUsers": 206,
     "drpImportDeploymentProfiles": 39,
     "drpPRDeploymentProfiles": 63,
@@ -58,7 +58,7 @@
     "drpProfileOrgs": 100,
     "drpProfileProjects": 103,
     "drpProfileRepositories": 106,
-    "drpPullRequestSourceBranches": 71,
+    "drpPullRequestSourceBranches": 72,
     "drpPullRequestTargetBranches": 75,
     "drpPushDeploymentProfiles": 21,
     "drpSharepointLists": 217,
@@ -202,7 +202,7 @@
     "lblDeployEnvironment": 185,
     "lblDeployEnvironmentVariables": 196,
     "lblDeployFlowOwnership": 198,
-    "lblDeploymentEnvironment": 70,
+    "lblDeploymentEnvironment": 68,
     "lblDeploymentEnvironmentName": 115,
     "lblDeploymentEnvironmentUrl": 116,
     "lblDeploymentProfile": 147,
@@ -263,7 +263,7 @@
     "lblSolutionFriendlyName": 83,
     "lblSolutionImportHistory": 47,
     "lblSolutionImportHistoryEmpty": 46,
-    "lblSourceBranch": 69,
+    "lblSourceBranch": 71,
     "lblTargetBranch": 73,
     "loaderDeploymentEnvironment": 184,
     "loaderSolutionComponents": 199,
@@ -292,7 +292,7 @@
     "Separator5": 268,
     "Separator5_1": 280,
     "tglCreateBranch": 26,
-    "tglPRAdvancedSettings": 68,
+    "tglPRAdvancedSettings": 69,
     "tglPRBypassPrepare": 76,
     "tglPublishAdvancedSettings": 25,
     "tglPublishBypassPrepare": 31,
@@ -321,7 +321,7 @@
     "UpgradeToDeploymentProfiles": 9
   },
   "FunctionParamsInvariantScripts": {},
-  "HeaderLastSavedDateTimeUTC": "01/13/2022 16:17:52",
+  "HeaderLastSavedDateTimeUTC": "01/31/2022 16:15:04",
   "LocalDatabaseReferencesAsEmpty": false,
   "LocalResourceFileNames": {
     "deployment": "0012.png",
@@ -333,13 +333,13 @@
     "sharepointicon": "0010.png"
   },
   "LocalResourceRootPaths": {
-    "deployment": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00012.png?sv=2017-04-17&sr=b&sig=tw0n5kPXxOReEem2Uu2EF%2F3X3RVIdWracATq5iQpZnI%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "download": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00005.svg?sv=2017-04-17&sr=b&sig=3YIP3NYGmtuxPrLGlRA3MO4sKmVL%2FPjxt467vGv6i30%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "ic_fluent_error_circle_24_regular": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00004.svg?sv=2017-04-17&sr=b&sig=ke9x6%2BSAu%2FyNe2BYsE7Uc5MjZ%2FdMoscz9Emgndi7ExY%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "loading-buffering": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00013.gif?sv=2017-04-17&sr=b&sig=KhKtsvw3Ecw6eTVxtgi0QEA789J1lASuGvfGTcJ6D0g%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "PowerApps_scalable": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00008.svg?sv=2017-04-17&sr=b&sig=mCCgMo0DLDCo067h%2BNnBbp2Y9yh%2FZfpP2O87bnnEIGI%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "PowerAutomate_scalable": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00009.svg?sv=2017-04-17&sr=b&sig=Iv9SvMbKa%2Bg7O2FtBoL7%2F0Ppud68w62Sc6R47UvXE4M%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r",
-    "sharepointicon": "https://docserverpwaprodeus.blob.core.windows.net/7e8266ad-2e26-4345-be16-77261241c75c-1/resource/Assets0Images00010.png?sv=2017-04-17&sr=b&sig=y3OfMbBUJc022%2F8FlCJ5dxOlmYR%2FtZ3LPYqk%2Fvd2PXc%3D&spr=https&se=2022-01-14T16%3A32%3A19Z&sp=r"
+    "deployment": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00012.png?sv=2017-04-17&sr=b&sig=7YotD%2BeyBi8CtRXQ%2FFq9p9LnvleFSM6w9HaVTCIhuuE%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "download": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00005.svg?sv=2017-04-17&sr=b&sig=4gAl8I3RspYhU9eEhM7S9OXalulPVTCv2aUZOgLeuTo%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "ic_fluent_error_circle_24_regular": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00004.svg?sv=2017-04-17&sr=b&sig=K4rANMcZYCpclNL7P3Zkb%2F5VSU7lJERQZbWKQ3VcCJ8%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "loading-buffering": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00013.gif?sv=2017-04-17&sr=b&sig=lrwT1ETesxoniWbWdUuzMzvq7BBE3u36z%2F0AaOHz1o4%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "PowerApps_scalable": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00008.svg?sv=2017-04-17&sr=b&sig=sou6h5G6M%2BOrFT1TdsanWi0FgLTfTOIh5mzjAM0HBX4%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "PowerAutomate_scalable": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00009.svg?sv=2017-04-17&sr=b&sig=YoNMg8kOlWqSl7O31Zj%2BHmsex0pRqG0%2BVtAduahKKcU%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r",
+    "sharepointicon": "https://docserverpwaprodeus.blob.core.windows.net/e695d536-f2c0-45e9-8752-5cbe3fe9b49f-1/resource/Assets0Images00010.png?sv=2017-04-17&sr=b&sig=3JWKW%2FPCN5MAprLaxTeBeLD4LFAj5wQQC0mX36ZCn%2Bo%3D&spr=https&se=2022-02-01T16%3A25%3A32Z&sp=r"
   },
   "OldLogoFileName": "4fkmbvku.jpg",
   "OrderComponentMetadata": {
@@ -353,23 +353,23 @@
     "ff9831bc4b09407c96273781d0834797": 0
   },
   "OrderDataSource": {
-    "AADGroups": 98,
-    "AllEnvironments": 103,
+    "AADGroups": 97,
+    "AllEnvironments": 102,
     "App User Settings": 73,
     "App User Settings\\cat_appusersetting_statecode": 15,
     "App User Settings\\cat_appusersetting_statuscode": 16,
     "App User Settings\\default.cds_cat_appusersetting_views": 57,
-    "AppSharingPermissions": 111,
-    "AppUserSetting_UserSettings": 127,
+    "AppSharingPermissions": 110,
+    "AppUserSetting_UserSettings": 126,
     "BranchConfigFolders": 88,
     "BranchFolders": 90,
     "BranchSolutionFolders": 89,
     "ColumnChartSample": 68,
     "ComboBoxSample": 66,
-    "ComponentStyles": 119,
+    "ComponentStyles": 118,
     "CustomAzureDevOps": 2,
     "CustomGallerySample": 64,
-    "DeleteDeploymentRequests": 102,
+    "DeleteDeploymentRequests": 101,
     "Deployment Environments": 78,
     "Deployment Environments\\cat_deploymentenvironment_statecode": 45,
     "Deployment Environments\\cat_deploymentenvironment_statuscode": 46,
@@ -384,26 +384,26 @@
     "Deployment Requests\\cat_deploymentrequesttype": 51,
     "Deployment Requests\\default.cds_cat_deploymentrequest_views": 62,
     "Deployment Steps": 79,
-    "Deployment Steps\\cat_approvaltype": 48,
+    "Deployment Steps\\cat_approvaltype": 47,
     "Deployment Steps\\cat_deploymentstep_statecode": 49,
     "Deployment Steps\\cat_deploymentstep_statuscode": 50,
     "Deployment Steps\\default.cds_cat_deploymentstep_views": 61,
-    "Deployment Steps\\field_security_permission_type": 47,
+    "Deployment Steps\\field_security_permission_type": 48,
     "Deployment User Settings": 81,
     "Deployment User Settings\\cat_deploymentusersetting_statecode": 54,
     "Deployment User Settings\\cat_deploymentusersetting_statuscode": 55,
     "Deployment User Settings\\default.cds_cat_deploymentusersetting_views": 63,
-    "DeploymentEnvironments": 116,
-    "DeploymentProfiles": 104,
-    "DeploymentRequestHistory": 100,
-    "DeploymentRequests": 129,
+    "DeploymentEnvironments": 115,
+    "DeploymentProfiles": 103,
+    "DeploymentRequestHistory": 99,
+    "DeploymentRequests": 128,
     "DeploymentSettings": 95,
-    "DeploymentSteps": 117,
-    "DeploymentUserSettings": 128,
-    "DistinctOrgProjectProfiles": 124,
+    "DeploymentSteps": 116,
+    "DeploymentUserSettings": 127,
+    "DistinctOrgProjectProfiles": 123,
     "DropDownSample": 65,
-    "EnvironmentConnections": 122,
-    "EnvironmentUsers": 106,
+    "EnvironmentConnections": 121,
+    "EnvironmentUsers": 105,
     "GetEnvironmentId": 3,
     "GetEnvironmentSolutions": 1,
     "GetSharepointLists": 12,
@@ -415,74 +415,74 @@
     "LegendSample": 69,
     "LineChartSample": 70,
     "ListboxSample": 72,
-    "locPipelines": 97,
+    "locPipelines": 96,
     "MyPeople": 82,
     "Office365Users": 13,
-    "Orgs": 126,
+    "Orgs": 125,
     "ParseDeploymentSettings": 6,
     "PieChartSample": 71,
     "PowerAppsforMakers": 0,
-    "ProfileBuilds": 123,
+    "ProfileBuilds": 122,
     "RadioSample": 67,
     "SearchAADGroups": 14,
     "SearchDeploymentEnvironmentUsers": 8,
     "SearchSharepointSites": 10,
-    "SelectedEnvironmentSolutions": 125,
-    "SelectedOrgProjects": 121,
+    "SelectedEnvironmentSolutions": 124,
+    "SelectedOrgProjects": 120,
     "SelectedProfileSteps": 87,
     "SelectedProjectRepos": 86,
     "SelectedRepoBranches": 85,
-    "SharepointLists": 105,
-    "SharepointSites": 99,
-    "SolutionCanvasApps": 109,
-    "SolutionConnectionReferences": 114,
-    "SolutionDeploymentSettings": 96,
-    "SolutionEnvironmentVariables": 112,
-    "SolutionFlows": 107,
+    "SharepointLists": 104,
+    "SharepointSites": 98,
+    "SolutionCanvasApps": 108,
+    "SolutionConnectionReferences": 113,
+    "SolutionDeploymentSettings": 129,
+    "SolutionEnvironmentVariables": 111,
+    "SolutionFlows": 106,
     "SolutionsImportLatestBuildStatuses": 83,
     "SolutionsLatestBuildStatuses": 93,
     "splitCol": 92,
-    "splitCol1": 115,
-    "splitCol2": 113,
-    "splitCol3": 110,
-    "splitCol4": 108,
-    "StageStatesIcons": 118,
+    "splitCol1": 114,
+    "splitCol2": 112,
+    "splitCol3": 109,
+    "splitCol4": 107,
+    "StageStatesIcons": 117,
     "StylesStatic": 76,
-    "TempDeploymentRequestHistory": 101,
+    "TempDeploymentRequestHistory": 100,
     "TempSelectedEnvironmentSolutions": 91,
     "TempSolutionsImportLatestBuildStatuses": 84,
     "TempSolutionsLatestBuildStatuses": 94,
-    "ThemeStyles": 120,
+    "ThemeStyles": 119,
     "User Settings": 74,
     "User Settings\\cat_usersetting_statecode": 17,
     "User Settings\\cat_usersetting_statuscode": 18,
     "User Settings\\default.cds_cat_usersetting_views": 56,
     "Users": 75,
     "Users\\default.cds_systemuser_views": 58,
-    "Users\\systemuser_accessmode": 40,
-    "Users\\systemuser_address1_addresstypecode": 28,
-    "Users\\systemuser_address1_shippingmethodcode": 29,
-    "Users\\systemuser_address2_addresstypecode": 41,
-    "Users\\systemuser_address2_shippingmethodcode": 42,
-    "Users\\systemuser_azurestate": 31,
-    "Users\\systemuser_caltype": 30,
-    "Users\\systemuser_defaultfilterspopulated": 24,
-    "Users\\systemuser_deletestate": 38,
-    "Users\\systemuser_displayinserviceviews": 22,
-    "Users\\systemuser_emailrouteraccessapproval": 35,
-    "Users\\systemuser_incomingemaildeliverymethod": 39,
-    "Users\\systemuser_invitestatuscode": 32,
-    "Users\\systemuser_isactivedirectoryuser": 21,
-    "Users\\systemuser_isdisabled": 23,
-    "Users\\systemuser_isemailaddressapprovedbyo365admin": 26,
-    "Users\\systemuser_isintegrationuser": 25,
-    "Users\\systemuser_isuserlicensed": 20,
-    "Users\\systemuser_isusersynced": 27,
-    "Users\\systemuser_outgoingemaildeliverymethod": 36,
-    "Users\\systemuser_preferredaddresscode": 33,
-    "Users\\systemuser_preferredemailcode": 34,
-    "Users\\systemuser_preferredphonecode": 37,
-    "Users\\systemuser_setupuser": 19
+    "Users\\systemuser_accessmode": 30,
+    "Users\\systemuser_address1_addresstypecode": 32,
+    "Users\\systemuser_address1_shippingmethodcode": 31,
+    "Users\\systemuser_address2_addresstypecode": 28,
+    "Users\\systemuser_address2_shippingmethodcode": 29,
+    "Users\\systemuser_azurestate": 36,
+    "Users\\systemuser_caltype": 35,
+    "Users\\systemuser_defaultfilterspopulated": 20,
+    "Users\\systemuser_deletestate": 34,
+    "Users\\systemuser_displayinserviceviews": 25,
+    "Users\\systemuser_emailrouteraccessapproval": 41,
+    "Users\\systemuser_incomingemaildeliverymethod": 38,
+    "Users\\systemuser_invitestatuscode": 40,
+    "Users\\systemuser_isactivedirectoryuser": 23,
+    "Users\\systemuser_isdisabled": 26,
+    "Users\\systemuser_isemailaddressapprovedbyo365admin": 19,
+    "Users\\systemuser_isintegrationuser": 21,
+    "Users\\systemuser_isuserlicensed": 24,
+    "Users\\systemuser_isusersynced": 22,
+    "Users\\systemuser_outgoingemaildeliverymethod": 39,
+    "Users\\systemuser_preferredaddresscode": 37,
+    "Users\\systemuser_preferredemailcode": 33,
+    "Users\\systemuser_preferredphonecode": 42,
+    "Users\\systemuser_setupuser": 27
   },
   "OrderGroupControls": {
     "EnvironmentSettings": {
@@ -864,7 +864,7 @@
   },
   "TemplateVersions": {},
   "VolatileProperties": {
-    "AnalysisLoadTime": 6.4208292,
+    "AnalysisLoadTime": 5.9473358000000003,
     "ControlCount": {
       "23319544814d4787a45f2d6caa5282ab": 1,
       "65045f6bb68044feac8f639d9c2191c6": 1,
@@ -884,7 +884,7 @@
       "timer": 1,
       "toggleSwitch": 5
     },
-    "DeserializationLoadTime": 5.1940093999999997,
+    "DeserializationLoadTime": 6.1127253000000001,
     "ErrorCount": 0
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3643,7 +3643,7 @@ @@
                   }
                 }
               ],
-              "version": "1.320"
+              "version": "1.321"
             }
           }
         }
@@ Expand Down @@