From 700d0bfd322d18aa948156c99cffc032f1860f4f Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sun, 30 Jan 2022 01:24:42 +0100 Subject: [PATCH] feat: create flow with trigger app --- .../src/graphql/mutations/create-flow.ts | 20 ++++++++++++++---- packages/backend/src/graphql/types/flow.ts | 8 +++++++ packages/web/public/favicon.ico | Bin 3870 -> 15406 bytes packages/web/src/config/urls.ts | 3 ++- .../web/src/graphql/mutations/create-flow.ts | 4 ++-- packages/web/src/pages/Application/index.tsx | 4 ++-- packages/web/src/pages/Editor/create.tsx | 19 +++++++++++------ 7 files changed, 43 insertions(+), 15 deletions(-) diff --git a/packages/backend/src/graphql/mutations/create-flow.ts b/packages/backend/src/graphql/mutations/create-flow.ts index 1920c7b3..fd587260 100644 --- a/packages/backend/src/graphql/mutations/create-flow.ts +++ b/packages/backend/src/graphql/mutations/create-flow.ts @@ -1,14 +1,23 @@ import Step from '../../models/step'; -import flowType from '../types/flow'; +import flowType, { flowInputType} from '../types/flow'; import RequestWithCurrentUser from '../../types/express/request-with-current-user'; -const createFlowResolver = async (req: RequestWithCurrentUser) => { +type Params = { + input: { + triggerAppKey: string; + }; +}; + +const createFlowResolver = async (params: Params, req: RequestWithCurrentUser) => { + const appKey = params?.input?.triggerAppKey; + const flow = await req.currentUser.$relatedQuery('flows').insert({}); await Step.query().insert({ flowId: flow.id, type: 'trigger', position: 1, + appKey, }); return flow; @@ -16,8 +25,11 @@ const createFlowResolver = async (req: RequestWithCurrentUser) => { const createFlow = { type: flowType, - resolve: (_: any, _params: any, req: RequestWithCurrentUser) => - createFlowResolver(req), + args: { + input: { type: flowInputType }, + }, + resolve: (_: any, params: Params, req: RequestWithCurrentUser) => + createFlowResolver(params, req), }; export default createFlow; diff --git a/packages/backend/src/graphql/types/flow.ts b/packages/backend/src/graphql/types/flow.ts index 627f4f21..4665b111 100644 --- a/packages/backend/src/graphql/types/flow.ts +++ b/packages/backend/src/graphql/types/flow.ts @@ -1,6 +1,7 @@ import { GraphQLList, GraphQLObjectType, + GraphQLInputObjectType, GraphQLString, GraphQLBoolean, } from 'graphql'; @@ -18,4 +19,11 @@ const flowType = new GraphQLObjectType({ }, }); +export const flowInputType = new GraphQLInputObjectType({ + name: 'FlowInput', + fields: { + triggerAppKey: { type: GraphQLString }, + }, +}); + export default flowType; diff --git a/packages/web/public/favicon.ico b/packages/web/public/favicon.ico index a11777cc471a4344702741ab1c8a588998b1311a..59ab8480ef7bffdf8d21b5ef9386dec3f73f51fd 100644 GIT binary patch literal 15406 zcmeI2dx%t39LIlC+WVp8rmnj)ch}8UDY48RNVHNa;Xa(19a5LdBDO$GVok^t><{TF z)E`D#X&49unEc^WK+`BV7bMBq>dhZH#2hN;xfA{zN zp7%LdBq68EkRd{D$vuNat`-r?%0D*_6a1$1g@1RiJ;!gJk3#S8lXc&?3WVyf9ZK=c#6$TNo!- z6{i-gO?Ryh-^ta+4pS+V6Fwq>vdUHTZPI;KNDTr%hd( zu9Mr)+r?P-F!^&iOGcEK*T)3!bX@F<0qxSj+iwyvDZYJlLffG8Qn3j;}&~uUrq`9Q{oCFZ!UyMMEK#V|)K#YKcz?`HE)qSY0?OAib!#-5+ zarUvl`I>wS=?TuCu6Ne`2^G^bQRp+^&6!ejP4xFRdMA~sl~(+G17FJb#)W;N?xFtR zjN|QgOWJThk*l%yow~;?-(M+>vj+#BNU|o8LEx?De|pYr_Q6a)$lho{7JQLAW&UIT zngG7LaUP^D?gL}@&ex?E@(A(Q`(1q3v#x@@6EABY@j8==wEeJ8SL{vaA%%F7@&!E0 z!CCK9?{d!hyD1lV{K^sHj}J?H{5VFtSZg}}<(~dR`phH9R_g1K;*b4xKK_5F-y`@8 z8VSx==2eU#Li`yoH~9Gf8DrzwKK={i&k*D{`sj!n|200g_b~U2^7CKcwR5kBj=wzh zM2J80<-J~ZsT&A!tGYRP-}*XRDMLOjQb zTkp2Fk#t?>ecl`~{!~GtEh*z1Kg?~wZ+@!uE_(m%rrgvdgP4yO(5F8J+aBWa>lgix zbAbG}gV6pkS}rDrX8d1FTBB=a@*Tv~P5uk%gxXn@fbsW;#Ync-K`D8~w@wD$|HQQ6axOlNEZ!#?1AxdJG9O;O zV>k8*>S~^sY#4Ozm~UkKejNMj=)Z1T|D5MNq?PVBKOVLcwC@Mt^X}_Oxz$596f*PA zE!a2CUto7g=c*?5m?mTP{FRcokT+rvUHkf#CfTrP&iu8@$A=$zx0L<;ByH~+i=I>H zIfU*Hc<0%6c(*qDqswG7 zY#KP$V{=E5UDtllT-%MVE&6;v6}I2S`r7h);q76>KplO_95{8E$Z5qkqAuI>6W@Fj zgI`;!R43b7Yh=8hZA9&_Nq>_iXVIQIbsa<;2Pk{*t@7<$W9?zA+DTfdbB9UqK+|-r z$=1qr{9i;`g^&8}$!7YluC+CPop!RC@?srh+2af!XdnA&FEN)o(Y?BUqoeCP&1W!% hI{SP39JimkVzwB87=ajp7=ajp7=ajp7=aQ5{sk>Zrr-bo literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ diff --git a/packages/web/src/config/urls.ts b/packages/web/src/config/urls.ts index 014bb74d..d6ee38f7 100644 --- a/packages/web/src/config/urls.ts +++ b/packages/web/src/config/urls.ts @@ -16,7 +16,8 @@ export const APP_FLOWS = (appKey: string): string => `/app/${appKey}/flows`; export const APP_FLOWS_PATTERN = '/app/:appKey/flows'; export const EDITOR = '/editor'; -export const CREATE_FLOW = '/editor/create'; +export const CREATE_FLOW ='/editor/create'; +export const CREATE_FLOW_WITH_APP = (appKey: string) => `/editor/create?appKey=${appKey}`; export const FLOW_EDITOR = (flowId: string): string => `/editor/${flowId}`; export const FLOWS = '/flows'; diff --git a/packages/web/src/graphql/mutations/create-flow.ts b/packages/web/src/graphql/mutations/create-flow.ts index 93b07d9e..317fc591 100644 --- a/packages/web/src/graphql/mutations/create-flow.ts +++ b/packages/web/src/graphql/mutations/create-flow.ts @@ -1,8 +1,8 @@ import { gql } from '@apollo/client'; export const CREATE_FLOW = gql` - mutation createFlow { - createFlow { + mutation createFlow($input: FlowInput) { + createFlow(input: $input) { id name } diff --git a/packages/web/src/pages/Application/index.tsx b/packages/web/src/pages/Application/index.tsx index 815ee198..3c0e5b11 100644 --- a/packages/web/src/pages/Application/index.tsx +++ b/packages/web/src/pages/Application/index.tsx @@ -70,9 +70,9 @@ export default function Application(): React.ReactElement { linkProps, ref, ) { - return ; + return ; }), - [], + [appKey], ); return ( diff --git a/packages/web/src/pages/Editor/create.tsx b/packages/web/src/pages/Editor/create.tsx index 1b8af63d..57555d02 100644 --- a/packages/web/src/pages/Editor/create.tsx +++ b/packages/web/src/pages/Editor/create.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate, useSearchParams } from 'react-router-dom'; import { useMutation } from '@apollo/client'; import CircularProgress from '@mui/material/CircularProgress'; import Typography from '@mui/material/Typography'; @@ -11,22 +11,29 @@ import { CREATE_FLOW } from 'graphql/mutations/create-flow'; import Box from '@mui/material/Box'; export default function CreateFlow(): React.ReactElement { + const [searchParams] = useSearchParams(); const navigate = useNavigate(); const formatMessage = useFormatMessage(); const [createFlow] = useMutation(CREATE_FLOW); + const appKey = searchParams.get('appKey'); + React.useEffect(() => { async function initiate() { - const response = await createFlow(); + const response = await createFlow({ + variables: { + input: { + triggerAppKey: appKey, + } + } + }); const flowId = response.data?.createFlow?.id; - setTimeout(() => { - navigate(URLS.FLOW_EDITOR(flowId)); - }, 1234); + navigate(URLS.FLOW_EDITOR(flowId)); } initiate(); - }, [createFlow, navigate]); + }, [createFlow, navigate, appKey]); return (