vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-22 06:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix form loading

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2021-02-05 16:35:39 -08:00
parent 2a7387cb6c
commit c923c18cf9
7 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/webapp/src/components/maps-page/action-dispatcher/base-dialog/index.tsx
View File

@ -8,7 +8,6 @@ import GlobalError from "../../../form/global-error";
export type DialogProps = { export type DialogProps = {
onClose: () => void; onClose: () => void;
onSubmit?: (event: React.FormEvent<HTMLFormElement>) => void; onSubmit?: (event: React.FormEvent<HTMLFormElement>) => void;
open: boolean;
children: any; children: any;
error?: ErrorInfo; error?: ErrorInfo;
@ -21,8 +20,6 @@ const BaseDialog = (props: DialogProps) => {
const intl = useIntl(); const intl = useIntl();
const handleOnClose = props.onClose; const handleOnClose = props.onClose;
const onSubmit = props.onSubmit; const onSubmit = props.onSubmit;
const isOpen = props.open;
const handleOnSubmit = (e: React.FormEvent<HTMLFormElement>) => { const handleOnSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();
@ -36,7 +33,7 @@ const BaseDialog = (props: DialogProps) => {
return ( return (
<div> <div>
<StyledDialog <StyledDialog
open={isOpen} open={true}
onClose={handleOnClose} onClose={handleOnClose}
maxWidth="sm" maxWidth="sm"
fullWidth={true}> fullWidth={true}>

3
packages/webapp/src/components/maps-page/action-dispatcher/create-dialog/index.tsx
View File

@ -25,7 +25,6 @@ const CreateDialog = (props: CreateProps) => {
const client: Client = useSelector(activeInstance); const client: Client = useSelector(activeInstance);
const [model, setModel] = React.useState<CreateModel>(defaultModel); const [model, setModel] = React.useState<CreateModel>(defaultModel);
const [error, setError] = React.useState<ErrorInfo>(); const [error, setError] = React.useState<ErrorInfo>();
const { open } = props;
const intl = useIntl(); const intl = useIntl();
const mutation = useMutation<number, ErrorInfo, CreateModel>((model: CreateModel) => { const mutation = useMutation<number, ErrorInfo, CreateModel>((model: CreateModel) => {
@ -62,7 +61,7 @@ const CreateDialog = (props: CreateProps) => {
return ( return (
<div> <div>
<BaseDialog open={open} onClose={handleOnClose} onSubmit={handleOnSubmit} error={error} <BaseDialog onClose={handleOnClose} onSubmit={handleOnSubmit} error={error}
title={intl.formatMessage({ id: 'create.title', defaultMessage: 'Create a new mindmap' })} title={intl.formatMessage({ id: 'create.title', defaultMessage: 'Create a new mindmap' })}
description={intl.formatMessage({ id: 'create.description', defaultMessage: 'Please, fill the new map name and description.' })} description={intl.formatMessage({ id: 'create.description', defaultMessage: 'Please, fill the new map name and description.' })}
submitButton={intl.formatMessage({ id: 'create.button', defaultMessage: 'Create' })}> submitButton={intl.formatMessage({ id: 'create.button', defaultMessage: 'Create' })}>

2
packages/webapp/src/components/maps-page/action-dispatcher/delete-dialog/index.tsx
View File

@ -34,7 +34,7 @@ const DeleteDialog = (props: DialogProps) => {
return ( return (
<div> <div>
<BaseDialog <BaseDialog
open={props.open} onClose={handleOnClose} onSubmit={handleOnSubmit} onClose={handleOnClose} onSubmit={handleOnSubmit}
title={intl.formatMessage({ id: "action.delete-title", defaultMessage: "Delete" })} title={intl.formatMessage({ id: "action.delete-title", defaultMessage: "Delete" })}
submitButton={intl.formatMessage({ id: "action.delete-title", defaultMessage: "Delete" })} > submitButton={intl.formatMessage({ id: "action.delete-title", defaultMessage: "Delete" })} >
<Alert severity="warning"> <Alert severity="warning">

2
packages/webapp/src/components/maps-page/action-dispatcher/duplicate-dialog/index.tsx
View File

@ -71,7 +71,7 @@ const DuplicateDialog = (props: DialogProps) => {
return ( return (
<div> <div>
<BaseDialog open={open} onClose={handleOnClose} onSubmit={handleOnSubmit} error={error} <BaseDialog onClose={handleOnClose} onSubmit={handleOnSubmit} error={error}
title={intl.formatMessage({ id: 'duplicate.title', defaultMessage: 'Duplicate' })} title={intl.formatMessage({ id: 'duplicate.title', defaultMessage: 'Duplicate' })}
description={intl.formatMessage({ id: 'rename.description', defaultMessage: 'Please, fill the new map name and description.' })} description={intl.formatMessage({ id: 'rename.description', defaultMessage: 'Please, fill the new map name and description.' })}
submitButton={intl.formatMessage({ id: 'duplicate.title', defaultMessage: 'Duplicate' })}> submitButton={intl.formatMessage({ id: 'duplicate.title', defaultMessage: 'Duplicate' })}>

6
packages/webapp/src/components/maps-page/action-dispatcher/history-dialog/index.tsx
View File

@ -1,10 +1,10 @@
import React, { ErrorInfo } from "react"; import React, { ErrorInfo } from "react";
import { FormattedMessage, useIntl } from "react-intl"; import { FormattedMessage, useIntl } from "react-intl";
import { useMutation, useQuery, useQueryClient } from "react-query"; import { useQuery } from "react-query";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import Client, { ChangeHistory } from "../../../../client"; import Client, { ChangeHistory } from "../../../../client";
import { activeInstance } from '../../../../redux/clientSlice'; import { activeInstance } from '../../../../redux/clientSlice';
import { DialogProps, fetchMapById, handleOnMutationSuccess } from ".."; import { DialogProps } from "..";
import BaseDialog from "../base-dialog"; import BaseDialog from "../base-dialog";
import { Link, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Tooltip } from "@material-ui/core"; import { Link, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Tooltip } from "@material-ui/core";
import moment from "moment"; import moment from "moment";
@ -36,7 +36,7 @@ const HistoryDialog = (props: DialogProps) => {
return ( return (
<div> <div>
<BaseDialog <BaseDialog
open={props.open} onClose={handleOnClose} onClose={handleOnClose}
title={intl.formatMessage({ id: "action.history-title", defaultMessage: "Version history" })} title={intl.formatMessage({ id: "action.history-title", defaultMessage: "Version history" })}
description={intl.formatMessage({ id: "action.history-description", defaultMessage: "List of changes introduced in the last 90 days." })} > description={intl.formatMessage({ id: "action.history-description", defaultMessage: "List of changes introduced in the last 90 days." })} >
<TableContainer component={Paper} style={{ maxHeight: '200px' }}> <TableContainer component={Paper} style={{ maxHeight: '200px' }}>

13
packages/webapp/src/components/maps-page/action-dispatcher/index.tsx
View File

@ -37,17 +37,18 @@ const ActionDispatcher = (props: ActionDialogProps) => {
window.location.href = `/c/maps/${mapId}/edit`; window.location.href = `/c/maps/${mapId}/edit`;
break; break;
case 'print': case 'print':
window.open(`/c/maps/${mapId}/print`,'print'); window.open(`/c/maps/${mapId}/print`, 'print');
break; break;
} }
return ( return (
<span> <span>
<CreateDialog open={action === 'create'} onClose={handleOnClose}/>
<DeleteDialog open={action === 'delete'} onClose={handleOnClose} mapId={mapId} /> {action === 'create' ? <CreateDialog open={true} onClose={handleOnClose} /> : null}
<RenameDialog open={action === 'rename'} onClose={handleOnClose} mapId={mapId} /> {action === 'delete' ? <DeleteDialog open={true} onClose={handleOnClose} mapId={mapId} /> : null}
<DuplicateDialog open={action === 'duplicate'} onClose={handleOnClose} mapId={mapId} /> {action === 'rename' ? <RenameDialog open={true} onClose={handleOnClose} mapId={mapId} /> : null}
<HistoryDialog open={action === 'history'} onClose={handleOnClose} mapId={mapId} /> {action === 'duplicate' ? <DuplicateDialog open={true} onClose={handleOnClose} mapId={mapId} /> : null}
{action === 'history' ? <HistoryDialog open={true} onClose={handleOnClose} mapId={mapId} /> : null}
</span > </span >
); );
} }

4
packages/webapp/src/components/maps-page/action-dispatcher/rename-dialog/index.tsx
View File

@ -70,7 +70,7 @@ const RenameDialog = (props: DialogProps) => {
return ( return (
<div> <div>
<BaseDialog open={open} onClose={handleOnClose} onSubmit={handleOnSubmit} error={error} <BaseDialog onClose={handleOnClose} onSubmit={handleOnSubmit} error={error}
title={intl.formatMessage({ id: 'rename.title', defaultMessage: 'Rename' })} title={intl.formatMessage({ id: 'rename.title', defaultMessage: 'Rename' })}
description={intl.formatMessage({ id: 'rename.description', defaultMessage: 'Please, fill the new map name and description.' })} description={intl.formatMessage({ id: 'rename.description', defaultMessage: 'Please, fill the new map name and description.' })}
submitButton={intl.formatMessage({ id: 'rename.title', defaultMessage: 'Rename' })}> submitButton={intl.formatMessage({ id: 'rename.title', defaultMessage: 'Rename' })}>
@ -83,7 +83,7 @@ const RenameDialog = (props: DialogProps) => {
value={model.description} onChange={handleOnChange} required={false} fullWidth={true} /> value={model.description} onChange={handleOnChange} required={false} fullWidth={true} />
</FormControl> </FormControl>
</BaseDialog> </BaseDialog>
</div> </div>
); );
} }