Merge pull request #61 from rdai10/dev

2.5.5

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "node"
+  - "11.10.1"
 
 before_install:
   - cd theme

theme/package.json

@@ -105,5 +105,5 @@
 		"test": "jest",
 		"zip": "zip -r Liferay-Help-Center.zip dist -x *.zat*"
 	},
-	"version": "2.5.4"
+	"version": "2.5.5"
 }

theme/src/css/_zendesk-variables.scss

@@ -22,7 +22,7 @@ $color-primary-hover: #0053F0 !default;
 $color-success: #287D3C !default;
 $color-warning: #B95000 !default;
 
-$color-grey: #F7F8F9 !default;
+$color-grey: #F5F7FA !default;
 $color-grey-focus: #F0F1F2 !default;
 $color-grey-hover: #F2F4F5 !default;
 $color-white: #FFF !default;

theme/src/js/components/Pagination.js

@@ -123,7 +123,7 @@ class Pagination extends preact.Component {
 		const {total} = this.props;
 		const {currentPage} = this.state;
 
-		let nextPageBuffer = PAGE_BUFFER;
+		let nextPageBuffer = total - currentPage >= PAGE_BUFFER ? PAGE_BUFFER : total - currentPage;
 		let prevPageBuffer = 0;
 
 		if (currentPage > 1) {
@@ -133,9 +133,6 @@ class Pagination extends preact.Component {
 				nextPageBuffer = 0;
 			}
 		}
-		else {
-			nextPageBuffer = total - currentPage >= PAGE_BUFFER ? PAGE_BUFFER : total - currentPage;
-		}
 
 		return {
 			nextPageBuffer,
@@ -150,6 +147,7 @@ class Pagination extends preact.Component {
 					{this.getPages().map(
 						page => (
 							<PaginationItem
+								key={page.label}
 								active={this.state.currentPage === page.number}
 								label={page.label}
 								number={page.number}

theme/src/js/components/__tests__/Pagination.js

@@ -22,6 +22,7 @@ const setup = () => {
 
 	return {
 		firstPage,
+		handleClick,
 		lastPage,
 		nextPage,
 		prevPage,
@@ -62,9 +63,7 @@ describe('Pagination', () => {
 
 		fireEvent.click(lastPage);
 
-		const page100 = getByText('100');
-
-		expect(page100).toBeTruthy();
+		expect(getByText('100')).toBeTruthy();
 	});
 
 	it('renders only first and prev page controls on last page', () => {
@@ -106,10 +105,39 @@ describe('Pagination', () => {
 	it('renders a maximum of five pages previous to and after the current page', () => {
 		debounceRenderingOff();
 
-		const {container, queryByText} = setup();
+		const {container, getByText} = setup();
 
-		fireEvent.click(queryByText('6'));
+		fireEvent.click(getByText('6'));
 
+		expect(getByText('1')).toBeTruthy();
+		expect(getByText('5')).toBeTruthy();
+		expect(getByText('7')).toBeTruthy();
+		expect(getByText('11')).toBeTruthy();
 		expect(container).toMatchSnapshot();
 	});
+
+	it('should not render page numbers exceeding the total page count on initial load', () => {
+		debounceRenderingOff();
+
+		const {handleClick} = setup();
+
+		const {queryByText} = render(
+			<Pagination onClick={handleClick} perPage={10} total={5} />
+		);
+
+		expect(queryByText('5')).toBeTruthy();
+		expect(queryByText('6')).toBeFalsy();
+	});
+
+	it('should not render page numbers exceeding the total page count after interaction', () => {
+		debounceRenderingOff();
+
+		const {getByText, lastPage, queryByText} = setup();
+
+		fireEvent.click(lastPage);
+		fireEvent.click(getByText('98'));
+
+		expect(getByText('100')).toBeTruthy();
+		expect(queryByText('101')).toBeFalsy();
+	});
 });

theme/src/resources/manifest.json

@@ -1,7 +1,7 @@
 {
 	"name": "Liferay Help Center Theme",
 	"author": "Liferay",
-	"version": "2.5.4",
+	"version": "2.5.5",
 	"api_version": 1,
 	"default_locale": "en-us",
 	"settings": [

theme/src/resources/templates/category_pages/liferay_commerce.hbs

@@ -37,7 +37,7 @@
 								description: '{{dc 'commerce-latest_release_card_description'}}',
 								name: '{{dc '7_1-latest_release_card'}}',
 								svgId: '#latest-release',
-								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_mvcRenderCommandName=%2Fview&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_journalArticleResourcePrimKey=118250141'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_mvcRenderCommandName=%2Fview&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_journalArticleResourcePrimKey=118356144'
 							},
 							{
 								description: '{{dc 'commerce-compatibility_matrix_card_description'}}',

theme/src/resources/templates/category_pages/liferay_dxp_7_0.hbs

@@ -98,7 +98,7 @@
 								description: '{{dc '7_0-service_packs_archive_card_description'}}',
 								name: '{{dc '7_1-service_packs_archive_card'}}',
 								svgId: '#service-pack-archive',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541608573640&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=dxp_70&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191009&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191044'
 							},
 							{
 								description: '{{dc '7_1-security_advisories_card_description'}}',
@@ -110,7 +110,7 @@
 								description: '{{dc '7_0-patching_tool_card_description'}}',
 								name: '{{dc '7_1-patching_tool_card'}}',
 								svgId: '#patching-tool',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541608612830&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=patchingTool&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191019&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191066'
 							}
 						],
 						tabAccess: 'kb'

theme/src/resources/templates/category_pages/liferay_dxp_7_1.hbs

@@ -50,7 +50,7 @@
 								description: '{{dc '7_1-fix_packs_card_description'}}',
 								name: '{{dc '7_1-fix_packs_card'}}',
 								svgId: '#fixpack',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541544150388&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=dxp_71&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=fixPacks'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191011&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191054'
 							},
 							{
 								description: '{{dc '7_1-activation_keys_card_description'}}',
@@ -92,25 +92,25 @@
 								description: '{{dc '7_1-fix_packs_card_description'}}',
 								name: '{{dc '7_1-fix_packs_card'}}',
 								svgId: '#fixpack',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541544150388&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=dxp_71&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=fixPacks'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191011&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191054'
 							},
 							{
 								description: '{{dc '7_1-service_packs_archive_card_description'}}',
 								name: '{{dc '7_1-service_packs_archive_card'}}',
 								svgId: '#service-pack-archive',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541544915133&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=dxp_71&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191011&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191052'
 							},
 							{
 								description: '{{dc '7_1-security_advisories_card_description'}}',
 								name: '{{dc 'mega_menu-security_advisories'}}',
 								svgId: '#security-advisories',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1543617205105&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=dxp_71&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=security'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191011&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191056'
 							},
 							{
 								description: '{{dc '7_1-patching_tool_card_description'}}',
 								name: '{{dc '7_1-patching_tool_card'}}',
 								svgId: '#patching-tool',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541544924558&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=patchingTool&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191019&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191066'
 							}
 						],
 						tabAccess: 'kb'
@@ -252,4 +252,4 @@
 			document.getElementById('dxp71ProductPage')
 		);
 	});
-</script>
+</script>

theme/src/resources/templates/category_pages/liferay_portal_6_1.hbs

@@ -44,7 +44,7 @@
 								description: '{{dc '6_1-latest_release_card_description'}}',
 								name: '{{dc '7_1-latest_release_card'}}',
 								svgId: '#latest-release',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1542818284844&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191086'
 							},
 							{
 								description: '{{dc '6_1-compatibility_matrix_card_description'}}',
@@ -56,7 +56,7 @@
 								description: '{{dc '7_1-fix_packs_card_description'}}',
 								name: '{{dc '7_1-fix_packs_card'}}',
 								svgId: '#fixpack',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541609184146&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=fixPacks'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191088'
 							},
 							{
 								description: '{{dc '6_2-activation_keys_card_description'}}',
@@ -86,25 +86,25 @@
 								description: '{{dc '6_1-latest_release_card_description'}}',
 								name: '{{dc '7_1-latest_release_card'}}',
 								svgId: '#latest-release',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1543427162569&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191086'
 							},
 							{
 								description: '{{dc '7_1-fix_packs_card_description'}}',
 								name: '{{dc '7_1-fix_packs_card'}}',
 								svgId: '#fixpack',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541609184146&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=fixPacks'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191088'
 							},
 							{
 								description: '{{dc '6_1-service_packs_archive_card_description'}}',
 								name: '{{dc '7_1-service_packs_archive_card'}}',
 								svgId: '#service-pack-archive',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1541609083193&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=product'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191086'
 							},
 							{
 								description: '{{dc '6_2-security_advisories_card_description'}}',
 								name: '{{dc 'mega_menu-security_advisories'}}',
 								svgId: '#security-advisories',
-								url: 'https://customer.liferay.com/downloads?_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_formDate=1543617409908&p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_product=portal_61&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileType=security'
+								url: 'https://customer.liferay.com/downloads?p_p_id=com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_productAssetCategoryId=118191025&_com_liferay_osb_customer_downloads_display_web_DownloadsDisplayPortlet_fileTypeAssetCategoryId=118191093'
 							},
 							{
 								description: '{{dc '6_1-patching_tool_card_description'}}',