From 80ab3d221b91c3151086aea937aa8bca28963839 Mon Sep 17 00:00:00 2001
From: Mariel de la Garza <mariel.delagarza@viget.com>
Date: Tue, 14 Jun 2022 15:16:52 -0400
Subject: [PATCH 1/3] Update query for 'data' posts to fix pagination bug (#73)

Add a new wp_query to the archive-data file, replace archive-data
content with old content that had been moved to dataTables-archive-data.
The dataTables default for pagination is true, but forcing it by
declaring "paging": "true" helped fix the bug.
---
 wp-content/themes/aerospace/archive-data.php | 108 ++++++++++++-------
 wp-content/themes/aerospace/js/data-repo.js  |   1 +
 2 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/wp-content/themes/aerospace/archive-data.php b/wp-content/themes/aerospace/archive-data.php
index bac064dd..ab386f5a 100755
--- a/wp-content/themes/aerospace/archive-data.php
+++ b/wp-content/themes/aerospace/archive-data.php
@@ -7,6 +7,13 @@
  * @package Aerospace
  */
 
+$args = array(
+	'post_type' => 'data',
+	'posts_per_page' => -1
+);
+
+$result = new WP_Query($args);
+
 if ( get_archive_top_content() ) {
     $description = get_archive_top_content();
 } else {
@@ -23,56 +30,75 @@
 get_header(); ?>
 
 <div id="primary" class="content-area">
-  <main id="main" class="site-main content-wrapper">
-    <header class="page-header row">
-      <div class="title-container">
-      <?php the_archive_title('<h1 class="page-title">', '</h1>'); ?>
-      <div class="archive-description row">
+	<main id="main" class="site-main content-wrapper">
+		<header class="page-header row">
+			<div class="title-container">
+			<?php the_archive_title('<h1 class="page-title">', '</h1>'); ?>
+			<div class="archive-description row">
                 <?php echo $description_extra; ?>
                 <?php echo $description; ?>
             </div>
-      <div class="archive-pages-top row">
-        <?php if (have_posts() ) : ?>
-          <div class="col-xs-12 col-sm archives-meta-left">
-            <?php aerospace_post_num(); ?>
-          </div>
+			<div class="archive-pages-top row">
+				<?php if ( have_posts() ) : ?>
+					<div class="col-xs-12 col-sm archives-meta-left">
+						<?php aerospace_post_num(); ?>
+					</div>
+					<div class="col-xs-12 col-sm-6 archives-meta-right">
+						<div class="sort-filter">
+							<span class="meta-label">Sort By:</span>
+							<button class="btn-sort tableSort active" data-sortCol="2" aria-label="Sort by Date">Date</button>
+							<span class="sort-filter-divider">|</span>
+							<button class="btn-sort tableSort" data-sortCol="1" aria-label="Sort by Title">Title</button>
+						</div>
+					</div>
+				<?php endif; ?>
+			</div>
+		</header><!-- .page-header -->
+		<section class="archive-content row">
+			<?php  if ( $result->have_posts() ) : ?>
+			<div class="col-xs-12 col-md-3 filter-sidebar">
+				<?php get_template_part( 'components/filters-data'); ?>
+			</div>
+			<div class="col-xs-12 col-md-9">
 
-        <?php endif; ?>
-      </div>
-    </header><!-- .page-header -->
-    <section class="archive-content row temp-data-archive">
-      <?php if (have_posts() ) : ?>
+				<table id="dataRepo" class="cards is-hidden">
+					<thead>
+						<tr>
+							<th>Display</th>
+							<th>Title</th>
+							<th>Last Updated</th>
+							<th>category</th>
+							<th>Tag</th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php
+						/* Start the Loop */
+						while ($result->have_posts()) : $result->the_post();
+							get_template_part( 'template-parts/content-data' );
+						endwhile;
+						?>
+					</tbody>
+				</table>
+			</div>
+			<?php
+			else :
+			get_template_part( 'template-parts/content', 'none' );
 
-        <table class="cards is-hidden">
-          <tbody>
-            <?php
-            /* Start the Loop */
-            while ( have_posts() ) : the_post();
-              get_template_part( 'template-parts/content-data' );
-            endwhile;
-            ?>
-          </tbody>
-        </table>
-      <?php
-      else :
-      get_template_part( 'template-parts/content', 'none' );
-
-      endif; ?>
-    </section>
-    <?php if (have_posts() ) : ?>
-    <footer class="archive-pages-bottom row">
+			endif; ?>
+		</section>
+		<?php if (have_posts() ) : ?>
+		<footer class="archive-pages-bottom row">
             <div class="col-xs-12 col-sm archives-meta-left"><?php aerospace_post_num(); ?></div>
             <div class="col-xs-12 col-sm-6 archives-meta-right">
-                <?php the_posts_pagination( array(
-                    'prev_text' => '<i class="icon-arrow-left"></i>',
-                    'next_text' => '<i class="icon-arrow-right"></i>',
-                )); ?>
-        </div>
-      </footer>
+               
+    		</div>
+    	</footer>
     <?php endif; ?>
-  </main><!-- #main -->
+	</main><!-- #main -->
 </div><!-- #primary -->
 
 <?php
+wp_enqueue_script('aerospace-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array(), '20171128', true );
+wp_enqueue_script('aerospace-datarepo', get_template_directory_uri() . '/js/data-repo.js', array(), '20171128', true );
 get_footer();
-
diff --git a/wp-content/themes/aerospace/js/data-repo.js b/wp-content/themes/aerospace/js/data-repo.js
index f01e8758..51cd9169 100644
--- a/wp-content/themes/aerospace/js/data-repo.js
+++ b/wp-content/themes/aerospace/js/data-repo.js
@@ -7,6 +7,7 @@
 		"info": false,
 		"lengthChange": false,
 		"order": [[ 2, "desc" ]],
+		"paging": true,
 		"pageLength": 10,
 		"pagingType": "simple_numbers",
 		"language": {

From 180e3e651f437cd85779f48ccbb0c059d43b2e71 Mon Sep 17 00:00:00 2001
From: Mariel de la Garza <mariel.delagarza@viget.com>
Date: Tue, 14 Jun 2022 15:39:51 -0400
Subject: [PATCH 2/3] Remove unused references to aerospace_post_sum (#73)

aerospace_post_sum is used to display "Page X/Y" at the top and bottom of the page. You can see it also used in the other archives (e.g. Aerospace 101). Because the data for the table is fetched in advanced, pagination through dataTables.js is not a true page refresh, so the aerospace_post_sum doesn't get triggered and "PAGE 1/2" does not update to "PAGE 2/2" when the user goes to the second page of the table.
---
 wp-content/themes/aerospace/archive-data.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wp-content/themes/aerospace/archive-data.php b/wp-content/themes/aerospace/archive-data.php
index ab386f5a..aa3227dc 100755
--- a/wp-content/themes/aerospace/archive-data.php
+++ b/wp-content/themes/aerospace/archive-data.php
@@ -41,7 +41,6 @@
 			<div class="archive-pages-top row">
 				<?php if ( have_posts() ) : ?>
 					<div class="col-xs-12 col-sm archives-meta-left">
-						<?php aerospace_post_num(); ?>
 					</div>
 					<div class="col-xs-12 col-sm-6 archives-meta-right">
 						<div class="sort-filter">
@@ -89,10 +88,7 @@
 		</section>
 		<?php if (have_posts() ) : ?>
 		<footer class="archive-pages-bottom row">
-            <div class="col-xs-12 col-sm archives-meta-left"><?php aerospace_post_num(); ?></div>
-            <div class="col-xs-12 col-sm-6 archives-meta-right">
                
-    		</div>
     	</footer>
     <?php endif; ?>
 	</main><!-- #main -->

From bd2f7a4d5815285e99eeb1a2331590dbd647d2b2 Mon Sep 17 00:00:00 2001
From: Mariel de la Garza <mariel.delagarza@viget.com>
Date: Tue, 14 Jun 2022 15:49:01 -0400
Subject: [PATCH 3/3] Remove unnecessary paging setting in dataRepo.js (#73)

With other updates, file doesn't need to have "paging" set to true in order to function properly. The default for dataTables pagination is already true.
---
 wp-content/themes/aerospace/js/data-repo.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wp-content/themes/aerospace/js/data-repo.js b/wp-content/themes/aerospace/js/data-repo.js
index 51cd9169..f01e8758 100644
--- a/wp-content/themes/aerospace/js/data-repo.js
+++ b/wp-content/themes/aerospace/js/data-repo.js
@@ -7,7 +7,6 @@
 		"info": false,
 		"lengthChange": false,
 		"order": [[ 2, "desc" ]],
-		"paging": true,
 		"pageLength": 10,
 		"pagingType": "simple_numbers",
 		"language": {