aef22190d2
Make sure expression before && is always boolean in React rendering in marketing page.
2023-03-15 08:24:00 +08:00
0cf56774f5
Merge branch 'trunk' into feature/34909-marketing-create-campaign-modal
2023-03-13 12:51:24 +08:00
baf9408f69
Merge branch 'feature/34909-marketing-create-campaign-modal' into feature/34904-marketing-introduction-banner
...
Conflicts:
plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.test.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2023-03-13 01:02:12 +08:00
0a58ec19f8
Remove unneeded div in CreateNewCampaignModal.
2023-03-10 02:14:35 +08:00
e4da8cba09
Display info message when there are no campaign types.
2023-03-10 02:13:05 +08:00
6446053784
Load campaign types in overview and refetch after installeing a channel.
2023-03-09 23:46:54 +08:00
8b6aad4138
Refetch campaign types after installing a channel in CreateNewCampaignModal.
2023-03-09 22:51:12 +08:00
29d67a3a21
Refactor test data in CreateNewCampaignModal tests.
2023-03-09 22:31:51 +08:00
9f0326b398
Remove unneeded return in CreateNewCampaignModal.
...
This helps us save indentation and make the code few lines shorter.
2023-03-09 22:26:06 +08:00
e15305b7c3
Remove unneeded CardDivider in CreateNewCampaignModal.
...
The code is copied from the Channels component, but in CreateNewCampaignModal, we don't need to display the divider, so we can just remove the divider code.
2023-03-09 22:23:27 +08:00
c6dcee426b
Make it clear that title and classname cannot be overwritten by props.
2023-03-09 22:17:03 +08:00
f5bb8490ea
Rename open and setOpen to isModalOpen and setModalOpen in Campaigns.
2023-03-09 22:11:53 +08:00
e831e89997
Make the mocked modal clearer.
...
The previous text "Create a new campaign" can be a bit confusing with the other text "Create new campaign" in the test.
2023-03-09 22:09:24 +08:00
551db21e9b
Remove unneeded getByText in Campaigns test.
2023-03-09 22:05:17 +08:00
f19969dacb
Change NewCampaignTypes to CampaignTypes.
2023-03-09 21:52:11 +08:00
6d72c2bbe1
Fix failed test for Campaigns component.
2023-03-09 01:08:28 +08:00
66e46d8942
Run lint:css-fix.
2023-03-09 00:34:20 +08:00
97ed1d2a7d
Fix array length rendering literal 0 in CreateNewCampaignModal.
2023-03-08 02:57:02 +08:00
42ac7e4d28
Better logic for displaying buttons in IntroductionBanner.
2023-03-08 02:54:43 +08:00
8fe3781266
Use ref instead of location hash to scroll to add channels section.
2023-03-08 02:06:06 +08:00
0cb2fb1cd0
Display CreateNewCampaignModal upon button click in IntroductionBanner.
2023-03-08 00:37:55 +08:00
a9b696d28c
Move CreateNewCampaignModal to shared components folder.
2023-03-08 00:34:09 +08:00
ed6c19b827
Fix 0 rendered on short-circuit evaluation.
2023-03-07 15:06:25 +02:00
7c9eedbbb4
Merge branch 'feature/34909-marketing-create-campaign-modal' into feature/34904-marketing-introduction-banner
...
Conflicts:
plugins/woocommerce-admin/client/marketing/hooks/index.ts
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/RecommendedChannels.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2023-03-07 00:46:38 +08:00
3e620c41c6
Add tests for CreateNewCampaignModal.
2023-03-04 01:02:46 +08:00
15c57bf712
Fix and add tests for Campaigns card.
2023-03-03 03:25:00 +08:00
913f7176b2
Refetch registered channels after installing channel in Campaigns card.
2023-03-03 02:34:16 +08:00
ec15697d44
Load campaign types in Campaigns card.
2023-03-03 01:08:21 +08:00
e13112875b
Move useNewCampaignTypes to shared hooks directory.
2023-03-03 01:05:14 +08:00
2443bfd7a0
Merge branch 'feature/34905-marketing-campaigns-card' into feature/34909-marketing-create-campaign-modal
...
Conflicts:
plugins/woocommerce-admin/client/marketing/data-multichannel/action-types.ts
plugins/woocommerce-admin/client/marketing/data-multichannel/actions.ts
plugins/woocommerce-admin/client/marketing/data-multichannel/resolvers.ts
2023-03-03 00:11:35 +08:00
4b87f0a4ed
Add JSDOC.
2023-03-02 03:15:38 +08:00
8e9f344478
Test code refactor with createTestCampaign.
2023-03-02 00:59:22 +08:00
d111370d1e
Make UI work with wp.data new campaign types.
2023-02-28 00:51:34 +08:00
418e4fba02
Fix build error after merging.
2023-02-27 23:49:50 +08:00
f420a0ed9e
Merge branch 'feature/34905-marketing-campaigns-card' into feature/34909-marketing-create-campaign-modal
...
Conflicts:
plugins/woocommerce-admin/client/marketing/components/RecommendedChannelsList.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.scss
plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/Channels.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/RecommendedChannels.tsx
2023-02-27 23:46:30 +08:00
e57181b987
Add tests for Campaigns component.
2023-02-27 02:23:11 +08:00
f62b44ae2f
Set numberOfRows for TablePlaceholder in Campaigns card.
2023-02-24 23:48:04 +08:00
92762ca9b0
Better pagination with TablePlaceholder in Campaigns card.
2023-02-24 17:09:42 +08:00
cc5345db4e
Campaigns pagination UI logic.
2023-02-24 02:13:20 +08:00
048906ad80
Change Campaigns CSS to use @include font-size().
2023-02-02 19:06:17 +08:00
7b068bf908
Code refactor for Campaigns card CSS.
2023-02-02 17:52:22 +08:00
c17f336acc
Code refactor for Campaigns card.
2023-02-02 17:47:42 +08:00
0abe368962
Display error state in Campaigns card.
2023-02-02 17:17:29 +08:00
183fc48132
Show CardFooter and Pagination only when it is needed.
...
This means when total is more than perPage.
2023-02-01 20:29:32 +08:00
eda6f194b9
Use perPage constant instead of literal 5.
2023-02-01 20:27:07 +08:00
274ea3dd60
Use Link component in Campaigns.
...
This allows fast client-side navigation.
2023-02-01 20:23:14 +08:00
29154425cb
Check description before rendering FlexItem.
...
This is to eliminate the unneeded flex gap when there is no description.
2023-02-01 20:17:53 +08:00
c342cbb98d
Change to color variable in Campaigns CSS.
2023-02-01 20:09:17 +08:00
cd7b5f2c96
Fetch and display campaigns with wp.data.
2023-02-01 19:02:03 +08:00
630bd0ab17
Merge branch 'feature/34906-marketing-channels-card' into feature/34905-marketing-campaigns-card
2023-02-01 00:52:48 +08:00
177fc59dea
Simplify rendering code in MarketingOverviewMultichannel.
2023-02-01 00:29:38 +08:00
3384ad576d
Remove unused import.
2023-02-01 00:20:04 +08:00
d69f7f00b7
Fix ids typescript error in Campaigns.
2023-02-01 00:18:53 +08:00
76102143ff
Merge branch 'feature/34906-marketing-channels-card' into feature/34905-marketing-campaigns-card
...
Conflicts:
plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2023-01-31 23:50:03 +08:00
d59e7e5721
Edit and arrange imports in MarketingOverviewMultichannel.
2023-01-31 23:39:02 +08:00
e700232415
Simplify Channels component.
2023-01-29 01:28:14 +08:00
15200103cc
Simplify Channels CSS.
2023-01-28 01:16:31 +08:00
0eb318c1f5
Simplify and remove RecommendedChannels and RecommendedChannelsList components.
2023-01-28 01:12:36 +08:00
14511ae4d6
Code refactor with SyncStatus and IssueStatus components.
2023-01-28 00:14:50 +08:00
316aad8b2e
Simplify RegisteredChannelCardBody CSS.
2023-01-27 21:15:40 +08:00
1af1524b83
Rename CSS installed-channel to registered-channel.
2023-01-21 02:38:00 +08:00
ef669d8ca2
Rename InstalledChannel to RegisteredChannel.
2023-01-21 02:36:39 +08:00
3cc568b4ed
Remove duplicated RecommendedChannel type.
2023-01-21 02:20:06 +08:00
cd0402a10c
Refetch registered channels after install and activate recommended channels.
2023-01-20 01:02:41 +08:00
2d7c8db2e5
Map product_listings_status to syncStatus.
2023-01-19 01:32:38 +08:00
f616d688d8
Call marketing channels API with wp.data.
2023-01-18 02:04:42 +08:00
f92f4d3dee
Code refactor with useIsLocationHashAddChannels.
2022-12-28 01:09:37 +08:00
86cc1181bf
Focus on Add Channels section when users click on Add Channels button.
2022-12-28 00:56:59 +08:00
e1a82c5b94
Display and dismiss introduction banner with wp_options.
2022-12-27 22:01:46 +08:00
a2419dbf44
Display buttons in introduction banner with large illustration.
2022-12-27 21:06:26 +08:00
82db71c94f
Add close button to introduction banner card.
2022-12-27 20:47:14 +08:00
b6eec1e1bf
Add introduction banner card to marketing page.
2022-12-27 02:05:58 +08:00
c89b28157d
Merge branch 'feature/34903-multichannel-marketing-frontend/34905-campaigns-card' into feature/34903-multichannel-marketing-frontend/34909-create-campaign-modal
...
Conflicts:
plugins/woocommerce-admin/client/marketing/hooks/index.ts
plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/Channels.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/RecommendedChannels.tsx
plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/useChannels.ts
2022-12-24 02:07:15 +08:00
1d7b663186
Remove the unneeded "Create new campaign" button for now.
2022-12-24 01:45:59 +08:00
8e39098256
Show Campaigns card only when there is at least one registered channel.
2022-12-24 01:43:09 +08:00
ee6fa9508e
Merge branch 'feature/34903-multichannel-marketing-frontend/34906-channels-card' into feature/34903-multichannel-marketing-frontend/34905-campaigns-card
...
Conflicts:
plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2022-12-24 01:39:57 +08:00
52dd8845cc
Load registered and recommended channels in MarketingOverviewMultichannel.
...
The data will be used to conditionally display Campaigns card later.
2022-12-24 01:14:02 +08:00
e950417542
Move useRegisteredChannels and useRecommendedChannels into shared hooks directory.
2022-12-24 00:48:03 +08:00
7bd32ba638
Remove useChannels and use useRegisteredChannels and useRecommendedChannels directly.
2022-12-24 00:32:23 +08:00
9e0b71ff1c
Rename CollapsibleRecommendedChannels to RecommendedChannels.
2022-12-23 22:12:16 +08:00
af2f4eb904
CSS for "Add channels" button.
2022-12-23 22:08:50 +08:00
31b635b888
Code refactor: move CSS code to corresponding SCSS file.
2022-12-23 21:53:42 +08:00
06a303fc33
Types for useRegisteredChannels.
2022-12-23 21:21:52 +08:00
4fa4f802e9
Check for empty recommended channels.
2022-12-23 21:19:00 +08:00
d0de1b5c21
Add border and change padding for recommended channels in create campaign modal.
2022-12-23 02:00:45 +08:00
07894d42e3
Code refactor for Campaigns component, remove unneeded CampaignsCardHeader.
2022-12-22 01:52:24 +08:00
a3c8680789
Use perPage variable instead of duplicated number.
2022-12-22 01:34:46 +08:00
321145eb2e
Better code clarity with woocommerce-marketing-campaigns-table class name.
2022-12-21 23:12:10 +08:00
894b77dc96
Code refactor with CreateNewCampaignModal.
2022-12-21 22:56:22 +08:00
5caffb6c63
Make create campaign button open in new tab depending on createUrl origin.
2022-12-21 21:26:57 +08:00
6b3fbdf16b
Display new campaign types in create campaign modal.
2022-12-21 02:38:56 +08:00
24d59f7316
Hide the recommended channels section if it is empty.
2022-12-20 22:39:00 +08:00
17f2072d9f
Display recommended channels in create campaign modal.
2022-12-20 02:37:02 +08:00
5f50e63a1e
Move useRecommendedChannels to shared hooks directory.
2022-12-20 02:35:37 +08:00
6de95c78a1
Move RecommendedChannelsList to shared components directory.
2022-12-20 02:33:35 +08:00
33998743d6
Remove unneeded imports in RecommendedChannelsList.
2022-12-20 02:29:42 +08:00
08661353eb
Add CampaignsCardHeader component with modal.
2022-12-20 01:17:30 +08:00
558ddf2609
Use Campaign type in useCampaigns.
2022-12-19 20:54:01 +08:00
cbc616a9f3
Set cost column as numeric in Campaigns card.
...
This makes the column right-aligned.
2022-12-18 20:38:07 +08:00
32cf8d1341
Add pagination to Campaigns card.
2022-12-18 20:37:25 +08:00
Gan Eng Chin
Rodrigue Tusse