From 3e9d9b0d4e1036e5f37e5a0ae307266c2957a505 Mon Sep 17 00:00:00 2001 From: Jan Jakes Date: Tue, 28 Jun 2022 14:46:41 +0200 Subject: [PATCH] Fix file organization and naming [MAILPOET-4404] --- mailpoet/assets/js/src/automation/automation.tsx | 6 +++--- .../js/src/automation/{list => listing}/cells/Edit.tsx | 0 .../js/src/automation/{list => listing}/cells/More.tsx | 0 .../js/src/automation/{list => listing}/cells/Name.tsx | 0 .../js/src/automation/{list => listing}/cells/Status.tsx | 0 .../automation/{list => listing}/cells/Subscribers.tsx | 0 mailpoet/assets/js/src/automation/listing/cells/index.tsx | 5 +++++ .../src/automation/{list/row.tsx => listing/get-row.tsx} | 8 ++------ .../{list/automation-listing.tsx => listing/index.tsx} | 5 +++-- .../automation/{list/workflow.tsx => listing/workflow.ts} | 0 .../automation/onboarding/{onboarding.tsx => index.tsx} | 0 11 files changed, 13 insertions(+), 11 deletions(-) rename mailpoet/assets/js/src/automation/{list => listing}/cells/Edit.tsx (100%) rename mailpoet/assets/js/src/automation/{list => listing}/cells/More.tsx (100%) rename mailpoet/assets/js/src/automation/{list => listing}/cells/Name.tsx (100%) rename mailpoet/assets/js/src/automation/{list => listing}/cells/Status.tsx (100%) rename mailpoet/assets/js/src/automation/{list => listing}/cells/Subscribers.tsx (100%) create mode 100644 mailpoet/assets/js/src/automation/listing/cells/index.tsx rename mailpoet/assets/js/src/automation/{list/row.tsx => listing/get-row.tsx} (64%) rename mailpoet/assets/js/src/automation/{list/automation-listing.tsx => listing/index.tsx} (94%) rename mailpoet/assets/js/src/automation/{list/workflow.tsx => listing/workflow.ts} (100%) rename mailpoet/assets/js/src/automation/onboarding/{onboarding.tsx => index.tsx} (100%) diff --git a/mailpoet/assets/js/src/automation/automation.tsx b/mailpoet/assets/js/src/automation/automation.tsx index 566d84709f..f923e18fe2 100644 --- a/mailpoet/assets/js/src/automation/automation.tsx +++ b/mailpoet/assets/js/src/automation/automation.tsx @@ -1,7 +1,7 @@ import ReactDOM from 'react-dom'; -import { Workflow } from './list/workflow'; -import { AutomationListing } from './list/automation-listing'; -import { Onboarding } from './onboarding/onboarding'; +import { Workflow } from './listing/workflow'; +import { AutomationListing } from './listing'; +import { Onboarding } from './onboarding'; import { Loading } from '../common'; import { CreateTestingWorkflowButton, diff --git a/mailpoet/assets/js/src/automation/list/cells/Edit.tsx b/mailpoet/assets/js/src/automation/listing/cells/Edit.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/list/cells/Edit.tsx rename to mailpoet/assets/js/src/automation/listing/cells/Edit.tsx diff --git a/mailpoet/assets/js/src/automation/list/cells/More.tsx b/mailpoet/assets/js/src/automation/listing/cells/More.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/list/cells/More.tsx rename to mailpoet/assets/js/src/automation/listing/cells/More.tsx diff --git a/mailpoet/assets/js/src/automation/list/cells/Name.tsx b/mailpoet/assets/js/src/automation/listing/cells/Name.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/list/cells/Name.tsx rename to mailpoet/assets/js/src/automation/listing/cells/Name.tsx diff --git a/mailpoet/assets/js/src/automation/list/cells/Status.tsx b/mailpoet/assets/js/src/automation/listing/cells/Status.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/list/cells/Status.tsx rename to mailpoet/assets/js/src/automation/listing/cells/Status.tsx diff --git a/mailpoet/assets/js/src/automation/list/cells/Subscribers.tsx b/mailpoet/assets/js/src/automation/listing/cells/Subscribers.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/list/cells/Subscribers.tsx rename to mailpoet/assets/js/src/automation/listing/cells/Subscribers.tsx diff --git a/mailpoet/assets/js/src/automation/listing/cells/index.tsx b/mailpoet/assets/js/src/automation/listing/cells/index.tsx new file mode 100644 index 0000000000..db2c704078 --- /dev/null +++ b/mailpoet/assets/js/src/automation/listing/cells/index.tsx @@ -0,0 +1,5 @@ +export * from './Edit'; +export * from './More'; +export * from './Name'; +export * from './Status'; +export * from './Subscribers'; diff --git a/mailpoet/assets/js/src/automation/list/row.tsx b/mailpoet/assets/js/src/automation/listing/get-row.tsx similarity index 64% rename from mailpoet/assets/js/src/automation/list/row.tsx rename to mailpoet/assets/js/src/automation/listing/get-row.tsx index 4101c0b727..fa5bc767a4 100644 --- a/mailpoet/assets/js/src/automation/list/row.tsx +++ b/mailpoet/assets/js/src/automation/listing/get-row.tsx @@ -1,11 +1,7 @@ import { Workflow } from './workflow'; -import { Subscribers } from './cells/Subscribers'; -import { Status } from './cells/Status'; -import { Name } from './cells/Name'; -import { Edit } from './cells/Edit'; -import { More } from './cells/More'; +import { Edit, More, Name, Status, Subscribers } from './cells'; -export function Row(workflow: Workflow): object[] { +export function getRow(workflow: Workflow): object[] { return [ { value: workflow.name, diff --git a/mailpoet/assets/js/src/automation/list/automation-listing.tsx b/mailpoet/assets/js/src/automation/listing/index.tsx similarity index 94% rename from mailpoet/assets/js/src/automation/list/automation-listing.tsx rename to mailpoet/assets/js/src/automation/listing/index.tsx index 5217f4d9be..8fd77ea3b9 100644 --- a/mailpoet/assets/js/src/automation/list/automation-listing.tsx +++ b/mailpoet/assets/js/src/automation/listing/index.tsx @@ -1,17 +1,18 @@ import { Search, TableCard } from '@woocommerce/components'; import { __ } from '@wordpress/i18n'; -import { Row } from './row'; +import { getRow } from './get-row'; import { Workflow } from './workflow'; interface AutomationListingProps { workflows: Workflow[]; loading: boolean; } + export function AutomationListing({ workflows, loading, }: AutomationListingProps): JSX.Element { - const rows = workflows.map((workflow) => Row(workflow)); + const rows = workflows.map((workflow) => getRow(workflow)); const headers = [ { key: 'name', label: __('Name', 'mailpoet') }, diff --git a/mailpoet/assets/js/src/automation/list/workflow.tsx b/mailpoet/assets/js/src/automation/listing/workflow.ts similarity index 100% rename from mailpoet/assets/js/src/automation/list/workflow.tsx rename to mailpoet/assets/js/src/automation/listing/workflow.ts diff --git a/mailpoet/assets/js/src/automation/onboarding/onboarding.tsx b/mailpoet/assets/js/src/automation/onboarding/index.tsx similarity index 100% rename from mailpoet/assets/js/src/automation/onboarding/onboarding.tsx rename to mailpoet/assets/js/src/automation/onboarding/index.tsx