Page MenuHomePhabricator
Differential D4058

[web, lib] [refactor] [ENG-536] move clear query to lib/hooks
ClosedPublic
Actions

Authored by • benschac on May 16 2022, 8:36 AM.
Tags
None
Referenced Files
F5111170: D4058.diff
Wed, Apr 2, 2:49 AM
F5108599: D4058.id12774.diff
Tue, Apr 1, 2:24 PM
Unknown Object (File)
Mon, Mar 31, 8:46 PM
Unknown Object (File)
Mon, Mar 31, 10:54 AM
Unknown Object (File)
Mon, Mar 31, 6:06 AM
Unknown Object (File)
Sun, Mar 30, 2:33 PM
Unknown Object (File)
Sat, Mar 29, 7:11 PM
Unknown Object (File)
Sun, Mar 23, 9:04 AM
View All Files
Subscribers
• abosh
• adrian
ashoat

Details

Reviewers
atul
tomek
• jacek
Commits
rCOMM50a152a78c58: [web, lib] [refactor] [ENG-536] move clear query to lib/hooks
Summary

move clear query method to lib hooks.

Test Plan

clear query functionality should work as it did before on web. This clear query wasn't implemented on native.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• benschac created this revision.May 16 2022, 8:36 AM
Herald added subscribers: • abosh, • adrian, ashoat. · View Herald TranscriptMay 16 2022, 8:36 AM
• benschac added a parent revision: D4057: [lib, native, web] move onChangeSearch to hook.May 16 2022, 8:36 AM
Harbormaster completed remote builds in B9168: Diff 12747.May 16 2022, 8:41 AM
• benschac requested review of this revision.May 16 2022, 8:41 AM
• benschac updated this revision to Diff 12774.May 16 2022, 2:21 PM

rebase

Harbormaster completed remote builds in B9183: Diff 12774.May 16 2022, 2:34 PM
• benschac added a child revision: D4060: [native, lib, web] [refactor] move text out of state.May 16 2022, 2:38 PM
• benschac updated this revision to Diff 12817.May 17 2022, 7:57 AM

rebase

• benschac added inline comments.May 17 2022, 7:59 AM
lib/hooks/search-sidebars.js
26 ↗(On Diff #12817)

this one is missing a +

• benschac updated this revision to Diff 12820.May 17 2022, 8:00 AM

add plus

Harbormaster failed remote builds in B9227: Diff 12820!May 17 2022, 8:01 AM
Harbormaster failed remote builds in B9224: Diff 12817!
• benschac updated this revision to Diff 12825.May 17 2022, 8:02 AM

rebase

Harbormaster completed remote builds in B9232: Diff 12825.May 17 2022, 8:35 AM
Harbormaster completed remote builds in B9224: Diff 12817.
Harbormaster completed remote builds in B9227: Diff 12820.May 17 2022, 8:49 AM
tomek accepted this revision.May 18 2022, 3:35 AM
This revision is now accepted and ready to land.May 18 2022, 3:35 AM
• benschac updated this revision to Diff 13090.May 24 2022, 10:23 AM

rebase

Harbormaster completed remote builds in B9452: Diff 13090.May 24 2022, 10:36 AM
• benschac updated this revision to Diff 13176.May 27 2022, 11:37 AM

fix merge conflicts

Harbormaster completed remote builds in B9513: Diff 13176.May 27 2022, 11:42 AM
• benschac updated this revision to Diff 13177.May 27 2022, 11:52 AM

rename variable

This revision was landed with ongoing or failed builds.May 27 2022, 11:56 AM
Closed by commit rCOMM50a152a78c58: [web, lib] [refactor] [ENG-536] move clear query to lib/hooks (authored by • benschac). · Explain Why
This revision was automatically updated to reflect the committed changes.
• benschac added a commit: rCOMM50a152a78c58: [web, lib] [refactor] [ENG-536] move clear query to lib/hooks.
Harbormaster completed remote builds in B9514: Diff 13177.May 27 2022, 11:59 AM

Revision Contents
Changeset List

PathSize
lib/
hooks/
12 lines
web/
modals/
chat/
10 lines

Diff 12774

View Options

lib/hooks/search-sidebars.js

// @flow // @flow
import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements'; import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements';
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Alert, Text } from 'react-native';
import { TouchableOpacity } from 'react-native-gesture-handler'; import { TouchableOpacity } from 'react-native-gesture-handler';
import type { NavigationRoute } from '../navigation/route-names';
import { useColors } from '../themes/colors.js'; import { useColors } from '../themes/colors.js';
type Props = React.ElementConfig<typeof BaseHeaderBackButton>; type ChangeRolesHeaderLeftButtonProps = {
function ChangeRolesHeaderLeftButton(props: Props): React.Node { +route: NavigationRoute<'ChangeRolesScreen'>,
...React.ElementConfig<typeof BaseHeaderBackButton>,
};
function ChangeRolesHeaderLeftButton(
props: ChangeRolesHeaderLeftButtonProps,
): React.Node {
const { memberInfo, role: selectedRole } = props.route.params;
const { role: memberRole } = memberInfo;
const onCancel = React.useCallback(() => {
const { onPress } = props;
invariant(onPress, 'onPress must be defined');
if (selectedRole === memberRole) {
onPress();
return;
}
Alert.alert(
'Unsaved Changes',
'You have unsaved changes, are you sure you want to cancel? You will lose all your progress',
[
{ text: 'Cancel', onPress },
{ text: 'Stay', style: 'cancel' },
],
{ cancelable: true },
);
}, [memberRole, props, selectedRole]);
rohanAuthorUnsubmitted
Done
Inline Actions

I think the wording here may be a bit confusing. In my experience, 'cancel' typically means close the alert, and there's another option like 'confirm' or something that will mean you're ok with discarding changes.

Here it seems like 'cancel' means we're ok with discarding changes. Not sure if it's just me though (cc @ted)

rohan: I think the wording here may be a bit confusing. In my experience, 'cancel' typically means…
ashoatUnsubmitted
Not Done
Inline Actions

What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted

ashoat: What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted
rohanAuthorUnsubmitted
Done
Inline Actions

Ah my bad. It looks like in message editing: Continue editing closes the alert and continues editing while Discard edit closes the alert and exits editing

rohan: Ah my bad. It looks like in message editing: `Continue editing` closes the alert and continues…
ashoatUnsubmitted
Not Done
Inline Actions
  1. I agree we shouldn't use the term Cancel here... how about Leave?
  2. I don't think we need { cancelable: true }... we can just default to Stay if the user dismisses the Alert
  3. Can we try to match copy for title / description with the edit-message workflow?
ashoat: 1. I agree we shouldn't use the term `Cancel` here... how about `Leave`? 2. I don't think we…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah that makes sense, I'll update the diff

rohan: Yeah that makes sense, I'll update the diff
const { panelForegroundSecondaryLabel } = useColors(); const { panelForegroundSecondaryLabel } = useColors();
const labelStyle = React.useMemo( const labelStyle = React.useMemo(
() => ({ () => ({
color: panelForegroundSecondaryLabel, color: panelForegroundSecondaryLabel,
marginLeft: 10, marginLeft: 10,
}), }),
[panelForegroundSecondaryLabel], [panelForegroundSecondaryLabel],
); );
return ( return (
<TouchableOpacity onPress={props.onPress}> <TouchableOpacity onPress={onCancel}>
<Text style={labelStyle}>Cancel</Text> <Text style={labelStyle}>Cancel</Text>
</TouchableOpacity> </TouchableOpacity>
); );
} }
export default ChangeRolesHeaderLeftButton; export default ChangeRolesHeaderLeftButton;
View Options

web/modals/chat/sidebar-list-modal.react.js

// @flow // @flow
import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements'; import { HeaderBackButton as BaseHeaderBackButton } from '@react-navigation/elements';
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text } from 'react-native'; import { Alert, Text } from 'react-native';
import { TouchableOpacity } from 'react-native-gesture-handler'; import { TouchableOpacity } from 'react-native-gesture-handler';
import type { NavigationRoute } from '../navigation/route-names';
import { useColors } from '../themes/colors.js'; import { useColors } from '../themes/colors.js';
type Props = React.ElementConfig<typeof BaseHeaderBackButton>; type ChangeRolesHeaderLeftButtonProps = {
function ChangeRolesHeaderLeftButton(props: Props): React.Node { +route: NavigationRoute<'ChangeRolesScreen'>,
...React.ElementConfig<typeof BaseHeaderBackButton>,
};
function ChangeRolesHeaderLeftButton(
props: ChangeRolesHeaderLeftButtonProps,
): React.Node {
const { memberInfo, role: selectedRole } = props.route.params;
const { role: memberRole } = memberInfo;
const onCancel = React.useCallback(() => {
const { onPress } = props;
invariant(onPress, 'onPress must be defined');
if (selectedRole === memberRole) {
onPress();
return;
}
Alert.alert(
'Unsaved Changes',
'You have unsaved changes, are you sure you want to cancel? You will lose all your progress',
[
{ text: 'Cancel', onPress },
{ text: 'Stay', style: 'cancel' },
],
{ cancelable: true },
);
}, [memberRole, props, selectedRole]);
rohanAuthorUnsubmitted
Done
Inline Actions

I think the wording here may be a bit confusing. In my experience, 'cancel' typically means close the alert, and there's another option like 'confirm' or something that will mean you're ok with discarding changes.

Here it seems like 'cancel' means we're ok with discarding changes. Not sure if it's just me though (cc @ted)

rohan: I think the wording here may be a bit confusing. In my experience, 'cancel' typically means…
ashoatUnsubmitted
Not Done
Inline Actions

What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted

ashoat: What do we do in the current edit-message workflow? Heads-up I generally handle copy, not @ted
rohanAuthorUnsubmitted
Done
Inline Actions

Ah my bad. It looks like in message editing: Continue editing closes the alert and continues editing while Discard edit closes the alert and exits editing

rohan: Ah my bad. It looks like in message editing: `Continue editing` closes the alert and continues…
ashoatUnsubmitted
Not Done
Inline Actions
  1. I agree we shouldn't use the term Cancel here... how about Leave?
  2. I don't think we need { cancelable: true }... we can just default to Stay if the user dismisses the Alert
  3. Can we try to match copy for title / description with the edit-message workflow?
ashoat: 1. I agree we shouldn't use the term `Cancel` here... how about `Leave`? 2. I don't think we…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah that makes sense, I'll update the diff

rohan: Yeah that makes sense, I'll update the diff
const { panelForegroundSecondaryLabel } = useColors(); const { panelForegroundSecondaryLabel } = useColors();
const labelStyle = React.useMemo( const labelStyle = React.useMemo(
() => ({ () => ({
color: panelForegroundSecondaryLabel, color: panelForegroundSecondaryLabel,
marginLeft: 10, marginLeft: 10,
}), }),
[panelForegroundSecondaryLabel], [panelForegroundSecondaryLabel],
); );
return ( return (
<TouchableOpacity onPress={props.onPress}> <TouchableOpacity onPress={onCancel}>
<Text style={labelStyle}>Cancel</Text> <Text style={labelStyle}>Cancel</Text>
</TouchableOpacity> </TouchableOpacity>
); );
} }
export default ChangeRolesHeaderLeftButton; export default ChangeRolesHeaderLeftButton;