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

Flows now fetching and publishing through uuid #488

Merged
merged 2 commits into from
Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ REACT_APP_GLIFIC_API="http://glific.test:4000/api"
REACT_APP_WEB_SOCKET="ws://glific.test:4000/socket"
SENTRY_DSN=""
REACT_APP_FLOW_EDITOR_API="http://glific.test:4000/flow-editor/"
REACT_APP_FLOW_EDITOR_CONFIGURE="http://glific.test:3000/automation/configure"
1 change: 1 addition & 0 deletions src/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const REACT_APP_GLIFIC_AUTHENTICATION_API =
export const USER_SESSION = process.env.REACT_APP_GLIFIC_API + '/v1/session';
export const RESET_PASSWORD = process.env.REACT_APP_GLIFIC_API + '/v1/registration/reset-password';
export const RENEW_TOKEN = USER_SESSION + '/renew';
export const FLOW_EDITOR_CONFIGURE_LINK = process.env.REACT_APP_FLOW_EDITOR_CONFIGURE;

// const enums
// provider status against the contact
Expand Down
19 changes: 19 additions & 0 deletions src/components/floweditor/FlowEditor.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.Button {
position: fixed !important;
bottom: 20px;
right: 15px;
z-index: 1000;
}

.Link {
text-decoration: none;
}

.HelpIcon {
position: fixed !important;
bottom: 25px;
right: 110px;
z-index: 1000;
width: 28px !important;
height: 28px;
}
19 changes: 18 additions & 1 deletion src/components/floweditor/FlowEditor.test.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
import React from 'react';
import { mount } from 'enzyme';
import { FlowEditor } from './FlowEditor';
import { MemoryRouter } from 'react-router-dom';
import { MockedProvider } from '@apollo/client/testing';

const wrapper = mount(<FlowEditor uuid="d3223dvfdfddffdknf" />);
const wrapper = mount(
<MockedProvider addTypename={false}>
<MemoryRouter>
<FlowEditor match={{ params: { uuid: 'd3223dvfdfddffdknf' } }} />
</MemoryRouter>
</MockedProvider>
);

test('it should display the flowEditor', () => {
expect(wrapper.find('#flow').exists()).toBe(true);
});

test('it should have a done button that redirects to automation page', () => {
expect(wrapper.find('[data-testid="button"]').exists()).toBe(true);
});

test('it should have a help button that redirects to help page', () => {
expect(wrapper.find('[data-testid="helpButton"]').exists()).toBe(true);
wrapper.unmount();
});
57 changes: 49 additions & 8 deletions src/components/floweditor/FlowEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import React, { useEffect } from 'react';
import React, { useEffect, useState } from 'react';

import { FLOW_EDITOR_API } from '../../config/index';

import { useMutation } from '@apollo/client';
import styles from './FlowEditor.module.css';
import { ReactComponent as HelpIcon } from '../../assets/images/icons/Help.svg';
import { Button } from '../UI/Form/Button/Button';
import { PUBLISH_AUTOMATION } from '../../graphql/mutations/Automation';
import { Redirect } from 'react-router';
import { FLOW_EDITOR_CONFIGURE_LINK } from '../../common/constants';

import * as Manifest from '@nyaruka/flow-editor/build/asset-manifest.json';

declare function showFlowEditor(node: any, config: any): void;
Expand Down Expand Up @@ -62,9 +70,9 @@ const setConfig = (uuid: any) => {
'split_by_run_result',
'split_by_random',
'split_by_groups',
'split_by_scheme'
'split_by_scheme',
],

excludeOperators: [
'has_beginning',
'has_text',
Expand Down Expand Up @@ -96,7 +104,7 @@ const setConfig = (uuid: any) => {
'has_ward',
'has_error',
'has_value',
'has_pattern'
'has_pattern',
],
help: {
legacy_extra: 'help.html',
Expand All @@ -123,17 +131,19 @@ const setConfig = (uuid: any) => {
flows: base_glific + 'flows',
revisions: base_glific + 'revisions/' + uuid,
functions: base_glific + 'functions',
editor: '/',
editor: FLOW_EDITOR_CONFIGURE_LINK,
},
};
};

export interface FlowEditorProps {
uuid: string;
match: any;
}

export const FlowEditor = (props: FlowEditorProps) => {
const config = setConfig(props.uuid);
const config = setConfig(props.match.params.uuid);
const [publishFlow] = useMutation(PUBLISH_AUTOMATION);
const [published, setPublished] = useState(false);

useEffect(() => {
const files = loadfiles();
Expand All @@ -153,5 +163,36 @@ export const FlowEditor = (props: FlowEditorProps) => {
}
}, []);

return <div id="flow"></div>;
const handlePublishFlow = () => {
publishFlow({ variables: { uuid: props.match.params.uuid } });
setPublished(true);
};

if (published) {
return <Redirect to="/automation" />;
}

return (
<>
<a
href="https://app.rapidpro.io/video/"
className={styles.Link}
target="_blank"
rel="noopener noreferrer"
data-testid="helpButton"
>
<HelpIcon className={styles.HelpIcon} />
</a>
<Button
variant="contained"
color="primary"
className={styles.Button}
data-testid="button"
onClick={handlePublishFlow}
>
Done
</Button>
<div id="flow"></div>
</>
);
};

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/containers/Automation/Automation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export const Automation: React.SFC<AutomationProps> = ({ match }) => {
formFields={formFields}
redirectionLink="automation"
cancelLink="automation"
linkParameter="id"
linkParameter="uuid"
listItem="flow"
icon={automationIcon}
additionalAction={additionalAction}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const columnAttributes = {
};
const configureIcon = <ConfigureIcon></ConfigureIcon>;

const additionalAction = { icon: configureIcon, parameter: 'id', link: '/automation/configure' };
const additionalAction = { icon: configureIcon, parameter: 'uuid', link: '/automation/configure' };

export const AutomationList: React.SFC<AutomationListProps> = (props) => (
<List
Expand Down
4 changes: 2 additions & 2 deletions src/graphql/mutations/Automation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export const UPDATE_AUTOMATION = gql`
`;

export const PUBLISH_AUTOMATION = gql`
mutation publishFlow($id: ID!) {
publishFlow(id: $id) {
mutation publishFlow($uuid: UUID!) {
publishFlow(uuid: $uuid) {
success
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/route/AuthenticatedRoute/AuthenticatedRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Automation } from '../../containers/Automation/Automation';
import { GroupList } from '../../containers/Group/GroupList/GroupList';
import { Group } from '../../containers/Group/Group';
import { GroupContact } from '../../containers/Group/GroupContact/GroupContact';
import { FlowEditorContainer } from '../../components/floweditor/FlowEditorContainer/FlowEditorContainer';
import { FlowEditor } from '../../components/floweditor/FlowEditor';
import { CollectionList } from '../../containers/Collection/CollectionList/CollectionList';
import { Collection } from '../../containers/Collection/Collection';
import { Chat } from '../../containers/Chat/Chat';
Expand Down Expand Up @@ -88,7 +88,7 @@ export const AuthenticatedRoute: React.SFC = () => {
<Route path="/group/:id/edit" exact component={Group} />
<Route path="/group/:id/contacts" exact component={GroupContact} />

<Route path="/automation/configure/:id" exact component={FlowEditorContainer} />
<Route path="/automation/configure/:uuid" exact component={FlowEditor} />

<Route path="/collection" exact component={CollectionList} />
<Route path="/collection/add" exact component={Collection} />
Expand Down