From 2420364f54f87e34534736da43d916a340ab1490 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Wed, 3 Jul 2024 23:19:36 +0530 Subject: [PATCH 01/25] Added my product page --- inc/Admin.php | 3 ++ src/app/data/routes.js | 10 ++++++ src/app/pages/products/index.js | 55 +++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 src/app/pages/products/index.js diff --git a/inc/Admin.php b/inc/Admin.php index 4a63d288c..e60eb9b0b 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -91,6 +91,9 @@ public static function subpages() { 'bluehost#/staging' => __( 'Staging', 'wp-plugin-bluehost' ), ) : array(); + $products = array( + 'bluehost#/products' => __( 'My Products', 'wp-plugin-bluehost' ), + ); $help = array( 'bluehost#/help' => __( 'Help', 'wp-plugin-bluehost' ), ); diff --git a/src/app/data/routes.js b/src/app/data/routes.js index aa04a7f89..2f656860c 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -6,6 +6,7 @@ import { AdjustmentsHorizontalIcon, BuildingStorefrontIcon, DocumentDuplicateIcon, + Squares2X2Icon, } from '@heroicons/react/24/outline'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import { Route, Routes } from 'react-router-dom'; @@ -21,6 +22,7 @@ import Admin from '../pages/admin'; import { getMarketplaceSubnavRoutes } from '@modules/wp-module-marketplace/components/marketplaceSubnav'; import { ReactComponent as HelpIcon } from '../components/icons/HelpIcon.svg'; import PagesAndPosts from '../pages/pages-and-posts'; +import Products from '../pages/products'; const addPartialMatch = ( prefix, path ) => prefix === path ? `${ prefix }/*` : path; @@ -73,6 +75,7 @@ const topRoutePaths = [ '/performance', '/settings', '/staging', + '/products', ]; const utilityRoutePaths = [ '/help' ]; @@ -166,6 +169,13 @@ export const routes = [ Component: Admin, condition: true, }, + { + name: '/products', + title: __( 'My Products', 'wp-plugin-bluehost' ), + Component: Products, + Icon: Squares2X2Icon, + condition: true, + }, ]; export const topRoutes = _filter( routes, ( route ) => diff --git a/src/app/pages/products/index.js b/src/app/pages/products/index.js new file mode 100644 index 000000000..7d31f3fd7 --- /dev/null +++ b/src/app/pages/products/index.js @@ -0,0 +1,55 @@ +import { Container, Page } from '@newfold/ui-component-library'; +import apiFetch from '@wordpress/api-fetch'; +import { useState, useEffect } from '@wordpress/element'; +import { useLocation, useMatch, useNavigate } from 'react-router-dom'; +import classnames from 'classnames'; +import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; +import { default as NewfoldProducts } from '@newfold-labs/wp-module-products/components/product'; +import { isJarvis } from '../../util/helpers'; + +// constants to pass to module +const moduleConstants = { + text: { + title: __( 'My Products', 'bluehost-wordpress-plugin' ), + subTitle: __( + 'Explore our featured collection of tools and services.', + 'bluehost-wordpress-plugin' + ), + error: __( + 'Oops, there was an error loading products, please try again later.', + 'bluehost-wordpress-plugin' + ), + noProducts: __( + 'Sorry, no products. Please, try again later.', + 'bluehost-wordpress-plugin' + ), + }, +}; + +// methods to pass to module +const moduleMethods = { + apiFetch, + classnames, + useState, + useEffect, + useLocation, + useMatch, + useNavigate, + NewfoldRuntime, + isJarvis, +}; + +const Products = () => { + return ( + + + + + + ); +}; + +export default Products; From 942640edc063291427287fec7a5cb4244dcf706c Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Fri, 5 Jul 2024 11:18:36 +0530 Subject: [PATCH 02/25] updated module import and small improments --- src/app/pages/products/index.js | 34 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/app/pages/products/index.js b/src/app/pages/products/index.js index 7d31f3fd7..e5430d97c 100644 --- a/src/app/pages/products/index.js +++ b/src/app/pages/products/index.js @@ -1,20 +1,13 @@ import { Container, Page } from '@newfold/ui-component-library'; import apiFetch from '@wordpress/api-fetch'; import { useState, useEffect } from '@wordpress/element'; -import { useLocation, useMatch, useNavigate } from 'react-router-dom'; -import classnames from 'classnames'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { default as NewfoldProducts } from '@newfold-labs/wp-module-products/components/product'; +import { default as NewfoldProducts } from '@newfold-labs/wp-module-my-products/components/product'; import { isJarvis } from '../../util/helpers'; // constants to pass to module const moduleConstants = { text: { - title: __( 'My Products', 'bluehost-wordpress-plugin' ), - subTitle: __( - 'Explore our featured collection of tools and services.', - 'bluehost-wordpress-plugin' - ), error: __( 'Oops, there was an error loading products, please try again later.', 'bluehost-wordpress-plugin' @@ -23,18 +16,18 @@ const moduleConstants = { 'Sorry, no products. Please, try again later.', 'bluehost-wordpress-plugin' ), + jarvisText: __( + 'Please login to your account manager to see products.', + 'bluehost-wordpress-plugin' + ), }, }; // methods to pass to module const moduleMethods = { apiFetch, - classnames, useState, useEffect, - useLocation, - useMatch, - useNavigate, NewfoldRuntime, isJarvis, }; @@ -43,6 +36,23 @@ const Products = () => { return ( + +

+ { __( + 'A list of products associated with your Bluehost hosting package. For more information, check out the ', + 'bluehost-wordpress-plugin' + ) } + + + { __( + 'Bluehost Account Manager', + 'bluehost-wordpress-plugin' + ) } + +

+
Date: Tue, 23 Jul 2024 18:34:21 +0530 Subject: [PATCH 03/25] moved myproducts in home section --- src/app/pages/home/index.js | 9 ++++ src/app/pages/home/productSection.js | 63 ++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/app/pages/home/productSection.js diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index bd7f2254c..ea829614a 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,8 +1,16 @@ import { Container, Page } from '@newfold/ui-component-library'; +import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; +import ProductSection from './productSection'; + +const abTestShowMyProducts = NewfoldRuntime.hasCapability( + 'abTestShowMyProducts' +); + +console.log( NewfoldRuntime.hasCapability( 'abTestShowMyProducts' ) ); const Home = () => { return ( @@ -17,6 +25,7 @@ const Home = () => {
+ { abTestShowMyProducts && }
); }; diff --git a/src/app/pages/home/productSection.js b/src/app/pages/home/productSection.js new file mode 100644 index 000000000..049e5b740 --- /dev/null +++ b/src/app/pages/home/productSection.js @@ -0,0 +1,63 @@ +import { Container } from '@newfold/ui-component-library'; +import apiFetch from '@wordpress/api-fetch'; +import { useState, useEffect } from '@wordpress/element'; +import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; +import { default as NewfoldProducts } from '@newfold-labs/wp-module-my-products/components/product'; +import { isJarvis } from '../../util/helpers'; + +// constants to pass to module +const moduleConstants = { + text: { + error: __( + 'Oops, there was an error loading products, please try again later.', + 'bluehost-wordpress-plugin' + ), + noProducts: __( + 'Sorry, no products. Please, try again later.', + 'bluehost-wordpress-plugin' + ), + jarvisText: __( + 'Please login to your account manager to see products.', + 'bluehost-wordpress-plugin' + ), + }, +}; + +// methods to pass to module +const moduleMethods = { + apiFetch, + useState, + useEffect, + NewfoldRuntime, + isJarvis, +}; + +const ProductSection = () => { + return ( + + +

+ { __( + 'A list of products associated with your Bluehost hosting package. For more information, check out the ', + 'bluehost-wordpress-plugin' + ) } + + + { __( + 'Bluehost Account Manager', + 'bluehost-wordpress-plugin' + ) } + +

+
+ +
+ ); +}; + +export default ProductSection; From b972eddc8e112f6905aa88b622a4c398280875f2 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Tue, 23 Jul 2024 22:52:46 +0530 Subject: [PATCH 04/25] removed top level nav --- inc/Admin.php | 5 +-- src/app/data/routes.js | 10 ----- src/app/pages/home/index.js | 2 - src/app/pages/products/index.js | 65 --------------------------------- 4 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 src/app/pages/products/index.js diff --git a/inc/Admin.php b/inc/Admin.php index e60eb9b0b..f9861287f 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -90,10 +90,7 @@ public static function subpages() { ? array( 'bluehost#/staging' => __( 'Staging', 'wp-plugin-bluehost' ), ) - : array(); - $products = array( - 'bluehost#/products' => __( 'My Products', 'wp-plugin-bluehost' ), - ); + : array(); $help = array( 'bluehost#/help' => __( 'Help', 'wp-plugin-bluehost' ), ); diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 2f656860c..aa04a7f89 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -6,7 +6,6 @@ import { AdjustmentsHorizontalIcon, BuildingStorefrontIcon, DocumentDuplicateIcon, - Squares2X2Icon, } from '@heroicons/react/24/outline'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import { Route, Routes } from 'react-router-dom'; @@ -22,7 +21,6 @@ import Admin from '../pages/admin'; import { getMarketplaceSubnavRoutes } from '@modules/wp-module-marketplace/components/marketplaceSubnav'; import { ReactComponent as HelpIcon } from '../components/icons/HelpIcon.svg'; import PagesAndPosts from '../pages/pages-and-posts'; -import Products from '../pages/products'; const addPartialMatch = ( prefix, path ) => prefix === path ? `${ prefix }/*` : path; @@ -75,7 +73,6 @@ const topRoutePaths = [ '/performance', '/settings', '/staging', - '/products', ]; const utilityRoutePaths = [ '/help' ]; @@ -169,13 +166,6 @@ export const routes = [ Component: Admin, condition: true, }, - { - name: '/products', - title: __( 'My Products', 'wp-plugin-bluehost' ), - Component: Products, - Icon: Squares2X2Icon, - condition: true, - }, ]; export const topRoutes = _filter( routes, ( route ) => diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index ea829614a..0dbd10a6f 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -10,8 +10,6 @@ const abTestShowMyProducts = NewfoldRuntime.hasCapability( 'abTestShowMyProducts' ); -console.log( NewfoldRuntime.hasCapability( 'abTestShowMyProducts' ) ); - const Home = () => { return ( diff --git a/src/app/pages/products/index.js b/src/app/pages/products/index.js deleted file mode 100644 index e5430d97c..000000000 --- a/src/app/pages/products/index.js +++ /dev/null @@ -1,65 +0,0 @@ -import { Container, Page } from '@newfold/ui-component-library'; -import apiFetch from '@wordpress/api-fetch'; -import { useState, useEffect } from '@wordpress/element'; -import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { default as NewfoldProducts } from '@newfold-labs/wp-module-my-products/components/product'; -import { isJarvis } from '../../util/helpers'; - -// constants to pass to module -const moduleConstants = { - text: { - error: __( - 'Oops, there was an error loading products, please try again later.', - 'bluehost-wordpress-plugin' - ), - noProducts: __( - 'Sorry, no products. Please, try again later.', - 'bluehost-wordpress-plugin' - ), - jarvisText: __( - 'Please login to your account manager to see products.', - 'bluehost-wordpress-plugin' - ), - }, -}; - -// methods to pass to module -const moduleMethods = { - apiFetch, - useState, - useEffect, - NewfoldRuntime, - isJarvis, -}; - -const Products = () => { - return ( - - - -

- { __( - 'A list of products associated with your Bluehost hosting package. For more information, check out the ', - 'bluehost-wordpress-plugin' - ) } - - - { __( - 'Bluehost Account Manager', - 'bluehost-wordpress-plugin' - ) } - -

-
- -
-
- ); -}; - -export default Products; From bac587577aadd3c98f4a65370b52cd01871fea82 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Wed, 24 Jul 2024 20:38:35 +0530 Subject: [PATCH 05/25] added tests --- tests/cypress/fixtures/products.json | 14 ++++++ tests/cypress/integration/home.cy.js | 68 +++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 tests/cypress/fixtures/products.json diff --git a/tests/cypress/fixtures/products.json b/tests/cypress/fixtures/products.json new file mode 100644 index 000000000..398361cdd --- /dev/null +++ b/tests/cypress/fixtures/products.json @@ -0,0 +1,14 @@ +[ + { + "autoRenewFlag": null, + "expirationDate": "9999.December.31 00:00:00", + "prodId": 7103940, + "prodName": "Free SSL" + }, + { + "autoRenewFlag": null, + "expirationDate": "2025.March.26 00:00:00", + "prodId": 7102074, + "prodName": "SiteLock Lite" + } +] \ No newline at end of file diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index 54cf10f97..b9a031492 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -1,5 +1,5 @@ // - +const productFixtures = require( '../fixtures/products.json' ); describe( 'Home Page', function () { let NewfoldRuntime; @@ -129,4 +129,70 @@ describe( 'Home Page', function () { cy.reload(); cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' ); } ); + + it( 'My Products Section exists', () => { + if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { + cy.get( '.wppbh-products-section' ) + .contains( 'My Products' ) + .scrollIntoView() + .should( 'be.visible' ); + } else { + cy.get( '.wppbh-products-section' ).should( 'not.exist' ); + } + } ); + + it( 'Products Section Renders Correctly', () => { + if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { + cy.intercept( + 'GET', + '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', + productFixtures + ); + cy.reload(); + // Verify the table contains the correct product data + cy.get( '.wppbh-products-data-section' ).within( () => { + cy.contains( 'Products & Services' ).should( 'be.visible' ); + cy.contains( 'Free SSL' ).should( 'be.visible' ); + cy.contains( 'SiteLock Lite' ).should( 'be.visible' ); + } ); + } else { + cy.get( '.wppbh-products-section' ).should( 'not.exist' ); + } + } ); + + it( 'Products Section Renders Correctly for No products response', () => { + if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { + cy.intercept( + 'GET', + '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', + [] + ); + cy.reload(); + cy.get( '.wppbh-products-section' ) + .contains( 'Sorry, no products. Please, try again later.' ) + .scrollIntoView() + .should( 'be.visible' ); + } else { + cy.get( '.wppbh-products-section' ).should( 'not.exist' ); + } + } ); + + it( 'Products Section Renders Correctly for Empty response', () => { + if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { + cy.intercept( + 'GET', + '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', + {} + ); + cy.reload(); + cy.get( '.wppbh-products-section' ) + .contains( + 'Oops, there was an error loading products, please try again later.' + ) + .scrollIntoView() + .should( 'be.visible' ); + } else { + cy.get( '.wppbh-products-section' ).should( 'not.exist' ); + } + } ); } ); From 55d28e5606529e2f4d1b715225bbcff0a0568988 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Tue, 30 Jul 2024 21:22:09 +0530 Subject: [PATCH 06/25] import module instead of package --- src/app/pages/home/productSection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/home/productSection.js b/src/app/pages/home/productSection.js index 049e5b740..bac3b3196 100644 --- a/src/app/pages/home/productSection.js +++ b/src/app/pages/home/productSection.js @@ -2,7 +2,7 @@ import { Container } from '@newfold/ui-component-library'; import apiFetch from '@wordpress/api-fetch'; import { useState, useEffect } from '@wordpress/element'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { default as NewfoldProducts } from '@newfold-labs/wp-module-my-products/components/product'; +import { default as NewfoldMyProducts } from '@modules/wp-module-my-products/components/product'; import { isJarvis } from '../../util/helpers'; // constants to pass to module @@ -52,7 +52,7 @@ const ProductSection = () => {

- From 752de1e8af9404fb93fbbcf12465f5d2e74f7781 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Tue, 30 Jul 2024 21:23:02 +0530 Subject: [PATCH 07/25] required my-products module and bumped data to 2.6.1 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bba411beb..4995b6b2f 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "newfold-labs/wp-module-atomic": "^1.3.0", "newfold-labs/wp-module-coming-soon": "^1.2.5", "newfold-labs/wp-module-context": "^1.0.1", - "newfold-labs/wp-module-data": "2.5.3", + "newfold-labs/wp-module-data": "2.6.1", "newfold-labs/wp-module-deactivation": "^1.2.3", "newfold-labs/wp-module-ecommerce": "^1.3.37", "newfold-labs/wp-module-facebook": "^1.0.9", @@ -94,6 +94,7 @@ "newfold-labs/wp-module-secure-passwords": "^1.1.1", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.0", + "newfold-labs/wp-module-my-products": "^0.1.0", "wp-forge/wp-update-handler": "^1.0.2", "wp-forge/wp-upgrade-handler": "^1.0" } From 355db549ceeaeb1a9a89414ed090bae7f2949df1 Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Thu, 1 Aug 2024 11:50:01 +0530 Subject: [PATCH 08/25] on error hide my product section --- src/app/pages/home/productSection.js | 27 ++++++++++----------------- tests/cypress/integration/home.cy.js | 18 +----------------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/src/app/pages/home/productSection.js b/src/app/pages/home/productSection.js index bac3b3196..64d5b06c0 100644 --- a/src/app/pages/home/productSection.js +++ b/src/app/pages/home/productSection.js @@ -20,6 +20,16 @@ const moduleConstants = { 'Please login to your account manager to see products.', 'bluehost-wordpress-plugin' ), + title: __( 'My Products', 'bluehost-wordpress-plugin' ), + subTitle: __( + 'A list of products associated with your Bluehost hosting package. For more information, check out the ', + 'bluehost-wordpress-plugin' + ), + renewalText: __( + 'Bluehost Account Manager', + 'bluehost-wordpress-plugin' + ), + renewalCenterUrl: 'https://www.bluehost.com/my-account/renewal-center', }, }; @@ -35,23 +45,6 @@ const moduleMethods = { const ProductSection = () => { return ( - -

- { __( - 'A list of products associated with your Bluehost hosting package. For more information, check out the ', - 'bluehost-wordpress-plugin' - ) } - - - { __( - 'Bluehost Account Manager', - 'bluehost-wordpress-plugin' - ) } - -

-
{ - if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { - cy.get( '.wppbh-products-section' ) - .contains( 'My Products' ) - .scrollIntoView() - .should( 'be.visible' ); - } else { - cy.get( '.wppbh-products-section' ).should( 'not.exist' ); - } - } ); - it( 'Products Section Renders Correctly', () => { if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { cy.intercept( @@ -185,12 +174,7 @@ describe( 'Home Page', function () { {} ); cy.reload(); - cy.get( '.wppbh-products-section' ) - .contains( - 'Oops, there was an error loading products, please try again later.' - ) - .scrollIntoView() - .should( 'be.visible' ); + cy.get( '.wppbh-products-section' ).should( 'not.exist' ); } else { cy.get( '.wppbh-products-section' ).should( 'not.exist' ); } From 8d426b13b52ea049fcc9306d4e8df08a0eea5ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:06:50 +0000 Subject: [PATCH 09/25] NPM(deps): Bump @reduxjs/toolkit from 2.2.6 to 2.2.7 Bumps [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit) from 2.2.6 to 2.2.7. - [Release notes](https://github.com/reduxjs/redux-toolkit/releases) - [Commits](https://github.com/reduxjs/redux-toolkit/compare/v2.2.6...v2.2.7) --- updated-dependencies: - dependency-name: "@reduxjs/toolkit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42269d1fc..1b70461c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@newfold-labs/wp-module-facebook": "1.0.7", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", - "@reduxjs/toolkit": "^2.2.6", + "@reduxjs/toolkit": "^2.2.7", "@wordpress/compose": "^7.5.0", "@wordpress/dom-ready": "^4.5.0", "@wordpress/element": "^6.3.0", @@ -3621,9 +3621,9 @@ } }, "node_modules/@reduxjs/toolkit": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz", - "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.7.tgz", + "integrity": "sha512-faI3cZbSdFb8yv9dhDTmGwclW0vk0z5o1cia+kf7gCbaCwHI5e+7tP57mJUv22pNcNbeA62GSrPpfrUfdXcQ6g==", "dependencies": { "immer": "^10.0.3", "redux": "^5.0.1", diff --git a/package.json b/package.json index b98d35d99..f9d2ed017 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@newfold-labs/wp-module-facebook": "1.0.7", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", - "@reduxjs/toolkit": "^2.2.6", + "@reduxjs/toolkit": "^2.2.7", "@wordpress/compose": "^7.5.0", "@wordpress/dom-ready": "^4.5.0", "@wordpress/element": "^6.3.0", From 4dbf4fe6294bf3bf34a3e10c5d7c6d7cd5d40158 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:07:29 +0000 Subject: [PATCH 10/25] NPM(deps): Bump @wordpress/icons from 10.4.0 to 10.5.0 Bumps [@wordpress/icons](https://github.com/WordPress/gutenberg/tree/HEAD/packages/icons) from 10.4.0 to 10.5.0. - [Release notes](https://github.com/WordPress/gutenberg/releases) - [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/icons/CHANGELOG.md) - [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/icons@10.5.0/packages/icons) --- updated-dependencies: - dependency-name: "@wordpress/icons" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 23 +++++++++++++---------- package.json | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42269d1fc..2d8bc06cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@wordpress/element": "^6.3.0", "@wordpress/html-entities": "^4.4.0", "@wordpress/i18n": "^5.4.0", - "@wordpress/icons": "^10.4.0", + "@wordpress/icons": "^10.5.0", "classnames": "^2.5.1", "jquery": "^3.7.1", "lodash": "^4.17.21", @@ -6070,13 +6070,13 @@ } }, "node_modules/@wordpress/icons": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.4.0.tgz", - "integrity": "sha512-1odn+v7Fr5n3+ZpdXb37zy/yr/4LQLvYcT0pPtQ6fnuKGoelnU5f2FEAWwFgJ+Nvt5GjzKAFV3XGk1Qr81z3Mw==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.5.0.tgz", + "integrity": "sha512-BZwKBRKoTef9uW73T+FwK6d4JlcvgdVAaz3LB5dCluXg5PLV5ufMdumAaMxKWq/Ffl92/ddt8CKIdHjxfAZF4A==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/element": "^6.4.0", - "@wordpress/primitives": "^4.4.0" + "@wordpress/element": "^6.5.0", + "@wordpress/primitives": "^4.5.0" }, "engines": { "node": ">=18.12.0", @@ -6084,17 +6084,20 @@ } }, "node_modules/@wordpress/icons/node_modules/@wordpress/primitives": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.4.0.tgz", - "integrity": "sha512-QmIrB0EgrmrFrCEngvrE/4mN7CGQMeJNkbvYinNNpqv53RDYI6cYCoMRDvNNXlqb+Ja3rOzkef0/VZdvtv2PMw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.5.0.tgz", + "integrity": "sha512-1TYCpCAr2BmYJESlD8v325GgYXSgUbrFtebwgvpMN/28CEwmPN+ORRECV41nPX4yVJ2k0kYzYxzQUGp/78xWsw==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/element": "^6.4.0", + "@wordpress/element": "^6.5.0", "clsx": "^2.1.1" }, "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" + }, + "peerDependencies": { + "react": "^18.0.0" } }, "node_modules/@wordpress/is-shallow-equal": { diff --git a/package.json b/package.json index b98d35d99..b588ed539 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@wordpress/element": "^6.3.0", "@wordpress/html-entities": "^4.4.0", "@wordpress/i18n": "^5.4.0", - "@wordpress/icons": "^10.4.0", + "@wordpress/icons": "^10.5.0", "classnames": "^2.5.1", "jquery": "^3.7.1", "lodash": "^4.17.21", From 44bd7a8d7832c613ac6939d1d95b1e00d2f5195c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:07:43 +0000 Subject: [PATCH 11/25] NPM Dev(deps-dev): Bump cypress from 13.13.2 to 13.13.3 Bumps [cypress](https://github.com/cypress-io/cypress) from 13.13.2 to 13.13.3. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v13.13.2...v13.13.3) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42269d1fc..69be4f091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@wordpress/env": "^10.5.0", "@wordpress/eslint-plugin": "^20.1.0", "@wordpress/scripts": "^27.9.0", - "cypress": "^13.13.2", + "cypress": "^13.13.3", "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", @@ -9186,9 +9186,9 @@ } }, "node_modules/cypress": { - "version": "13.13.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.2.tgz", - "integrity": "sha512-PvJQU33933NvS1StfzEb8/mu2kMy4dABwCF+yd5Bi7Qly1HOVf+Bufrygee/tlmty/6j5lX+KIi8j9Q3JUMbhA==", + "version": "13.13.3", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.3.tgz", + "integrity": "sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index b98d35d99..6f37d15b2 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@wordpress/env": "^10.5.0", "@wordpress/eslint-plugin": "^20.1.0", "@wordpress/scripts": "^27.9.0", - "cypress": "^13.13.2", + "cypress": "^13.13.3", "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", From 3a6da75f0577c6de06d761a60f9863821e5bf44d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:08:24 +0000 Subject: [PATCH 12/25] NPM Dev(deps-dev): Bump @wordpress/eslint-plugin from 20.1.0 to 20.2.0 Bumps [@wordpress/eslint-plugin](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin) from 20.1.0 to 20.2.0. - [Release notes](https://github.com/WordPress/gutenberg/releases) - [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/eslint-plugin@20.2.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@wordpress/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42269d1fc..f165c3a25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@tailwindcss/forms": "^0.5.7", "@testing-library/cypress": "^10.0.2", "@wordpress/env": "^10.5.0", - "@wordpress/eslint-plugin": "^20.1.0", + "@wordpress/eslint-plugin": "^20.2.0", "@wordpress/scripts": "^27.9.0", "cypress": "^13.13.2", "cypress-axe": "^1.5.0", @@ -5916,16 +5916,16 @@ } }, "node_modules/@wordpress/eslint-plugin": { - "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-20.1.0.tgz", - "integrity": "sha512-2FVQsdvG92qiKKnXhR0JO4RVyjrdRVY5vS6C6OZjp4M+O/kC/k5sx/BsjOX09qyUGletXJyQRmy11uoCE9lmAA==", + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-20.2.0.tgz", + "integrity": "sha512-lC8sUkzf4x3ByQHs3xF7X0XxS3SPEYzXho9+NeIgB5Cg0s/PlyWuPQI+4oHVgZI3hzPH76G6ewRtIt27gQRcdw==", "dev": true, "dependencies": { "@babel/eslint-parser": "^7.16.0", "@typescript-eslint/eslint-plugin": "^6.4.1", "@typescript-eslint/parser": "^6.4.1", - "@wordpress/babel-preset-default": "^8.4.0", - "@wordpress/prettier-config": "^4.4.0", + "@wordpress/babel-preset-default": "^8.5.0", + "@wordpress/prettier-config": "^4.5.0", "cosmiconfig": "^7.0.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.2", @@ -5959,9 +5959,9 @@ } }, "node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/babel-preset-default": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.4.0.tgz", - "integrity": "sha512-BIbHlZxXGG6gEDrTUJ3s7wU2mAPbHFCkc7QkeTD+7GMIixEzEPr7IBbrpHkcwLIRWqEvc9LB69YPrWklUKJZmg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.5.0.tgz", + "integrity": "sha512-ra9UWhidrAIoYTuqIIMFs+5LawUis/qDhiB2c3mc9HJUXXQDOvdhww5f9H9SjWqOo1oB9jSuVh4pXtBpcR1E6A==", "dev": true, "dependencies": { "@babel/core": "^7.16.0", @@ -5970,8 +5970,8 @@ "@babel/preset-env": "^7.16.0", "@babel/preset-typescript": "^7.16.0", "@babel/runtime": "^7.16.0", - "@wordpress/browserslist-config": "^6.4.0", - "@wordpress/warning": "^3.4.0", + "@wordpress/browserslist-config": "^6.5.0", + "@wordpress/warning": "^3.5.0", "browserslist": "^4.21.10", "core-js": "^3.31.0", "react": "^18.3.0" @@ -5982,9 +5982,9 @@ } }, "node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/browserslist-config": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.4.0.tgz", - "integrity": "sha512-6Uvh++K+UCOSSlE589uHtxVWa7vJmcFjDYHT7/VsdrHkwpCRwJd0UAUrmTBqiekGYo3NQzZW/ikODxR+lkORjw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.5.0.tgz", + "integrity": "sha512-B5cYN5INRknBjzbNH2qJOq6x66qXS2UoLk5Ebyew1JkW9xzvX1O+eQumjFv65fAN6RNPtomHs8c7BNoD3wAebQ==", "dev": true, "engines": { "node": ">=18.12.0", @@ -5992,9 +5992,9 @@ } }, "node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/prettier-config": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.4.0.tgz", - "integrity": "sha512-etguLCGd8r0solW9pkUeBHGuqrsCGL+d2JzCB3APhDo3mYD+TK2PUg3EfXKOvJzHsQwHg73h0eW9/C5DU+ll+Q==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.5.0.tgz", + "integrity": "sha512-HxpR4128yfJJs1idQaBJfBffa6P2JXKN7mvx+D/G2UukjjWlXHaCXLO8wuBLnXwXSg4pOq5vfDM/p5TawZd7Zg==", "dev": true, "engines": { "node": ">=18.12.0", @@ -6005,9 +6005,9 @@ } }, "node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/warning": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.4.0.tgz", - "integrity": "sha512-0LbBvyRLZVulwVcseH+WryDlnP//CFBwAq15+XzzoZc3s0ANlGsLPTlYamZ7eoyosGQZVKqG/yzP3DAlESj89w==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.5.0.tgz", + "integrity": "sha512-cYM2Vqf2EokJJoWHD5Ry15OUmdsKtDgR8/qxE0sWHUAdSQeoTuJZnqhgYI898cZGxHaZWX2xJCxQa7Qtwl8lqw==", "dev": true, "engines": { "node": ">=18.12.0", diff --git a/package.json b/package.json index b98d35d99..e0cfda0d4 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@tailwindcss/forms": "^0.5.7", "@testing-library/cypress": "^10.0.2", "@wordpress/env": "^10.5.0", - "@wordpress/eslint-plugin": "^20.1.0", + "@wordpress/eslint-plugin": "^20.2.0", "@wordpress/scripts": "^27.9.0", "cypress": "^13.13.2", "cypress-axe": "^1.5.0", From f65f5aab6a2fd865f1ef54f1d56b5d8b68ecfd2e Mon Sep 17 00:00:00 2001 From: girish-lokapure Date: Mon, 19 Aug 2024 13:05:38 +0530 Subject: [PATCH 13/25] bumped module-my-products to 0.2.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9b4167fc..59477ef3f 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ "newfold-labs/wp-module-secure-passwords": "^1.1.1", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.0", - "newfold-labs/wp-module-my-products": "^0.1.0", + "newfold-labs/wp-module-my-products": "^0.2.0", "wp-forge/wp-update-handler": "^1.0.2", "wp-forge/wp-upgrade-handler": "^1.0" } From 957e3d1e12328a2b158e2991228cab1c36514db2 Mon Sep 17 00:00:00 2001 From: girish-lokapure Date: Mon, 19 Aug 2024 13:07:01 +0530 Subject: [PATCH 14/25] removed extra tab --- inc/Admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/Admin.php b/inc/Admin.php index 33710a483..0590745ba 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -92,7 +92,7 @@ public static function subpages() { ? array( 'bluehost#/staging' => __( 'Staging', 'wp-plugin-bluehost' ), ) - : array(); + : array(); $help = array( 'bluehost#/help' => __( 'Help', 'wp-plugin-bluehost' ), ); From 9e3f37f0cbf0ec1fc17013d67480ef586e22f85a Mon Sep 17 00:00:00 2001 From: Ramya krishna Date: Wed, 21 Aug 2024 15:50:54 +0530 Subject: [PATCH 15/25] ecommerce version bump to 1.3.41 --- composer.json | 2 +- composer.lock | 70 +++++++++++++++++++++++++---------------------- package-lock.json | 9 +++--- package.json | 2 +- 4 files changed, 45 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index e1bcba465..8483519fb 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "newfold-labs/wp-module-context": "^1.0.1", "newfold-labs/wp-module-data": "^2.6.2", "newfold-labs/wp-module-deactivation": "^1.2.3", - "newfold-labs/wp-module-ecommerce": "^1.3.40", + "newfold-labs/wp-module-ecommerce": "^1.3.41", "newfold-labs/wp-module-facebook": "^1.0.9", "newfold-labs/wp-module-features": "^1.4.2", "newfold-labs/wp-module-global-ctb": "^1.0.13", diff --git a/composer.lock b/composer.lock index 3bc01a760..2cc52bad4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1b3c0adf75e076db3e6d457232df4b19", + "content-hash": "1b72beb21460316ee5e4596cba353ea3", "packages": [ { "name": "doctrine/inflector", @@ -663,16 +663,16 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v1.3.40", + "version": "v1.3.41", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "56b70f018aaa7d49fe4eed6cc83b831d3cfb5999" + "reference": "4e4d787d6a033c2f2f3672ceaae4ae17ff41968d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/56b70f018aaa7d49fe4eed6cc83b831d3cfb5999", - "reference": "56b70f018aaa7d49fe4eed6cc83b831d3cfb5999", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/4e4d787d6a033c2f2f3672ceaae4ae17ff41968d", + "reference": "4e4d787d6a033c2f2f3672ceaae4ae17ff41968d", "shasum": "" }, "require": { @@ -715,10 +715,10 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.40", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.41", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2024-08-14T12:15:48+00:00" + "time": "2024-08-21T09:22:19+00:00" }, { "name": "newfold-labs/wp-module-facebook", @@ -2818,17 +2818,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "4ee5bb22f4c3a7ced8de2ff3e7abce703d546de8" + "reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4ee5bb22f4c3a7ced8de2ff3e7abce703d546de8", - "reference": "4ee5bb22f4c3a7ced8de2ff3e7abce703d546de8", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8938260885863ec2dd9f2aaf9a79ba14e58a92f6", + "reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.2.13", + "admidio/admidio": "<4.3.10", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<2.2", "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6", @@ -2861,7 +2861,7 @@ "athlon1600/php-proxy-app": "<=3", "austintoddj/canvas": "<=3.4.2", "auth0/wordpress": "<=4.6", - "automad/automad": "<=2.0.0.0-alpha5", + "automad/automad": "<2.0.0.0-alpha5", "automattic/jetpack": "<9.8", "awesome-support/awesome-support": "<=6.0.7", "aws/aws-sdk-php": "<3.288.1", @@ -2881,7 +2881,7 @@ "bcosca/fatfree": "<3.7.2", "bedita/bedita": "<4", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<2.9.5", + "billz/raspap-webgui": "<=3.1.4", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "blueimp/jquery-file-upload": "==6.4.4", "bmarshall511/wordpress_zero_spam": "<5.2.13", @@ -2920,7 +2920,7 @@ "codeigniter4/shield": "<1.0.0.0-beta8", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.27|>=2,<2.2.24|>=2.3,<2.7.7", - "concrete5/concrete5": "<9.2.8", + "concrete5/concrete5": "<9.3.3", "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4", @@ -2941,7 +2941,7 @@ "datatables/datatables": "<1.10.10", "david-garcia/phpwhois": "<=4.3.1", "dbrisinajumi/d2files": "<1", - "dcat/laravel-admin": "<=2.1.3.0-beta", + "dcat/laravel-admin": "<=2.1.3", "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", "desperado/xml-bundle": "<=0.1.7", @@ -2984,12 +2984,12 @@ "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev", "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26|>=3.3,<3.3.39", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.35", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", - "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", + "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev|>=3.3,<3.3.40", "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", "ezsystems/ezplatform-user": ">=1,<1.0.1", "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", @@ -3007,6 +3007,7 @@ "filp/whoops": "<2.1.13", "fineuploader/php-traditional-server": "<=1.2.2", "firebase/php-jwt": "<6", + "fisharebest/webtrees": "<=2.1.18", "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2", "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6", "flarum/core": "<1.8.5", @@ -3067,8 +3068,9 @@ "hov/jobfair": "<1.0.13|>=2,<2.0.2", "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/admin-ui": ">=4.2,<4.2.3", + "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6.0.0-beta1,<4.6.9", "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", + "ibexa/fieldtype-richtext": ">=4.6,<4.6.10", "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/post-install": "<=1.0.4", "ibexa/solr": ">=4.5,<4.5.4", @@ -3090,6 +3092,7 @@ "innologi/typo3-appointments": "<2.0.6", "intelliants/subrion": "<4.2.2", "inter-mediator/inter-mediator": "==5.5", + "ipl/web": "<0.10.1", "islandora/islandora": ">=2,<2.4.1", "ivankristianto/phpwhois": "<=4.3", "jackalope/jackalope-doctrine-dbal": "<1.7.4", @@ -3172,7 +3175,7 @@ "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1", "microsoft/microsoft-graph-beta": "<2.0.1", "microsoft/microsoft-graph-core": "<2.0.2", - "microweber/microweber": "<=2.0.4", + "microweber/microweber": "<=2.0.16", "mikehaertl/php-shellcommand": "<1.6.1", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", @@ -3225,7 +3228,7 @@ "open-web-analytics/open-web-analytics": "<1.7.4", "opencart/opencart": ">=0", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.5", + "openmage/magento-lts": "<20.10.1", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", @@ -3235,6 +3238,7 @@ "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3", + "oveleon/contao-cookiebar": "<1.16.3|>=2,<2.1.3", "oxid-esales/oxideshop-ce": "<4.5", "oxid-esales/paymorrow-module": ">=1,<1.0.2|>=2,<2.0.1", "packbackbooks/lti-1-3-php-library": "<5", @@ -3276,7 +3280,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<=1.4.2", + "pimcore/admin-ui-classic-bundle": "<=1.5.1", "pimcore/customer-management-framework-bundle": "<4.0.6", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -3309,6 +3313,7 @@ "pubnub/pubnub": "<6.1", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6.0-beta", + "pxlrbt/filament-excel": "<2.3.3", "pyrocms/pyrocms": "<=3.9.1", "qcubed/qcubed": "<=3.1.1", "quickapps/cms": "<=2.0.0.0-beta2", @@ -3336,8 +3341,8 @@ "serluck/phpwhois": "<=4.2.6", "sfroemken/url_redirect": "<=1.2.1", "sheng/yiicms": "<=1.2", - "shopware/core": "<6.5.8.8-dev|>=6.6.0.0-RC1-dev,<6.6.1", - "shopware/platform": "<6.5.8.8-dev|>=6.6.0.0-RC1-dev,<6.6.1", + "shopware/core": "<=6.5.8.12|>=6.6,<=6.6.5", + "shopware/platform": "<=6.5.8.12|>=6.6,<=6.6.5", "shopware/production": "<=6.3.5.2", "shopware/shopware": "<=5.7.17", "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", @@ -3387,7 +3392,7 @@ "ssddanbrown/bookstack": "<24.05.1", "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", - "studio-42/elfinder": "<2.1.62", + "studio-42/elfinder": "<=2.1.64", "studiomitte/friendlycaptcha": "<0.1.4", "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", @@ -3467,6 +3472,7 @@ "tribalsystems/zenario": "<9.5.60602", "truckersmp/phpwhois": "<=4.3.1", "ttskch/pagination-service-provider": "<1", + "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2", "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3", "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", @@ -3621,7 +3627,7 @@ "type": "tidelift" } ], - "time": "2024-07-25T19:04:34+00:00" + "time": "2024-08-19T21:04:39+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -4098,16 +4104,16 @@ }, { "name": "wp-cli/wp-cli", - "version": "v2.10.0", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/wp-cli/wp-cli.git", - "reference": "a339dca576df73c31af4b4d8054efc2dab9a0685" + "reference": "53f0df112901fcf95099d0f501912a209429b6a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/a339dca576df73c31af4b4d8054efc2dab9a0685", - "reference": "a339dca576df73c31af4b4d8054efc2dab9a0685", + "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/53f0df112901fcf95099d0f501912a209429b6a9", + "reference": "53f0df112901fcf95099d0f501912a209429b6a9", "shasum": "" }, "require": { @@ -4137,7 +4143,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.10.x-dev" + "dev-main": "2.11.x-dev" } }, "autoload": { @@ -4164,7 +4170,7 @@ "issues": "https://github.com/wp-cli/wp-cli/issues", "source": "https://github.com/wp-cli/wp-cli" }, - "time": "2024-02-08T16:52:43+00:00" + "time": "2024-08-08T03:04:55+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -4300,5 +4306,5 @@ "platform-overrides": { "php": "7.3.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/package-lock.json b/package-lock.json index bcfdbe44b..df2536d25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", - "@newfold-labs/wp-module-ecommerce": "^1.3.40", + "@newfold-labs/wp-module-ecommerce": "^1.3.41", "@newfold-labs/wp-module-facebook": "1.0.7", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", @@ -3197,9 +3197,10 @@ } }, "node_modules/@newfold-labs/wp-module-ecommerce": { - "version": "1.3.40", - "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.40/40d07cb698088104d6b512d850c9ddf2d06914cd", - "integrity": "sha512-aUEFfHnbKDfj39RL49FUCdZmRBriiVZKNjFeIdLcuDARPWbfx2NPWLf9I3Rng1dijUeyKc2SWZppg03LFCxzdA==", + "version": "1.3.41", + "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.41/d9a093b1da7e519c16b081619587663d85c04e2c", + "integrity": "sha512-BWw84zCmPNxeBrh0eLg42HTywYZcbNPIC2vZXZIna3UJpdY/rjqA/AsTKhWmpCZt8pIKSqrNt8p354cFHFRbGQ==", + "license": "GPL-2.0-or-later", "dependencies": { "@faizaanceg/pandora": "^1.1.1", "@heroicons/react": "2.1.3", diff --git a/package.json b/package.json index f4d581220..80ea179a3 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@heroicons/react": "^2.1.5", - "@newfold-labs/wp-module-ecommerce": "^1.3.40", + "@newfold-labs/wp-module-ecommerce": "^1.3.41", "@newfold-labs/wp-module-facebook": "1.0.7", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", From ac2da2c080d88186e13a92014afa2330c77e5c74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 21:01:58 +0000 Subject: [PATCH 16/25] NPM(deps): Bump @wordpress/html-entities from 4.4.0 to 4.6.0 Bumps [@wordpress/html-entities](https://github.com/WordPress/gutenberg/tree/HEAD/packages/html-entities) from 4.4.0 to 4.6.0. - [Release notes](https://github.com/WordPress/gutenberg/releases) - [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/html-entities/CHANGELOG.md) - [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/html-entities@4.6.0/packages/html-entities) --- updated-dependencies: - dependency-name: "@wordpress/html-entities" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 027ed1577..1e6d1ee26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@wordpress/compose": "^7.5.0", "@wordpress/dom-ready": "^4.5.0", "@wordpress/element": "^6.3.0", - "@wordpress/html-entities": "^4.4.0", + "@wordpress/html-entities": "^4.6.0", "@wordpress/i18n": "^5.4.0", "@wordpress/icons": "^10.5.0", "classnames": "^2.5.1", @@ -6026,9 +6026,9 @@ } }, "node_modules/@wordpress/html-entities": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.4.0.tgz", - "integrity": "sha512-EXOo+eBYeKKuBFgRleQYfK3fdXy5gzFdHtxbPPDunsETYkdapgX4pr/epDLmi9Uk3fcdFMwFre2o2s6LkLke4A==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.6.0.tgz", + "integrity": "sha512-ypTlGwDKw7jpmu9rneErkkq9dFHXzju8SGdEWkVAeqhRS9Ifri9DvmrovASB2c5IPY+Ijwh4YlVkx1yNBRHr5w==", "dependencies": { "@babel/runtime": "^7.16.0" }, diff --git a/package.json b/package.json index ecba2c9a2..4fc12fa6d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@wordpress/compose": "^7.5.0", "@wordpress/dom-ready": "^4.5.0", "@wordpress/element": "^6.3.0", - "@wordpress/html-entities": "^4.4.0", + "@wordpress/html-entities": "^4.6.0", "@wordpress/i18n": "^5.4.0", "@wordpress/icons": "^10.5.0", "classnames": "^2.5.1", From f56b029345f0b37d4abb036d89364e9b2606559f Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 20:51:45 -0700 Subject: [PATCH 17/25] Bump my products module to 1.0.1 --- composer.json | 2 +- composer.lock | 63 ++++++++++++++++++- src/app/pages/home/index.js | 4 +- ...productSection.js => myProductsSection.js} | 17 +++-- tests/cypress/fixtures/products.json | 14 ----- tests/cypress/integration/home.cy.js | 52 +-------------- 6 files changed, 72 insertions(+), 80 deletions(-) rename src/app/pages/home/{productSection.js => myProductsSection.js} (79%) delete mode 100644 tests/cypress/fixtures/products.json diff --git a/composer.json b/composer.json index 875986bc6..c886e26f7 100644 --- a/composer.json +++ b/composer.json @@ -86,6 +86,7 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", + "newfold-labs/wp-module-my-products": "^1.0.1", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", @@ -94,7 +95,6 @@ "newfold-labs/wp-module-secure-passwords": "^1.1.1", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.0", - "newfold-labs/wp-module-my-products": "^0.2.0", "wp-forge/wp-update-handler": "^1.0.2", "wp-forge/wp-upgrade-handler": "^1.0" } diff --git a/composer.lock b/composer.lock index 23a92b6f1..608030b5d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8370dd50979d91ab03223e61a16a53ab", + "content-hash": "001b5cba0bb7e33dd7f6801888bb5605", "packages": [ { "name": "doctrine/inflector", @@ -1154,6 +1154,65 @@ }, "time": "2024-08-21T14:04:06+00:00" }, + { + "name": "newfold-labs/wp-module-my-products", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/newfold-labs/wp-module-my-products.git", + "reference": "685999ab517a31f8f14e8ff64186aff02fd1c75b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/685999ab517a31f8f14e8ff64186aff02fd1c75b", + "reference": "685999ab517a31f8f14e8ff64186aff02fd1c75b", + "shasum": "" + }, + "require": { + "newfold-labs/wp-module-context": "^1.0", + "newfold-labs/wp-module-data": "^2.6.1", + "newfold-labs/wp-module-features": "^1.3.0" + }, + "require-dev": { + "newfold-labs/wp-php-standards": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "NewfoldLabs\\WP\\Module\\MyProducts\\": "includes" + }, + "files": [ + "bootstrap.php" + ] + }, + "scripts": { + "fix": [ + "vendor/bin/phpcbf --standard=phpcs.xml ." + ], + "lint": [ + "vendor/bin/phpcs --standard=phpcs.xml -s ." + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Vara Prasad Maruboina", + "email": "varaprasad.maruboina@newfold.com" + }, + { + "name": "Girish Lokapure", + "email": "girish.lokapure@newfold.com" + } + ], + "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", + "support": { + "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.1", + "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" + }, + "time": "2024-08-22T03:21:25+00:00" + }, { "name": "newfold-labs/wp-module-notifications", "version": "1.5.0", @@ -4306,5 +4365,5 @@ "platform-overrides": { "php": "7.3.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 0dbd10a6f..7598c1bc9 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -4,7 +4,7 @@ import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; -import ProductSection from './productSection'; +import MyProductSection from './myProductsSection'; const abTestShowMyProducts = NewfoldRuntime.hasCapability( 'abTestShowMyProducts' @@ -23,7 +23,7 @@ const Home = () => {
- { abTestShowMyProducts && } + { abTestShowMyProducts && }
); }; diff --git a/src/app/pages/home/productSection.js b/src/app/pages/home/myProductsSection.js similarity index 79% rename from src/app/pages/home/productSection.js rename to src/app/pages/home/myProductsSection.js index 64d5b06c0..39be23d3e 100644 --- a/src/app/pages/home/productSection.js +++ b/src/app/pages/home/myProductsSection.js @@ -1,9 +1,8 @@ -import { Container } from '@newfold/ui-component-library'; import apiFetch from '@wordpress/api-fetch'; import { useState, useEffect } from '@wordpress/element'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { default as NewfoldMyProducts } from '@modules/wp-module-my-products/components/product'; import { isJarvis } from '../../util/helpers'; +import { default as NewfoldMyProducts } from '@modules/wp-module-my-products/components/myProducts'; // constants to pass to module const moduleConstants = { @@ -42,15 +41,13 @@ const moduleMethods = { isJarvis, }; -const ProductSection = () => { +const MyProductsSection = () => { return ( - - - + ); }; -export default ProductSection; +export default MyProductsSection; diff --git a/tests/cypress/fixtures/products.json b/tests/cypress/fixtures/products.json deleted file mode 100644 index 398361cdd..000000000 --- a/tests/cypress/fixtures/products.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "autoRenewFlag": null, - "expirationDate": "9999.December.31 00:00:00", - "prodId": 7103940, - "prodName": "Free SSL" - }, - { - "autoRenewFlag": null, - "expirationDate": "2025.March.26 00:00:00", - "prodId": 7102074, - "prodName": "SiteLock Lite" - } -] \ No newline at end of file diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index b45564cf4..54cf10f97 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -1,5 +1,5 @@ // -const productFixtures = require( '../fixtures/products.json' ); + describe( 'Home Page', function () { let NewfoldRuntime; @@ -129,54 +129,4 @@ describe( 'Home Page', function () { cy.reload(); cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' ); } ); - - it( 'Products Section Renders Correctly', () => { - if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { - cy.intercept( - 'GET', - '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', - productFixtures - ); - cy.reload(); - // Verify the table contains the correct product data - cy.get( '.wppbh-products-data-section' ).within( () => { - cy.contains( 'Products & Services' ).should( 'be.visible' ); - cy.contains( 'Free SSL' ).should( 'be.visible' ); - cy.contains( 'SiteLock Lite' ).should( 'be.visible' ); - } ); - } else { - cy.get( '.wppbh-products-section' ).should( 'not.exist' ); - } - } ); - - it( 'Products Section Renders Correctly for No products response', () => { - if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { - cy.intercept( - 'GET', - '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', - [] - ); - cy.reload(); - cy.get( '.wppbh-products-section' ) - .contains( 'Sorry, no products. Please, try again later.' ) - .scrollIntoView() - .should( 'be.visible' ); - } else { - cy.get( '.wppbh-products-section' ).should( 'not.exist' ); - } - } ); - - it( 'Products Section Renders Correctly for Empty response', () => { - if ( NewfoldRuntime.capabilities.abTestShowMyProducts ) { - cy.intercept( - 'GET', - '/index.php?rest_route=%2Fnewfold-my-products%2Fv1%2Fproducts&_locale=user', - {} - ); - cy.reload(); - cy.get( '.wppbh-products-section' ).should( 'not.exist' ); - } else { - cy.get( '.wppbh-products-section' ).should( 'not.exist' ); - } - } ); } ); From b95da890ab1649f00ed80bd9a99c14ab1c5125dc Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 20:57:28 -0700 Subject: [PATCH 18/25] Resolve conflicts --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 608030b5d..897cae8c0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "001b5cba0bb7e33dd7f6801888bb5605", + "content-hash": "088926a3cbacc2382d78525b04bbb7e5", "packages": [ { "name": "doctrine/inflector", @@ -663,16 +663,16 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v1.3.40", + "version": "v1.3.41", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "56b70f018aaa7d49fe4eed6cc83b831d3cfb5999" + "reference": "4e4d787d6a033c2f2f3672ceaae4ae17ff41968d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/56b70f018aaa7d49fe4eed6cc83b831d3cfb5999", - "reference": "56b70f018aaa7d49fe4eed6cc83b831d3cfb5999", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/4e4d787d6a033c2f2f3672ceaae4ae17ff41968d", + "reference": "4e4d787d6a033c2f2f3672ceaae4ae17ff41968d", "shasum": "" }, "require": { @@ -715,10 +715,10 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.40", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.41", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2024-08-14T12:15:48+00:00" + "time": "2024-08-21T09:22:19+00:00" }, { "name": "newfold-labs/wp-module-facebook", From 99e6d80d5f1fe07e091e2692df3164ab965e777c Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 21:38:55 -0700 Subject: [PATCH 19/25] Prevent plugin icon jumping when admin menu is folding Info: https://jira.newfold.com/browse/PRESS0-2130 --- inc/Admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/Admin.php b/inc/Admin.php index 0590745ba..2659a5b30 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -118,6 +118,7 @@ public static function admin_nav_style() { echo 'ul#adminmenu a.toplevel_page_bluehost.wp-has-current-submenu:after, ul#adminmenu>li#toplevel_page_bluehost.current>a.current:after { border-right-color: #fff !important; }'; echo 'li#toplevel_page_bluehost > ul > li.wp-first-item { display: none !important; }'; echo '#wp-toolbar #wp-admin-bar-bluehost-coming_soon .ab-item { padding: 0; }'; + echo 'body.folded #adminmenu .toplevel_page_bluehost div.wp-menu-image { width: 36px; height: 34px; }'; echo ''; } From 0e4ebabd1ecfb958172a04ba0273f98f27638cdf Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 21:40:33 -0700 Subject: [PATCH 20/25] Bump my products module to 1.0.2 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index b4412e210..efa79b77d 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", - "newfold-labs/wp-module-my-products": "^1.0.1", + "newfold-labs/wp-module-my-products": "^1.0.2", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", diff --git a/composer.lock b/composer.lock index 897cae8c0..3f5ed182e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "088926a3cbacc2382d78525b04bbb7e5", + "content-hash": "554a2c571f2ca68d4729edc817bb26a0", "packages": [ { "name": "doctrine/inflector", @@ -1156,16 +1156,16 @@ }, { "name": "newfold-labs/wp-module-my-products", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-my-products.git", - "reference": "685999ab517a31f8f14e8ff64186aff02fd1c75b" + "reference": "95705b1772f79b034800e02cd1a69f95a0316417" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/685999ab517a31f8f14e8ff64186aff02fd1c75b", - "reference": "685999ab517a31f8f14e8ff64186aff02fd1c75b", + "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/95705b1772f79b034800e02cd1a69f95a0316417", + "reference": "95705b1772f79b034800e02cd1a69f95a0316417", "shasum": "" }, "require": { @@ -1208,10 +1208,10 @@ ], "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", "support": { - "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.1", + "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.2", "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" }, - "time": "2024-08-22T03:21:25+00:00" + "time": "2024-08-22T04:14:26+00:00" }, { "name": "newfold-labs/wp-module-notifications", From 2302c94c1ac116e6d1a4d6231052fbf9e1553fc6 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 21:45:57 -0700 Subject: [PATCH 21/25] Update version to 3.15.0 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index d31f3f67a..ebf08cafa 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.14.6 + * Version: 3.15.0 * Requires at least: 6.4 * Requires PHP: 7.3 * Tested up to: 6.6.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.14.6' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.15.0' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index 03510ed24..9bab39d81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", diff --git a/package.json b/package.json index 4d3fce87f..b3cf70601 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", From bc83ff95a8b2d60eb30427ebaf68975c54e169f0 Mon Sep 17 00:00:00 2001 From: wpalani Date: Thu, 22 Aug 2024 15:35:00 -0700 Subject: [PATCH 22/25] Bump my products module to 1.0.3 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index efa79b77d..a46a3cb7a 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", - "newfold-labs/wp-module-my-products": "^1.0.2", + "newfold-labs/wp-module-my-products": "^1.0.3", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", diff --git a/composer.lock b/composer.lock index 3f5ed182e..6fd0e6ae6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "554a2c571f2ca68d4729edc817bb26a0", + "content-hash": "f6e0ff3ece4cdd6275d5fa174fe2e4af", "packages": [ { "name": "doctrine/inflector", @@ -1156,16 +1156,16 @@ }, { "name": "newfold-labs/wp-module-my-products", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-my-products.git", - "reference": "95705b1772f79b034800e02cd1a69f95a0316417" + "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/95705b1772f79b034800e02cd1a69f95a0316417", - "reference": "95705b1772f79b034800e02cd1a69f95a0316417", + "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/e0796b9087f5d4349ad0403a3bf55046ec620eb1", + "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1", "shasum": "" }, "require": { @@ -1208,10 +1208,10 @@ ], "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", "support": { - "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.2", + "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.3", "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" }, - "time": "2024-08-22T04:14:26+00:00" + "time": "2024-08-22T21:57:38+00:00" }, { "name": "newfold-labs/wp-module-notifications", From 52877729e842e41d3105ecfe8b488fd7a46a1fb5 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:50:21 -0700 Subject: [PATCH 23/25] Update version to 3.14.7 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index ebf08cafa..61c79a47d 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.15.0 + * Version: 3.14.7 * Requires at least: 6.4 * Requires PHP: 7.3 * Tested up to: 6.6.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.15.0' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.14.7' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index 9bab39d81..f890ffea5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", diff --git a/package.json b/package.json index b3cf70601..060f4c5b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", From 92ec80cfd963e5dd8c5ac078ad198e86a762f358 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:53:48 -0700 Subject: [PATCH 24/25] Remove my products module --- composer.json | 1 - composer.lock | 61 +------------------------ src/app/pages/home/index.js | 6 --- src/app/pages/home/myProductsSection.js | 53 --------------------- 4 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 src/app/pages/home/myProductsSection.js diff --git a/composer.json b/composer.json index a46a3cb7a..a1b75ec79 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,6 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", - "newfold-labs/wp-module-my-products": "^1.0.3", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", diff --git a/composer.lock b/composer.lock index 6fd0e6ae6..0a7cc593e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6e0ff3ece4cdd6275d5fa174fe2e4af", + "content-hash": "460a529c9817ae719ddd78ed07ff66fc", "packages": [ { "name": "doctrine/inflector", @@ -1154,65 +1154,6 @@ }, "time": "2024-08-21T14:04:06+00:00" }, - { - "name": "newfold-labs/wp-module-my-products", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/newfold-labs/wp-module-my-products.git", - "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/e0796b9087f5d4349ad0403a3bf55046ec620eb1", - "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1", - "shasum": "" - }, - "require": { - "newfold-labs/wp-module-context": "^1.0", - "newfold-labs/wp-module-data": "^2.6.1", - "newfold-labs/wp-module-features": "^1.3.0" - }, - "require-dev": { - "newfold-labs/wp-php-standards": "^1.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "NewfoldLabs\\WP\\Module\\MyProducts\\": "includes" - }, - "files": [ - "bootstrap.php" - ] - }, - "scripts": { - "fix": [ - "vendor/bin/phpcbf --standard=phpcs.xml ." - ], - "lint": [ - "vendor/bin/phpcs --standard=phpcs.xml -s ." - ] - }, - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Vara Prasad Maruboina", - "email": "varaprasad.maruboina@newfold.com" - }, - { - "name": "Girish Lokapure", - "email": "girish.lokapure@newfold.com" - } - ], - "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", - "support": { - "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.3", - "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" - }, - "time": "2024-08-22T21:57:38+00:00" - }, { "name": "newfold-labs/wp-module-notifications", "version": "1.5.0", diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 7598c1bc9..396a958c4 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,15 +1,10 @@ import { Container, Page } from '@newfold/ui-component-library'; -import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; import MyProductSection from './myProductsSection'; -const abTestShowMyProducts = NewfoldRuntime.hasCapability( - 'abTestShowMyProducts' -); - const Home = () => { return ( @@ -23,7 +18,6 @@ const Home = () => { - { abTestShowMyProducts && } ); }; diff --git a/src/app/pages/home/myProductsSection.js b/src/app/pages/home/myProductsSection.js deleted file mode 100644 index 39be23d3e..000000000 --- a/src/app/pages/home/myProductsSection.js +++ /dev/null @@ -1,53 +0,0 @@ -import apiFetch from '@wordpress/api-fetch'; -import { useState, useEffect } from '@wordpress/element'; -import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { isJarvis } from '../../util/helpers'; -import { default as NewfoldMyProducts } from '@modules/wp-module-my-products/components/myProducts'; - -// constants to pass to module -const moduleConstants = { - text: { - error: __( - 'Oops, there was an error loading products, please try again later.', - 'bluehost-wordpress-plugin' - ), - noProducts: __( - 'Sorry, no products. Please, try again later.', - 'bluehost-wordpress-plugin' - ), - jarvisText: __( - 'Please login to your account manager to see products.', - 'bluehost-wordpress-plugin' - ), - title: __( 'My Products', 'bluehost-wordpress-plugin' ), - subTitle: __( - 'A list of products associated with your Bluehost hosting package. For more information, check out the ', - 'bluehost-wordpress-plugin' - ), - renewalText: __( - 'Bluehost Account Manager', - 'bluehost-wordpress-plugin' - ), - renewalCenterUrl: 'https://www.bluehost.com/my-account/renewal-center', - }, -}; - -// methods to pass to module -const moduleMethods = { - apiFetch, - useState, - useEffect, - NewfoldRuntime, - isJarvis, -}; - -const MyProductsSection = () => { - return ( - - ); -}; - -export default MyProductsSection; From f574a849e84d61e6d29eb7d5138c0d97f1e01b63 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:56:33 -0700 Subject: [PATCH 25/25] Remove MyProductSection --- src/app/pages/home/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 396a958c4..bd7f2254c 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -3,7 +3,6 @@ import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; -import MyProductSection from './myProductsSection'; const Home = () => { return (