From 59713ca0f181340ae364e9d6bb5ae840d8e822ec Mon Sep 17 00:00:00 2001
From: Corey McKrill <916023+coreymckrill@users.noreply.github.com>
Date: Thu, 24 Oct 2019 20:06:47 -0700
Subject: [PATCH] Pledges: Move contributor management UI to separate file
 (#47)

Having both the input for adding a comma separated list of contributors
to a new pledge and the UI for managing the contributors on an existing
pledge in the same file was confusing and it conflated two different
pieces of functionality. It also caused `undefined index` errors in some
views  because `'pledge-contributors'` only exists when submitting the
new pledge form.
---
 plugins/wporg-5ftf/includes/pledge-meta.php   |  2 +-
 .../wporg-5ftf/views/form-pledge-manage.php   |  2 +-
 .../views/inputs-pledge-contributors.php      | 53 -----------------
 .../wporg-5ftf/views/manage-contributors.php  | 57 +++++++++++++++++++
 4 files changed, 59 insertions(+), 55 deletions(-)
 create mode 100644 plugins/wporg-5ftf/views/manage-contributors.php

diff --git a/plugins/wporg-5ftf/includes/pledge-meta.php b/plugins/wporg-5ftf/includes/pledge-meta.php
index 902c738..2d690ad 100755
--- a/plugins/wporg-5ftf/includes/pledge-meta.php
+++ b/plugins/wporg-5ftf/includes/pledge-meta.php
@@ -168,7 +168,7 @@ function render_meta_boxes( $pledge, $box ) {
 			break;
 
 		case 'pledge-contributors':
-			require FiveForTheFuture\get_views_path() . 'inputs-pledge-contributors.php';
+			require FiveForTheFuture\get_views_path() . 'manage-contributors.php';
 			break;
 	}
 
diff --git a/plugins/wporg-5ftf/views/form-pledge-manage.php b/plugins/wporg-5ftf/views/form-pledge-manage.php
index a97c2d7..1b7bdc2 100644
--- a/plugins/wporg-5ftf/views/form-pledge-manage.php
+++ b/plugins/wporg-5ftf/views/form-pledge-manage.php
@@ -10,7 +10,7 @@ use function WordPressDotOrg\FiveForTheFuture\get_views_path;
 <form class="pledge-form" id="5ftf-form-pledge-manage" action="" method="post">
 	<?php
 	require get_views_path() . 'inputs-pledge-org-info.php';
-	require get_views_path() . 'inputs-pledge-contributors.php';
+	require get_views_path() . 'manage-contributors.php';
 	require get_views_path() . 'inputs-pledge-org-email.php';
 	?>
 
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-contributors.php b/plugins/wporg-5ftf/views/inputs-pledge-contributors.php
index 254ca0c..b591807 100644
--- a/plugins/wporg-5ftf/views/inputs-pledge-contributors.php
+++ b/plugins/wporg-5ftf/views/inputs-pledge-contributors.php
@@ -1,13 +1,10 @@
 <?php
 namespace WordPressDotOrg\FiveForTheFuture\View;
 
-/** @var array $contributors */
 /** @var array $data */
 /** @var bool  $readonly */
 ?>
 
-<?php if ( empty( $contributors ) ) : ?>
-
 <div class="form-field">
 	<label for="5ftf-pledge-contributors">
 		<?php esc_html_e( 'Contributors', 'wordpressorg' ); ?>
@@ -24,53 +21,3 @@ namespace WordPressDotOrg\FiveForTheFuture\View;
 		<?php esc_html_e( 'Separate each username with a comma.', 'wordpressorg' ); ?>
 	</p>
 </div>
-
-<?php else : ?>
-
-<div class="5ftf-contributors">
-	<?php foreach ( $contributors as $contributor_status => $group ) : ?>
-		<?php if ( ! empty( $group ) ) : ?>
-			<h3 class="contributor-list-heading">
-				<?php
-				switch ( $contributor_status ) {
-					case 'pending':
-						esc_html_e( 'Unconfirmed', 'wporg' );
-						break;
-					case 'publish':
-						esc_html_e( 'Confirmed', 'wporg' );
-						break;
-				}
-				?>
-			</h3>
-
-			<ul class="contributor-list <?php echo esc_attr( $contributor_status ); ?>">
-				<?php foreach ( $group as $contributor_post ) :
-					$contributor = get_user_by( 'login', $contributor_post->post_title );
-					?>
-					<li>
-						<?php echo get_avatar( $contributor->user_email, 32 ); ?>
-						<?php echo esc_html( $contributor_post->post_title ); ?>
-						<!-- TODO These buttons don't do anything yet.
-						<button class="button-primary" data-action="remove" data-contributor-post="<?php echo esc_attr( $contributor_post->ID ); ?>">
-							<?php esc_html_e( 'Remove', 'wporg' ); ?>
-						</button>
-						<?php if ( 'pending' === $contributor_post->post_status ) : ?>
-							<button class="button-secondary" data-action="resend-confirmation" data-contributor-post="<?php echo esc_attr( $contributor_post->ID ); ?>">
-								<?php esc_html_e( 'Resend confirmation', 'wporg' ); ?>
-							</button>
-						<?php endif; ?>
-						-->
-					</li>
-				<?php endforeach; ?>
-			</ul>
-		<?php endif; ?>
-	<?php endforeach; ?>
-
-	<!-- TODO This button doesn't do anything yet.
-	<button class="button-primary" data-action="add-contributor">
-		<?php esc_html_e( 'Add new contributor', 'wporg' ); ?>
-	</button>
-	-->
-</div>
-
-<?php endif; ?>
diff --git a/plugins/wporg-5ftf/views/manage-contributors.php b/plugins/wporg-5ftf/views/manage-contributors.php
new file mode 100644
index 0000000..42c3d53
--- /dev/null
+++ b/plugins/wporg-5ftf/views/manage-contributors.php
@@ -0,0 +1,57 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var array $contributors */
+/** @var array $data */
+/** @var bool  $readonly */
+?>
+
+<div class="5ftf-contributors">
+	<?php if ( ! empty( $contributors ) ) : ?>
+		<?php foreach ( $contributors as $contributor_status => $group ) : ?>
+			<?php if ( ! empty( $group ) ) : ?>
+				<h3 class="contributor-list-heading">
+					<?php
+					switch ( $contributor_status ) {
+						case 'pending':
+							esc_html_e( 'Unconfirmed', 'wporg' );
+							break;
+						case 'publish':
+							esc_html_e( 'Confirmed', 'wporg' );
+							break;
+					}
+					?>
+				</h3>
+
+				<ul class="contributor-list <?php echo esc_attr( $contributor_status ); ?>">
+					<?php foreach ( $group as $contributor_post ) :
+						$contributor = get_user_by( 'login', $contributor_post->post_title );
+						?>
+						<li>
+							<?php echo get_avatar( $contributor->user_email, 32 ); ?>
+							<?php echo esc_html( $contributor_post->post_title ); ?>
+							<!-- TODO These buttons don't do anything yet.
+							<button class="button-primary" data-action="remove" data-contributor-post="<?php echo esc_attr( $contributor_post->ID ); ?>">
+								<?php esc_html_e( 'Remove', 'wporg' ); ?>
+							</button>
+							<?php if ( 'pending' === $contributor_post->post_status ) : ?>
+								<button class="button-secondary" data-action="resend-confirmation" data-contributor-post="<?php echo esc_attr( $contributor_post->ID ); ?>">
+									<?php esc_html_e( 'Resend confirmation', 'wporg' ); ?>
+								</button>
+							<?php endif; ?>
+							-->
+						</li>
+					<?php endforeach; ?>
+				</ul>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<p><?php esc_html_e( 'There are no contributors added to this pledge yet.', 'wporg' ); ?></p>
+	<?php endif; ?>
+
+	<!-- TODO This button doesn't do anything yet.
+	<button class="button-primary" data-action="add-contributor">
+		<?php esc_html_e( 'Add new contributor', 'wporg' ); ?>
+	</button>
+	-->
+</div>