Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Move api setup to automation root, fix initialization side-effect

Browse Source 
[MAILPOET-4420]
This commit is contained in:
Jan Jakes
2022-07-07 11:17:28 +02:00
committed by Veljko V
parent 1801f522f6
commit db6f0d14b1
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/assets/js/src/automation/api.tsx → mailpoet/assets/js/src/automation/api/hooks.ts
View File

@ -1,5 +1,5 @@
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
import { api } from './config'; import { api } from '../config';
const API_URL = `${api.root}/mailpoet/v1/automation`; const API_URL = `${api.root}/mailpoet/v1/automation`;

4
mailpoet/assets/js/src/automation/editor/store/api.ts → mailpoet/assets/js/src/automation/api/index.ts
View File

@ -1,5 +1,7 @@
import apiFetch from '@wordpress/api-fetch'; import apiFetch from '@wordpress/api-fetch';
import { api } from '../../config'; import { api } from '../config';
export * from './hooks';
const apiUrl = `${api.root}/mailpoet/v1/automation/`; const apiUrl = `${api.root}/mailpoet/v1/automation/`;

2
mailpoet/assets/js/src/automation/editor/index.tsx
View File

@ -15,6 +15,7 @@ import { KeyboardShortcuts } from './components/keyboard-shortcuts';
import { Sidebar } from './components/sidebar'; import { Sidebar } from './components/sidebar';
import { Workflow } from './components/workflow'; import { Workflow } from './components/workflow';
import { store, storeName } from './store'; import { store, storeName } from './store';
import { initializeApi } from '../api';
// See: // See:
// https://github.com/WordPress/gutenberg/blob/9601a33e30ba41bac98579c8d822af63dd961488/packages/edit-post/src/components/layout/index.js // https://github.com/WordPress/gutenberg/blob/9601a33e30ba41bac98579c8d822af63dd961488/packages/edit-post/src/components/layout/index.js
@ -75,6 +76,7 @@ function Editor(): JSX.Element {
window.addEventListener('DOMContentLoaded', () => { window.addEventListener('DOMContentLoaded', () => {
const root = document.getElementById('mailpoet_automation_editor'); const root = document.getElementById('mailpoet_automation_editor');
if (root) { if (root) {
initializeApi();
ReactDOM.render(<Editor />, root); ReactDOM.render(<Editor />, root);
} }
}); });

3
mailpoet/assets/js/src/automation/editor/store/index.ts
View File

@ -1,7 +1,6 @@
import { createReduxStore, register, StoreDescriptor } from '@wordpress/data'; import { createReduxStore, register, StoreDescriptor } from '@wordpress/data';
import { controls } from '@wordpress/data-controls'; import { controls } from '@wordpress/data-controls';
import * as actions from './actions'; import * as actions from './actions';
import { initializeApi } from './api';
import { storeName } from './constants'; import { storeName } from './constants';
import { initialState } from './initial_state'; import { initialState } from './initial_state';
import { reducer } from './reducer'; import { reducer } from './reducer';
@ -15,8 +14,6 @@ type StoreType = Omit<StoreDescriptor, 'name'> & {
name: typeof storeName; name: typeof storeName;
}; };
initializeApi();
export const store = createReduxStore<State>(storeName, { export const store = createReduxStore<State>(storeName, {
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- the "Action" type is missing thunks with "dispatch" // eslint-disable-next-line @typescript-eslint/no-explicit-any -- the "Action" type is missing thunks with "dispatch"
actions: actions as any, actions: actions as any,