Fix default/fixed filter

JackDawson94 · Feb 17, 2024 · 4b4848b · 4b4848b
1 parent c8ef04a
commit 4b4848b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/frontend/src/components/list/EditList.tsx b/frontend/src/components/list/EditList.tsx
@@ -27,6 +27,7 @@ interface EditsProps {
   defaultVoted?: UserVotedFilterEnum;
   defaultBot?: "include" | "exclude" | "only";
   showVotedFilter?: boolean;
+  userSubmitted?: boolean;
   defaultUserSubmitted?: boolean;
 }
 
@@ -45,6 +46,8 @@ const EditListComponent: FC<EditsProps> = ({
   defaultVoted,
   defaultBot,
   showVotedFilter,
+  userSubmitted,
+  defaultUserSubmitted,
 }) => {
   const { page, setPage } = usePagination();
   const {
@@ -70,6 +73,8 @@ const EditListComponent: FC<EditsProps> = ({
     defaultVoteStatus,
     defaultVoted,
     defaultBot,
+    userSubmitted,
+    defaultUserSubmitted,
   });
   const { data, loading } = useEdits({
     input: {

diff --git a/frontend/src/hooks/useEditFilter.tsx b/frontend/src/hooks/useEditFilter.tsx
@@ -59,6 +59,7 @@ interface EditFilterProps {
   defaultVoteStatus?: VoteStatusEnum | "all";
   defaultVoted?: UserVotedFilterEnum;
   defaultBot?: "include" | "exclude" | "only";
+  defaultUserSubmitted?: boolean;
 }
 
 const useEditFilter = ({
@@ -76,6 +77,7 @@ const useEditFilter = ({
   defaultVoteStatus = "all",
   defaultVoted,
   defaultBot = "include",
+  defaultUserSubmitted = true,
 }: EditFilterProps) => {
   const [params, setParams] = useQueryParams({
     query: { name: "query", type: "string", default: "" },
@@ -94,7 +96,7 @@ const useEditFilter = ({
     user_submitted: {
       name: "user_submitted",
       type: "string",
-      default: "true",
+      default: defaultUserSubmitted.toString(),
     },
   });
 
@@ -242,20 +244,22 @@ const useEditFilter = ({
           value={botOptions.find((opt) => opt.value === selectedBot)}
         />
       </Form.Group>
-      <Form.Group
-        controlId="include_user_submitted"
-        className="text-center ms-3"
-      >
-        <Form.Label>My Edits</Form.Label>
-        <Form.Check
-          className="mt-2"
-          type="switch"
-          defaultChecked={userSubmitted}
-          onChange={(e) =>
-            setParams("user_submitted", e.currentTarget.checked.toString())
-          }
-        />
-      </Form.Group>
+      {fixedUserSubmitted === undefined && (
+        <Form.Group
+          controlId="include_user_submitted"
+          className="text-center ms-3"
+        >
+          <Form.Label>My Edits</Form.Label>
+          <Form.Check
+            className="mt-2"
+            type="switch"
+            defaultChecked={userSubmitted}
+            onChange={(e) =>
+              setParams("user_submitted", e.currentTarget.checked.toString())
+            }
+          />
+        </Form.Group>
+      )}
     </Form>
   );
 

diff --git a/frontend/src/pages/users/UserEdits.tsx b/frontend/src/pages/users/UserEdits.tsx
@@ -23,6 +23,7 @@ const UserEditsComponent: FC<Props> = ({ user, isPrivateUser }) => (
       userId={user.id}
       defaultVoteStatus={VoteStatusEnum.PENDING}
       showVotedFilter={!isPrivateUser}
+      userSubmitted={true}
     />
   </>
 );