release: new version

- remove legacy Page Templates functionality - remove Template Cloud functionality for new users & users who weren't using the feature - we have launched a dedicated Templates Cloud plugin that offers advanced permission controls and additional features. which you can try from your Themeisle account - if you already have templates saved in the cloud, you can still use them in this plugin if you already have a license key set up
Codeinwp · Nov 28, 2024 · cb8efbd · cb8efbd
2 parents 067a173 + ce77bb0
commit cb8efbd
Show file tree

Hide file tree

Showing 20 changed files with 650 additions and 302 deletions.
diff --git a/assets/src/Components/Main.js b/assets/src/Components/Main.js
@@ -9,7 +9,8 @@ import ImportModal from './ImportModal';
 import DemoSiteTemplatesImport from './CloudLibrary/DemoSiteTemplatesImport';
 import Header from './Header';
 import OnboardingContent from './OnboardingContent';
-import Settings from "./Settings/Settings";
+import Settings from './Settings/Settings';
+import NewTCNotice from './NewTCNotice';
 
 const Onboarding = ( {
 	getSites,
@@ -28,6 +29,9 @@ const Onboarding = ( {
 				<Header />
 				<div className="ob-body">
 					<div className="content-container">
+
+						{['library', 'settings'].includes(currentTab) && <NewTCNotice/>}
+
 						{ migration && <Migration data={ migration } /> }
 
 						{ 'starterSites' === currentTab &&

diff --git a/assets/src/Components/NewTCNotice.js b/assets/src/Components/NewTCNotice.js
@@ -0,0 +1,55 @@
+import {__} from '@wordpress/i18n';
+import {Button} from '@wordpress/components';
+import {close} from '@wordpress/icons';
+import {useState} from '@wordpress/element';
+import {ajaxAction} from '../utils/rest';
+
+export default function () {
+  const [isVisible, setIsVisible] = useState(true);
+
+  const {
+    show,
+    ajaxURL,
+    nonce
+  } = window.tiobDash.newTCNotice;
+
+  const dismissNotice = () => {
+    ajaxAction(
+        ajaxURL,
+        'dismiss_new_tc_notice',
+        nonce
+    ).then( (r) => {
+      console.log(r);
+        setIsVisible(false);
+    } ).catch(e => {
+        console.error(e);
+    } );
+  };
+
+  if (!show || ! isVisible) {
+    return null;
+  }
+
+  return (
+      <div className="tiob-new-tc-notice">
+        <div>
+        <p>
+          {__('We\'ve launched a dedicated Templates Cloud plugin that offers advanced permission controls and additional features. Try it out from your Themeisle account.', 'templates-patterns-collection')}
+        </p>
+
+        <p className="description">
+          {__('If you already have templates saved in the cloud, you can still use them in this plugin.', 'templates-patterns-collection')}
+        </p>
+        </div>
+
+        <Button
+            size="compact"
+            className="dismiss"
+            icon={close}
+            iconSize={20}
+            label={__('Dismiss', 'templates-patterns-collection')}
+            onClick={dismissNotice}
+        />
+      </div>
+  );
+}
diff --git a/assets/src/scss/_new-tc-notice.scss b/assets/src/scss/_new-tc-notice.scss
@@ -0,0 +1,27 @@
+.tiob-new-tc-notice {
+  padding: 10px 20px;
+  background: #fff;
+  border: 1px solid #e5e5e5;
+  display: flex;
+  margin-top: 20px;
+  width: 100%;
+  gap: 20px;
+  box-sizing: border-box;
+  align-items: center;
+  border-left: 5px solid var(--wp-admin-theme-color, #3858e9);
+
+  p {
+    margin: 0 0 10px;
+    font-size: 14px;
+  }
+
+  .description {
+    font-size: 12px;
+    margin: 0;
+  }
+
+  .dismiss {
+    flex-shrink: 0;
+    margin-left: auto;
+  }
+}
diff --git a/assets/src/style.scss b/assets/src/style.scss
@@ -19,5 +19,6 @@
 @import "scss/license";
 @import "scss/feedback";
 @import "scss/settings";
+@import "scss/new-tc-notice";
 
 @import "scss/media-queries";
diff --git a/beaver/src/components/header.js b/beaver/src/components/header.js
@@ -12,13 +12,11 @@ const Header = ( { closeModal, getOrder, getSearchQuery } ) => {
 	const { setFetching, updateCurrentTab } = useDispatch( 'tpc/beaver' );
 
 	const TABS = {
-		templates: window.tiTpc.library.tabs.templates,
+		library: window.tiTpc.library.tabs.library,
+		// Removed during PRF.
+		// templates: window.tiTpc.library.tabs.templates,
 	};
 
-	if ( parseInt( window.tiTpc.tier ) === 3 ) {
-		TABS.library = window.tiTpc.library.tabs.library;
-	}
-
 	const isFetching = useSelect( ( select ) =>
 		select( 'tpc/beaver' ).isFetching()
 	);
@@ -85,10 +83,7 @@ const Header = ( { closeModal, getOrder, getSearchQuery } ) => {
 							/>
 						) }
 
-						{ window.tiTpc.postTypes.includes(
-							window.tiTpc.postType
-						) &&
-							parseInt( window.tiTpc.tier ) === 3 && (
+						{ window.tiTpc.postTypes.includes(window.tiTpc.postType) && (
 								<Button
 									label={ window.tiTpc.library.actions.save }
 									icon={ cloudUpload }

diff --git a/beaver/src/data/store/index.js b/beaver/src/data/store/index.js
@@ -3,10 +3,7 @@ import { registerStore } from '@wordpress/data';
 const DEFAULT_STATE = {
 	isFetching: true,
 	isPreview: false,
-	tab:
-		parseInt( window.tiTpc ? window.tiTpc.tier : 0 ) === 3
-			? 'library'
-			: 'templates',
+	tab: 'library',
 	templates: {
 		items: [],
 		currentPage: 0,

diff --git a/beaver/src/export.js b/beaver/src/export.js
@@ -1,63 +1,61 @@
 /* global FLBuilder */
 
-if ( parseInt( window.tiTpc.tier ) === 3 ) {
-	const contextMenu = document.getElementById( 'tmpl-fl-row-overlay' );
-
-	const tpcExport = ( e ) => {
-		const row = e.closest( '.fl-row' );
-		const node = row.dataset.node;
-
-		const message = `<div class="tpc-template-cloud-export-modal">
-		<h1>${ window.tiTpc.exporter.modalLabel }</h1>
-		<label for="tpc-${ node }">${ window.tiTpc.exporter.textLabel }</label>
-		<input id="tpc-${ node }" type="text" placeholder="${ window.tiTpc.exporter.textPlaceholder }" />
-	</div>`;
-
-		FLBuilder.confirm( {
-			message,
-			ok: () => {
-				const input = document.getElementById( `tpc-${ node }` );
-				const title = input.value || 'Template';
-				setTimeout( function () {
-					FLBuilder.showAjaxLoader();
-					FLBuilder.ajax(
-						{
-							action: 'ti_export_template',
-							node,
-							title,
-						},
-						( res ) => {
-							if ( undefined !== res.success && ! res.success ) {
-								FLBuilder.alert(
-									`<h1>${ window.tiTpc.exporter.exportFailed }</h1> ${ res.data }`
-								);
-							}
-
-							FLBuilder.hideAjaxLoader();
+const contextMenu = document.getElementById( 'tmpl-fl-row-overlay' );
+
+const tpcExport = ( e ) => {
+	const row = e.closest( '.fl-row' );
+	const node = row.dataset.node;
+
+	const message = `<div class="tpc-template-cloud-export-modal">
+	<h1>${ window.tiTpc.exporter.modalLabel }</h1>
+	<label for="tpc-${ node }">${ window.tiTpc.exporter.textLabel }</label>
+	<input id="tpc-${ node }" type="text" placeholder="${ window.tiTpc.exporter.textPlaceholder }" />
+</div>`;
+
+	FLBuilder.confirm( {
+		message,
+		ok: () => {
+			const input = document.getElementById( `tpc-${ node }` );
+			const title = input.value || 'Template';
+			setTimeout( function () {
+				FLBuilder.showAjaxLoader();
+				FLBuilder.ajax(
+					{
+						action: 'ti_export_template',
+						node,
+						title,
+					},
+					( res ) => {
+						if ( undefined !== res.success && ! res.success ) {
+							FLBuilder.alert(
+								`<h1>${ window.tiTpc.exporter.exportFailed }</h1> ${ res.data }`
+							);
 						}
-					);
-				}, 1000 );
-			},
-			strings: {
-				ok: window.tiTpc.exporter.buttonLabel,
-				cancel: window.tiTpc.exporter.cancelLabel,
-			},
-		} );
-	};
-
-	window.tiTpc.tpcExport = tpcExport;
-
-	if ( contextMenu ) {
-		const text = contextMenu.textContent;
-		contextMenu.textContent = text.replace(
-			// eslint-disable-next-line prettier/prettier
-			'<li><a class="fl-block-row-reset" href="javascript:void(0);">Reset Row Width</a></li>',
-			// eslint-disable-next-line prettier/prettier
-			'<li><a class="fl-block-row-reset" href="javascript:void(0);">Reset Row Width</a></li><li><a class="fl-block-row-tpc-export" onclick="window.tiTpc.tpcExport(this)" href="javascript:void(0);">Save to Templates Cloud</a></li>'
-		);
-	}
-
-	FLBuilder.addHook( 'tiTpcExport', () => {
-		window.tiTpc.initModalExport();
+
+						FLBuilder.hideAjaxLoader();
+					}
+				);
+			}, 1000 );
+		},
+		strings: {
+			ok: window.tiTpc.exporter.buttonLabel,
+			cancel: window.tiTpc.exporter.cancelLabel,
+		},
 	} );
+};
+
+window.tiTpc.tpcExport = tpcExport;
+
+if ( contextMenu ) {
+	const text = contextMenu.textContent;
+	contextMenu.textContent = text.replace(
+		// eslint-disable-next-line prettier/prettier
+		'<li><a class="fl-block-row-reset" href="javascript:void(0);">Reset Row Width</a></li>',
+		// eslint-disable-next-line prettier/prettier
+		'<li><a class="fl-block-row-reset" href="javascript:void(0);">Reset Row Width</a></li><li><a class="fl-block-row-tpc-export" onclick="window.tiTpc.tpcExport(this)" href="javascript:void(0);">Save to Templates Cloud</a></li>'
+	);
 }
+
+FLBuilder.addHook( 'tiTpcExport', () => {
+	window.tiTpc.initModalExport();
+} );
diff --git a/editor/src/components/header.js b/editor/src/components/header.js
@@ -14,14 +14,11 @@ const Header = ( { closeModal, getOrder, getSearchQuery } ) => {
 	const { setFetching, updateCurrentTab } = useDispatch( 'tpc/block-editor' );
 
 	const TABS = {
-		templates: __( 'Page Templates', 'templates-patterns-collection' ),
-		// patterns: __( 'Patterns' ),
+		library : __( 'My Library', 'templates-patterns-collection' )
+		// Removed since PRF.
+		// templates: __( 'Page Templates', 'templates-patterns-collection' ),
 	};
 
-	if ( parseInt( tiTpc.tier ) === 3 ) {
-		TABS.library = __( 'My Library', 'templates-patterns-collection' );
-	}
-
 	const isFetching = useSelect( ( select ) =>
 		select( 'tpc/block-editor' ).isFetching()
 	);

diff --git a/editor/src/data/block-editor/index.js b/editor/src/data/block-editor/index.js
@@ -3,7 +3,7 @@ import { registerStore } from '@wordpress/data';
 const DEFAULT_STATE = {
 	isFetching: true,
 	isPreview: false,
-	tab: parseInt( window.tiTpc.tier ) === 3 ? 'library' : 'templates',
+	tab: 'library',
 	templates: [],
 	patterns: [],
 	library: {

diff --git a/editor/src/index.js b/editor/src/index.js
@@ -34,9 +34,7 @@ if ( ! tiTpc.isSiteEditor ) {
 	} );
 }
 
-if ( parseInt( tiTpc.tier ) === 3 ) {
-	registerPlugin( 'ti-tpc', {
-		render: tiTpc.isSiteEditor ? SiteEditorExporter : Exporter,
-		icon,
-	} );
-}
+registerPlugin( 'ti-tpc', {
+	render: tiTpc.isSiteEditor ? SiteEditorExporter : Exporter,
+	icon,
+} );
diff --git a/elementor/src/components/header.js b/elementor/src/components/header.js
@@ -102,27 +102,13 @@ const Header = ( {
 							className={ classnames(
 								'ti-tpc-template-library-menu-item',
 								{
-									'is-active': 'templates' === currentTab,
+									'is-active': 'library' === currentTab,
 								}
 							) }
-							onClick={ () => updateCurrentTab( 'templates' ) }
+							onClick={ () => updateCurrentTab( 'library' ) }
 						>
-							{ window.tiTpc.library.tabs.templates }
+							{ window.tiTpc.library.tabs.library }
 						</Button>
-
-						{ parseInt( window.tiTpc.tier ) === 3 && (
-							<Button
-								className={ classnames(
-									'ti-tpc-template-library-menu-item',
-									{
-										'is-active': 'library' === currentTab,
-									}
-								) }
-								onClick={ () => updateCurrentTab( 'library' ) }
-							>
-								{ window.tiTpc.library.tabs.library }
-							</Button>
-						) }
 					</div>
 				) }
 
@@ -181,8 +167,7 @@ const Header = ( {
 
 								{ [ 'wp-post', 'wp-page' ].includes(
 									elementor.config.document.type
-								) &&
-									parseInt( window.tiTpc.tier ) === 3 && (
+								) && (
 										<Button
 											className="ti-tpc-templates-modal__header__item"
 											onClick={ () =>

diff --git a/elementor/src/data/store/index.js b/elementor/src/data/store/index.js
@@ -3,7 +3,7 @@ import { registerStore } from '@wordpress/data';
 const DEFAULT_STATE = {
 	isFetching: true,
 	isPreview: false,
-	tab: parseInt( window.tiTpc.tier ) === 3 ? 'library' : 'templates',
+	tab: 'library',
 	templates: [],
 	library: {
 		items: [],

diff --git a/elementor/src/data/templates-cloud/index.js b/elementor/src/data/templates-cloud/index.js
@@ -65,10 +65,6 @@ export const fetchTemplates = async ( additionalParams = {} ) => {
 };
 
 export const fetchLibrary = async ( additionalParams = {} ) => {
-	if ( parseInt( window.tiTpc.tier ) !== 3 ) {
-		return;
-	}
-
 	const { meta, ...filteredParams } = tiTpc.params;
 	const { isScroll, ...filteredAdditionalParams } = additionalParams;
 	const params = {