Fixed count, error state and created empty state component for scheduled post and draft #8626

Rajat-Dabade · 2025-02-24T07:18:03Z

Summary

Ticket Link

Checklist

Added or updated unit tests (required for all new features)
Has UI changes
Includes text changes and localization file updates
Have tested against the 5 core themes to ensure consistency between them.
Have run E2E tests by adding label E2E iOS tests for PR.

Device Information

This PR was tested on:

Screenshots

Release Note

harshilsharma63 · 2025-02-24T08:56:05Z

app/components/scheduled_post_indicator/index.ts

    const preferences = queryDisplayNamePreferences(database).
        observeWithColumns(['value']);
    const isMilitaryTime = preferences.pipe(map((prefs) => getDisplayNamePreferenceAsBool(prefs, 'use_military_time')));

+    // TODO: fix the count for DM's and GM's and Thread


Can you create a Jira ticket to track this is planing to do it later?

harshilsharma63 · 2025-02-24T09:07:56Z

app/components/scheduled_post_indicator/index.ts

    const preferences = queryDisplayNamePreferences(database).
        observeWithColumns(['value']);
    const isMilitaryTime = preferences.pipe(map((prefs) => getDisplayNamePreferenceAsBool(prefs, 'use_military_time')));

+    // TODO: fix the count for DM's and GM's and Thread
+    const scheduledPostCount = currentTeamId.pipe(switchMap((teamId) => observeScheduledPostCountForChannel(database, teamId, channelId)));


We need to include thread ID as well (root post's ID) as when in a thread, we need to show only that thread's count. Similarly when in channels, we need to exclude thread scheduled posts from the count.

You also need to fetch the scheduled post if count is 1, and replace the hardcoded value in the component where there's a todo //TODO: remove this hardcoded value with actual value with the scheduled post's scheduled at time. We need to display that time if there is only a single scheduled post in channel/thread.

Only when crt is enabled, correct?

Yup, added crt checks as well.

harshilsharma63 · 2025-02-25T13:31:23Z

app/components/scheduled_post_indicator/index.ts

+        scheduledPostCount = observeScheduledPostCountForDMsAndGMs(database, channelId, isCRTEnabled);
+    } else if (channelType === 'O' && channelId) {
+        scheduledPostCount = currentTeamId.pipe(switchMap((teamId) => observeScheduledPostCountForChannel(database, teamId, channelId, isCRTEnabled)));
+    } else if (rootId) {


If its a thread in open channel, the code will go the the above else if, not this else, right? That looks wrong.

I have reverted the code, Now we will be checking firstly if rootId is present or not, if present that means we have to extract the count of the thread. If not then extract the count of the channel, DMs and GMs.

enahum · 2025-03-11T02:59:03Z

app/components/scheduled_post_indicator/index.ts

+    rootId?: string;
+}
+
+const enhance = withObservables(['channelId', 'channelType', 'isCRTEnabled', 'rootId'], ({database, channelId, channelType, isCRTEnabled, rootId}: Props) => {


are we expect this props to change over time while the component is mounted? if not, is ok to leave as `withObservables([], ){...}: Props) => {

Yup, when the component is mounted, these props are not expected to change over time. So we can go with your suggestion.

enahum · 2025-03-11T03:00:24Z

app/components/scheduled_post_indicator_with_datetime/index.tsx

+type Props = WithDatabaseArgs & {
+    channelId: string;
+}
+
+const enchanced = withObservables(['channelId'], ({database}: Props) => {


why do you need channelId here if is not being used at all.

Missed it. Will remove it. Nice catch 🙌

enahum · 2025-03-11T03:01:43Z

app/components/scheduled_post_indicator/scheduled_post_indicator.tsx

@@ -54,9 +53,16 @@ type Props = {
    isMilitaryTime: boolean;
    isThread?: boolean;
    scheduledPostCount?: number;
+    channelId: string;


does not seem to be used.

Yup, will remove it.

enahum · 2025-03-11T03:01:57Z

app/components/scheduled_post_indicator/scheduled_post_indicator.tsx

-                    dateTime,
-                }}
+            <ScheduledPostIndicatorWithDatetime
+                channelId={channelId}


this component is not really using the channelId

Will remove it.

enahum · 2025-03-11T03:04:05Z

app/queries/servers/scheduled_post.ts

+    channelId: string,
+    isCRTEnabled: boolean,
+) => {
+    let query = database.collections.get<ScheduledPostModel>(SCHEDULED_POST).query(


Suggested change

let query = database.collections.get<ScheduledPostModel>(SCHEDULED_POST).query(

let query = database.get<ScheduledPostModel>(SCHEDULED_POST).query(

enahum · 2025-03-11T03:08:18Z

app/screens/channel/index.tsx

@@ -29,6 +30,7 @@ const enhanced = withObservables([], ({database, serverUrl}: EnhanceProps) => {
    const currentUserId = observeCurrentUserId(database);
    const hasGMasDMFeature = observeHasGMasDMFeature(database);
    const isBookmarksEnabled = observeConfigBooleanValue(database, 'FeatureFlagChannelBookmarks');
+    const isCRTEnabled = observeIsCRTEnabled(database);


do we need this here? I think that can be moved to the index file of SchedulePostIndicator

enahum · 2025-03-11T03:08:53Z

app/screens/channel/channel.tsx

@@ -40,6 +40,7 @@ type ChannelProps = {
    channelType: ChannelType;
    hasGMasDMFeature: boolean;
    includeBookmarkBar?: boolean;
+    isCRTEnabled: boolean;


move to the component that uses it, no need to have it here

enahum · 2025-03-11T03:11:44Z

app/screens/home/channel_list/categories_list/index.tsx

-    const scheduledPostHasError = of(false);
+    const scheduledPostHasError = allScheduledPost.pipe(
+        // eslint-disable-next-line max-nested-callbacks
+        switchMap((scheduledPosts) => of(scheduledPosts.some((post) => post.errorCode !== ''))),


you can extract this function scheduledPosts.some((post) => post.errorCode !== '') and get rid of the eslint-disable-line

enahum · 2025-03-11T03:13:24Z

app/screens/thread/thread.tsx

+                    <ScheduledPostIndicator
+                        isCRTEnabled={isCRTEnabled}
+                        rootId={rootId}
+                        channelId={EMPTY_STRING}


this makes me thing that channelId in SchedulePostIndicator should be optional

enahum · 2025-03-11T03:13:44Z

app/screens/thread/thread.tsx

@@ -40,6 +41,8 @@ const styles = StyleSheet.create({
    flex: {flex: 1},
 });

+const EMPTY_STRING = '';


very weird.. make channelId optional in the component that is receiving this

I already made it optional; I forgot about these changes. Done it, corrected it.

…led post and draft

enahum · 2025-03-11T11:48:44Z

app/components/scheduled_post_indicator/index.ts

    const currentUser = observeCurrentUser(database);
+    const currentChannelId = observeCurrentChannelId(database);


Why you need the current channel id for?

Removed it.

enahum · 2025-03-13T08:34:47Z

app/screens/home/channel_list/categories_list/index.tsx

@@ -15,11 +17,12 @@ import type {WithDatabaseArgs} from '@typings/database/database';
 const enchanced = withObservables([], ({database}: WithDatabaseArgs) => {
    const currentTeamId = observeCurrentTeamId(database);
    const draftsCount = currentTeamId.pipe(switchMap((teamId) => observeDraftCount(database, teamId))); // Observe draft count
+    const scheduledPostCount = currentTeamId.pipe(switchMap((teamId) => observeScheduledPostCount(database, teamId, true))); // Observe scheduled post count
+    const allScheduledPost = currentTeamId.pipe(switchMap((teamId) => observeScheduledPostsForTeam(database, teamId, true))); // Observe scheduled post count


The comment is misleading

app/screens/home/channel_list/categories_list/index.tsx

…sed on fetched scheduled post

mm-cloud-bot added the release-note label Feb 24, 2025

Rajat-Dabade marked this pull request as ready for review February 24, 2025 08:30

Rajat-Dabade requested a review from harshilsharma63 February 24, 2025 08:30

Rajat-Dabade self-assigned this Feb 24, 2025

Rajat-Dabade added the 2: Dev Review Requires review by a core commiter label Feb 24, 2025

harshilsharma63 requested changes Feb 24, 2025

View reviewed changes

Rajat-Dabade requested review from enahum and harshilsharma63 February 25, 2025 11:23

Rajat-Dabade force-pushed the scheduled-post-options branch from 2bd8672 to 5517875 Compare February 25, 2025 12:14

Rajat-Dabade force-pushed the empty-state-scheduled-post branch from 92506d1 to 1bdb012 Compare February 25, 2025 12:22

harshilsharma63 reviewed Feb 25, 2025

View reviewed changes

Rajat-Dabade force-pushed the empty-state-scheduled-post branch from 1bdb012 to 39e11d0 Compare February 25, 2025 19:42

Rajat-Dabade requested a review from harshilsharma63 February 25, 2025 19:58

harshilsharma63 approved these changes Feb 26, 2025

View reviewed changes

enahum requested changes Mar 11, 2025

View reviewed changes

Rajat-Dabade force-pushed the empty-state-scheduled-post branch from a036a49 to b83266f Compare March 11, 2025 10:18

Rajat-Dabade requested a review from enahum March 11, 2025 11:46

Rajat-Dabade added 13 commits March 12, 2025 18:45

updated test

e4b75af

List of Scheduled post in Scheduled post tab

583651f

Fixed count, error state and created empty state component for schedu…

9b9db7f

…led post and draft

fix test for scheduled post indicator

1f6a746

fix test

e65906f

scheduled post count for GMs and DMs and updated snapshot

14acf52

Count for thread

9285412

show time if one scheduled post

c0e3373

removed unnecessary snapshot

634c732

intl fixes

df4cf26

updated test

3f47591

intl fixes

783c967

review comments

e008c20

removed unnecessary function and variables

218d3fd

Rajat-Dabade force-pushed the empty-state-scheduled-post branch from d48ca4f to 218d3fd Compare March 12, 2025 13:17

enahum requested changes Mar 13, 2025

View reviewed changes

remove channelId from scheduled post indicator, and fetching count ba…

fab1fff

…sed on fetched scheduled post

Rajat-Dabade requested a review from enahum March 13, 2025 09:35

enahum approved these changes Mar 13, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed count, error state and created empty state component for scheduled post and draft #8626

Fixed count, error state and created empty state component for scheduled post and draft #8626

Rajat-Dabade commented Feb 24, 2025

harshilsharma63 Feb 24, 2025

harshilsharma63 Feb 24, 2025

enahum Feb 24, 2025

Rajat-Dabade Feb 25, 2025 •

edited

Loading

harshilsharma63 Feb 25, 2025

Rajat-Dabade Feb 25, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 11, 2025

enahum Mar 11, 2025

Rajat-Dabade Mar 13, 2025

enahum Mar 13, 2025

	let query = database.collections.get<ScheduledPostModel>(SCHEDULED_POST).query(
	let query = database.get<ScheduledPostModel>(SCHEDULED_POST).query(

		const currentUser = observeCurrentUser(database);
		const currentChannelId = observeCurrentChannelId(database);

Fixed count, error state and created empty state component for scheduled post and draft #8626

Are you sure you want to change the base?

Fixed count, error state and created empty state component for scheduled post and draft #8626

Conversation

Rajat-Dabade commented Feb 24, 2025

Summary

Ticket Link

Checklist

Device Information

Screenshots

Release Note

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Rajat-Dabade Feb 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Rajat-Dabade Feb 25, 2025 •

edited

Loading