Hide own edits in Edits page

frontend/src/components/list/EditList.tsx

@@ -27,6 +27,8 @@ interface EditsProps {
   defaultVoted?: UserVotedFilterEnum;
   defaultBot?: "include" | "exclude" | "only";
   showVotedFilter?: boolean;
+  userSubmitted?: boolean;
+  defaultUserSubmitted?: boolean;
 }
 
 const PER_PAGE = 20;
@@ -44,6 +46,8 @@ const EditListComponent: FC<EditsProps> = ({
   defaultVoted,
   defaultBot,
   showVotedFilter,
+  userSubmitted,
+  defaultUserSubmitted,
 }) => {
   const { page, setPage } = usePagination();
   const {
@@ -56,6 +60,7 @@ const EditListComponent: FC<EditsProps> = ({
     selectedStatus,
     selectedFavorite,
     selectedBot,
+    selectedUserSubmitted,
   } = useEditFilter({
     sort,
     direction,
@@ -68,6 +73,8 @@ const EditListComponent: FC<EditsProps> = ({
     defaultVoteStatus,
     defaultVoted,
     defaultBot,
+    userSubmitted,
+    defaultUserSubmitted,
   });
   const { data, loading } = useEdits({
     input: {
@@ -88,6 +95,7 @@ const EditListComponent: FC<EditsProps> = ({
       per_page: PER_PAGE,
       sort: selectedSort,
       direction: selectedDirection,
+      include_user_submitted: selectedUserSubmitted,
     },
   });
 

frontend/src/graphql/types.ts

@@ -189,6 +189,8 @@ export type EditQueryInput = {
   /** Filter by applied status */
   applied?: InputMaybe<Scalars["Boolean"]>;
   direction?: SortDirectionEnum;
+  /** Filter out user's own edits */
+  include_user_submitted?: InputMaybe<Scalars["Boolean"]>;
   /** Filter to bot edits only */
   is_bot?: InputMaybe<Scalars["Boolean"]>;
   /** Filter by favorite status */

frontend/src/hooks/useEditFilter.tsx

@@ -53,11 +53,13 @@ interface EditFilterProps {
   voted?: UserVotedFilterEnum;
   favorite?: boolean;
   bot?: boolean;
+  userSubmitted?: boolean;
   showFavoriteOption?: boolean;
   showVotedFilter?: boolean;
   defaultVoteStatus?: VoteStatusEnum | "all";
   defaultVoted?: UserVotedFilterEnum;
   defaultBot?: "include" | "exclude" | "only";
+  defaultUserSubmitted?: boolean;
 }
 
 const useEditFilter = ({
@@ -69,11 +71,13 @@ const useEditFilter = ({
   voted: fixedVoted,
   favorite: fixedFavorite,
   bot: fixedBot,
+  userSubmitted: fixedUserSubmitted,
   showFavoriteOption = true,
   showVotedFilter = true,
   defaultVoteStatus = "all",
   defaultVoted,
   defaultBot = "include",
+  defaultUserSubmitted = true,
 }: EditFilterProps) => {
   const [params, setParams] = useQueryParams({
     query: { name: "query", type: "string", default: "" },
@@ -89,6 +93,11 @@ const useEditFilter = ({
     type: { name: "type", type: "string", default: "" },
     favorite: { name: "favorite", type: "string", default: "false" },
     bot: { name: "bot", type: "string", default: defaultBot },
+    user_submitted: {
+      name: "user_submitted",
+      type: "string",
+      default: defaultUserSubmitted.toString(),
+    },
   });
 
   const sort = ensureEnum(EditSortEnum, params.sort);
@@ -98,6 +107,7 @@ const useEditFilter = ({
   const status = resolveEnum(VoteStatusEnum, params.status, undefined);
   const type = resolveEnum(TargetTypeEnum, params.type);
   const favorite = params.favorite === "true";
+  const userSubmitted = params.user_submitted !== "false";
 
   const selectedSort = fixedSort ?? sort;
   const selectedDirection = fixedDirection ?? direction;
@@ -107,6 +117,7 @@ const useEditFilter = ({
   const selectedVoted = fixedVoted ?? voted;
   const selectedFavorite = fixedFavorite ?? favorite;
   const selectedBot = fixedBot ?? params.bot;
+  const selectedUserSubmitted = fixedUserSubmitted ?? userSubmitted;
 
   const enumToOptions = (e: Record<string, string>) =>
     Object.keys(e).map((key) => (
@@ -233,6 +244,22 @@ const useEditFilter = ({
           value={botOptions.find((opt) => opt.value === selectedBot)}
         />
       </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>
   );
 
@@ -246,6 +273,7 @@ const useEditFilter = ({
     selectedVoted,
     selectedFavorite,
     selectedBot,
+    selectedUserSubmitted,
   };
 };
 

frontend/src/pages/edits/Edits.tsx

@@ -12,6 +12,7 @@ const EditsComponent: FC = () => (
       defaultVoteStatus={VoteStatusEnum.PENDING}
       defaultVoted={UserVotedFilterEnum.NOT_VOTED}
       defaultBot="exclude"
+      defaultUserSubmitted={true}
     />
   </>
 );

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}
     />
   </>
 );

graphql/schema/types/edit.graphql

@@ -138,6 +138,8 @@ input EditQueryInput {
   voted: UserVotedFilterEnum
   """Filter to bot edits only"""
   is_bot: Boolean
+  """Filter out user's own edits"""
+  include_user_submitted: Boolean
 
   page: Int! = 1
   per_page: Int! = 25

pkg/sqlx/querybuilder_edit.go

@@ -292,6 +292,12 @@ func (qb *editQueryBuilder) buildQuery(filter models.EditQueryInput, userID uuid
 		query.Eq("bot", *q)
 	}
 
+	if q := filter.IncludeUserSubmitted; q != nil {
+		if !*q {
+			query.NotEq(editDBTable.Name()+".user_id", userID)
+		}
+	}
+
 	if filter.Sort == models.EditSortEnumClosedAt || filter.Sort == models.EditSortEnumUpdatedAt {
 		// When closed_at/updated_at value is null, fallback to created_at
 		colName := getColumn(editTable, filter.Sort.String())