=Base Integrations mainly done - doing a test with setting up the Square in...

Jake Vanderwerf

10 days ago de317675a8069b747cb253ba3e2b5dc394ca36ef

 inc/ui/CRUDSkeleton.php

@@ -1,6 +1,7 @@
<?php
namespace JVBase\ui;

use JVBase\base\Site;
use JVBase\managers\UserTermsManager;
use JVBase\meta\Form;
use JVBase\registrar\Registrar;
@@ -37,6 +38,7 @@
   protected string $singular = '';
   protected string $plural = '';
   protected string $icon;
   protected string $emptyState = '';

   // Capabilities
   protected array $caps = [];
@@ -118,7 +120,6 @@
   protected ?array $uploaderConfig = null;

   // Data
   protected $dataSourceCallback = null;
   protected array $templates = [];

   // UI Options
@@ -129,7 +130,7 @@
   protected array $customDateRanges = [];
   protected array $additionalClasses = [];

   protected Registrar $registrar;
   protected ?Registrar $registrar;
   public function __construct() {
      $this->icon = jvbDefaultIcon();
      $this->user = wp_get_current_user();
@@ -145,12 +146,26 @@
      return $this;
   }

   public function icon(string $icon):void
   {
      $this->icon = $icon;
   }

   public function getIcon():string
   {
      return $this->icon;
   }
   /**
    * Set content type information
    */
   public function content(string $type, string $singular, string $plural): self {
      $this->dataType = $type;
      $this->registrar = Registrar::getInstance($type);
      $registrar = Registrar::getInstance($type);
      if ($registrar) {
         $this->registrar = Registrar::getInstance($type)??null;
         $this->sections = $this->registrar->getSections();
      }

      $this->singular = $singular;
      $this->plural = $plural;
      return $this;
@@ -234,7 +249,7 @@

   protected function taxConfig(string $taxonomy, string $label = ''):array
   {
      $isVerified = jvbUserIsVerified();
      $isVerified = $this->userIsVerified();
      $label = ($label === '') ? Registrar::getInstance($taxonomy)->getPlural() : $label;
      return [
         'type'      => 'taxonomy',
@@ -246,6 +261,13 @@
      ];
   }

   protected function userIsVerified():bool
   {
      $membership = Site::membership();

      return !($membership && $membership->has('member_verified')) || current_user_can('skip_moderation');
   }

   public function addSearch():self
   {
      $this->hasSearch = true;
@@ -343,7 +365,7 @@
      }

      $this->timelineSharedFields = array_keys(array_filter($this->fields, function ($field) {
         if (!array_key_exists('for_all', $field) || $field['for_all'] === false){
         if (!array_key_exists('for_all', $field) || $field['for_all'] === false || is_null($field['for_all'])){
            return true;
         }
         return false;
@@ -357,7 +379,6 @@
         return false;
      }));


      $all = array_merge($this->timelineUniqueFields, $this->timelineSharedFields);
      $this->nonTimelineFields = array_filter($this->fields, function ($field) use ($all) {
         return !in_array($field, $all);
@@ -458,15 +479,6 @@
   }

   /**
    * Set the data source callback
    * Callback should accept filters and return array of items
    */
   public function dataSource(callable $callback): self {
      $this->dataSourceCallback = $callback;
      return $this;
   }

   /**
    * Add a custom template
    */
   public function addTemplate(string $name, string $template): self {
@@ -531,7 +543,7 @@
    * Render the CRUD interface
    */
   public function render(): void {
      $config = $this->build();

      $classes = array_merge(['dashboard-page', $this->dataType], $this->additionalClasses);

//    ob_start();
@@ -576,14 +588,17 @@
   protected function renderUploader(): void {
      ?>
      <details open class="uploader">
         <summary class="row btw"><?= esc_html($this->uploaderConfig['label'] ?? 'Upload Files') ?></summary>
         <?php
         echo Form::render(
            'new_' . $this->dataType,
            '',
            $this->uploaderConfig
         );
         ?>
         <summary class="row x-btw"><?= esc_html($this->uploaderConfig['label'] ?? 'Upload Files') ?></summary>
         <form id="uploader" data-form-id="upload_new_<?=$this->dataType ?>">
            <?php
            echo jvbFormRestore();
            echo Form::render(
               'new_' . $this->dataType,
               '',
               $this->uploaderConfig
            );
            ?>
         </form>
      </details>
      <?php
   }
@@ -595,7 +610,7 @@
      $dataIgnore = $this->useCRUDjs ? '' : ' data-ignore';
      ?>
      <section class="items-list <?= esc_attr($this->dataType) ?> crud" data-content="<?= esc_attr($this->dataType) ?>" data-singular="<?=$this->singular?>" data-plural="<?=$this->plural?>" data-view="<?= $this->defaultView?>"<?=$dataIgnore?>>
         <div class="wrap">
         <div id="item-wrap">
            <?php
            $this->renderControlsAndFilters();

@@ -619,8 +634,8 @@
         return;
      }
      ?>
      <details class="all-filters col start" data-ignore>
         <summary>Filters <button hidden data-action="clear-filters" data-ignore><?=jvbIcon('x')?><span>Clear Filters</span></span></button></summary>
      <details class="all-filters col top" data-ignore>
         <summary>Filters</summary>
         <?php

         $this->renderSearch();
@@ -634,6 +649,7 @@
         ?>
         <button data-action="refresh" data-ignore><?=jvbIcon('arrows-clockwise')?><span>Hard Refresh</span></span></button>
      </details>
      <button hidden data-action="clear-filters" data-ignore hidden><?=jvbIcon('x')?><span>Clear Filters</span></span></button>
      <?php
   }

@@ -643,7 +659,7 @@
         return;
      }
      ?>
      <div class="search row start nowrap">
      <div class="search row left nowrap">
         <span class="label">Search:</span>
         <?= jvbSearch() ?>
      </div>
@@ -656,7 +672,7 @@
         return;
      }
      ?>
      <div class="radio-options view row">
      <div class="radio-options view row left">
         <span class="label">View:</span>
         <?php
         $views = [
@@ -677,7 +693,7 @@
            <label for="view-<?=$view?>"
               title="<?=$views[$view]['label']?>">
               <?= jvbDashIcon($views[$view]['icon']) ?>
               <span class="screen-reader-text"><?=$views[$view]['label']?></span>
               <span class="label"><?=$views[$view]['label']?></span>
            </label>
            <?php
         }
@@ -692,7 +708,7 @@
         return;
      }
      ?>
      <div class="radio-options status row">
      <div class="radio-options status row left">
         <span class="label">Status:</span>
         <?php
         $i = 1;
@@ -707,6 +723,7 @@
            <input type="radio" class="btn" data-filter="status" value="<?=$status?>" name="status" id="<?=$status?>"<?=$checked?>>
            <label for="<?=$status?>" title="<?=$config['label']?>">
               <?= jvbDashIcon($config['icon']) ?>
               <span class="label"><?= $config['label'] ?></span>
            </label>
            <?php
            $i++;
@@ -719,34 +736,52 @@
   protected function renderOrderControls():void
   {
      ?>
      <div class="radio-options order row btw w-full">
      <div class="radio-options order row x-btw w-full">
         <?php
         $order = [
            'orderby' => [
               'date' => 'Order by date created',
               'alphabetical' => 'Order alphabetically'
               [
                  'slug'   => 'date',
                  'label'  => 'Date Created',
                  'icon'   => 'calendar'
               ],
               [
                  'slug'   => 'alphabetical',
                  'label'  => 'Alphabetically',
                  'icon'   => 'alphabetical',
               ],
               [
                  'slug'   => 'date_modified',
                  'icon'   => 'clock-clockwise',
                  'label'  => 'Date Modified',
               ],
            ],
            'order' => [
               'sort-ascending' => 'In ascending order (Z-A, oldest to newest)',
               'sort-descending' => 'In descending order (A-Z, newest to oldest)'
               [
                  'slug'   => 'desc',
                  'icon'   => 'sort-descending',
                  'label'  => 'Descending (A-Z, 1-10)'
               ],
               [
                  'slug'   => 'asc',
                  'icon'   => 'sort-ascending',
                  'label'  => 'Ascending (Z-A, 10-1)'
               ]
            ]
         ];

         foreach ($order as $o => $option) {
            ?>
            <div class="row start">
            <div class="row left">
               <span class="label"><?= ucfirst($o)?>:</span>
               <?php
               $title = $o === 'orderby' ? 'Order by ' : 'Sort ';
               $i = 0;
               foreach ($option as $opt => $label) {
                  $icon = $opt === 'date' ? 'calendar' : $opt;
                  $value = $opt;
                  $value = ($value === 'sort-ascending') ? 'asc' : $value;
                  $value = ($value === 'sort-descending') ? 'desc' : $value;
               foreach ($option as $conf) {
                  ?>
                  <input id="<?=$opt?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$value?>"<?=$i===0 ? ' checked':''?>>
                  <input id="<?=$o.'-'.$conf['slug'] ?>" class="btn" type="radio" name="<?=$o?>" data-filter="<?=$o?>" value="<?=$conf['slug']?>"<?=$i===0 ? ' checked':''?>>

                  <label for="<?=$opt?>" title="<?=$label?>"><?=jvbDashIcon($icon)?></label>
                  <label for="<?=$o.'-'.$conf['slug']?>" title="<?=$title.' '.$conf['label']?>"><?=jvbDashIcon($conf['icon'])?><span class="label"><?= $conf['label'] ?></span></label>
                  <?php
                  $i++;
               }
@@ -764,7 +799,7 @@
         return;
      }
      ?>
      <div class="filters row start">
      <div class="filters row left">
         <span class="label">Filters:</span>
         <?php
         foreach ($this->filters as $key => $config) {
@@ -844,6 +879,7 @@
            $form = ob_get_clean();
            echo jvbNewModal(
               'date-range',
            'date-range',
            'Filter Results by Date:',
               $form
            );
@@ -883,8 +919,8 @@
         foreach ($terms as $term) {
            $out .= sprintf(
               '<option value="%s">%s</option>',
               esc_attr($term['term_id']),
               esc_html($term['name'])
               esc_attr(is_object($term) ? $term->term_id : $term['term_id']),
               esc_html(is_object($term) ? $term->name : $term['name'])
            );
         }
         $out .= '</select></div>';
@@ -899,7 +935,7 @@
    */
   protected function getCommonTerms(string $taxonomy, ?string $limit = null):array {
      if ($limit) {
         if ($limit === 'user') {
         if (Site::has('membership') && $limit === 'user') {
            $manager = new UserTermsManager();
            return $manager->fetchUserTerms($this->user_id, $taxonomy);
         } else {
@@ -922,7 +958,7 @@
      ob_start();
      ?>
      <details class="multi-select" title="Select columns" hidden>
         <summary class="row start nowrap">
         <summary class="row left nowrap">
            <?= jvbDashIcon('columns') ?>
            <span class="labels">Toggle Columns</span>
         </summary>
@@ -955,7 +991,7 @@
         return;
      }
      ?>
      <div class="bulk-controls row nowrap btw">
      <div class="bulk-controls row nowrap x-btw">
         <div class="bulk-select">
            <input type="checkbox" id="select-all" class="select-all">
            <label for="select-all" class="row"><span>Select All</span><span class="selected-count" hidden></span></label>
@@ -1053,7 +1089,7 @@
         }, ARRAY_FILTER_USE_KEY);

         echo '<template class="timelineItem">';
         echo Form::renderImagePreview(null, ['fields' => $temp]);
         echo Form::renderImagePreview(null, $temp);
         echo '</template>';
      }
      if (!array_key_exists('empty', $templates)) {
@@ -1076,15 +1112,23 @@
   }
   protected function renderEmptyState():string
   {
      ob_start();
      ?>
      <div class="empty-state">
         <h3><?=jvbDashIcon($this->icon)?>Nothing here<?=jvbDashIcon($this->icon)?></h3>
         <p>It doesn't look like you have any <?=$this->plural ?> yet.</p>
         <p><small><i>Add many by uploading images above.</i>, or click the "<?=jvbDashIcon('plus-square')?>" button to add one at a time.</small></p>
      </div>
      <?php
      return ob_get_clean();

      return empty($this->emptyState) ? sprintf(
         '<div class="empty-state">
            <h3>%sNothing here%s</h3>
            <p>It doesn\'t look like you have any %s yet.</p>
         <p><small><i>Add many by uploading images above.</i>, or click the "%s" button to add one at a time.</small></p>
         </div>',
         jvbDashIcon($this->icon),
         jvbDashIcon($this->icon),
         $this->plural,
         jvbDashIcon('plus-square')
      ) : $this->emptyState;
   }

   public function setEmptyState(string $state):void
   {
      $this->emptyState = $state;
   }

   protected function renderGalleryPreviewTemplate():void
@@ -1126,7 +1170,7 @@
      }
      ob_start();
      ?>
      <div class="item-actions row btw abs">
      <div class="item-actions row x-btw abs">
         <?php
         foreach ($this->itemActions as $action) {
            $config = $this->defaultItemActions[$action];
@@ -1167,7 +1211,7 @@
         <div class="item <?=esc_attr($this->dataType)?> row nowrap">
            <?= $this->renderItemSelect()?>
            <?=$this->renderImage() ?>
            <div class="col start w-full">
            <div class="col top w-full">
               <h3 data-field="post_title"></h3>
               <p data-attr="date"></p>
               <p data-field="price"></p>
@@ -1192,7 +1236,6 @@
      ?>
      <template class="contentTable">
         <form class="table"
            data-save="content"
            data-content="<?= esc_attr($this->dataType) ?>"
            data-form-id="content-table-<?= esc_attr($this->dataType) ?>"
            <?= $permissions?>>
@@ -1230,9 +1273,9 @@
               <?= $this->renderItemSelect() ?>
            </td>
            <?php
               if (array_key_exists('status', $this->fields)){
               if (array_key_exists('post_status', $this->fields)){
                  ?>
                  <td class="status" data-field="post_status">
                  <td class="post_status" data-field="post_status" data-field-type="radio">
                     <?= $this->renderStatusRadios() ?>
                  </td>
                  <?php
@@ -1246,7 +1289,7 @@
               'radio'
            ];
            foreach ($this->fields as $name => $config):
               if (array_key_exists('hidden', $config) || $name === 'status'){
               if ((array_key_exists('hidden', $config) && $config['hidden'] === true) || $name === 'post_status'){
                  continue;
               }
               $makeThisDetailed = (in_array($config['type'], $makeDetails));
@@ -1254,7 +1297,7 @@
               <td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
                  <?php
                  if (in_array('edit', $this->caps)) {
                     echo $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '';
                     echo $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '';
                     if (in_array($config['type'], ['selector', 'taxonomy', 'post'])) {
                        $config['autocomplete'] = true;
                     }
@@ -1286,7 +1329,6 @@
      ?>
      <template class="contentTable">
         <form class="table"
              data-save="content"
              data-content="<?= esc_attr($this->dataType) ?>"
              data-form-id="content-table-<?= esc_attr($this->dataType) ?>">
            <?= jvbFormStatus() ?>
@@ -1336,7 +1378,7 @@
               $makeThisDetailed = (in_array($config['type'], $makeDetails));
               ?>
               <td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
                  <?= $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '' ?>
                  <?= $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '' ?>
                  <?php
                  if (in_array($config['type'], ['selector', 'taxonomy', 'post'])) {
                     $config['autocomplete'] = true;
@@ -1359,7 +1401,7 @@
            </td>
            <?php
            foreach ($this->fields as $name => $config) {
               if(array_key_exists('hidden', $config) || $name === 'post_status') {
               if((array_key_exists('hidden', $config) && $config['hidden'] === true) || $name === 'post_status') {
                  continue;
               }
               if (!in_array($name, $this->timelineUniqueFields)) {
@@ -1369,7 +1411,7 @@
               $makeThisDetailed = (in_array($config['type'], $makeDetails));
               ?>
               <td class="field show-<?= esc_attr($name) ?>" data-field="<?= esc_attr($name) ?>" data-field-type="<?=$config['type']?>"<?=(in_array($name, $this->stuck)) ? ' data-stuck':''?>>
                  <?= $makeThisDetailed ? '<details><summary class="row btw">See Value</summary>' : '' ?>
                  <?= $makeThisDetailed ? '<details><summary class="row x-btw">See Value</summary>' : '' ?>
                  <?= Form::render($name, '', $config); ?>
                  <?= $makeThisDetailed ? '</details>' : '' ?>
               </td>
@@ -1386,64 +1428,59 @@
    * Render table header
    */
   protected function renderTableHeader(): string {
      ob_start();

      ?>
      <tr>
      $out = '<tr>
         <th scope="col" class="select-header">
            <input type="checkbox" id="select-all" name="select-all">
            <label for="select-all">All</label>
         </th>
         <?php if (array_key_exists('status', $this->fields)) { ?>
            <th scope="col" class="status-header">Status</th>
         <?php } ?>
         <?php foreach ($this->fields as $name => $config):
            if (array_key_exists('hidden', $config) || $name === 'status'){
               continue;
            }
            ?>
            <th scope="col" class="show-<?= esc_attr($name) ?>"<?= (in_array($name, $this->stuck)) ? ' data-stuck':''?>>
               <?= esc_html($config['label']) ?>
            </th>
         <?php endforeach;
         if (!empty($this->itemActions)) {
            ?>
            <th scope="col" class="show-actions">
               Actions
            </th>
            <?php
         }
         ?>
         </th>';

      </tr>
      <?php
      return ob_get_clean();
      if (array_key_exists('post_status', $this->fields)){
         $out .= '<th scope="col" class="status-header">Status</th>';
      }

      foreach ($this->fields as $name => $config) {
         if ($name === 'post_status' || (array_key_exists('hidden', $config) && $config['hidden'] === true)) {
            continue;
         }
         $out .= sprintf(
            '<th scope="col" class="show-%s"%s>%s</th>',
            esc_attr($name),
            in_array($name, $this->stuck) ? ' data-stuck' : '',
            esc_html($config['label'])
         );
      }

      if (!empty($this->itemActions)) {
         $out .= '<th scope="col" class="show-actions">Actions</th>';
      }
      $out .= '</tr>';

      return $out;
   }

   protected function renderTimelineTableHeader(): string {
      ob_start();

      ?>
      <tr>
      $out = '<tr>
         <th scope="col" class="select-header">
            <input type="checkbox" id="select-all" name="select-all">
            <label for="select-all">All</label>
         </th>
         <th scope="col" class="show-post_status">
            Status
         </th>
         <?php foreach ($this->fields as $name => $config):
            if (array_key_exists('hidden', $config) || $name === 'post_status'){
               continue;
            }
            ?>
            <th scope="col" class="show-<?= esc_attr($name) ?>"<?= (in_array($name, $this->stuck)) ? ' data-stuck':''?>>
               <?= esc_html($config['label']) ?>
            </th>
         <?php endforeach; ?>
      </tr>
      <?php
      return ob_get_clean();
         </th>';

      foreach ($this->fields as $name => $config) {
         if ($name === 'post_status' || (array_key_exists('hidden', $config) && $config['hidden'] === true)) {
            continue;
         }
         $out .= sprintf(
            '<th scope="col" class="show-%s"%s>%s</th>th>',
            esc_attr($name),
            in_array($name, $this->stuck) ? ' data-stuck':'',
            esc_html($config['label'])
         );
      }
      $out .= '</tr>';
      return $out;
   }

   /**
@@ -1452,7 +1489,7 @@
   protected function renderTableActions(): string {
      ob_start();
      ?>
      <div class="table-actions row btw nowrap">
      <div class="table-actions row x-btw nowrap">
         <?php if (count(array_intersect(['create', 'edit'], $this->caps)) > 0) { ?>
            <?= jvbRenderToggleTextField(
               'vertical',
@@ -1471,29 +1508,35 @@
      return ob_get_clean();
   }

   protected function renderStatusRadios(): string {
      ob_start();
      ?>
      <div class="radio-options status-options row" data-field="post_status" data-field-type="radio">
         <?php foreach ($this->statuses as $status):
            if ($status === 'all') continue;
            if (!array_key_exists($status, $this->allowedStatuses)) continue;
            $config = $this->allowedStatuses[$status];
            ?>
   protected function renderStatusRadios(): string
   {
      $out = '<div class="radio-options status-options row">';
      foreach ($this->statuses as $status) {
         if ($status === 'all' || !array_key_exists($status, $this->allowedStatuses)) continue;
         $config = $this->allowedStatuses[$status];

            <input type="radio"
         $out .= sprintf(
            '<input type="radio"
                  name="post_status"
                  id="status-<?= esc_attr($status) ?>"
                  value="<?= esc_attr($status) ?>">
            <label for="status-<?= esc_attr($status) ?>">
               <?= jvbDashIcon($config['icon']) ?>
               <span class="screen-reader-text"><?= esc_html($config['label']) ?></span>
            </label>
         <?php endforeach; ?>
         <span class="validation-message" hidden role="alert"></span>
      </div>
      <?php
      return ob_get_clean();
                  id="post_status-%s"
                  class="btn"
                  value="%s">
            <label for="post_status-%s" title="%s">
               %s
               <span class="screen-reader-text">%s</span>
            </label>',
            esc_attr($status),
            esc_attr($status),
            esc_attr($status),
            esc_html($config['label']),
            jvbDashIcon($config['icon']),
            esc_html($config['label'])
         );
      }
      $out .= '<span class="validation-message" hidden role="alert"></span>
      </div>';

      return $out;
   }


@@ -1539,6 +1582,7 @@
   {
      echo jvbNewModal(
         'create',
         'create',
         'Creating <span class="count"></span> New '.$this->singular,
         str_replace('edit-form"', 'create-form" data-noautosave', $this->editForm())
      );
@@ -1547,19 +1591,19 @@
   protected function editForm():string
   {
      ob_start();
/*    <form class="edit-form" data-save="content" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''*/
      ?>
      <form class="edit-form" data-save="content" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''?>>

      <form class="edit-form" data-form-id="edit-<?=$this->dataType?>" data-autosave<?= ($this->isTimeline) ? ' data-timeline' : ''?>>
         <?= jvbFormStatus() ?>
         <input type="hidden" name="form-id" value="<?=uniqid('new-')?>" />
         <input type="hidden" name="content" value="<?=$this->dataType?>" />
         <div class="fields">
            <?php
            if (!empty($this->statuses)) {
            if (empty($this->sections) && !empty($this->statuses)) {
               echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
            }



            if (!empty($this->sections)) {
               $tabs = [];
               foreach ($this->sections as $config) {
@@ -1570,8 +1614,9 @@
                        'icon'   => $config['icon']
                     ];
                  }

                  $tabs[$slug] = array_merge([
                     'title'  => $config['label'],
                     'title'  => $config['title'],
                     'content' => '',
                     'description' => $config['description']??'',
                  ], $section);
@@ -1581,13 +1626,18 @@
            }

            $fields = $this->fields;

            if (!$this->isTimeline) {
               $first = ['post_thumbnail', 'post_title', 'price'];
               $first = $this->registrar->getType() === 'post' ?
                  ['post_thumbnail', 'post_title', 'price'] :
                  ( $this->registrar->getType() === 'term' ?
                     ['name', 'thumbnail', 'description'] :
                     ['username', 'display_name', 'description']);

               foreach ($first as $f) {
                  if (array_key_exists($f, $fields)) {
                     if ($tabs) {
                        $tabs['basic']['content'] .= Form::render($f, '', $fields[$f]);
                        $tabs['main']['content'] .= Form::render($f, '', $fields[$f]);
                     } else {
                        echo Form::render($f, '', $fields[$f]);
                     }
@@ -1597,13 +1647,15 @@
            }

            if ($this->isTimeline) {
               $temp = array_filter($fields, function ($field) {
                  return in_array($field, $this->timelineUniqueFields);
               $temp = array_filter($fields, function ($field) use ($fields) {
                  return in_array($field, $this->timelineUniqueFields) && (!array_key_exists('hidden', $fields[$field]) || $fields[$field]['hidden'] === false);
               }, ARRAY_FILTER_USE_KEY);
               $config = [
                  'type'      => 'upload',
                  'subtype'   => 'timeline',
                  'data'      => 'timeline',
                  'multiple'  => true,
                  'limit'     => 0,
                  'data'      => ['timeline'],
                  'label'     => 'Progression',
                  'fields' => $temp
               ];
@@ -1613,22 +1665,30 @@
                     if (in_array($field['type'], ['taxonomy', 'selector'])) {
                        $field = array_merge($field, $this->taxConfig($field['taxonomy'], $field['label']));
                     }
                     $content .= Form::render($slug, '', $field);
                     if (!array_key_exists('hidden', $field) || $field['hidden'] === false) {
                        $content .= Form::render($slug, '', $field);
                     }
                  }
               }


               $content .= Form::render('timeline', '', $config);
               $content .= Form::render('timeline_gallery', '', $config);

               $tabs['progression']['content'] = $content;
               if ($tabs) {
                  $tabs['progression']['content'] = $content;
               } else {
                  echo $content;
               }

               $fields = $this->nonTimelineFields;
            }

            foreach ($fields as $n => $config) {
               if (in_array($config['type'], ['taxonomy', 'selector'])) {
                  $config = array_merge($config, $this->taxConfig($config['taxonomy'], $config['label']));
               }
               if ($tabs) {
                  $section = (array_key_exists('section', $config)) ? $config['section'] : 'basic';
                  $section = (array_key_exists('section', $config)) && !empty($config['section']) ? $config['section'] : 'main';
                  $tabs[$section]['content'] .= Form::render($n, '', $config);
               } else {
                  echo Form::render($n, '', $config);
@@ -1650,6 +1710,7 @@
   {
      echo jvbNewModal(
         'edit',
         'edit',
         'Edit your '.$this->singular,
         $this->editForm()
      );
@@ -1659,8 +1720,10 @@
   {
      if (empty($this->bulkActions)) return;
      ob_start();
/*    <form class="bulk-edit-form" data-save="content" data-form-id="bulk-edit-<?=$this->dataType?>">*/
      ?>
      <form class="bulk-edit-form" data-save="content" data-form-id="bulk-edit-<?=$this->dataType?>">

      <form class="bulk-edit-form" data-form-id="bulk-edit-<?=$this->dataType?>">
         <?= jvbFormStatus() ?>
         <div class="selected"></div>
         <p class="description">You can unselect items by clicking the image here.</p>
@@ -1700,6 +1763,7 @@
      $form = ob_get_clean();
      echo jvbNewModal(
         'bulkEdit',
         'bulkEdit',
         'Bulk Edit <span class="selected"></span> '.$this->plural,
         $form
      );
@@ -1777,4 +1841,31 @@
      $out = ob_get_clean();
      echo Form::fieldWrap('post_status', $out, ['type'=>'group']);
   }


   public static function searchFilter():string
   {
      $self = new self();
      $self->hasSearch = true;
      ob_start();
      $self->renderSearch();
      return ob_get_clean();
   }

   public static function viewFilter(array $views):string
   {
      $self = new self();
      $self->views = $views;
      ob_start();
      $self->renderViewControls();
      return ob_get_clean();
   }

   public static function orderFilter(bool $random = false):string
   {
      $self = new self();
      ob_start();
      $self->renderOrderControls();
      return ob_get_clean();
   }
}