feature / bookings ctb added in pages and posts #1183

manikantakailasa · 2024-07-15T03:58:37Z

When they view Pages and Posts (launchpad) in wp-admin
Then we will have CTB for bookings instead of removing the card altogether if they dont have bookings installed.

pages and posts.mov.zip

story: https://jira.newfold.com/browse/PRESS0-1323

wpalani · 2024-07-17T21:34:59Z

@manikantakailasa Thanks for your PR.

Since your PR includes UI changes, can you include a screenshot/video of the change?
Fix failing tests. I believe there's an issue with the SVG asset.
Can you add a cypress test? I think we asked for that in your last PR that was closed: Press0 1323 | bookings ctb added in pages and posts #1119
Fix lint issues.

If the items above are resolved by tomorrow, we can include your PR in the July 24 release.

manikantakailasa · 2024-07-18T09:11:09Z

@manikantakailasa Thanks for your PR.

Since your PR includes UI changes, can you include a screenshot/video of the change?

Fix failing tests. I believe there's an issue with the SVG asset.

Can you add a cypress test? I think we asked for that in your last PR that was closed: Press0 1323 | bookings ctb added in pages and posts #1119

Fix lint issues.

If the items above are resolved by tomorrow, we can include your PR in the July 24 release.

@wpalani
made changes as per suggestions and attached video in notes.

wpalani · 2024-07-19T18:09:37Z

src/app/pages/pages-and-posts/TransformStore.js

@@ -0,0 +1,35 @@
+import { Button, Card, Title } from '@newfold/ui-component-library';
+import { ReactComponent as TransformLogo } from '../../../../assets/svg/transformStore.svg';


Please use the Assets path alias to simplify the import path.

tried it but tests are failing as it is not able to find the path.

I inspected the Vector and it looks like the Vector was converted (By the designer) from an image, which increased the size of the asset from 2kb to 45kb with no added value in our use case.

I think it's best we convert this back from svg to png. We also need to properly name the asset to tie back the component name.

I created a branch from your PR and made some changes to simplify the import and component naming. Check this commit: b914f43

wpalani

I initially approved this PR. But took a second look at the Jira story and it this PR doesn't seem to properly address it.

wpalani · 2024-07-27T01:46:13Z

src/app/pages/pages-and-posts/TransformStore.js

+import { Button, Card, Title } from '@newfold/ui-component-library';
+import { ReactComponent as TransformLogo } from '../../../../assets/svg/transformStore.svg';
+
+const TransformStore = () => {


Change component name to EcommAddonCTB

wpalani · 2024-07-27T01:57:02Z

src/app/pages/pages-and-posts/TransformStore.js

@@ -0,0 +1,35 @@
+import { Button, Card, Title } from '@newfold/ui-component-library';
+import { ReactComponent as TransformLogo } from '../../../../assets/svg/transformStore.svg';


I inspected the Vector and it looks like the Vector was converted (By the designer) from an image, which increased the size of the asset from 2kb to 45kb with no added value in our use case.

I think it's best we convert this back from svg to png. We also need to properly name the asset to tie back the component name.

I created a branch from your PR and made some changes to simplify the import and component naming. Check this commit: b914f43

wpalani · 2024-07-27T02:15:28Z

src/app/pages/pages-and-posts/index.js

 					{ window.NewfoldRuntime.isYithBookingActive &&
-						window.NewfoldRuntime.isWoocommerceActive && (
-							<BookingAndAppointments />
-						) }
+					window.NewfoldRuntime.isWoocommerceActive ? (
+						<BookingAndAppointments />
+					) : (
+						<TransformStore />
+					) }


The Jira story requirement states:

Given customers do not have an ecommerce entitlement
When they view Pages and Posts (launchpad) in wp-admin
Then we will have CTB for ecom addon in the place of bookings card instead of removing the card altogether.

Meaning: this card (eComm addon CTB) is intended to be shown to users who do not have the e-commerce addon in their plan (ecommerce entitlement). In this condition, we are not considering whether they have the addon or not.

The condition should be:

IF: WooCommerce is active AND: The user doesn't have the e-commerce addon THEN: Show the `EcommAddonCTB` component ELSE IF... IF: WooCommerce is active AND: Yith Booking is active THEN: Show `BookingAndAppointments` component ELSE: Show nothing END

You can check for the e-commerce entitlement using the Newfold runtime:

import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; NewfoldRuntime.hasCapability( 'isEcommerce' ) // Bool

Or you can:

window.NewfoldRuntime.capabilities.isEcommerce // Bool | Undefined

Be careful with the second one because it can return undefined, especially in local environments or sites with connection issue.

updated fix , but ecommerce entitlement we check with hasYithExtended.

What's the reason for not using isEcommerce?

isEcommerce refers to whether or not WooCommerce plugin is active, has nothing to do with the commerce addon.

wpalani · 2024-07-27T02:17:12Z

tests/cypress/integration/pages-and-posts.cy.js

@@ -1,68 +1,68 @@
-describe( 'Pages & Posts', function () {
+describe('Pages & Posts', function () {


Please update the tests in this file to reflect the story requirements accurately.

Please revert the spaces of the lint.

pages and post transform store

ea7ffbb

wpalani added this to the July 24 Release milestone Jul 15, 2024

diwanshuster requested a review from bhwpteam July 16, 2024 06:45

wpalani self-requested a review July 17, 2024 21:06

manikantakailasa added 2 commits July 18, 2024 11:54

lint fix , tests

cd1ddde

svg path

9186cfa

wpalani modified the milestones: July 24 Release, July 31 Release Jul 18, 2024

wpalani approved these changes Jul 19, 2024

View reviewed changes

wpscholar modified the milestones: July 31 Release, August 7 Release Jul 24, 2024

wpalani changed the base branch from develop to update/PRESS0-1323 July 24, 2024 21:35

wpalani added 3 commits July 24, 2024 15:02

Fix conflict

b026e5d

Merge branch 'develop' into update/PRESS0-1323

5038679

Bump core version

26bd9ce

wpalani self-requested a review July 26, 2024 22:53

Fix code

b914f43

wpalani requested changes Jul 27, 2024

View reviewed changes

manikantakailasa and others added 2 commits July 29, 2024 17:15

fix:ecommerce entitlement

3afc3fa

Merge branch 'update/PRESS0-1323' into PRESS0-1323

eba7a8c

manikantakailasa requested a review from wpalani July 29, 2024 11:50

deleting duplicate

1faef30

manikantakailasa changed the base branch from update/PRESS0-1323 to develop August 2, 2024 11:02

wpalani approved these changes Aug 7, 2024

View reviewed changes

wpalani modified the milestones: 3.14.1 - August 7 Release, August 14 Release Aug 7, 2024

wpalani merged commit 4923d40 into bluehost:develop Aug 7, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature / bookings ctb added in pages and posts #1183

feature / bookings ctb added in pages and posts #1183

manikantakailasa commented Jul 15, 2024 •

edited

Loading

wpalani commented Jul 17, 2024 •

edited

Loading

manikantakailasa commented Jul 18, 2024

wpalani Jul 19, 2024

manikantakailasa Jul 22, 2024

wpalani Jul 27, 2024

wpalani left a comment

wpalani Jul 27, 2024

manikantakailasa Aug 2, 2024

wpalani Jul 27, 2024

wpalani Jul 27, 2024

manikantakailasa Jul 29, 2024

wpalani Jul 31, 2024

chrisdavidmiles Aug 7, 2024

wpalani Jul 27, 2024

manikantakailasa Jul 29, 2024

		@@ -0,0 +1,35 @@
		import { Button, Card, Title } from '@newfold/ui-component-library';
		import { ReactComponent as TransformLogo } from '../../../../assets/svg/transformStore.svg';

		@@ -1,68 +1,68 @@
		describe( 'Pages & Posts', function () {
		describe('Pages & Posts', function () {

feature / bookings ctb added in pages and posts #1183

feature / bookings ctb added in pages and posts #1183

Conversation

manikantakailasa commented Jul 15, 2024 • edited Loading

wpalani commented Jul 17, 2024 • edited Loading

manikantakailasa commented Jul 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wpalani left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

manikantakailasa commented Jul 15, 2024 •

edited

Loading

wpalani commented Jul 17, 2024 •

edited

Loading