From 1e17cca438e2d9b1faacf60de5532ebdae3edcb8 Mon Sep 17 00:00:00 2001
From: nick-funk <code@nickfunk.com>
Date: Tue, 26 Sep 2023 12:28:18 -0600
Subject: [PATCH] move DSAConfig to Admin > General

---
 .../Configure/sections/Advanced/AdvancedConfigContainer.tsx   | 3 ---
 .../sections/{Advanced => General}/DSAConfigContainer.tsx     | 4 ++--
 .../Configure/sections/General/GeneralConfigContainer.tsx     | 3 +++
 locales/en-US/admin.ftl                                       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename client/src/core/client/admin/routes/Configure/sections/{Advanced => General}/DSAConfigContainer.tsx (88%)

diff --git a/client/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx b/client/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
index 0d752e5b16..73b1a6d764 100644
--- a/client/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
+++ b/client/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
@@ -13,7 +13,6 @@ import { AdvancedConfigContainer_settings } from "coral-admin/__generated__/Adva
 import AMPConfig from "./AMPConfig";
 import CommentStreamLiveUpdatesContainer from "./CommentStreamLiveUpdatesContainer";
 import CustomCSSConfig from "./CustomCSSConfig";
-import { DSAConfigContainer } from "./DSAConfigContainer";
 import EmbeddedCommentRepliesConfig from "./EmbeddedCommentRepliesConfig";
 import ForReviewQueueConfig from "./ForReviewQueueConfig";
 import StoryCreationConfig from "./StoryCreationConfig";
@@ -40,7 +39,6 @@ const AdvancedConfigContainer: React.FunctionComponent<Props> = ({
       <StoryCreationConfig disabled={submitting} />
       <AMPConfig disabled={submitting} />
       <ForReviewQueueConfig disabled={submitting} />
-      <DSAConfigContainer disabled={submitting} />
     </HorizontalGutter>
   );
 };
@@ -55,7 +53,6 @@ const enhanced = withFragmentContainer<Props>({
       ...CommentStreamLiveUpdatesContainer_settings
       ...AMPConfig_formValues @relay(mask: false)
       ...ForReviewQueueConfig_formValues @relay(mask: false)
-      ...DSAConfigContainer_formValues @relay(mask: false)
     }
   `,
 })(AdvancedConfigContainer);
diff --git a/client/src/core/client/admin/routes/Configure/sections/Advanced/DSAConfigContainer.tsx b/client/src/core/client/admin/routes/Configure/sections/General/DSAConfigContainer.tsx
similarity index 88%
rename from client/src/core/client/admin/routes/Configure/sections/Advanced/DSAConfigContainer.tsx
rename to client/src/core/client/admin/routes/Configure/sections/General/DSAConfigContainer.tsx
index f1e38bd736..ac15b719a3 100644
--- a/client/src/core/client/admin/routes/Configure/sections/Advanced/DSAConfigContainer.tsx
+++ b/client/src/core/client/admin/routes/Configure/sections/General/DSAConfigContainer.tsx
@@ -21,9 +21,9 @@ interface Props {
 export const DSAConfigContainer: FunctionComponent<Props> = ({ disabled }) => {
   return (
     <ConfigBoxWithToggleField
-      data-testid="configure-advanced-dsaConfig"
+      data-testid="configure-general-dsaConfig"
       title={
-        <Localized id="configure-advanced-dsaConfig-title">
+        <Localized id="configure-general-dsaConfig-title">
           <Header container="h2">DSA Features (TODO)</Header>
         </Localized>
       }
diff --git a/client/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx b/client/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
index 5156a72a91..28143b659d 100644
--- a/client/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
+++ b/client/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
@@ -10,6 +10,7 @@ import { HorizontalGutter } from "coral-ui/components/v2";
 
 import { GeneralConfigContainer_settings as SettingsData } from "coral-admin/__generated__/GeneralConfigContainer_settings.graphql";
 
+import { DSAConfigContainer } from "../General/DSAConfigContainer";
 import AnnouncementConfigContainer from "./AnnouncementConfigContainer";
 import BadgeConfig from "./BadgeConfig";
 import ClosedStreamMessageConfig from "./ClosedStreamMessageConfig";
@@ -47,6 +48,7 @@ const GeneralConfigContainer: React.FunctionComponent<Props> = ({
       className={styles.root}
     >
       <LocaleConfig disabled={submitting} />
+      <DSAConfigContainer disabled={submitting} />
       <FlattenRepliesConfig disabled={submitting} />
       <SitewideCommentingConfig disabled={submitting} />
       <AnnouncementConfigContainer disabled={submitting} settings={settings} />
@@ -72,6 +74,7 @@ const enhanced = withFragmentContainer<Props>({
       ...AnnouncementConfigContainer_settings
       ...FlattenRepliesConfig_formValues @relay(mask: false)
       ...LocaleConfig_formValues @relay(mask: false)
+      ...DSAConfigContainer_formValues @relay(mask: false)
       ...GuidelinesConfig_formValues @relay(mask: false)
       ...CommentLengthConfig_formValues @relay(mask: false)
       ...CommentEditingConfig_formValues @relay(mask: false)
diff --git a/locales/en-US/admin.ftl b/locales/en-US/admin.ftl
index 1b88bd6721..b04490f9fa 100644
--- a/locales/en-US/admin.ftl
+++ b/locales/en-US/admin.ftl
@@ -949,8 +949,6 @@ configure-advanced-for-review-queue-explanation =
   mark them as "Reviewed".
 configure-advanced-for-review-queue-label = Show "For review" queue
 
-configure-advanced-dsaConfig-title = DSA Features (TODO)
-
 ## Decision History
 decisionHistory-popover =
   .description = A dialog showing the decision history
@@ -1605,6 +1603,8 @@ configure-general-rte-spoilerDesc =
   Words and phrases formatted as Spoiler are hidden behind a
   dark background until the reader chooses to reveal the text.
 
+configure-general-dsaConfig-title = DSA Features (TODO)
+
 configure-account-features-title = Commenter account management features
 configure-account-features-explanation =
   You can enable and disable certain features for your commenters to use