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.

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

Jetpack Social | Fix scheduled post double count #34323

Conversation

manzoorwanijk
Copy link
Member

Part of #34182. Right now, when editing an already scheduled post, the scheduled post is double counted.

Proposed changes:

  • Subtract the currently scheduled post from the initial scheduled post count
  • Change "Active connections" label to "Enabled connections" to remove confusion

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • For a site with a few social connections added, create a post
  • Schedule the post with some connections enabled
  • Create another post with some connections enabled
  • Now edit the previously scheduled post
  • Confirm that the enabled connections for the current post are subtracted from the scheduled count
  • Confirm that the label now says "Enabled connections" instead of "Active connections"
Screenshot 2023-11-28 at 5 08 53 PM

Copy link
Contributor

github-actions bot commented Nov 28, 2023

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/scheduled-post-double-count branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/scheduled-post-double-count
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented Nov 28, 2023

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Nov 28, 2023
@manzoorwanijk manzoorwanijk removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Nov 28, 2023
@github-actions github-actions bot added [Package] Publicize [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Nov 28, 2023
@manzoorwanijk manzoorwanijk removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Nov 28, 2023
Copy link
Contributor

@gmjuhasz gmjuhasz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works well for me!

@manzoorwanijk manzoorwanijk merged commit 7165623 into feature/jetpack-social-scheduled-posts-ui Nov 28, 2023
50 checks passed
@manzoorwanijk manzoorwanijk deleted the fix/scheduled-post-double-count branch November 28, 2023 12:10
@manzoorwanijk manzoorwanijk changed the title Jetpack Social| Fix scheduled post double count Jetpack Social | Fix scheduled post double count Nov 28, 2023
manzoorwanijk added a commit that referenced this pull request Nov 28, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Nov 30, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 7, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 7, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 11, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 12, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 13, 2023
* Enhance RecordBarMeter component with `className`

* Add changelog

* Jetpack Social | Warn the user that their scheduled posts won't get shared if they will get over limits. (#34183)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Extract messages to utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Use boolean instead of number

* Add unit tests for sharing data store (#34206)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Add types/jest

* Add tests for sharesData selectors

* Add tests for useShareLimits hook

* rename to *.test.js

* extract utility

* Create add-tests-for-sharing-data

* Update shares-data.test.js

* Extract messages to utility function

* Use the messages from utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Enhance RecordBarMeter component with `className`

* Add changelog

* Enhance RecordBarMeter component with `className`

* Add changelog

* Jetpack Social | Warn the user that their scheduled posts won't get shared if they will get over limits. (#34183)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Extract messages to utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Update tests

* Fix up versions

* Jetpack Social| Fix scheduled post double count (#34323)

* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!

* Update share limits bar design (#34392)

* Make share data selectors independent of the connections

* Enhance RecordMeterBar component

* Enhance ShareLimitsBar component

* Pass connections data to useShareLimits

* Update editor form components

* Update social admin page header

* Add support for providing text variant

* Add enabledConnections to used/scheduled number

* Fix enabledConnections being NaN

* Update the notice and meter to match the new designs/logic.

* Update the admin page header component

* Fix tests

* Revert changes to RecordBarMeter

* Revert an unnecessary change to RecordMeterBar

* Add changelog

* Create update-share-limits-bar-design

* Fix "msgid argument is not a string literal" build error 100th time in Jetpack

* Fix "Optimization seems to have broken the following translation strings"  - "left"

* Revert "Fix "Optimization seems to have broken the following translation strings"  - "left""

This reverts commit d1d7cda.

* Use "remaining" instead of "left" for the sake of passing the build

* Fix "Optimization seems to have broken the following translation strings - "left"" build error

* Simplify share limits bar logic

* Clean up unused logic

* Restore outOfConnections logic

* Fix unit tests

* Clean up types.ts

* Update notice CTA design

* Use "or" instead of "and"

* Fix the bar title and caption

* Fix "Optimization seems to have broken the following translation strings"

* Fix typo

* Make it a minor change instead of a patch

* Add enabled connections text

* Remove padding for the bar on Social admin page

* Fix up versions

* When under the limits, show an inline upgrade nudge instead of notice

* Revert "When under the limits, show an inline upgrade nudge instead of notice"

This reverts commit b0b1909.

* Fix the order of the title and notice

* Clean things up a bit

---------

Co-authored-by: Gergely Juhasz <[email protected]>
Co-authored-by: Paul Bunkham <[email protected]>

* Fix up versions and lockfile

* Fix the bar width

* Fix TS build

* Restore dependencies messed up while resolving conflicts.

* Restore the record meter bar styles

* Make the bar go red after 90% usage

* Use "connection" instead of "network"

* Hide connections text when publicize is OFF

* Fix up versions

---------

Co-authored-by: Gergely Juhasz <[email protected]>
Co-authored-by: Paul Bunkham <[email protected]>
manzoorwanijk added a commit that referenced this pull request Dec 13, 2023
* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!
manzoorwanijk added a commit that referenced this pull request Dec 14, 2023
* Jetpack Social | Warn the user that their scheduled posts won't get shared if they will get over limits. (#34183)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Extract messages to utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Add unit tests for sharing data store (#34206)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Add types/jest

* Add tests for sharesData selectors

* Add tests for useShareLimits hook

* rename to *.test.js

* extract utility

* Create add-tests-for-sharing-data

* Update shares-data.test.js

* Extract messages to utility function

* Use the messages from utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Enhance RecordBarMeter component with `className`

* Add changelog

* Enhance RecordBarMeter component with `className`

* Add changelog

* Jetpack Social | Warn the user that their scheduled posts won't get shared if they will get over limits. (#34183)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Extract messages to utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Update tests

* Fix up versions

* Jetpack Social| Fix scheduled post double count (#34323)

* Update store selectors and resolvers to save initial connections

* Update useShareLimits hook to subtract scheduled post if editing one

* Update ShareCountInfo to subtract the scheduled post from count

* Add changelog

* Fix versions

* changelog!!!!

* Jetpack Social | Warn the user that their scheduled posts won't get shared if they will get over limits. (#34183)

* Enhance RecordBarMeter component with `className`

* Add changelog

* Add store types

* Update store selectors and actions

* Update consumer hook to use new selectors

* Create useShareLimits hook

* Move `ShareCounter` to publicize-components and name it `ShareLimitsBar`

* Create separate notice components

* Fix the post editor notices

* Update Jetpack Social admin page to use the new meter bar

* Remove unused code left after #34111

* Add changelog

* Fix share count

* Update index.js

* Include active connections count for notices

* Fix i18n build error

* Enhance RecordBarMeter component with `className`

* Add changelog

* Extract constants and improve types

* Extract messages to utility function

* Enhance RecordBarMeter component with `className`

* Add changelog

* Fix up versions

* Revert "Remove unused code left after #34111"

This reverts commit ca45999.

* Use @wordpress/element instead of react

* Fix messaging

* Let TS infer type

* Combine the share limits logic into a single useSelect call

* Fix the limits shown even after a paid plan

* Delete unused PublicizePanel component

* Create smaller components out of PublicizeForm

* Use the newly created smaller components in `PublicizeForm`

* Update types.ts

* Fix jsdocs

* Fix up versions

* changelog

* Clean up PublicizeForm consumer component

* Restore changes messed up in rebase

* Restore description

* Fix types

* Fix types for test written in TS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants