From d31dcf7b6d3df915bf40f81a8cd9e282adccae3a Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Mon, 1 Nov 2021 09:02:55 +0700
Subject: [PATCH 01/10] add Optimize columns on list views for forms, estates,
 and addresses

---
 plugin.php                                    |   2 +-
 .../DetailViewPostSaveController.php          | 175 +++++++++++++++++-
 plugin/Gui/Table/AddressListTable.php         |  33 +++-
 plugin/Gui/Table/EstateListTable.php          |  33 +++-
 plugin/Gui/Table/FormsTable.php               |  34 +++-
 plugin/Installer/DatabaseChanges.php          |  13 +-
 .../RecordManagerReadListViewEstate.php       |   9 +
 tests/TestClassDatabaseChanges.php            |   5 +-
 8 files changed, 294 insertions(+), 10 deletions(-)

diff --git a/plugin.php b/plugin.php
index be176e4dd..d6c98a3b5 100644
--- a/plugin.php
+++ b/plugin.php
@@ -106,7 +106,7 @@
 }, 11);
 add_action('admin_init', [$pAdminViewController, 'add_ajax_actions']);
 add_action('admin_init', [CaptchaDataChecker::class, 'addHook']);
-
+add_action('admin_init', [$pDetailViewPostSaveController, 'getAllPost']);
 add_action('plugins_loaded', function() {
 	load_plugin_textdomain('onoffice-for-wp-websites', false, basename(ONOFFICE_PLUGIN_DIR) . '/languages');
 	// Check 'onoffice-personalized' Folder exists
diff --git a/plugin/Controller/DetailViewPostSaveController.php b/plugin/Controller/DetailViewPostSaveController.php
index 03e1ddf90..444b7ac12 100644
--- a/plugin/Controller/DetailViewPostSaveController.php
+++ b/plugin/Controller/DetailViewPostSaveController.php
@@ -23,6 +23,10 @@
 
 use onOffice\WPlugin\DataView\DataDetailViewHandler;
 use onOffice\WPlugin\Utility\__String;
+use onOffice\WPlugin\Record\RecordManagerReadListViewEstate;
+use onOffice\WPlugin\Record\RecordManagerReadListViewAddress;
+use onOffice\WPlugin\Record\RecordManagerReadForm;
+
 use WP_Post;
 
 /**
@@ -91,6 +95,18 @@ public function onSavePost($postId) {
 					flush_rewrite_rules();
 				}
 			}
+			$this->addPageUseShortCode($pPost);
+		}
+
+	}
+	public function getAllPost() {
+		$args = array(
+			'post_status' => 'publish',
+		);
+		$posts = get_pages($args);
+		foreach ($posts as $post)
+		{
+			$this->addPageUseShortCode($post);
 		}
 	}
 
@@ -114,6 +130,8 @@ public function onMoveTrash($postId) {
 			$pDataDetailViewHandler->saveDetailView($pDetailView);
 			flush_rewrite_rules();
 		}
+		$pPost = get_post($postId);
+		$this->deletePageUseShortCode($pPost);
 	}
 
 
@@ -128,7 +146,36 @@ private function generateDetailViewCode($detailViewName) {
 		return 'view="'.$detailViewName.'"';
 	}
 
-
+	private function generateDetailCode($detailViewName,$option) {
+		return $option.'="'.$detailViewName.'"';
+	}
+	private function getListView()
+	{
+		$pRecordReadListView = new RecordManagerReadListViewEstate();
+		$pRecordReadListView->addColumn('listview_id');
+		$pRecordReadListView->addColumn('name');
+		$pRecordReadListView->addColumn('page_shortcode');
+		$listView = $pRecordReadListView->getRecords();
+		return $listView;
+	}
+	private function getListViewAddress()
+	{
+		$pRecordReadListViewAddress = new RecordManagerReadListViewAddress();
+		$pRecordReadListViewAddress->addColumn('listview_address_id');
+		$pRecordReadListViewAddress->addColumn('name');
+		$pRecordReadListViewAddress->addColumn('page_shortcode');
+		$listViewAddress = $pRecordReadListViewAddress->getRecords();
+		return $listViewAddress;
+	}
+	private function getListForm()
+	{
+		$pRecordReadForm = new RecordManagerReadForm();
+		$pRecordReadForm->addColumn('form_id');
+		$pRecordReadForm->addColumn('name');
+		$pRecordReadForm->addColumn('page_shortcode');
+		$listForm = $pRecordReadForm->getRecords();
+		return $listForm;
+	}
 	/**
 	 *
 	 * @param string $post
@@ -156,4 +203,130 @@ private function postContainsViewName($post, $viewName) {
 
 		return false;
 	}
+
+	private function postContains($post, $viewName, $element,$option) {
+		$matches = array();
+		$regex = get_shortcode_regex(array($element));
+		preg_match_all('/'.$regex.'/ism', $post, $matches);
+
+		$detailviewCode = $this->generateDetailCode($viewName,$option);
+		if (!array_key_exists(3, $matches)) {
+			return false;
+		}
+
+		foreach ($matches[3] as $tagParams) {
+			if (__String::getNew($tagParams)->contains($detailviewCode)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function addPageUseShortCode($post)
+	{
+		$listView = $this->getListView();
+		$listViewAddress = $this->getListViewAddress();
+		$listForm = $this->getListForm();
+		$isRevision = wp_is_post_revision($post);
+		if (!$isRevision) {
+			$postContent = $post->post_content;
+			$postID = $post->ID;
+			if (empty($postID))
+			{
+				return;
+			}
+			if (strpos($postContent,'oo_estate') !== false)
+			{
+				$this->addPageShortCode($listView,$post,'oo_estate','view',"oo_plugin_listviews","listview_id","listview_id");
+			}
+			if (strpos($postContent,'oo_address') !== false)
+			{
+				$this->addPageShortCode($listViewAddress,$post,'oo_address','view',"oo_plugin_listviews_address","listview_address_id","listview_address_id");
+			}
+			if (strpos($postContent,'oo_form') !== false)
+			{
+				$this->addPageShortCode($listForm,$post,'oo_form','form',"oo_plugin_forms","form_id","form_id");
+			}
+
+		}
+	}
+	private function deletePageUseShortCode($post)
+	{
+		$listView = $this->getListView();
+		$listViewAddress = $this->getListViewAddress();
+		$listForm = $this->getListForm();
+		$isRevision = wp_is_post_revision($post);
+		if (!$isRevision) {
+			$postContent = $post->post_content;
+			$postID = $post->ID;
+			if (empty($postID))
+			{
+				return;
+			}
+			if (strpos($postContent,'oo_estate') !== false)
+			{
+				$this->deletePageShortCode($listView,$post,"oo_plugin_listviews","listview_id","listview_id");
+			}
+			if (strpos($postContent,'oo_address') !== false)
+			{
+				$this->deletePageShortCode($listViewAddress,$post,"oo_plugin_listviews_address","listview_address_id","listview_address_id");
+			}
+			if (strpos($postContent,'oo_form') !== false)
+			{
+				$this->deletePageShortCode($listForm,$post,"oo_plugin_forms","form_id","form_id");
+			}
+
+		}
+	}
+	private function addPageShortCode($listView,$post,$element,$option,$tableName,$column,$primaKey)
+	{
+		$pRecordReadListView = new RecordManagerReadListViewEstate();
+		$postID = $post->ID;
+		$postContent = $post->post_content;
+		foreach($listView as $view)
+		{
+			$pageID = [];
+			if (!empty($view->page_shortcode))
+			{
+				$pageID = explode(',',$view->page_shortcode);
+			}
+			if (in_array($postID,$pageID))
+			{
+				break;
+			}
+			$viewContained = $this->postContains($postContent, $view->name,$element,$option);
+			if ($viewContained) {
+				if (empty($pageID))
+				{
+					$pageID = $postID;
+				}else {
+					$pageID[] = $postID;
+					$pageID = implode(",",$pageID);
+				}
+				$pRecordReadListView->updateColumnPageShortCode($pageID,$view->$primaKey,$tableName,$column);
+			}
+		}
+	}
+	private function deletePageShortCode($listView,$post,$tableName,$column,$primaKey)
+	{
+		$pRecordReadListView = new RecordManagerReadListViewEstate();
+		$postID = $post->ID;
+		foreach($listView as $view)
+		{
+			$pageID = '';
+			if (empty($view->page_shortcode))
+			{
+				break;
+			}
+			if (strpos($view->page_shortcode,(string)$postID)!== false)
+			{
+				$pageID = chop($view->page_shortcode,$postID);
+				$pageID = trim($pageID,",");
+				$pageID = str_replace(",,",",",$pageID);
+				$pRecordReadListView->updateColumnPageShortCode($pageID,$view->$primaKey,$tableName,$column);
+			}
+
+		}
+	}
 }
diff --git a/plugin/Gui/Table/AddressListTable.php b/plugin/Gui/Table/AddressListTable.php
index 5c61c557c..d2bd7741f 100644
--- a/plugin/Gui/Table/AddressListTable.php
+++ b/plugin/Gui/Table/AddressListTable.php
@@ -77,9 +77,13 @@ private function fillData()
 		$pRecordRead->setOffset($offset);
 		$pRecordRead->addColumn('listview_address_id', 'ID');
 		$pRecordRead->addColumn('name');
+		$pRecordRead->addColumn('template');
 		$pRecordRead->addColumn('name', 'shortcode');
+		$pRecordRead->addColumn('page_shortcode');
 
-		$this->setItems($pRecordRead->getRecords());
+		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $this->handleRecord($pRecord);
+		$this->setItems($pRecord);
 		$itemsCount = $pRecordRead->getCountOverall();
 
 		$this->set_pagination_args([
@@ -89,6 +93,31 @@ private function fillData()
 		]);
 	}
 
+	private function handleRecord($listRecord)
+	{
+		if (empty($listRecord))
+		{
+			return [];
+		}
+		foreach ($listRecord as &$record)
+		{
+			if (!empty($record->page_shortcode))
+			{
+				$listPageID = explode(',',$record->page_shortcode);
+				$page = '';
+				foreach ($listPageID as $pageID)
+				{
+					if (!empty($page))
+					{
+						$page .= ',';
+					}
+					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
+				}
+				$record->page_shortcode = $page;
+			}
+		}
+		return $listRecord;
+	}
 
 	/**
 	 *
@@ -144,7 +173,9 @@ public function prepare_items()
 		$columns = [
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
+			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
+			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
 		];
 
 		$hidden = ['ID'];
diff --git a/plugin/Gui/Table/EstateListTable.php b/plugin/Gui/Table/EstateListTable.php
index f15ba3808..efdc3a4f8 100644
--- a/plugin/Gui/Table/EstateListTable.php
+++ b/plugin/Gui/Table/EstateListTable.php
@@ -104,12 +104,16 @@ private function fillData()
 		$pRecordRead->addColumn('listview_id', 'ID');
 		$pRecordRead->addColumn('name');
 		$pRecordRead->addColumn('filterId');
+		$pRecordRead->addColumn('template');
 		$pRecordRead->addColumn('show_status');
 		$pRecordRead->addColumn('list_type');
 		$pRecordRead->addColumn('name', 'shortcode');
+		$pRecordRead->addColumn('page_shortcode');
 		$pRecordRead->addWhere("`list_type` IN('default', 'reference', 'favorites')");
 
-		$this->setItems($pRecordRead->getRecords());
+		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $this->handleRecord($pRecord);
+		$this->setItems($pRecord);
 		$itemsCount = $pRecordRead->getCountOverall();
 
 		$this->set_pagination_args([
@@ -119,6 +123,31 @@ private function fillData()
 		]);
 	}
 
+	private function handleRecord($listRecord)
+	{
+		if (empty($listRecord))
+		{
+			return [];
+		}
+		foreach ($listRecord as &$record)
+		{
+			if (!empty($record->page_shortcode))
+			{
+				$listPageID = explode(',',$record->page_shortcode);
+				$page = '';
+				foreach ($listPageID as $pageID)
+				{
+					if (!empty($page))
+					{
+						$page .= ',';
+					}
+					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
+				}
+				$record->page_shortcode = $page;
+			}
+		}
+		return $listRecord;
+	}
 
 	/**
 	 *
@@ -130,9 +159,11 @@ public function prepare_items()
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
 			'filtername' => __('Filter', 'onoffice-for-wp-websites'),
+			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
 			'show_status' => __('Show Status', 'onoffice-for-wp-websites'),
 			'list_type' => __('Type of List', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
+			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
 		];
 
 		$hidden = ['ID', 'filterId'];
diff --git a/plugin/Gui/Table/FormsTable.php b/plugin/Gui/Table/FormsTable.php
index b04c2507e..c874547cc 100644
--- a/plugin/Gui/Table/FormsTable.php
+++ b/plugin/Gui/Table/FormsTable.php
@@ -93,14 +93,17 @@ private function fillData()
 		$pRecordRead->setOffset($offset);
 		$pRecordRead->addColumn('form_id', 'ID');
 		$pRecordRead->addColumn('name');
+		$pRecordRead->addColumn('template');
 		$pRecordRead->addColumn('form_type');
 		$pRecordRead->addColumn('name', 'shortcode');
-
+		$pRecordRead->addColumn('page_shortcode');
 		if ($this->_listType != 'all' && $this->_listType != null) {
 			$pRecordRead->addWhere("`form_type` = '".esc_sql($this->_listType)."'");
 		}
 
-		$this->setItems($pRecordRead->getRecords());
+		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $this->handleRecord($pRecord);
+		$this->setItems($pRecord);
 		$itemsCount = $pRecordRead->getCountOverall();
 
 		$this->set_pagination_args( array(
@@ -112,6 +115,31 @@ private function fillData()
 		$this->_countByType = $pRecordRead->getCountByType();
 	}
 
+	private function handleRecord($listRecord)
+	{
+		if (empty($listRecord))
+		{
+			return [];
+		}
+		foreach ($listRecord as &$record)
+		{
+			if (!empty($record->page_shortcode))
+			{
+				$listPageID = explode(',',$record->page_shortcode);
+				$page = '';
+				foreach ($listPageID as $pageID)
+				{
+					if (!empty($page))
+					{
+						$page .= ',';
+					}
+					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
+				}
+				$record->page_shortcode = $page;
+			}
+		}
+		return $listRecord;
+	}
 
 	/**
 	 *
@@ -122,8 +150,10 @@ public function prepare_items()
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of Form', 'onoffice-for-wp-websites'),
+			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
 			'form_type' => __('Type of Form', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
+			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
 		);
 
 		$hidden = array('ID', 'filterId');
diff --git a/plugin/Installer/DatabaseChanges.php b/plugin/Installer/DatabaseChanges.php
index 47a6a5a0b..46d8dccf1 100644
--- a/plugin/Installer/DatabaseChanges.php
+++ b/plugin/Installer/DatabaseChanges.php
@@ -34,7 +34,7 @@
 class DatabaseChanges implements DatabaseChangesInterface
 {
 	/** @var int */
-	const MAX_VERSION = 20;
+	const MAX_VERSION = 21;
 
 	/** @var WPOptionWrapperBase */
 	private $_pWpOption;
@@ -132,7 +132,7 @@ public function install()
 			$this->updateSortByUserDefinedDefault();
 			$dbversion = 15;
 		}
-		
+
 		if ($dbversion == 15) {
 			dbDelta( $this->getCreateQueryFieldConfigDefaults() );
 			dbDelta( $this->getCreateQueryFieldConfigDefaultsValues() );
@@ -159,6 +159,12 @@ public function install()
 			$dbversion = 20;
 		}
 
+		if ($dbversion == 20) {
+			dbDelta($this->getCreateQueryListviews());
+			dbDelta($this->getCreateQueryListViewsAddress());
+			dbDelta($this->getCreateQueryForms());
+			$dbversion = 21;
+		}
 		$this->_pWpOption->updateOption( 'oo_plugin_db_version', $dbversion, true);
 	}
 
@@ -229,6 +235,7 @@ private function getCreateQueryListviews()
 			`sortBySetting` ENUM('0','1') NOT NULL DEFAULT '0' COMMENT 'Sortierung nach Benutzerwahl: 0 means preselected, 1 means userDefined',
 			`sortByUserDefinedDefault` VARCHAR(200) NOT NULL COMMENT 'Standardsortierung',
 			`sortByUserDefinedDirection` ENUM('0','1') NOT NULL DEFAULT '0' COMMENT 'Formulierung der Sortierrichtung: 0 means highestFirst/lowestFirt, 1 means descending/ascending',
+			`page_shortcode` tinytext NOT NULL,
 			PRIMARY KEY (`listview_id`),
 			UNIQUE KEY `name` (`name`)
 		) $charsetCollate;";
@@ -269,6 +276,7 @@ private function getCreateQueryForms()
 			`radius` INT( 10 ) NULL DEFAULT NULL,
 			`geo_order` VARCHAR( 255 ) NOT NULL DEFAULT 'street,zip,city,country,radius',
 			`show_estate_context` tinyint(1) NOT NULL DEFAULT '0',
+			`page_shortcode` tinytext NOT NULL,
 			PRIMARY KEY (`form_id`),
 			UNIQUE KEY `name` (`name`)
 		) $charsetCollate;";
@@ -536,6 +544,7 @@ private function getCreateQueryListViewsAddress()
 			`template` tinytext NOT NULL,
 			`recordsPerPage` int(10) NOT NULL DEFAULT '10',
 			`showPhoto` tinyint(1) NOT NULL DEFAULT '0',
+			`page_shortcode` tinytext NOT NULL,
 			PRIMARY KEY (`listview_address_id`),
 			UNIQUE KEY `name` (`name`)
 		) $charsetCollate;";
diff --git a/plugin/Record/RecordManagerReadListViewEstate.php b/plugin/Record/RecordManagerReadListViewEstate.php
index f53097bfd..c8bf83fab 100644
--- a/plugin/Record/RecordManagerReadListViewEstate.php
+++ b/plugin/Record/RecordManagerReadListViewEstate.php
@@ -364,4 +364,13 @@ public function getContactDataByListviewId($listviewId)
 	{
 		return $this->readContactDataByListviewId($listviewId);
 	}
+
+	public function updateColumnPageShortCode($page,$listviewId,$tableName,$column)
+	{
+		$prefix = $this->getTablePrefix();
+		$pWpDb = $this->getWpdb();
+		$pWpDb->query("UPDATE {$prefix}".$tableName."
+				SET `page_shortcode` ='" .$page."' 
+				WHERE `".$column."` = ".esc_sql($listviewId));
+	}
 }
diff --git a/tests/TestClassDatabaseChanges.php b/tests/TestClassDatabaseChanges.php
index 6536863a6..d76661f63 100644
--- a/tests/TestClassDatabaseChanges.php
+++ b/tests/TestClassDatabaseChanges.php
@@ -111,12 +111,13 @@ public function testInstall(): array
 		$this->assertGreaterThanOrEqual(self::NUM_NEW_TABLES, count($this->_createQueries));
 
 		$dbversion = $this->_pDbChanges->getDbVersion();
-		$this->assertEquals(20, $dbversion);
+		$this->assertEquals(21, $dbversion);
 		return $this->_createQueries;
 	}
 
 	public function testInstallMigrationsDataSimilarEstates(): array
 	{
+		$this->_pDbChanges->deinstall();
 		add_option('oo_plugin_db_version', '16');
 		add_filter('query', [$this, 'saveCreateQuery'], 1);
 		$this->_pDbChanges->install();
@@ -191,7 +192,7 @@ public function testDeleteCommentFieldApplicantSearchForm()
 	 */
 	public function testMaxVersion()
 	{
-		$this->assertEquals(20, DatabaseChanges::MAX_VERSION);
+		$this->assertEquals(21, DatabaseChanges::MAX_VERSION);
 	}
 
 

From 9994a4000478444ce1aef0e8968c11ff56e2252d Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Tue, 2 Nov 2021 10:47:29 +0700
Subject: [PATCH 02/10] Change query insert ignore

---
 plugin/Installer/DatabaseChanges.php | 32 +++++++++++++++++-----------
 tests/TestClassWPPageWrapper.php     | 10 +++++++--
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/plugin/Installer/DatabaseChanges.php b/plugin/Installer/DatabaseChanges.php
index 46d8dccf1..54da36182 100644
--- a/plugin/Installer/DatabaseChanges.php
+++ b/plugin/Installer/DatabaseChanges.php
@@ -299,19 +299,27 @@ private function installDataQueryForms()
 				$template = $templatePathsForm;
 			}
 		}
-		$this->_pWPDB->insert(
-			$tableName,
-			array(
-				'name' => 'Default Form',
-				'form_type' => 'contact',
-				'template' => $template,
-				'country_active' => 1,
-				'zip_active' => 1,
-				'street_active' => 1,
-				'radius_active' => 1,
-				'geo_order' => 'street,zip,city,country,radius'
-			)
+		$data = array(
+			'name' => 'Default Form',
+			'form_type' => 'contact',
+			'template' => $template,
+			'country_active' => 1,
+			'zip_active' => 1,
+			'street_active' => 1,
+			'radius_active' => 1,
+			'geo_order' => 'street,zip,city,country,radius'
 		);
+		$query = "INSERT IGNORE $tableName (name, form_type, template, country_active, zip_active, street_active, radius_active, geo_order)";
+		$query .= "VALUES (";
+		$query .= "'" . esc_sql($data['name']) ."',";
+		$query .= "'" . esc_sql($data['form_type']) ."',";
+		$query .= "'" . esc_sql($data['template']) ."',";
+		$query .= esc_sql($data['country_active']) . ",";
+		$query .= esc_sql($data['zip_active']) . ",";
+		$query .= esc_sql($data['street_active']) . ",";
+		$query .= esc_sql($data['radius_active']) . ",";
+		$query .= "'" . esc_sql($data['geo_order']) ."')";
+		$this->_pWPDB->query($query);
 		$defaultFormId = $this->_pWPDB->insert_id;
 		$this->installDataQueryFormFieldConfig($defaultFormId);
 	}
diff --git a/tests/TestClassWPPageWrapper.php b/tests/TestClassWPPageWrapper.php
index 93573f282..17a6453cd 100644
--- a/tests/TestClassWPPageWrapper.php
+++ b/tests/TestClassWPPageWrapper.php
@@ -26,7 +26,9 @@
 use onOffice\WPlugin\WP\UnknownPageException;
 use onOffice\WPlugin\WP\WPPageWrapper;
 use WP_UnitTestCase;
-
+use onOffice\WPlugin\Installer\DatabaseChanges;
+use onOffice\WPlugin\Utility\__String;
+use onOffice\WPlugin\WP\WPOptionWrapperTest;
 
 /**
  * @preserveGlobalState disabled
@@ -61,6 +63,11 @@ class TestClassWPPageWrapper
 	 */
 	public function prepare()
 	{
+		global $wpdb;
+
+		$pWpOption = new WPOptionWrapperTest();
+		$pDbChanges = new DatabaseChanges($pWpOption, $wpdb);
+		$pDbChanges->install();
 		$this->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
 		$this->_pSubject = new WPPageWrapper();
 		// set this even though the permalink for pages always is %postname%
@@ -71,7 +78,6 @@ public function prepare()
 			'post_status' => 'publish',
 			'post_date' => '2016-05-01 13:37:37',
 		]);
-
 		$postData = self::POST_DATA;
 		$postData['post_parent'] = $this->_ancestorId;
 		$this->_postId = wp_insert_post($postData);

From 35b06b5d366faae436ab06cf0648bab2587de5cb Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Mon, 20 Dec 2021 10:13:01 +0700
Subject: [PATCH 03/10] update unit test change database

---
 tests/TestClassDatabaseChanges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestClassDatabaseChanges.php b/tests/TestClassDatabaseChanges.php
index fe13f4193..56b7f138c 100644
--- a/tests/TestClassDatabaseChanges.php
+++ b/tests/TestClassDatabaseChanges.php
@@ -108,7 +108,7 @@ public function testInstall(): array
 		$this->_pDbChanges->install();
 
 		remove_filter('query', [$this, 'saveCreateQuery'], 1);
-		$this->assertLessThanOrEqual(self::NUM_NEW_TABLES, count($this->_createQueries));
+		$this->assertGreaterThanOrEqual(self::NUM_NEW_TABLES, count($this->_createQueries));
 
 		$dbversion = $this->_pDbChanges->getDbVersion();
 		$this->assertEquals(22, $dbversion);

From 6444b3858231420242db4502ee9b8fab5846f0dd Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Mon, 27 Dec 2021 09:44:40 +0700
Subject: [PATCH 04/10] update test

---
 tests/TestClassDatabaseChanges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestClassDatabaseChanges.php b/tests/TestClassDatabaseChanges.php
index 56b7f138c..80fb18ef7 100644
--- a/tests/TestClassDatabaseChanges.php
+++ b/tests/TestClassDatabaseChanges.php
@@ -214,7 +214,7 @@ public function testUninstall(array $createQueries)
 		// assert that as many tables have been removed as have been created
 		$uniqueCreateQueries = array_unique($createQueries);
 		$uniqueDropQueries = array_unique($this->_dropQueries);
-		$this->assertGreaterThanOrEqual(count($uniqueCreateQueries), count($uniqueDropQueries));
+		$this->assertEquals(count($uniqueCreateQueries), count($uniqueDropQueries));
 		$dbversion = $this->_pWpOption->getOption('oo_plugin_db_version', null);
 		$this->assertNull($dbversion);
 		$this->assertNull($this->_pDbChanges->getDbVersion());

From 68246c1efc47f5cc2de293ba3dcd7fab7707ab88 Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Tue, 4 Jan 2022 09:40:53 +0700
Subject: [PATCH 05/10] fix code under review

---
 languages/onoffice-for-wp-websites-de_DE.mo   | Bin 16003 -> 15973 bytes
 languages/onoffice-for-wp-websites-de_DE.po   |   4 ++--
 languages/onoffice-for-wp-websites-es_ES.mo   | Bin 14992 -> 15751 bytes
 languages/onoffice-for-wp-websites-es_ES.po   |   2 +-
 languages/onoffice-for-wp-websites-it_IT.mo   | Bin 14944 -> 15569 bytes
 languages/onoffice-for-wp-websites-it_IT.po   |   2 +-
 languages/onoffice-for-wp-websites-nl_NL.mo   | Bin 14738 -> 15113 bytes
 languages/onoffice-for-wp-websites-nl_NL.po   |   2 +-
 .../DetailViewPostSaveController.php          |   8 +++++---
 plugin/Gui/Table/AddressListTable.php         |   2 +-
 plugin/Gui/Table/EstateListTable.php          |   8 +++++---
 plugin/Gui/Table/FormsTable.php               |   2 +-
 12 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/languages/onoffice-for-wp-websites-de_DE.mo b/languages/onoffice-for-wp-websites-de_DE.mo
index 6ca46cf0f2fe94b0e38f5e23834c7bbaf7864335..2bddd112fa23367148259bc42c08b19197796f92 100644
GIT binary patch
delta 4345
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

delta 4734
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

diff --git a/languages/onoffice-for-wp-websites-de_DE.po b/languages/onoffice-for-wp-websites-de_DE.po
index 3a111fe40..a97cc5662 100644
--- a/languages/onoffice-for-wp-websites-de_DE.po
+++ b/languages/onoffice-for-wp-websites-de_DE.po
@@ -706,8 +706,8 @@ msgstr "Absteigend"
 #: plugin/Model/FormModelBuilder/FormModelBuilderDB.php:193
 #: plugin/Model/FormModelBuilder/FormModelBuilderEstateDetailSettings.php:245
 #: plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php:215
-msgid "Template"
-msgstr "Template"
+msgid "Templates"
+msgstr "Templates"
 
 #: plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php:94
 #: plugin/Model/FormModelBuilder/FormModelBuilderDBEstateListSettings.php:119
diff --git a/languages/onoffice-for-wp-websites-es_ES.mo b/languages/onoffice-for-wp-websites-es_ES.mo
index 4ced997e48d297319aab1460d07e36e10e88a451..6156f31865a63879cb4b8401c2a7057a06ca118b 100644
GIT binary patch
delta 4777
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

delta 4529
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
VH|5N=e9?L7)K=rKt9WMq{{VsW=QaQU

diff --git a/languages/onoffice-for-wp-websites-es_ES.po b/languages/onoffice-for-wp-websites-es_ES.po
index 92e5e9e8a..b546f08eb 100644
--- a/languages/onoffice-for-wp-websites-es_ES.po
+++ b/languages/onoffice-for-wp-websites-es_ES.po
@@ -709,7 +709,7 @@ msgstr "Descendente"
 #: plugin/Model/FormModelBuilder/FormModelBuilderDB.php:193
 #: plugin/Model/FormModelBuilder/FormModelBuilderEstateDetailSettings.php:245
 #: plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php:215
-msgid "Template"
+msgid "Templates"
 msgstr "Plantilla"
 
 #: plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php:94
diff --git a/languages/onoffice-for-wp-websites-it_IT.mo b/languages/onoffice-for-wp-websites-it_IT.mo
index 69755195b2a5fc028072119a4f829fe8e2bff2d6..c0ef882463d5c0515ec7c6d2632e359cb83e8bfc 100644
GIT binary patch
delta 4576
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

delta 4531
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

diff --git a/languages/onoffice-for-wp-websites-it_IT.po b/languages/onoffice-for-wp-websites-it_IT.po
index 0fabf84a5..f4107c61b 100644
--- a/languages/onoffice-for-wp-websites-it_IT.po
+++ b/languages/onoffice-for-wp-websites-it_IT.po
@@ -709,7 +709,7 @@ msgstr "Scendendo"
 #: plugin/Model/FormModelBuilder/FormModelBuilderDB.php:193
 #: plugin/Model/FormModelBuilder/FormModelBuilderEstateDetailSettings.php:245
 #: plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php:215
-msgid "Template"
+msgid "Templates"
 msgstr "Modello"
 
 #: plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php:94
diff --git a/languages/onoffice-for-wp-websites-nl_NL.mo b/languages/onoffice-for-wp-websites-nl_NL.mo
index d9b50a29129ce7cc54ad57fcebccc6a2d8a262cf..d9890ba1c3a3675afd5754ef16cea3cad0961742 100644
GIT binary patch
delta 4490
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

delta 4589
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

diff --git a/languages/onoffice-for-wp-websites-nl_NL.po b/languages/onoffice-for-wp-websites-nl_NL.po
index 33c5c99a2..848883726 100644
--- a/languages/onoffice-for-wp-websites-nl_NL.po
+++ b/languages/onoffice-for-wp-websites-nl_NL.po
@@ -706,7 +706,7 @@ msgstr "Aflopend"
 #: plugin/Model/FormModelBuilder/FormModelBuilderDB.php:193
 #: plugin/Model/FormModelBuilder/FormModelBuilderEstateDetailSettings.php:245
 #: plugin/Model/FormModelBuilder/FormModelBuilderSimilarEstateSettings.php:215
-msgid "Template"
+msgid "Templates"
 msgstr "Sjabloon"
 
 #: plugin/Model/FormModelBuilder/FormModelBuilderDBAddress.php:94
diff --git a/plugin/Controller/DetailViewPostSaveController.php b/plugin/Controller/DetailViewPostSaveController.php
index 444b7ac12..24b91bcfc 100644
--- a/plugin/Controller/DetailViewPostSaveController.php
+++ b/plugin/Controller/DetailViewPostSaveController.php
@@ -321,9 +321,11 @@ private function deletePageShortCode($listView,$post,$tableName,$column,$primaKe
 			}
 			if (strpos($view->page_shortcode,(string)$postID)!== false)
 			{
-				$pageID = chop($view->page_shortcode,$postID);
-				$pageID = trim($pageID,",");
-				$pageID = str_replace(",,",",",$pageID);
+				$pageShortCode = explode(",",$view->page_shortcode);
+				if (($keyPageDelete = array_search($postID, $pageShortCode)) !== false) {
+					unset($pageShortCode[$keyPageDelete]);
+				}
+				$pageID = implode(",",$pageShortCode);
 				$pRecordReadListView->updateColumnPageShortCode($pageID,$view->$primaKey,$tableName,$column);
 			}
 
diff --git a/plugin/Gui/Table/AddressListTable.php b/plugin/Gui/Table/AddressListTable.php
index 273782b17..06e83fab9 100644
--- a/plugin/Gui/Table/AddressListTable.php
+++ b/plugin/Gui/Table/AddressListTable.php
@@ -174,7 +174,7 @@ public function prepare_items()
 		$columns = [
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
-			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
+			'template' => __('Templates', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
 			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
 		];
diff --git a/plugin/Gui/Table/EstateListTable.php b/plugin/Gui/Table/EstateListTable.php
index a131ec279..42d33ec2f 100644
--- a/plugin/Gui/Table/EstateListTable.php
+++ b/plugin/Gui/Table/EstateListTable.php
@@ -130,7 +130,8 @@ private function handleRecord($listRecord)
 		{
 			return [];
 		}
-		foreach ($listRecord as &$record)
+		$recordEstate = [];
+		foreach ($listRecord as $record)
 		{
 			if (!empty($record->page_shortcode))
 			{
@@ -142,12 +143,13 @@ private function handleRecord($listRecord)
 					{
 						$page .= ',';
 					}
-					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
+					$page .= "<a href='".esc_attr(get_edit_post_link((int)$pageID))."' target='_blank'>".esc_html(get_the_title((int)$pageID))."</a>";
 				}
 				$record->page_shortcode = $page;
 			}
+			$recordEstate[] = $record;
 		}
-		return $listRecord;
+		return $recordEstate;
 	}
 
 	/**
diff --git a/plugin/Gui/Table/FormsTable.php b/plugin/Gui/Table/FormsTable.php
index 841f4fd51..59f333b06 100644
--- a/plugin/Gui/Table/FormsTable.php
+++ b/plugin/Gui/Table/FormsTable.php
@@ -151,7 +151,7 @@ public function prepare_items()
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of Form', 'onoffice-for-wp-websites'),
-			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
+			'template' => __('Templates', 'onoffice-for-wp-websites'),
 			'form_type' => __('Type of Form', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
 			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),

From 500acc06522536ff61c11e90b14dc34e591971f6 Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Wed, 12 Jan 2022 08:52:52 +0700
Subject: [PATCH 06/10] 
 56183-Optimize-columns-on-list-views-for-forms-estates-and-addresses

---
 plugin/Gui/Table/AddressListTable.php | 26 -------------------------
 plugin/Gui/Table/EstateListTable.php  | 28 ---------------------------
 plugin/Gui/Table/FormsTable.php       | 25 ------------------------
 plugin/Gui/Table/WP/ListTable.php     | 27 ++++++++++++++++++++++++++
 4 files changed, 27 insertions(+), 79 deletions(-)

diff --git a/plugin/Gui/Table/AddressListTable.php b/plugin/Gui/Table/AddressListTable.php
index 06e83fab9..6992c7075 100644
--- a/plugin/Gui/Table/AddressListTable.php
+++ b/plugin/Gui/Table/AddressListTable.php
@@ -94,32 +94,6 @@ private function fillData()
 		]);
 	}
 
-	private function handleRecord($listRecord)
-	{
-		if (empty($listRecord))
-		{
-			return [];
-		}
-		foreach ($listRecord as &$record)
-		{
-			if (!empty($record->page_shortcode))
-			{
-				$listPageID = explode(',',$record->page_shortcode);
-				$page = '';
-				foreach ($listPageID as $pageID)
-				{
-					if (!empty($page))
-					{
-						$page .= ',';
-					}
-					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
-				}
-				$record->page_shortcode = $page;
-			}
-		}
-		return $listRecord;
-	}
-
 	/**
 	 *
 	 * @return array
diff --git a/plugin/Gui/Table/EstateListTable.php b/plugin/Gui/Table/EstateListTable.php
index 42d33ec2f..c2c6f78cb 100644
--- a/plugin/Gui/Table/EstateListTable.php
+++ b/plugin/Gui/Table/EstateListTable.php
@@ -124,34 +124,6 @@ private function fillData()
 		]);
 	}
 
-	private function handleRecord($listRecord)
-	{
-		if (empty($listRecord))
-		{
-			return [];
-		}
-		$recordEstate = [];
-		foreach ($listRecord as $record)
-		{
-			if (!empty($record->page_shortcode))
-			{
-				$listPageID = explode(',',$record->page_shortcode);
-				$page = '';
-				foreach ($listPageID as $pageID)
-				{
-					if (!empty($page))
-					{
-						$page .= ',';
-					}
-					$page .= "<a href='".esc_attr(get_edit_post_link((int)$pageID))."' target='_blank'>".esc_html(get_the_title((int)$pageID))."</a>";
-				}
-				$record->page_shortcode = $page;
-			}
-			$recordEstate[] = $record;
-		}
-		return $recordEstate;
-	}
-
 	/**
 	 *
 	 */
diff --git a/plugin/Gui/Table/FormsTable.php b/plugin/Gui/Table/FormsTable.php
index 59f333b06..110d872b7 100644
--- a/plugin/Gui/Table/FormsTable.php
+++ b/plugin/Gui/Table/FormsTable.php
@@ -116,31 +116,6 @@ private function fillData()
 		$this->_countByType = $pRecordRead->getCountByType();
 	}
 
-	private function handleRecord($listRecord)
-	{
-		if (empty($listRecord))
-		{
-			return [];
-		}
-		foreach ($listRecord as &$record)
-		{
-			if (!empty($record->page_shortcode))
-			{
-				$listPageID = explode(',',$record->page_shortcode);
-				$page = '';
-				foreach ($listPageID as $pageID)
-				{
-					if (!empty($page))
-					{
-						$page .= ',';
-					}
-					$page .= "<a href='".get_edit_post_link((int)$pageID)."' target='_blank'>".get_the_title((int)$pageID)."</a>";
-				}
-				$record->page_shortcode = $page;
-			}
-		}
-		return $listRecord;
-	}
 
 	/**
 	 *
diff --git a/plugin/Gui/Table/WP/ListTable.php b/plugin/Gui/Table/WP/ListTable.php
index 89b414601..57c3ae504 100644
--- a/plugin/Gui/Table/WP/ListTable.php
+++ b/plugin/Gui/Table/WP/ListTable.php
@@ -145,4 +145,31 @@ protected function setItems(array $items)
 	/** @return array */
 	protected function getItems()
 		{ return $this->items; }
+
+	protected function handleRecord(array $records)
+	{
+		if (empty($records))
+		{
+			return [];
+		}
+		$recordHandled = [];
+		foreach ($records as $record)
+		{
+			if (!empty($record->page_shortcode))
+			{
+				$listPageID = explode(',',$record->page_shortcode);
+				$pages = '';
+				$listPage = [];
+				foreach ($listPageID as $pageID)
+				{
+					$listPage[] = "<a href='".esc_attr(get_edit_post_link((int)$pageID))."' target='_blank'>".esc_html(get_the_title((int)$pageID))."</a>";
+				}
+				$pages = implode(',',$listPage);
+				$record->page_shortcode = $pages;
+			}
+			$recordHandled[] = $record;
+		}
+		return $recordHandled;
+	}
+
 }

From 6609639a29d19177664cb0b0ec0ee2f867444dab Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Wed, 26 Jan 2022 15:09:33 +0700
Subject: [PATCH 07/10] update oder field Alpha

---
 plugin/Gui/Table/AddressListTable.php | 35 ++++++++++++++++++++++++---
 plugin/Gui/Table/EstateListTable.php  |  7 ++----
 plugin/Gui/Table/FormsTable.php       |  5 ++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/plugin/Gui/Table/AddressListTable.php b/plugin/Gui/Table/AddressListTable.php
index 6992c7075..72046b5bc 100644
--- a/plugin/Gui/Table/AddressListTable.php
+++ b/plugin/Gui/Table/AddressListTable.php
@@ -23,6 +23,8 @@
 
 use onOffice\WPlugin\Gui\Table\WP\ListTable;
 use onOffice\WPlugin\Record\RecordManagerReadListViewAddress;
+use onOffice\WPlugin\FilterCall;
+use onOffice\SDK\onOfficeSDK;
 use function __;
 use function admin_url;
 use function esc_html;
@@ -43,6 +45,8 @@ class AddressListTable
 	/** @var int */
 	private $_itemsPerPage = null;
 
+	/** @var FilterCall */
+	private $_pFilterCall = null;
 
 	/**
 	 *
@@ -59,6 +63,7 @@ public function __construct($args = [])
 		]);
 
 		$this->_itemsPerPage = $this->get_items_per_page('onoffice-address-listview_per_page', 10);
+		$this->_pFilterCall = new FilterCall(onOfficeSDK::MODULE_ADDRESS);
 	}
 
 
@@ -77,12 +82,12 @@ private function fillData()
 		$pRecordRead->setOffset($offset);
 		$pRecordRead->addColumn('listview_address_id', 'ID');
 		$pRecordRead->addColumn('name');
+		$pRecordRead->addColumn('filterId');
 		$pRecordRead->addColumn('template');
 		$pRecordRead->addColumn('name', 'shortcode');
 		$pRecordRead->addColumn('page_shortcode');
 
-		$this->setItems($pRecordRead->getRecordsSortedAlphabetically());
-		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $pRecordRead->getRecordsSortedAlphabetically();
 		$pRecord = $this->handleRecord($pRecord);
 		$this->setItems($pRecord);
 		$itemsCount = $pRecordRead->getCountOverall();
@@ -93,7 +98,29 @@ private function fillData()
 			'total_pages' => ceil($itemsCount / 10)
 		]);
 	}
+	/**
+	 *
+	 * @param object $pItem
+	 * @return string
+	 *
+	 */
 
+	protected function column_filtername($pItem)
+	{
+		$filterName = '';
+		try {
+			if ($pItem->filterId != 0) {
+				$filterName = $this->_pFilterCall->getFilternameById($pItem->filterId);
+			}
+		} catch (APIClientCredentialsException $pCredentialsException) {
+			$filterName = __('(Needs valid API credentials)', 'onoffice-for-wp-websites');
+		} catch (UnknownFilterException $pFilterException) {
+			/* translators: %s will be replaced with a number. */
+			$filterName = sprintf(__('(Unknown Filter (ID: %s))', 'onoffice-for-wp-websites'),
+				$pFilterException->getFilterId());
+		}
+		return $filterName;
+	}
 	/**
 	 *
 	 * @return array
@@ -105,6 +132,7 @@ public function get_columns()
 		return [
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
+			'filtername' => __('Filter', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
 		];
 	}
@@ -148,12 +176,13 @@ public function prepare_items()
 		$columns = [
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
+			'filtername' => __('Filter', 'onoffice-for-wp-websites'),
 			'template' => __('Templates', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
 			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
 		];
 
-		$hidden = ['ID'];
+		$hidden = ['ID','filterId'];
 		$sortable = [];
 
 		$this->_column_headers = [$columns, $hidden, $sortable,
diff --git a/plugin/Gui/Table/EstateListTable.php b/plugin/Gui/Table/EstateListTable.php
index c2c6f78cb..10d628497 100644
--- a/plugin/Gui/Table/EstateListTable.php
+++ b/plugin/Gui/Table/EstateListTable.php
@@ -105,14 +105,12 @@ private function fillData()
 		$pRecordRead->addColumn('name');
 		$pRecordRead->addColumn('filterId');
 		$pRecordRead->addColumn('template');
-		$pRecordRead->addColumn('show_status');
 		$pRecordRead->addColumn('list_type');
 		$pRecordRead->addColumn('name', 'shortcode');
 		$pRecordRead->addColumn('page_shortcode');
 		$pRecordRead->addWhere("`list_type` IN('default', 'reference', 'favorites')");
 
-		$this->setItems($pRecordRead->getRecordsSortedAlphabetically());
-		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $pRecordRead->getRecordsSortedAlphabetically();
 		$pRecord = $this->handleRecord($pRecord);
 		$this->setItems($pRecord);
 		$itemsCount = $pRecordRead->getCountOverall();
@@ -134,8 +132,7 @@ public function prepare_items()
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of View', 'onoffice-for-wp-websites'),
 			'filtername' => __('Filter', 'onoffice-for-wp-websites'),
-			'template' => __('Tempaltes', 'onoffice-for-wp-websites'),
-			'show_status' => __('Show Status', 'onoffice-for-wp-websites'),
+			'template' => __('Templates', 'onoffice-for-wp-websites'),
 			'list_type' => __('Type of List', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),
 			'page_shortcode' => __('Page with Shortcode', 'onoffice-for-wp-websites'),
diff --git a/plugin/Gui/Table/FormsTable.php b/plugin/Gui/Table/FormsTable.php
index 110d872b7..49db12c97 100644
--- a/plugin/Gui/Table/FormsTable.php
+++ b/plugin/Gui/Table/FormsTable.php
@@ -93,6 +93,7 @@ private function fillData()
 		$pRecordRead->setOffset($offset);
 		$pRecordRead->addColumn('form_id', 'ID');
 		$pRecordRead->addColumn('name');
+		$pRecordRead->addColumn('recipient');
 		$pRecordRead->addColumn('template');
 		$pRecordRead->addColumn('form_type');
 		$pRecordRead->addColumn('name', 'shortcode');
@@ -101,10 +102,9 @@ private function fillData()
 			$pRecordRead->addWhere("`form_type` = '".esc_sql($this->_listType)."'");
 		}
 
-		$pRecord = $pRecordRead->getRecords();
+		$pRecord = $pRecordRead->getRecordsSortedAlphabetically();
 		$pRecord = $this->handleRecord($pRecord);
 		$this->setItems($pRecord);
-		$this->setItems($pRecordRead->getRecordsSortedAlphabetically());
 		$itemsCount = $pRecordRead->getCountOverall();
 
 		$this->set_pagination_args( array(
@@ -126,6 +126,7 @@ public function prepare_items()
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
 			'name' => __('Name of Form', 'onoffice-for-wp-websites'),
+			'recipient' => __('Email Address', 'onoffice-for-wp-websites'),
 			'template' => __('Templates', 'onoffice-for-wp-websites'),
 			'form_type' => __('Type of Form', 'onoffice-for-wp-websites'),
 			'shortcode' => __('Shortcode', 'onoffice-for-wp-websites'),

From d93dcbf63f349b487bde67b5f53601813521136e Mon Sep 17 00:00:00 2001
From: TangHien4698 <tanghienit4698@gmail.com>
Date: Wed, 26 Jan 2022 16:54:13 +0700
Subject: [PATCH 08/10] add exception

---
 plugin/Gui/Table/AddressListTable.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin/Gui/Table/AddressListTable.php b/plugin/Gui/Table/AddressListTable.php
index 72046b5bc..923814b2d 100644
--- a/plugin/Gui/Table/AddressListTable.php
+++ b/plugin/Gui/Table/AddressListTable.php
@@ -23,6 +23,8 @@
 
 use onOffice\WPlugin\Gui\Table\WP\ListTable;
 use onOffice\WPlugin\Record\RecordManagerReadListViewAddress;
+use onOffice\WPlugin\Controller\Exception\UnknownFilterException;
+use onOffice\WPlugin\API\APIClientCredentialsException;
 use onOffice\WPlugin\FilterCall;
 use onOffice\SDK\onOfficeSDK;
 use function __;

From 38668ef7975df325a61391d6ff1ec718f3fe0f3e Mon Sep 17 00:00:00 2001
From: tang-hien-egs <hien.tang@eastgate-software.com>
Date: Thu, 10 Mar 2022 15:02:51 +0700
Subject: [PATCH 09/10] change delete page use shortcode

---
 plugin/Controller/DetailViewPostSaveController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugin/Controller/DetailViewPostSaveController.php b/plugin/Controller/DetailViewPostSaveController.php
index 24b91bcfc..3e251c3ef 100644
--- a/plugin/Controller/DetailViewPostSaveController.php
+++ b/plugin/Controller/DetailViewPostSaveController.php
@@ -27,6 +27,7 @@
 use onOffice\WPlugin\Record\RecordManagerReadListViewAddress;
 use onOffice\WPlugin\Record\RecordManagerReadForm;
 
+use PHPStan\Rules\Variables\VariableCloningRule;
 use WP_Post;
 
 /**
@@ -131,6 +132,7 @@ public function onMoveTrash($postId) {
 			flush_rewrite_rules();
 		}
 		$pPost = get_post($postId);
+//		var_dump($pPost);
 		$this->deletePageUseShortCode($pPost);
 	}
 
@@ -257,8 +259,12 @@ private function deletePageUseShortCode($post)
 		$listViewAddress = $this->getListViewAddress();
 		$listForm = $this->getListForm();
 		$isRevision = wp_is_post_revision($post);
+//		var_dump($isRevision);
+//		die();
 		if (!$isRevision) {
 			$postContent = $post->post_content;
+//			var_dump(strpos($postContent,'oo_address') !== false);
+//			die();
 			$postID = $post->ID;
 			if (empty($postID))
 			{
@@ -317,7 +323,7 @@ private function deletePageShortCode($listView,$post,$tableName,$column,$primaKe
 			$pageID = '';
 			if (empty($view->page_shortcode))
 			{
-				break;
+				continue;
 			}
 			if (strpos($view->page_shortcode,(string)$postID)!== false)
 			{

From 893ac08985beb209d6be8d8d46c5b19702410d4f Mon Sep 17 00:00:00 2001
From: tang-hien-egs <hien.tang@eastgate-software.com>
Date: Thu, 10 Mar 2022 23:02:40 +0700
Subject: [PATCH 10/10] romove comment in code

---
 plugin/Controller/DetailViewPostSaveController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugin/Controller/DetailViewPostSaveController.php b/plugin/Controller/DetailViewPostSaveController.php
index 3e251c3ef..799ba15ea 100644
--- a/plugin/Controller/DetailViewPostSaveController.php
+++ b/plugin/Controller/DetailViewPostSaveController.php
@@ -27,7 +27,6 @@
 use onOffice\WPlugin\Record\RecordManagerReadListViewAddress;
 use onOffice\WPlugin\Record\RecordManagerReadForm;
 
-use PHPStan\Rules\Variables\VariableCloningRule;
 use WP_Post;
 
 /**
@@ -132,7 +131,6 @@ public function onMoveTrash($postId) {
 			flush_rewrite_rules();
 		}
 		$pPost = get_post($postId);
-//		var_dump($pPost);
 		$this->deletePageUseShortCode($pPost);
 	}
 
@@ -259,12 +257,9 @@ private function deletePageUseShortCode($post)
 		$listViewAddress = $this->getListViewAddress();
 		$listForm = $this->getListForm();
 		$isRevision = wp_is_post_revision($post);
-//		var_dump($isRevision);
-//		die();
+
 		if (!$isRevision) {
 			$postContent = $post->post_content;
-//			var_dump(strpos($postContent,'oo_address') !== false);
-//			die();
 			$postID = $post->ID;
 			if (empty($postID))
 			{