From fc681d9ebc295ecb9b96a0dda50e483ced6cab5f Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Sun, 7 Aug 2022 14:50:16 +0200 Subject: [PATCH] feat: add flow app icons in execution row --- .../src/graphql/queries/get-executions.ts | 6 +++++- .../web/src/components/ExecutionRow/index.tsx | 7 ++++++- .../web/src/components/ExecutionRow/style.ts | 19 +++++++++++++++++-- .../web/src/graphql/queries/get-executions.ts | 3 +++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/graphql/queries/get-executions.ts b/packages/backend/src/graphql/queries/get-executions.ts index 2d41d722..068fb36b 100644 --- a/packages/backend/src/graphql/queries/get-executions.ts +++ b/packages/backend/src/graphql/queries/get-executions.ts @@ -13,7 +13,11 @@ const getExecutions = async ( ) => { const executions = context.currentUser .$relatedQuery('executions') - .withGraphFetched('flow') + .withGraphFetched({ + flow: { + steps: true + } + }) .orderBy('created_at', 'desc'); return paginate(executions, params.limit, params.offset); diff --git a/packages/web/src/components/ExecutionRow/index.tsx b/packages/web/src/components/ExecutionRow/index.tsx index 01db1847..5e3652b1 100644 --- a/packages/web/src/components/ExecutionRow/index.tsx +++ b/packages/web/src/components/ExecutionRow/index.tsx @@ -9,7 +9,8 @@ import { DateTime } from 'luxon'; import type { IExecution } from '@automatisch/types'; import * as URLS from 'config/urls'; -import { CardContent, Typography } from './style'; +import FlowAppIcons from 'components/FlowAppIcons'; +import { Apps, CardContent, Typography } from './style'; type ExecutionRowProps = { execution: IExecution; @@ -26,6 +27,10 @@ export default function ExecutionRow(props: ExecutionRowProps): React.ReactEleme + + + + ({ display: 'grid', gridTemplateRows: 'auto', - gridTemplateColumns: '1fr auto', - gridColumnGap: theme.spacing(2), + gridTemplateColumns: 'calc(30px * 3 + 8px * 2) minmax(0, auto) min-content', + gridGap: theme.spacing(2), + gridTemplateAreas: ` + "apps title menu" + `, alignItems: 'center', + [theme.breakpoints.down('sm')]: { + gridTemplateAreas: ` + "apps menu" + "title menu" + `, + gridTemplateColumns: 'minmax(0, auto) min-content', + gridTemplateRows: 'auto auto', + } })); +export const Apps = styled(MuiStack)(() => ({ + gridArea: 'apps', +})); export const Typography = styled(MuiTypography)(() => ({ display: 'inline-block', diff --git a/packages/web/src/graphql/queries/get-executions.ts b/packages/web/src/graphql/queries/get-executions.ts index 1241ad35..1c015677 100644 --- a/packages/web/src/graphql/queries/get-executions.ts +++ b/packages/web/src/graphql/queries/get-executions.ts @@ -17,6 +17,9 @@ export const GET_EXECUTIONS = gql` id name active + steps { + iconUrl + } } } }