groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: add formattedData in IConnection references

Browse Source
This commit is contained in:
Ali BARIN
2022-03-04 20:02:40 +01:00
committed by Ömer Faruk Aydın
parent 719a948134
commit 6a8ec97c31
9 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/types/index.d.ts vendored
View File

@@ -6,10 +6,11 @@ export interface IJSONObject {
[x: string]: IJSONValue;
}
export interface IConnection<D extends IJSONObject | string> {
export interface IConnection {
id: string;
key: string;
data: D;
data: string;
formattedData: IJSONObject;
userId: string;
verified: boolean;
count: number;
@@ -43,7 +44,7 @@ export interface IStep {
status: string;
position: number;
parameters: Record<string, unknown>;
connection: IConnection;
connection: Partial<IConnection>;
flow: IFlow;
executionSteps: IExecutionStep[];
// FIXME: remove this property once execution steps are properly exposed via queries

4
packages/web/src/components/AppConnectionRow/index.tsx
View File

@@ -42,7 +42,7 @@ function AppConnectionRow(props: AppConnectionRowProps): React.ReactElement {
const [deleteConnection] = useMutation(DELETE_CONNECTION);
const formatMessage = useFormatMessage();
const { id, key, data, verified, createdAt } = props.connection;
const { id, key, formattedData, verified, createdAt } = props.connection;
const contextButtonRef = React.useRef<SVGSVGElement | null>(null);
const [anchorEl, setAnchorEl] = React.useState<SVGSVGElement | null>(null);
@@ -88,7 +88,7 @@ function AppConnectionRow(props: AppConnectionRowProps): React.ReactElement {
spacing={1}
>
<Typography variant="h6">
{data.screenName}
{formattedData?.screenName}
</Typography>
<Typography variant="caption">

6
packages/web/src/components/ChooseAccountSubstep/index.tsx
View File

@@ -21,12 +21,12 @@ type ChooseAccountSubstepProps = {
step: IStep;
};
const optionGenerator = (connection: IConnection<IJSONObject>): { label: string; value: string; } => ({
label: connection?.data?.screenName as string ?? 'Unnamed',
const optionGenerator = (connection: IConnection): { label: string; value: string; } => ({
label: connection?.formattedData?.screenName as string ?? 'Unnamed',
value: connection?.id as string,
});
const getOption = (options: Record<string, unknown>[], connectionId: string) => options.find(connection => connection.value === connectionId) || null;
const getOption = (options: Record<string, unknown>[], connectionId?: string) => options.find(connection => connection.value === connectionId) || null;
function ChooseAccountSubstep(props: ChooseAccountSubstepProps): React.ReactElement {
const {

4
packages/web/src/graphql/mutations/create-connection.ts
View File

@@ -2,11 +2,11 @@ import { gql } from '@apollo/client';
export const CREATE_CONNECTION = gql`
mutation CreateConnection($key: AvailableAppsEnumType!, $data: JSONObject!) {
createConnection(key: $key, data: $data) {
createConnection(key: $key, formattedData: $data) {
id
key
verified
data {
formattedData {
screenName
}
app {

2
packages/web/src/graphql/mutations/update-connection.ts
View File

@@ -6,7 +6,7 @@ export const UPDATE_CONNECTION = gql`
id
key
verified
data {
formattedData {
screenName
}
}

2
packages/web/src/graphql/mutations/verify-connection.ts
View File

@@ -5,7 +5,7 @@ export const VERIFY_CONNECTION = gql`
verifyConnection(id: $id) {
id
verified
data {
formattedData {
screenName
}
}

2
packages/web/src/graphql/queries/get-app-connections.ts
View File

@@ -8,7 +8,7 @@ export const GET_APP_CONNECTIONS = gql`
id
key
verified
data {
formattedData {
screenName
}
createdAt

12
packages/web/src/helpers/authenticationSteps.ts
View File

@@ -1,4 +1,4 @@
import type { IAuthenticationStep } from '@automatisch/types';
import type { IAuthenticationStep, IJSONObject } from '@automatisch/types';
import apolloClient from 'graphql/client';
import MUTATIONS from 'graphql/mutations';
import appConfig from 'config/app';
@@ -8,7 +8,7 @@ enum AuthenticationSteps {
OpenWithPopup = 'openWithPopup',
}
const processMutation = async (step: IAuthenticationStep, variables: Record<string, unknown>) => {
const processMutation = async (step: IAuthenticationStep, variables: IJSONObject) => {
const mutation = MUTATIONS[step.name];
const mutationResponse = await apolloClient.mutate({ mutation, variables });
const responseData = mutationResponse.data[step.name];
@@ -32,15 +32,15 @@ function getObjectOfEntries(iterator: any) {
return result;
}
const processOpenWithPopup = (step: IAuthenticationStep, variables: Record<string, string>) => {
const processOpenWithPopup = (step: IAuthenticationStep, variables: IJSONObject) => {
return new Promise((resolve) => {
const windowFeatures = 'toolbar=no, titlebar=no, menubar=no, width=500, height=700, top=100, left=100';
const url = variables.url;
const popup = window.open(url, '_blank', windowFeatures) as WindowProxy;
const popup = window.open(url as string, '_blank', windowFeatures) as WindowProxy;
popup?.focus();
const messageHandler = async (event: any) => {
const messageHandler = async (event: MessageEvent) => {
// check origin and data.source to trust the event
if (event.origin !== appConfig.baseUrl || event.data.source !== 'automatisch') {
return;
@@ -56,7 +56,7 @@ const processOpenWithPopup = (step: IAuthenticationStep, variables: Record<strin
});
};
export const processStep = async (step: IAuthenticationStep, variables: Record<string, string>): Promise<any> => {
export const processStep = async (step: IAuthenticationStep, variables: IJSONObject): Promise<any> => {
if (step.type === AuthenticationSteps.Mutation) {
return processMutation(step, variables);
} else if (step.type === AuthenticationSteps.OpenWithPopup) {

4
packages/web/src/types/connection.ts
View File

@@ -1,3 +1,3 @@
import type { IConnection, IJSONObject } from '@automatisch/types';
import type { IConnection } from '@automatisch/types';
export type Connection = IConnection<IJSONObject>;
export type Connection = IConnection;