toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Open forms in bindings on all locations (#5665)

Browse source
This commit is contained in:
Daniel Espino García 2021-09-24 14:34:40 +02:00 committed by GitHub
parent aa776e4ae6
commit 6dbb537f22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx
View file

@ -58,11 +58,15 @@ const ButtonBinding = ({binding, doAppCall, intl, post, postEphemeralCallRespons
const style = getStyleSheet(theme);
const onPress = useCallback(preventDoubleTap(async () => {
if (!binding.call || pressed.current) {
if (pressed.current) {
return;
}
pressed.current = true;
const call = binding.form?.call || binding.call;
if (!call) {
return;
}
const context = createCallContext(
binding.app_id,
@ -72,13 +76,20 @@ const ButtonBinding = ({binding, doAppCall, intl, post, postEphemeralCallRespons
post.id,
);
const call = createCallRequest(
binding.call,
const callRequest = createCallRequest(
call,
context,
{post: AppExpandLevels.EXPAND_ALL},
);
const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
if (binding.form) {
showAppForm(binding.form, callRequest, theme);
return;
}
pressed.current = true;
const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
pressed.current = false;
if (res.error) {

15
app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx
View file

@ -42,7 +42,9 @@ const MenuBinding = ({binding, doAppCall, intl, post, postEphemeralCallResponseF
return;
}
if (!bind.call) {
const call = bind.form?.call || bind.call;
if (!call) {
return;
}
@ -54,13 +56,18 @@ const MenuBinding = ({binding, doAppCall, intl, post, postEphemeralCallResponseF
post.id,
);
const call = createCallRequest(
bind.call,
const callRequest = createCallRequest(
call,
context,
{post: AppExpandLevels.EXPAND_ALL},
);
const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
if (bind.form) {
showAppForm(bind.form, callRequest);
return;
}
const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
if (res.error) {
const errorResponse = res.error;
const errorMessage = errorResponse.error || intl.formatMessage({

2
app/screens/apps_form/apps_form_component.tsx
View file

@ -168,6 +168,8 @@ export default class AppsFormComponent extends PureComponent<Props, State> {
const callResponse = res.data!;
switch (callResponse.type) {
case AppCallResponseTypes.OK:
await this.handleHide();
return;
case AppCallResponseTypes.NAVIGATE:
await this.handleHide();
this.props.actions.handleGotoLocation(callResponse.navigate_to_url!, this.context.intl);

16
app/screens/channel_info/bindings/bindings.tsx
View file

@ -88,7 +88,9 @@ class Option extends React.PureComponent<OptionProps, OptionState> {
return;
}
if (!binding.call) {
const call = binding.form?.call || binding.call;
if (!call) {
return;
}
@ -98,14 +100,20 @@ class Option extends React.PureComponent<OptionProps, OptionState> {
currentChannel.id,
currentChannel.team_id || currentTeamId,
);
const call = createCallRequest(
binding.call,
const callRequest = createCallRequest(
call,
context,
);
if (binding.form) {
await dismissModal();
showAppForm(binding.form, callRequest, theme);
return;
}
this.setState({submitting: true});
const res = await doAppCall(call, AppCallTypes.SUBMIT, intl);
const res = await doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
this.setState({submitting: false});

18
app/screens/post_options/bindings/bindings.tsx
View file

@ -86,9 +86,12 @@ class Option extends React.PureComponent<OptionProps> {
const {post, teamID, binding, intl, theme} = this.props;
const {doAppCall, postEphemeralCallResponseForPost} = this.props.actions;
if (!binding.call) {
const call = binding.form?.call || binding.call;
if (!call) {
return;
}
const context = createCallContext(
binding.app_id,
binding.location,
@ -97,15 +100,20 @@ class Option extends React.PureComponent<OptionProps> {
post.id,
post.root_id,
);
const call = createCallRequest(
binding.call,
const callRequest = createCallRequest(
call,
context,
{
post: AppExpandLevels.ALL,
},
);
const callPromise = doAppCall(call, AppCallTypes.SUBMIT, intl);
if (binding.form) {
showAppForm(binding.form, callRequest, theme);
return;
}
const callPromise = doAppCall(callRequest, AppCallTypes.SUBMIT, intl);
await this.close();
const res = await callPromise;
@ -134,7 +142,7 @@ class Option extends React.PureComponent<OptionProps> {
this.props.actions.handleGotoLocation(callResp.navigate_to_url!, intl);
break;
case AppCallResponseTypes.FORM:
showAppForm(callResp.form, call, theme);
showAppForm(callResp.form, callRequest, theme);
break;
default: {
const title = intl.formatMessage({