Fixed: broadcasting filters

codelitdev · Nov 16, 2024 · 7108f7e · 7108f7e
1 parent f3783b2
commit 7108f7e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 34 deletions.
diff --git a/apps/web/components/admin/mails/broadcast-editor.tsx b/apps/web/components/admin/mails/broadcast-editor.tsx
@@ -402,15 +402,19 @@ function MailEditor({ id, address, dispatch, prefix }: MailEditorProps) {
     };
 
     const onFilterChange = ({
-        filters: inputFilters,
+        filters: newFilters,
         aggregator,
         segmentId,
-        count,
+        count: filteredCount,
     }) => {
-        if (JSON.stringify(filters) !== JSON.stringify(inputFilters)) {
-            setFilters(filters);
+        if (
+            JSON.stringify(filters) !== JSON.stringify(newFilters) ||
+            filtersAggregator !== aggregator ||
+            filteredUsersCount !== filteredCount
+        ) {
+            setFilters(newFilters);
             setFiltersAggregator(aggregator);
-            setFilteredUsersCount(count);
+            setFilteredUsersCount(filteredCount);
         }
     };
 
@@ -457,17 +461,6 @@ function MailEditor({ id, address, dispatch, prefix }: MailEditorProps) {
                         setSubject(e.target.value)
                     }
                 />
-                {/* <FormField
-                    component="textarea"
-                    value={content}
-                    disabled={isPublished}
-                    multiline="true"
-                    rows={5}
-                    label={MAIL_BODY_PLACEHOLDER}
-                    onChange={(e: ChangeEvent<HTMLInputElement>) =>
-                        setContent(e.target.value)
-                    }
-                /> */}
                 <MailEditorAndPreview
                     content={content}
                     onChange={setContent}
@@ -489,23 +482,6 @@ function MailEditor({ id, address, dispatch, prefix }: MailEditorProps) {
                             setDelay(selectedDate.getTime());
                         }}
                     />
-                    /*
-                    <FormField
-                        value={
-                            new Date(delay || new Date().getTime())
-                            .toISOString()
-                            .slice(0, 16)
-                        }
-                        type="datetime-local"
-                        label={FORM_MAIL_SCHEDULE_TIME_LABEL}
-                        min={new Date().toISOString().slice(0, 16)}
-                        onChange={(e: ChangeEvent<HTMLInputElement>) => {
-                            const selectedDate = new Date(e.target.value);
-                            const utcDate = new Date(Date.UTC(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate(), selectedDate.getHours(), selectedDate.getMinutes()));
-                            setDelay(utcDate.getTime());
-                        }}
-                    />
-                    */
                 )}
                 {[
                     Constants.sequenceStatus[0],

diff --git a/apps/web/components/admin/users/filter-container/index.tsx b/apps/web/components/admin/users/filter-container/index.tsx
@@ -175,13 +175,13 @@ export default function FilterContainer({
             setCountLoading(true);
             const response = await fetch.exec();
             if (typeof response.count !== "undefined") {
-                setCount(response.count);
                 onChange({
                     filters: [...internalFilters],
                     aggregator: internalAggregator,
                     segmentId: activeSegment,
                     count: response.count,
                 });
+                setCount(response.count);
             }
         } catch (err) {
             dispatch && dispatch(setAppMessage(new AppMessage(err.message)));