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.

Sign up for GitHub

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

Jump to bottom

Add Campaigns card in Multichannel Marketing page #36735

Merged
merged 45 commits into from Mar 3, 2023
Merged

Add Campaigns card in Multichannel Marketing page #36735

merged 45 commits into from Mar 3, 2023

Commits on Dec 15, 2022

  1. Add empty state Campaigns card.

    @ecgan
    ecgan committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    30d3168 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2022

  1. Add loading state for Campaigns card.

    @ecgan
    ecgan committed Dec 17, 2022
    Configuration menu
    Copy the full SHA
    af4f79a View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2022

  1. Display campaign data in table in Campaigns card.

    @ecgan
    ecgan committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    f5799c8 View commit details
    Browse the repository at this point in the history

  2. CSS for campaign rows in Campaigns card.

    @ecgan
    ecgan committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    c444dbd View commit details
    Browse the repository at this point in the history

  3. Add pagination to Campaigns card.

    @ecgan
    ecgan committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    32cf8d1 View commit details
    Browse the repository at this point in the history

  4. Set cost column as numeric in Campaigns card. 

    This makes the column right-aligned.
    @ecgan
    ecgan committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    cbc616a View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Add Campaign type.

    @ecgan
    ecgan committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    c67e479 View commit details
    Browse the repository at this point in the history

  2. Use Campaign type in useCampaigns.

    @ecgan
    ecgan committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    558ddf2 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Merge branch 'feature/34903-multichannel-marketing-frontend/34906-cha… 

    …nnels-card' into feature/34903-multichannel-marketing-frontend/34905-campaigns-card

Conflicts:
	plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
    @ecgan
    ecgan committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    ee6fa95 View commit details
    Browse the repository at this point in the history

  2. Show Campaigns card only when there is at least one registered channel.

    @ecgan
    ecgan committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    8e39098 View commit details
    Browse the repository at this point in the history

  3. Remove the unneeded "Create new campaign" button for now.

    @ecgan
    ecgan committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    1d7b663 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'feature/34906-marketing-channels-card' into feature/349… 

    …05-marketing-campaigns-card

Conflicts:
	plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
    @ecgan
    ecgan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7610214 View commit details
    Browse the repository at this point in the history

  2. Fix ids typescript error in Campaigns.

    @ecgan
    ecgan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    d69f7f0 View commit details
    Browse the repository at this point in the history

  3. Remove unused import.

    @ecgan
    ecgan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3384ad5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/34906-marketing-channels-card' into feature/349… 

    …05-marketing-campaigns-card
    @ecgan
    ecgan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    630bd0a View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Fetch and display campaigns with wp.data.

    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    cd7b5f2 View commit details
    Browse the repository at this point in the history

  2. Change to color variable in Campaigns CSS.

    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    c342cbb View commit details
    Browse the repository at this point in the history

  3. Check description before rendering FlexItem. 

    This is to eliminate the unneeded flex gap when there is no description.
    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    2915442 View commit details
    Browse the repository at this point in the history

  4. Use Link component in Campaigns. 

    This allows fast client-side navigation.
    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    274ea3d View commit details
    Browse the repository at this point in the history

  5. Use perPage constant instead of literal 5.

    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    eda6f19 View commit details
    Browse the repository at this point in the history

  6. Show CardFooter and Pagination only when it is needed. 

    This means when total is more than perPage.
    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    183fc48 View commit details
    Browse the repository at this point in the history

  7. Set per_page to 100 for getCampaigns. 

    100 is the maximum limit allowed by the API.

We do this because the API does not return total number of rows, so we use 100 to get "all" rows, to support pagination in the UI.
    @ecgan
    ecgan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    743c0e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Display error state in Campaigns card.

    @ecgan
    ecgan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    0abe368 View commit details
    Browse the repository at this point in the history

  2. Code refactor for Campaigns card.

    @ecgan
    ecgan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c17f336 View commit details
    Browse the repository at this point in the history

  3. Code refactor for Campaigns card CSS.

    @ecgan
    ecgan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7b068bf View commit details
    Browse the repository at this point in the history

  4. Change Campaigns CSS to use @include font-size().

    @ecgan
    ecgan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    048906a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/34906-marketing-channels-card' into feature/349… 

    …05-marketing-campaigns-card
    @ecgan
    ecgan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c9214ab View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Add controls with fetchWithHeaders.

    @ecgan
    ecgan committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    20ae504 View commit details
    Browse the repository at this point in the history

  2. wp.data for campaigns data pagination.

    @ecgan
    ecgan committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    60d815c View commit details
    Browse the repository at this point in the history

  3. Campaigns pagination UI logic.

    @ecgan
    ecgan committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    cc5345d View commit details
    Browse the repository at this point in the history

  4. Add changelog.

    @ecgan
    ecgan committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    61aa3cd View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Better pagination with TablePlaceholder in Campaigns card.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    92762ca View commit details
    Browse the repository at this point in the history

  2. Error handling in getCampaigns.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    a982b7b View commit details
    Browse the repository at this point in the history

  3. Remove unused fetchWithHeaders control.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    f5ba6d9 View commit details
    Browse the repository at this point in the history

  4. Change meta.total to optional in receiveCampaignsSuccess.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    a4e1192 View commit details
    Browse the repository at this point in the history

  5. Code refactor with getTotalFromResponse in getCampaigns.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    f7a1ef2 View commit details
    Browse the repository at this point in the history

  6. Set numberOfRows for TablePlaceholder in Campaigns card.

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    f62b44a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'trunk' into feature/34905-marketing-campaigns-card

    @ecgan
    ecgan committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    3513ef5 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Add tests for Campaigns component.

    @ecgan
    ecgan committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    e57181b View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Test code refactor with createTestCampaign.

    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    8e9f344 View commit details
    Browse the repository at this point in the history

  2. Fix getTotalFromResponse treating total 0 as undefined. 

    If total is 0, then the function should return 0, not undefined.
    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    b838885 View commit details
    Browse the repository at this point in the history

  3. Add JSDOC for getTotalFromResponse.

    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    5af90c5 View commit details
    Browse the repository at this point in the history

  4. Simplify receive campaigns success and error.

    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    9feaf55 View commit details
    Browse the repository at this point in the history

  5. Add JSDOC.

    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    4b87f0a View commit details
    Browse the repository at this point in the history

  6. Remove unused error property in CampaignsState.

    @ecgan
    ecgan committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    c0364ad View commit details
    Browse the repository at this point in the history