3Speak: fixed filtering in entry editing

ecency · Sep 19, 2023 · af243ec · af243ec
1 parent 1d8b52f
commit af243ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/common/components/video-gallery/index.tsx b/src/common/components/video-gallery/index.tsx
@@ -16,7 +16,6 @@ interface Props {
   insertText: (before: string, after?: string) => any;
   setVideoEncoderBeneficiary?: (video: any) => void;
   toggleNsfwC?: () => void;
-  preFilter?: string;
   setVideoMetadata?: (v: ThreeSpeakVideo) => void;
 }
 
@@ -26,27 +25,24 @@ const VideoGallery = ({
   insertText,
   setVideoEncoderBeneficiary,
   toggleNsfwC,
-  preFilter,
   setVideoMetadata
 }: Props) => {
   const { activeUser } = useMappedStore();
   const { isEditing } = useThreeSpeakManager();
 
   const [label, setLabel] = useState("All");
   const [filterStatus, setFilterStatus] = useState<ThreeSpeakVideo["status"] | "all">(
-    preFilter ?? "all"
+    isEditing ? "published" : "all"
   );
 
   const { data: items, isFetching, refresh } = useThreeSpeakVideo(filterStatus, showGallery);
 
   useEffect(() => {
-    if (isEditing) {
-      setFilterStatus("published");
-    }
+    setFilterStatus(isEditing ? "published" : "all");
   }, [isEditing]);
 
   useEffect(() => {
-    setFilterStatus(preFilter ?? "all");
+    setFilterStatus(isEditing ? "published" : "all");
   }, [activeUser]);
 
   return (
@@ -63,7 +59,7 @@ const VideoGallery = ({
         </Modal.Header>
         <Modal.Body>
           <div className="video-status-picker">
-            {!preFilter && !isEditing ? (
+            {!isEditing ? (
               <DropDown
                 float="left"
                 label={label?.toUpperCase()}
@@ -122,7 +118,7 @@ const VideoGallery = ({
               variant="link"
               className="refresh-gallery p-0"
               onClick={() => {
-                setFilterStatus(isEditing ? filterStatus : preFilter ?? "all");
+                setFilterStatus(isEditing ? filterStatus : "all");
                 setLabel(_t("video-gallery.all"));
                 refresh();
               }}

diff --git a/src/common/pages/submit/index.tsx b/src/common/pages/submit/index.tsx
@@ -137,6 +137,9 @@ export function Submit(props: PageProps & MatchProps) {
       threeSpeakManager.setIsEditing(true);
     } else if (editingEntry) {
       setEditingEntry(null);
+      threeSpeakManager.setIsEditing(false);
+    } else {
+      threeSpeakManager.setIsEditing(false);
     }
   });