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

CRM: Resolves 3389 - remove axios dependencies #34315

Merged
merged 3 commits into from
Dec 4, 2023
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
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: removed
Comment: Replaced axios with native fetch.


1 change: 0 additions & 1 deletion projects/plugins/crm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"@wordpress/element": "5.24.0",
"@wordpress/i18n": "4.47.0",
"@wordpress/icons": "9.38.0",
"axios": "1.6.2",
"classnames": "2.3.2",
"prop-types": "15.8.1",
"react": "18.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const WorkflowRow: React.FC< WorkflowRowProps > = props => {
<div className={ styles.triggers }>
{ workflow.triggers.map( ( trigger: Trigger ) => {
return (
<div className={ styles.triggers__item }>
<div key={ trigger.slug } className={ styles.triggers__item }>
{ trigger.title }
<IconTooltip
title={ trigger.title }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const WorkflowTable: React.FC< WorkflowTableProps > = props => {
const getSortableWorkflowTableHeader = ( column: SortableWorkflowTableColumn ) => {
return (
<WorkflowTableHeader
key={ column }
column={ column }
onClick={ getSortableHeaderOnClick( column ) }
selectedForSort={ sortedColumn === column }
Expand All @@ -49,14 +50,22 @@ export const WorkflowTable: React.FC< WorkflowTableProps > = props => {
return (
<div className={ styles.container }>
<table className={ styles.table }>
<tr className={ styles[ 'header-row' ] }>
<WorkflowTableHeader column={ 'checkbox' } />
{ sortableColumns.map( column => getSortableWorkflowTableHeader( column ) ) }
<WorkflowTableHeader column={ 'edit' } />
</tr>
{ sortedWorkflows.map( workflow => (
<WorkflowRow workflow={ workflow } refetchWorkflows={ refetchWorkflows } />
) ) }
<thead>
<tr className={ styles[ 'header-row' ] }>
<WorkflowTableHeader column={ 'checkbox' } />
{ sortableColumns.map( column => getSortableWorkflowTableHeader( column ) ) }
<WorkflowTableHeader column={ 'edit' } />
</tr>
</thead>
<tbody>
{ sortedWorkflows.map( workflow => (
<WorkflowRow
key={ workflow.id }
workflow={ workflow }
refetchWorkflows={ refetchWorkflows }
/>
) ) }
</tbody>
</table>
</div>
);
Expand Down
34 changes: 26 additions & 8 deletions projects/plugins/crm/src/js/data/query-functions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import axios from 'axios';
import { Workflow, ServerPreparedWorkflow } from 'crm/state/automations-admin/types';
import { getServerPreparedWorkflow } from 'crm/state/automations-admin/util';

Expand All @@ -7,24 +6,43 @@ declare let jpcrmAutomationsInitialState: any;

const v4ApiRoot = `${ jpcrmAutomationsInitialState.apiRoot }jetpack-crm/v4`;

const api = axios.create( {
baseURL: v4ApiRoot,
headers: { 'X-WP-Nonce': jpcrmAutomationsInitialState.apiNonce },
} );
type fetchAutomationsAPIOptions = {
headers: HeadersInit;
method: string;
body?: string;
};

const callAutomationsAPI = async ( relative_url: string, payload?: object ) => {
const options: fetchAutomationsAPIOptions = {
headers: {
'X-WP-Nonce': jpcrmAutomationsInitialState.apiNonce,
'Content-Type': 'application/json',
},
method: 'GET',
};
if ( payload ) {
options.method = 'POST';
options.body = JSON.stringify( payload );
}
const response = await fetch( v4ApiRoot + relative_url, options );
return await response.json();
};
tbradsha marked this conversation as resolved.
Show resolved Hide resolved

// /wp-json/jetpack-crm/v4/automation/workflows
export const getAutomationWorkflows =
( hydrate: ( workflows: Workflow[] ) => void ) => async () => {
const result = await api.get< Workflow[] >( '/automation/workflows' );
result.data && hydrate( result.data );
const result: Workflow[] = await callAutomationsAPI( '/automation/workflows' );
result && hydrate( result );
return result;
};

// /wp-json/jetpack-crm/v4/automation/workflows/:id
export const postAutomationWorkflow = async ( workflow: Workflow ) => {
const serverPreparedWorkflow = getServerPreparedWorkflow( workflow );
return await api.post< ServerPreparedWorkflow >(

const result: ServerPreparedWorkflow = await callAutomationsAPI(
`/automation/workflows/${ workflow.id }`,
serverPreparedWorkflow
);
return result;
};
Loading