Page MenuHomePhabricator
Differential D7983

[web-db] implement SQL queries for report store
ClosedPublic
Actions

Authored by kamil on May 25 2023, 10:28 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 2, 8:16 AM
Unknown Object (File)
Tue, Apr 1, 6:36 AM
Unknown Object (File)
Sat, Mar 29, 8:41 AM
Unknown Object (File)
Sat, Mar 29, 8:41 AM
Unknown Object (File)
Sat, Mar 29, 8:05 AM
Unknown Object (File)
Sat, Mar 29, 8:04 AM
Unknown Object (File)
Sat, Mar 29, 5:49 AM
Unknown Object (File)
Fri, Mar 21, 1:27 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
tomek
michal
Commits
rCOMMc34f13c3fa14: [web-db] implement SQL queries for report store
Summary

Mapping native structure and logic

Depends on D7982

Test Plan

Run tests

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.May 25 2023, 10:28 AM
kamil held this revision as a draft.
Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 25 2023, 10:28 AM
kamil added a child revision: D7984: [web-db] add report table on web.May 25 2023, 10:29 AM
Harbormaster completed remote builds in B19776: Diff 27068.May 25 2023, 10:46 AM
kamil published this revision for review.May 25 2023, 1:46 PM
michal accepted this revision.May 30 2023, 8:26 AM
michal added inline comments.
web/database/queries/report-queries.test.js
25 ↗(On Diff #27068)

Shouldn't we setupSQLiteDB in the beforeAll?

76 ↗(On Diff #27068)

I think you missed the name

This revision is now accepted and ready to land.May 30 2023, 8:26 AM
kamil updated this revision to Diff 27309.May 31 2023, 9:49 AM

add missing name

web/database/queries/report-queries.test.js
25 ↗(On Diff #27068)

because tests are concentrated on the reports table (created via createReportTable()) it doesn't really make any difference, I'll remove this

76 ↗(On Diff #27068)

oversight, fixing

Harbormaster completed remote builds in B19929: Diff 27309.May 31 2023, 10:09 AM
Closed by commit rCOMMc34f13c3fa14: [web-db] implement SQL queries for report store (authored by kamil). · Explain WhyMay 31 2023, 10:12 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMc34f13c3fa14: [web-db] implement SQL queries for report store.

Revision Contents
Changeset List

PathSize
web/
database/
queries/
72 lines
86 lines

Diff 27311

View Options

web/database/queries/report-queries.js

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines
View Options

web/database/queries/report-queries.test.js

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines