de2aa280ef
Simplify boolean expression before && in Marketing page.
2023-03-27 21:55:42 +08:00
59c94ce24a
Fix build errors after merging from trunk.
2023-03-22 18:35:06 +08:00
186f1fb850
Merge branch 'trunk' into feature/37127-marketing-reload-installed-extensions
2023-03-22 18:28:39 +08:00
3189f2b7f5
Reorganize code.
2023-03-22 16:44:44 +08:00
01492520d3
Fix JSDOC comment in UseRecommendedPluginsWithoutChannels.
2023-03-22 16:38:21 +08:00
5e6cd11028
Simplify naming in PluginsTabPanel.
2023-03-22 16:09:40 +08:00
b18e1705cd
Fix and simplify mocks in DiscoverTools tests.
2023-03-22 16:07:51 +08:00
e281c09bc6
Merge branch 'trunk' into feature/34907-marketing-exclude-channels
...
Conflicts:
plugins/woocommerce-admin/client/marketing/hooks/index.ts
2023-03-21 23:33:41 +08:00
648eab74eb
Change namings in useInstalledExtensions to useInstalledPluginsWithoutChannels.
2023-03-21 23:22:39 +08:00
fab90dc712
Fix incorrect data while loading in useRecommendedPlugins.
...
See the incorrect data issue in https://github.com/woocommerce/woocommerce/pull/37126#discussion_r1141936304 .
2023-03-21 22:28:05 +08:00
e4a8d17ed3
Rename file useRecommendedPlugins to useRecommendedPluginsWithoutChannels.
2023-03-21 21:13:19 +08:00
b129dd5173
Change namings and add docs in useRecommendedPlugins.
2023-03-21 21:12:00 +08:00
c6bcf9fa67
Fix incorrect data while loading in useRecommendedPlugins.
...
See the incorrect data issue in https://github.com/woocommerce/woocommerce/pull/37126#discussion_r1141936304 .
2023-03-21 19:30:24 +08:00
fe4e28d511
Rename UseInstalledPlugins to UseInstalledExtensions.
...
Also change related names from "plugin" to "extension".
2023-03-21 19:08:13 +08:00
a2b02fc00c
Rename illustration-large.svg to illustration.svg.
2023-03-20 18:11:02 +08:00
0300078dfd
Remove unused illustration.svg file.
2023-03-20 18:08:30 +08:00
4e38969ce7
Use one illustration instead of two in IntroductionBanner.
2023-03-20 18:07:30 +08:00
7dd7994e01
Make scrollIntoView center on the "Add channels" button.
2023-03-20 17:46:54 +08:00
29299903c3
Make shouldShowCampaigns boolean type.
2023-03-20 17:23:20 +08:00
5455abcabb
Use useImperativeHandle instead of exposing button ref in Channels.
2023-03-20 01:00:19 +08:00
75c11a681d
Simplify CSS to have less hardcoded width value.
2023-03-20 00:11:32 +08:00
38370cc544
Remove unneeded CSS.
2023-03-19 23:34:17 +08:00
ddd287cc4c
Show Campaigns card when banner is dismissed or campaigns total is truthy.
2023-03-19 23:30:21 +08:00
458c16bad9
Move useCampaigns to shared hooks directory.
2023-03-19 22:54:55 +08:00
c6a95ae9bf
Rename callback props in IntroductionBanner to make them clearer.
2023-03-19 21:10:22 +08:00
6b75b5db38
Rename variables to make them clearer.
2023-03-19 20:58:54 +08:00
155211d77a
Remove unneeded Icon component.
2023-03-19 20:56:00 +08:00
65523e36dd
Fix spacing for close button in IntroductionBanner.
2023-03-19 20:54:34 +08:00
7cc8e065f9
Merge branch 'trunk' into feature/34904-marketing-introduction-banner
2023-03-19 20:09:23 +08:00
e20b9d1ac9
Filter out marketing channels in useRecommendedPlugins.
2023-03-19 18:06:39 +08:00
555116f3df
Fix broken tests for CreateNewCampaignModal.
...
The tests had errors because useInstalledPlugins is added into the component and it is not mocked in the tests.
2023-03-19 17:59:35 +08:00
1aaa26e07d
Reload installed extensions data after installing recommended channels.
...
This is because the channel may not have registered itself as a marketing channel and it should show up in the Installed extensions card.
2023-03-18 00:47:54 +08:00
f769a8c6f5
Merge branch 'trunk' into feature/34904-marketing-introduction-banner
...
Conflicts:
plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
2023-03-17 01:21:13 +08:00
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
Gan Eng Chin