From 56a9a1ccf764ff7a6af8f8a2292cb07443cb4aa7 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 28 May 2026 18:19:57 +0000
Subject: [PATCH] =New Gitbit setpu
---
inc/ui/CRUDSkeleton.php | 218 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 144 insertions(+), 74 deletions(-)
diff --git a/inc/ui/CRUDSkeleton.php b/inc/ui/CRUDSkeleton.php
index c8eeda1..d1d4834 100644
--- a/inc/ui/CRUDSkeleton.php
+++ b/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;
@@ -118,7 +119,6 @@
protected ?array $uploaderConfig = null;
// Data
- protected $dataSourceCallback = null;
protected array $templates = [];
// UI Options
@@ -129,7 +129,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();
@@ -150,7 +150,12 @@
*/
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;
@@ -217,13 +222,16 @@
public function addTaxonomyFilter(array $taxonomies, ?string $limit = null): self {
foreach($taxonomies as $taxonomy) {
$registrar = Registrar::getInstance($taxonomy);
- $this->taxonomies[$taxonomy] = [
- 'type' => 'taxonomy',
- 'taxonomy'=> $taxonomy,
- 'limit' => $limit,
- 'label' => $registrar->getPlural(),
- 'icon' => $registrar->getIcon()
- ];
+
+ if ($registrar) {
+ $this->taxonomies[$taxonomy] = [
+ 'type' => 'taxonomy',
+ 'taxonomy'=> $taxonomy,
+ 'limit' => $limit,
+ 'label' => $registrar->getPlural(),
+ 'icon' => $registrar->getIcon()
+ ];
+ }
}
return $this;
@@ -231,7 +239,7 @@
protected function taxConfig(string $taxonomy, string $label = ''):array
{
- $isVerified = jvbUserIsVerified();
+ $isVerified = $this->userIsVerified();
$label = ($label === '') ? Registrar::getInstance($taxonomy)->getPlural() : $label;
return [
'type' => 'taxonomy',
@@ -243,6 +251,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;
@@ -340,7 +355,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;
@@ -354,7 +369,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);
@@ -455,15 +469,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 {
@@ -573,14 +578,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
}
@@ -616,8 +624,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();
@@ -631,6 +639,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
}
@@ -640,7 +649,7 @@
return;
}
?>
- <div class="search row start nowrap">
+ <div class="search row left nowrap">
<span class="label">Search:</span>
<?= jvbSearch() ?>
</div>
@@ -653,7 +662,7 @@
return;
}
?>
- <div class="radio-options view row">
+ <div class="radio-options view row left">
<span class="label">View:</span>
<?php
$views = [
@@ -674,7 +683,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
}
@@ -689,7 +698,7 @@
return;
}
?>
- <div class="radio-options status row">
+ <div class="radio-options status row left">
<span class="label">Status:</span>
<?php
$i = 1;
@@ -704,6 +713,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++;
@@ -716,34 +726,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++;
}
@@ -761,7 +789,7 @@
return;
}
?>
- <div class="filters row start">
+ <div class="filters row left">
<span class="label">Filters:</span>
<?php
foreach ($this->filters as $key => $config) {
@@ -880,8 +908,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>';
@@ -896,9 +924,9 @@
*/
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->getUserTerms($this->user_id, $taxonomy);
+ return $manager->fetchUserTerms($this->user_id, $taxonomy);
} else {
$limit = (int)$limit;
}
@@ -919,7 +947,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>
@@ -952,7 +980,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>
@@ -977,7 +1005,8 @@
<option value="<?=$control?>"<?=$disabled?>><?=$label?></option>
<?php
}
- foreach ($this->taxonomies as $taxonomy) {
+
+ foreach ($this->taxonomies as $taxonomy =>$config) {
$registrar = Registrar::getInstance($taxonomy);
if (!$registrar) continue;
?>
@@ -1049,7 +1078,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)) {
@@ -1122,7 +1151,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];
@@ -1163,7 +1192,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>
@@ -1250,7 +1279,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;
}
@@ -1332,7 +1361,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;
@@ -1365,7 +1394,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>
@@ -1448,7 +1477,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',
@@ -1550,8 +1579,9 @@
<input type="hidden" name="content" value="<?=$this->dataType?>" />
<div class="fields">
<?php
- echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
-
+ if (!empty($this->statuses)) {
+ echo Form::render('post_status', '', $this->getStatusFieldConfig('edit-'));
+ }
if (!empty($this->sections)) {
$tabs = [];
@@ -1574,8 +1604,13 @@
}
$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)) {
@@ -1590,13 +1625,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
];
@@ -1606,14 +1643,21 @@
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) {
@@ -1624,7 +1668,6 @@
$section = (array_key_exists('section', $config)) ? $config['section'] : 'basic';
$tabs[$section]['content'] .= Form::render($n, '', $config);
} else {
- jvbDump($config, $n);
echo Form::render($n, '', $config);
}
}
@@ -1771,4 +1814,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();
+ }
}
--
Gitblit v1.10.0