Codeinwp · vytisbulkevicius · Dec 27, 2024 · Dec 16, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/.distignore b/.distignore
@@ -39,3 +39,5 @@ docker-compose.travis.yml
 .nvmrc
 .releaserc.yml
 docker-compose.ci.yml
+.wp-env.json
+artifacts
diff --git a/.github/workflows/build-dev-artifacts.yml b/.github/workflows/build-dev-artifacts.yml
@@ -37,7 +37,11 @@ jobs:
       - name: Create zip
         run: |
           npm ci
-          npm run build
+          npm run build 
+          CURRENT_VERSION=$(node -p -e "require('./package.json').version")
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          DEV_VERSION="${CURRENT_VERSION}-dev.${COMMIT_HASH}"
+          npm run grunt version::${DEV_VERSION}
           npm run dist
       - name: Retrieve branch name
         id: retrieve-branch-name

diff --git a/.wp-env.json b/.wp-env.json
@@ -1,6 +1,10 @@
 {
 	"core": null,
 	"plugins": [ "." ],
+	"lifecycleScripts": {
+		"afterStart": "wp-env run tests-cli wp option update feedzy_legacyv5 1"
+
+	},
 	"env": {
 		"tests": {
 			"config": {

diff --git a/bin/cli-setup.sh b/bin/cli-setup.sh
diff --git a/bin/mysql/init-db.sql b/bin/mysql/init-db.sql
diff --git a/bin/run-e2e-tests-default.sh b/bin/run-e2e-tests-default.sh
diff --git a/bin/run-e2e-tests-gutenberg.sh b/bin/run-e2e-tests-gutenberg.sh
diff --git a/bin/wp-down.sh b/bin/wp-down.sh
diff --git a/bin/wp-init.sh b/bin/wp-init.sh
diff --git a/css/settings.css b/css/settings.css
@@ -154,6 +154,9 @@
 .feedzy-accordion-item__title{
 	position: relative;
 }
+.feedzy-accordion-item.only-pro{
+	opacity: 0.5;
+}
 .feedzy-accordion-item .feedzy-accordion-item__button{
 	width: 100%;
 	position: relative;

diff --git a/feedzy-rss-feed.php b/feedzy-rss-feed.php
@@ -255,8 +255,8 @@ function feedzy_themeisle_log_event( $name, $msg, $type, $file, $line ) {
 			'primary_color'      => '#4268CF',
 			'pages'              => array( 'feedzy_imports', 'edit-feedzy_imports', 'edit-feedzy_categories', 'feedzy_page_feedzy-settings', 'feedzy_page_feedzy-support', 'feedzy_page_feedzy-integration' ),
 			'has_upgrade_menu'   => ! feedzy_is_pro(),
-			'upgrade_link'       => tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'floatWidget' ), 'query' ),
-			'documentation_link' => tsdk_translate_link( tsdk_utmify( 'https://docs.themeisle.com/collection/1569-feedzy-rss-feeds', 'floatWidget' ), 'query' ),
+			'upgrade_link'       => tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'floatWidget' ) ),
+			'documentation_link' => tsdk_translate_link( tsdk_utmify( 'https://docs.themeisle.com/collection/1569-feedzy-rss-feeds', 'floatWidget' ) ),
 			'wizard_link'        => ! feedzy_is_pro() && ! empty( get_option( 'feedzy_fresh_install', false ) ) ? admin_url( 'admin.php?page=feedzy-setup-wizard&tab#step-1' ) : '',
 		);
 	}

diff --git a/form/form.php b/form/form.php
@@ -31,19 +31,7 @@
 		foreach ( $html_parts as $item => $section ) {
 			$output .= '<div class="container feedzy_' . $item . '">';
 			$output .= '<h5>' . $section['title'] . '</h5>';
-			if ( ! feedzy_is_pro() && 'section_feed' === $item ) {
-				$upsell_url = tsdk_translate_link( tsdk_utmify( FEEDZY_UPSELL_LINK, 'amazonproductadvertising', 'classiceditorshortcode' ), 'query' );
 
-				$output .= '<div class="upgrade-alert">';
-				$output .= '<strong>' . __( 'NEW!', 'feedzy-rss-feeds' ) . '</strong>';
-				$output .= wp_sprintf(
-					// translators: %1$s: opening anchor tag, %2$s: closing anchor tag
-					__( 'Enable Amazon Product Advertising feeds to generate affiliate revenue by %1$s upgrading to Feedzy Pro. %2$s', 'feedzy-rss-feeds' ),
-					'<a target="_blank" href="' . esc_url( $upsell_url ) . '" >',
-					'</a>'
-				);
-				$output .= '</div>';
-			}
 			if ( isset( $section['description'] ) ) {
 				$output .= '<p>' . $section['description'] . '</p>';
 			}

diff --git a/js/ActionPopup/Actions.js b/js/ActionPopup/Actions.js
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { SortableContainer } from 'react-sortable-hoc';
 import SortableItem from './SortableItem';
 import { Panel } from '@wordpress/components';

 const Actions = ( props ) => {
 	if ( props.data && props.data.length === 0 ) {
 		return(
 			<></>
 		);
 	}

 	return (
 		<>
 			<Panel header="" className="fz-action-panel" initialOpen={ false }>
 				<ul>
 					{props.data.map((value, index) => '' !== value.id && (
 						<SortableItem key={`item-${index}`} index={index} item={value} loopIndex={index} propRef={props}/>
 					))}
 				</ul>
 			</Panel>
 		</>
	import React from 'react';
Check warning on line 1 in js/ActionPopup/Actions.js GitHub Actions / npm `'react' should be listed in the project's dependencies. Run 'npm i -S react' to add it`
	import ReactDOM from 'react-dom';
Check warning on line 2 in js/ActionPopup/Actions.js GitHub Actions / npm `'react-dom' should be listed in the project's dependencies. Run 'npm i -S react-dom' to add it` Check warning on line 2 in js/ActionPopup/Actions.js GitHub Actions / npm `'ReactDOM' is defined but never used`
	import { SortableContainer } from 'react-sortable-hoc';
	import SortableItem from './SortableItem';
	import { Panel } from '@wordpress/components';

	const Actions = ( props ) => {
Check warning on line 7 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `·props·` with `props`
	if ( props.data && props.data.length === 0 ) {
Check warning on line 8 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `·props.data·&&·props.data.length·===·0·` with `props.data·&&·props.data.length·===·0`
	return(
Check warning on line 9 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `(⏎↹↹↹<></>⏎↹↹)` with `·<></>`
	<></>
	);
	}

	return (
	<>
	<Panel header="" className="fz-action-panel" initialOpen={ false }>
Check warning on line 16 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `·false·` with `false`
	<ul>
	{props.data.map((value, index) => '' !== value.id && (
Check warning on line 18 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `(value,·index)·=>·` with `⏎↹↹↹↹↹↹(value,·index)·=>⏎↹↹↹↹↹↹↹`
	<SortableItem key={`item-${index}`} index={index} item={value} loopIndex={index} propRef={props}/>
Check warning on line 19 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `<SortableItem·key={`item-${index}`}·index={index}·item={value}·loopIndex={index}·propRef={props}` with `↹↹<SortableItem⏎↹↹↹↹↹↹↹↹↹key={`item-${index}`}⏎↹↹↹↹↹↹↹↹↹index={index}⏎↹↹↹↹↹↹↹↹↹item={value}⏎↹↹↹↹↹↹↹↹↹loopIndex={index}⏎↹↹↹↹↹↹↹↹↹propRef={props}⏎↹↹↹↹↹↹↹↹`
	))}
Check warning on line 20 in js/ActionPopup/Actions.js GitHub Actions / npm Replace `↹↹↹↹↹)` with `↹↹↹↹↹↹↹)⏎↹↹↹↹↹`
	</ul>
	</Panel>
	</>