From 47f90de990c528db4c0adcfb6d1585610cb91f0b Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 3 May 2018 13:30:53 +0200
Subject: [PATCH] Speedup the import page of JCB packages, to via background
 ajax get package info and store it in local browser memory

---
 README.md                                     |  2 +-
 admin/README.txt                              |  2 +-
 admin/models/joomla_components.php            |  4 +-
 .../import_joomla_components/tmpl/default.php | 41 ++++++++++++++++++-
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 854d00b56..6765cf21d 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.7.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **193640**
++ *Line count*: **193677**
 + *Field count*: **1030**
 + *File count*: **1201**
 + *Folder count*: **193**
diff --git a/admin/README.txt b/admin/README.txt
index 854d00b56..6765cf21d 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.7.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **193640**
++ *Line count*: **193677**
 + *Field count*: **1030**
 + *File count*: **1201**
 + *Folder count*: **193**
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 0e634d90e..3e46d4a2e 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -931,12 +931,10 @@ class ComponentbuilderModelJoomla_components extends JModelList
 				}
 				$this->info['getKeyFrom']['package_links']	= $this->exportPackageLinks;
 				// we started adding this at v2.7.7
-				$this->info['key'] = true;
+				$this->info['source']['paid'] = true;
 			}
 			else
 			{
-				// we started adding this at v2.7.7
-				$this->info['key'] = false;
 				// Set the owner information
 				$data = base64_encode($data);
 			}
diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php
index ab303f1df..289a09bd9 100644
--- a/admin/views/import_joomla_components/tmpl/default.php
+++ b/admin/views/import_joomla_components/tmpl/default.php
@@ -352,9 +352,48 @@ jQuery(document).ready(function($) {
 </form>
 </div>
 <script type="text/javascript">
+// set packages that are on the page
+var packages = {};
+jQuery(document).ready(function($)
+{
+	// get all jcb packages
+	jQuery("#jcb_package option").each(function()
+	{
+		var key =  jQuery(this).val();
+		packages[key] = 'jcb';
+	});
+	// get all vdm packages
+	jQuery("#vdm_package option").each(function()
+	{
+		var key =  jQuery(this).val();
+		packages[key] = 'vdm';
+	});
+	// no start behind the scene getting of package info
+	autoJCBpackageInfo();
+});
+
+function autoJCBpackageInfo(){
+	jQuery.each( packages, function( url, type ) {
+		var key = url.replace(/\W/g, '');
+		// check if the values are local
+		var result = jQuery.jStorage.get('JCB-packages-details'+key, null);
+		if (!result && url.length > 0) {
+			 autoJCBpackageInfoAgain(url, key, type);
+		}
+	});
+}
+
+function autoJCBpackageInfoAgain(url, key,type){
+	getJCBpackageInfo_server(url).done(function(result) {
+		if(result.owner || result.packages){
+			jQuery.jStorage.set('JCB-packages-details'+key, result, {TTL: expire});
+		}
+	});
+}
+
 function getJCBpackageInfo(type){
 	// show spinner
-	jQuery('#loading').show();
+	jQuery('#loading').css('display', 'block');
 	jQuery('#noticeboard').show();
 	jQuery('#installer-import').hide();
 	// get value