Internal: Conversion Center - add contact button document #27341

nicoladj77 · 2024-05-15T22:36:34Z

PR Checklist

The commit message follows our guidelines: https://github.com/elementor/elementor/blob/master/.github/CONTRIBUTING.md

PR Type

What kind of change does this PR introduce?

Summary

This PR can be summarized in the following changelog entry:

Implement Contact Button Document

Description

An explanation of what is done in this PR

Implement Contact Button Document

Test instructions

This PR can be tested by following these steps:

Quality assurance

I have tested this code to the best of my abilities
I have added unittests to verify the code works as intended
Docs have been added / updated (for bug fixes / features)

Fixes #

nicoladj77 · 2024-05-15T22:38:09Z

assets/dev/js/editor/components/template-library/views/parts/templates.js

@@ -153,7 +153,7 @@ TemplateLibraryCollectionView = Marionette.CompositeView.extend( {
 	},

 	setFiltersUI() {
-		if ( ! this.select2Instance ) {
+		if ( ! this.select2Instance && this.$( this.ui.selectFilter ).length ) {


@louiswol94 this avoids error when categories are not returned.

…entor-collaboration into feature/contacts-page-doc

louiswol94 · 2024-05-22T14:19:13Z

app/modules/import-export/utils.php

@@ -81,7 +81,8 @@ public static function get_registered_cpt_names() {
 		unset(
 			$post_types[ Landing_Pages_Module::CPT ],
 			$post_types[ Source_Local::CPT ],
-			$post_types[ Conversion_Center_Module::CPT_LINKS_PAGES ]
+			$post_types[ Conversion_Center_Module::CPT_LINKS_PAGES ],


@nicoladj77 Will there be a separate PR to remove CPT_LINKS_PAGES?

@louiswol94 yes I have it ready when this is merged.

louiswol94 · 2024-05-22T14:21:16Z

core/document-types/page-base.php

+	public static function get_labels() : array {
+		$plural_label   = static::get_plural_title();
+		$singular_label = static::get_title();
+
+		$labels = [
+			'name' => $plural_label, // Already translated.
+			'singular_name' => $singular_label, // Already translated.
+			'all_items' => sprintf( __( 'All %s', 'elementor' ), $plural_label ),
+			'add_new' => esc_html__( 'Add New', 'elementor' ),
+			'add_new_item' => sprintf( __( 'Add New %s', 'elementor' ), $singular_label ),
+			'edit_item' => sprintf( __( 'Edit %s', 'elementor' ), $singular_label ),
+			'new_item' => sprintf( __( 'New %s', 'elementor' ), $singular_label ),
+			'view_item' => sprintf( __( 'View %s', 'elementor' ), $singular_label ),
+			'search_items' => sprintf( __( 'Search %s', 'elementor' ), $plural_label ),
+			'not_found' => sprintf( __( 'No %s found.', 'elementor' ), strtolower( $plural_label ) ),
+			'not_found_in_trash' => sprintf( __( 'No %s found in Trash.', 'elementor' ), strtolower( $plural_label ) ),
+			'parent_item_colon' => '',
+			'menu_name' => $plural_label,
+		];
+
+		return $labels;
+	}


@nicoladj77 Why did you have to add this here?

@louiswol94 this is to streamline adding CPTs in modules. It's always the same so I thought it mades sense to have it here.

It feels risky :)

louiswol94 · 2024-05-22T14:22:15Z

modules/conversion-center/assets/js/admin/links-pages.js

@@ -27,16 +25,39 @@ export default class LinksPagesHandler extends AdminMenuHandler {
 		const settings = this.getSettings(),
 			isLinksPagesTablePage = !! window.location.href.includes( settings.paths.linksPagesTablePage ),
 			isLinksPagesTrashPage = !! window.location.href.includes( settings.paths.linksPagesTrashPage ),
-			isLinksPagesCreateYourFirstPage = !! window.location.href.includes( settings.paths.linksPagesAddNewPage );
+			isLinksPagesCreateYourFirstPage = !! window.location.href.includes( settings.paths.linksPagesAddNewPage ),


@nicoladj77 Should we rename this file if it handles the CB as well?

@louiswol94 it will be renamed in the next PR where we will not have Link In bios doc anymore

louiswol94 · 2024-05-22T14:23:21Z

modules/conversion-center/assets/js/editor/hooks/ui/editor/delete/open-library-after-delete.js

@@ -15,7 +15,7 @@ export class OpenLibraryAfterDelete extends After {
 			type = args?.containers[ 0 ]?.document?.config?.type;
 		}

-		return 'links-page' === type;
+		return 'links-page' === type || 'contact-buttons' === type;


Will we remove 'links-page' in a separate PR?

@louiswol94 yes

louiswol94 · 2024-05-22T14:28:48Z

modules/conversion-center/module.php

+	private function has_contact_pages(): bool {
+		if ( null !== $this->has_contact_pages ) {
+			return $this->has_contact_pages;
+		}
+
+		$this->has_contact_pages = $this->has_pages(
+			self::CPT_CONTACT_PAGES,
+			self::CONTACT_PAGE_DOCUMENT_TYPE
+		);
+
+		return $this->has_contact_pages;
+	}


We should probably split these into separate classes...
$this->register_contact_pages_cpt/$this->register_links_pages_cpt
-->

$this->links->register_cpt / $this->cb->register_cpt

And for others.

But we can do it if there's time left.

@louiswol94 I think this should be architectured in a way that can be re used throughout the code base. Happy to give it a shot if we have time. Probably should live more in the Document rather than in the module, but not sure how/when modules are initialized.

nicoladj77 added 10 commits May 14, 2024 23:38

add logic to reopen library if document empty

a599103

small fixes

d79f8ad

show editor placeholder

8448ad4

docs for contact page

c161cff

Merge branch 'main' into feature/library-and-document-fixes

94ad69e

add contact page

c23f140

localize settings

20f9e70

add contact buttons document

715527b

fix conflicts

e107615

linting

53340d6

nicoladj77 commented May 15, 2024

View reviewed changes

clean up

e7befda

nicoladj77 changed the title ~~Feature/contacts page doc~~ Internal: Conversion Center - add contact button document May 15, 2024

nicoladj77 requested a review from louiswol94 May 15, 2024 22:59

nicoladj77 and others added 8 commits May 16, 2024 11:01

Merge branch 'main' into feature/contacts-page-doc

05a325c

set draft

936ed10

fix redirects

451c92b

revert to quote

6ef3376

fix conflicts

a95a24f

Merge branch 'main' into feature/contacts-page-doc

0ff03de

fix tests

0ac89fe

Merge branch 'feature/contacts-page-doc' of github.com:10up/10up-elem…

3ab9592

…entor-collaboration into feature/contacts-page-doc

louiswol94 reviewed May 22, 2024

View reviewed changes

louiswol94 approved these changes May 22, 2024

View reviewed changes

Merge branch 'main' into feature/contacts-page-doc

50f18f2

nicoladj77 merged commit 3b60199 into elementor:main May 22, 2024
52 checks passed

nicoladj77 deleted the feature/contacts-page-doc branch May 22, 2024 18:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Internal: Conversion Center - add contact button document #27341

Internal: Conversion Center - add contact button document #27341

nicoladj77 commented May 15, 2024

nicoladj77 May 15, 2024

louiswol94 May 22, 2024

nicoladj77 May 22, 2024

louiswol94 May 22, 2024

nicoladj77 May 22, 2024

louiswol94 May 22, 2024

louiswol94 May 22, 2024

nicoladj77 May 22, 2024

louiswol94 May 22, 2024

nicoladj77 May 22, 2024

louiswol94 May 22, 2024 •

edited

nicoladj77 May 22, 2024

Internal: Conversion Center - add contact button document #27341

Internal: Conversion Center - add contact button document #27341

Conversation

nicoladj77 commented May 15, 2024

PR Checklist

PR Type

Summary

Description

Test instructions

Quality assurance

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

louiswol94 May 22, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

louiswol94 May 22, 2024 •

edited