Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mobile drafts #8280

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7a954e7
refactor: started with draft, done until new tabs for draft
Rajat-Dabade Sep 14, 2024
bf64bce
refactor: change the query and added the screen for draft
Rajat-Dabade Sep 16, 2024
d7e3aea
added condition for fetching draft for channel delete or not
Rajat-Dabade Sep 17, 2024
421fdf2
refactor: added draft screen
Rajat-Dabade Sep 20, 2024
c32df46
linter fixes
Rajat-Dabade Sep 22, 2024
1eefbde
Added draft post component
Rajat-Dabade Sep 24, 2024
6cb3094
added avatar and header display name for the draft post list
Rajat-Dabade Sep 25, 2024
1dbe020
added channel info component
Rajat-Dabade Oct 2, 2024
978a8cb
channel info completed
Rajat-Dabade Oct 7, 2024
f069326
proper naming
Rajat-Dabade Oct 7, 2024
9b4d50f
added image file markdown acknowledgement support
Rajat-Dabade Oct 7, 2024
743d994
draft actions
Rajat-Dabade Oct 9, 2024
bf7767e
Fix the draft receiver in drafts
Rajat-Dabade Oct 14, 2024
0aae855
separated send message handler
Rajat-Dabade Oct 14, 2024
bf446e3
Done with send drafts
Rajat-Dabade Oct 14, 2024
cf37827
done with delete drafts
Rajat-Dabade Oct 15, 2024
0a1fc59
change save to send draft
Rajat-Dabade Oct 15, 2024
b7b5053
handle lengthy message with show more button
Rajat-Dabade Oct 15, 2024
594f167
done with persistent message edit, send and delete drafts
Rajat-Dabade Oct 17, 2024
ea46f34
added alert for sending message
Rajat-Dabade Oct 17, 2024
b895070
added update at time for the drafts
Rajat-Dabade Oct 17, 2024
b93b340
Merge branch 'main' into mobile-drafts
mattermost-build Oct 22, 2024
086ec82
en.json extract fix
Rajat-Dabade Oct 22, 2024
98d58c3
Updated dependencies for useCallback
Rajat-Dabade Oct 23, 2024
902e2ea
refactor: added drafts list to animated list
Rajat-Dabade Oct 24, 2024
3fea445
added swipeable component and delete conformation for drafts
Rajat-Dabade Oct 26, 2024
2607869
done with rendering of images in markdown for drafts
Rajat-Dabade Oct 30, 2024
5e99dce
en.json issue fixed
Rajat-Dabade Nov 5, 2024
d26155c
fix en.json issue
Rajat-Dabade Nov 5, 2024
c7e36be
refactor: en.json fix
Rajat-Dabade Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions app/actions/local/draft.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import {DeviceEventEmitter, Image} from 'react-native';

import {Navigation, Screens} from '@app/constants';
import {goToScreen} from '@app/screens/navigation';
import {isTablet} from '@app/utils/helpers';
import DatabaseManager from '@database/manager';
import {getDraft} from '@queries/servers/drafts';
import {logError} from '@utils/log';

export const switchToGlobalDrafts = async () => {
const isTablelDevice = isTablet();
if (isTablelDevice) {
DeviceEventEmitter.emit(Navigation.NAVIGATION_HOME, Screens.GLOBAL_DRAFTS);
} else {
goToScreen(Screens.GLOBAL_DRAFTS, '', {}, {topBar: {visible: false}});
}
};

export async function updateDraftFile(serverUrl: string, channelId: string, rootId: string, file: FileInfo, prepareRecordsOnly = false) {
try {
const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
Expand Down Expand Up @@ -197,3 +211,94 @@ export async function updateDraftPriority(serverUrl: string, channelId: string,
return {error};
}
}

export async function updateDraftMarkdownImageMetadata({
serverUrl,
channelId,
rootId,
imageMetadata,
prepareRecordsOnly = false,
}: {
serverUrl: string;
channelId: string;
rootId: string;
imageMetadata: Dictionary<PostImage | undefined>;
prepareRecordsOnly?: boolean;
}) {
try {
const {database, operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
const draft = await getDraft(database, channelId, rootId);
if (!draft) {
const newDraft: Draft = {
channel_id: channelId,
root_id: rootId,
metadata: {
images: imageMetadata,
},
update_at: Date.now(),
};

return operator.handleDraft({drafts: [newDraft], prepareRecordsOnly});
}
Comment on lines +231 to +242
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder when this scenario happens, and if we really want to create a new draft.

My initial thought is this happens when we receive the metadata either after the draft is sent (and therefore not yet created) or before the draft is created. If it is already sent, we should just ignore. If it hasn't been added, probably this should not have been called.

Is there any other scenario I may be missing?

draft.prepareUpdate((d) => {
d.metadata = {
...d.metadata,
images: imageMetadata,
};
d.updateAt = Date.now();
});
if (!prepareRecordsOnly) {
await operator.batchRecords([draft], 'updateDraftImageMetadata');
}

return {draft};
} catch (error) {
logError('Failed updateDraftImages', error);
return {error};
}
}

async function getImageMetadata(url: string) {
let height = 0;
let width = 0;
let format;
try {
await new Promise((resolve, reject) => {
Image.getSize(
url,
(imageWidth, imageHeight) => {
width = imageWidth;
height = imageHeight;
resolve(null);
},
(error) => {
logError('Failed to get image size', error);
reject(error);
},
);
});
} catch (error) {
width = 0;
height = 0;
}
const match = url.match(/\.(\w+)(?=\?|$)/);
if (match) {
format = match[1];
}
return {
height,
width,
format,
frame_count: 1,
};
}

export async function parseMarkdownImages(markdown: string, imageMetadata: Dictionary<PostImage | undefined>) {
let match;
const imageRegex = /!\[.*?\]\((https:\/\/[^\s)]+)\)/g;
while ((match = imageRegex.exec(markdown)) !== null) {
const imageUrl = match[1];
// eslint-disable-next-line no-await-in-loop
imageMetadata[imageUrl] = await getImageMetadata(imageUrl);
}
}
72 changes: 72 additions & 0 deletions app/components/channel_info/avatar/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import {Image} from 'expo-image';
import React from 'react';
import {StyleSheet, View} from 'react-native';

import {buildAbsoluteUrl} from '@actions/remote/file';
import {buildProfileImageUrlFromUser} from '@actions/remote/user';
import {useServerUrl} from '@app/context/server';
import CompassIcon from '@components/compass_icon';
import {changeOpacity} from '@utils/theme';

import type UserModel from '@typings/database/models/servers/user';

type Props = {
author: UserModel;
}

const styles = StyleSheet.create({
avatarContainer: {
backgroundColor: 'rgba(255, 255, 255, 0.4)',
margin: 2,
width: 20,
height: 20,
},
avatar: {
height: 20,
width: 20,
},
avatarRadius: {
borderRadius: 18,
},
});

const Avatar = ({
author,
}: Props) => {
const serverUrl = useServerUrl();

let uri = '';
if (!uri && author) {
uri = buildProfileImageUrlFromUser(serverUrl, author);
}

let picture;
if (uri) {
picture = (
<Image
source={{uri: buildAbsoluteUrl(serverUrl, uri)}}
style={[styles.avatar, styles.avatarRadius]}
/>
);
} else {
picture = (
<CompassIcon
name='account-outline'
size={20}
color={changeOpacity('#fff', 0.48)}
/>
);
}

return (
<View style={[styles.avatarContainer, styles.avatarRadius]}>
{picture}
</View>
);
};

export default Avatar;

154 changes: 154 additions & 0 deletions app/components/channel_info/channel_info.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import React, {type ReactNode} from 'react';
import {Text, View} from 'react-native';

import {General} from '@app/constants';
import {useTheme} from '@app/context/theme';
import {changeOpacity, makeStyleSheetFromTheme} from '@app/utils/theme';
import {typography} from '@app/utils/typography';
import {getUserTimezone} from '@app/utils/user';
import FormattedText from '@components/formatted_text';
import FormattedTime from '@components/formatted_time';

import CompassIcon from '../compass_icon';

import Avatar from './avatar';

import type ChannelModel from '@typings/database/models/servers/channel';
import type PostModel from '@typings/database/models/servers/post';
import type UserModel from '@typings/database/models/servers/user';

type Props = {
channel: ChannelModel;
draftReceiverUser?: UserModel;
updateAt: number;
rootId?: PostModel['rootId'];
testID?: string;
currentUser?: UserModel;
isMilitaryTime: boolean;
}

const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
container: {
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
},
infoContainer: {
display: 'flex',
flexDirection: 'row',
gap: 5,
alignItems: 'center',
},
channelInfo: {
display: 'flex',
flexDirection: 'row',
gap: 5,
alignItems: 'center',
},
displayName: {
fontSize: 12,
fontWeight: '600',
color: changeOpacity(theme.centerChannelColor, 0.64),
lineHeight: 16,
fontFamily: 'Open Sans',
},
timeInfo: {
fontSize: 12,
fontWeight: '400',
color: changeOpacity(theme.centerChannelColor, 0.64),
lineHeight: 16,
},
time: {
color: theme.centerChannelColor,
marginTop: 5,
opacity: 0.5,
...typography('Body', 75, 'Regular'),
},
};
});

const ChannelInfo: React.FC<Props> = ({
channel,
draftReceiverUser,
updateAt,
rootId,
testID,
currentUser,
isMilitaryTime,
}) => {
const theme = useTheme();
const style = getStyleSheet(theme);
const isChannelTypeDM = channel.type === General.DM_CHANNEL;

let headerComponent: ReactNode = null;
const profileComponent = draftReceiverUser ? <Avatar author={draftReceiverUser}/> : (
<CompassIcon
color={changeOpacity(theme.centerChannelColor, 0.64)}
name='globe'
size={18}
/>);

if (rootId) {
headerComponent = (
<View style={style.channelInfo}>
<FormattedText
id='channel_info.thread_in'
defaultMessage={'Thread in:'}
style={style.displayName}
/>
{profileComponent}
</View>
);
} else if (isChannelTypeDM) {
headerComponent = (
<View style={style.channelInfo}>
<FormattedText
id='channel_info.to'
defaultMessage={'To:'}
style={style.displayName}
/>
{profileComponent}
</View>
);
} else {
headerComponent = (
<View style={style.channelInfo}>
<FormattedText
id='channel_info.in'
defaultMessage={'In:'}
style={style.displayName}
/>
{profileComponent}
</View>
);
}

return (

<View
style={style.container}
testID={testID}
>
<View style={style.infoContainer}>
{headerComponent}
<Text style={style.displayName}>
{channel.displayName}
</Text>
</View>
<FormattedTime
timezone={getUserTimezone(currentUser)}
isMilitaryTime={isMilitaryTime}
value={updateAt}
style={style.time}
testID='post_header.date_time'
/>
</View>
);
};

export default ChannelInfo;
25 changes: 25 additions & 0 deletions app/components/channel_info/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import {withDatabase, withObservables} from '@nozbe/watermelondb/react';
import {map} from 'rxjs/operators';

import {getDisplayNamePreferenceAsBool} from '@app/helpers/api/preference';
import {queryDisplayNamePreferences} from '@app/queries/servers/preference';
import {observeCurrentUser} from '@app/queries/servers/user';

import ChannelInfo from './channel_info';

const enhance = withObservables([], ({database}) => {
const currentUser = observeCurrentUser(database);
const preferences = queryDisplayNamePreferences(database).
observeWithColumns(['value']);
const isMilitaryTime = preferences.pipe(map((prefs) => getDisplayNamePreferenceAsBool(prefs, 'use_military_time')));

return {
currentUser,
isMilitaryTime,
};
});

export default withDatabase(enhance(ChannelInfo));
Loading