From 16f018c3f4c0c81aaea9ca6b8c93591559c84677 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Thu, 1 Aug 2024 13:17:24 +0200
Subject: [PATCH] address PR comments

---
 src/gpo/assets/PowerToys.admx                        |  2 +-
 src/gpo/assets/en-US/PowerToys.adml                  |  1 -
 .../Settings.UI/SettingsXAML/Views/GeneralPage.xaml  | 12 ++++++------
 .../Settings.UI/Strings/en-us/Resources.resw         |  3 ---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/gpo/assets/PowerToys.admx b/src/gpo/assets/PowerToys.admx
index 5ca8672f779..ded46dcfc5d 100644
--- a/src/gpo/assets/PowerToys.admx
+++ b/src/gpo/assets/PowerToys.admx
@@ -486,7 +486,7 @@
       </disabledValue>
     </policy>
     <policy name="AllowDiagnosticData" class="Both" displayName="$(string.AllowDiagnosticData)" explainText="$(string.AllowDiagnosticDataDescription)" key="Software\Policies\PowerToys" valueName="AllowDataDiagnostics">
-      <parentCategory ref="PowerToys" />
+      <parentCategory ref="GeneralSettings" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_84_0" />
       <enabledValue>
         <decimal value="1" />
diff --git a/src/gpo/assets/en-US/PowerToys.adml b/src/gpo/assets/en-US/PowerToys.adml
index 288f4bccf77..396a6dd99c9 100644
--- a/src/gpo/assets/en-US/PowerToys.adml
+++ b/src/gpo/assets/en-US/PowerToys.adml
@@ -251,7 +251,6 @@ If you disable or don't configure this policy, no predefined rules are applied.
       <string id="MwbValidateRemoteIp">Validate remote machine IP Address</string>
       <string id="MwbDisableUserDefinedIpMappingRules">Disable user defined IP Address mapping rules</string>
       <string id="MwbPolicyDefinedIpMappingRules">Predefined IP Address mapping rules</string>
-      <string id="AllowPowerToysAdvancedPasteOnlineAIModels">Advanced Paste: Allow using online AI models</string>
       <string id="AllowDiagnosticData">Allow sending diagnostic data</string>
     </stringTable>
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index a3eea25e121..d8d0e4fa81b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -368,18 +368,18 @@
                             x:Uid="GeneralPage_DiagnosticsAndFeedback_Link"
                             Margin="-8,0,0,0"
                             NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
-                        <InfoBar
-                            x:Uid="DataDiagnostics_SettingIsGPOManaged_InfoBar"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                            Severity="Informational" />
                         <tkcontrols:SettingsCard
                             x:Uid="GeneralPage_EnableDataDiagnostics"
                             HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}"
                             IsEnabled="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                             <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
+                        <InfoBar
+                            x:Uid="GPO_SettingIsManaged"
+                            IsClosable="False"
+                            IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
+                            IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
+                            Severity="Informational" />
                     </StackPanel>
                 </controls:SettingsGroup>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 970391486c6..bbcba6429d2 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -3798,9 +3798,6 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="GeneralPage_DiagnosticsAndFeedback_Link.Content" xml:space="preserve">
     <value>Learn more about the information we log &amp; how it gets used</value>
   </data>
-  <data name="DataDiagnostics_SettingIsGPOManaged_InfoBar.Title" xml:space="preserve">
-    <value>PowerToys diagnostic data is disabled because your organization has blocked permissions to change this setting.</value>
-  </data>
   <data name="GeneralPage_EnableDataDiagnostics.Header" xml:space="preserve">
     <value>Diagnostic data</value>
   </data>