From c68aefb847b09daa0697de7684d3451e2e68ce1e Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 09 Jul 2026 23:10:23 +0000
Subject: [PATCH] =Refactor of Integrations.php to be a bit more useful with a suite of methods for create, update, delete back and forths for integrations where sharing is enabled. Also considering a single instance with a connect method to connect as the site (no user) vs connecting as an individual user - rather than recreating instances for every user.
---
inc/registrar/Registrar.php | 155 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 126 insertions(+), 29 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index 19b92fd..b30b0cf 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -14,6 +14,7 @@
use JVBase\registrar\config\Directory;
use JVBase\registrar\config\Feed;
use JVBase\registrar\config\Integration;
+use JVBase\registrar\config\Register;
use JVBase\registrar\config\Section;
use JVBase\registrar\config\SEO;
use JVBase\registrar\helpers\AddIntegrationFields;
@@ -53,6 +54,8 @@
public string $prefix_with = 'by';
public bool $system = false;
+ public bool $baseless = false;
+ public bool $modify = false;
protected static array $allFlags = [
//Shared Flags
@@ -116,7 +119,7 @@
* @var bool Whether to make this a calendar type (example: events)
*/
protected bool $is_calendar = false;
- protected ?MakeCalendarType $isCalendarHandler = null;
+
/**
* @var bool Whether this is a before/after post type
*/
@@ -212,12 +215,14 @@
protected Dashboard $dashboard;
protected Directory|false $directory;
protected Feed|false $feed;
+ protected Register|false $login;
// protected Management $management;
// protected Responses $responses;
protected ?SEO $seo = null;
/** Helpers **/
protected MakeCalendarType|false $calendar = false;
+ protected bool $hasIntegrations = true;
protected array $integrationConfigs = [];
protected array $integrationFields = [];
protected MakeTrackChanges $trackChanges;
@@ -239,7 +244,10 @@
$this->setFields();
add_action('init', [$this, 'register'], 2);
- add_filter('jvbDashboardPage', [$this, 'renderDashPage'], 10, 3);
+ if ($this->slug !== 'dash') {
+ add_action(BASE.'dashboard_page_'.$this->slug, [$this, 'renderDashPage'], 10, 2);
+ }
+
}
public static function maybeExcludeSingles(array $IDs):array
@@ -294,13 +302,25 @@
'post_parent__not_in' => [0], // Only get posts with a parent
]);
}
-
+ public function ensureRegistrar():void
+ {
+ $this->initRegistrar();
+ }
protected function initRegistrar():void {
$this->registrar = match ($this->type) {
'post' => new Posts($this->slug, $this->singular, $this->plural),
'term' => new Terms($this->slug, $this->singular, $this->plural),
default => false,
};
+
+
+ if ($this->baseless) {
+ $this->registrar->baseless = true;
+ $this->registrar->postType = jvbNoBase($this->slug);
+ }
+ if ($this->modify) {
+ $this->registrar->modify = true;
+ }
}
protected function initClasses():void {
@@ -354,6 +374,8 @@
return self::$instances[$slug];
}
+
+
/**
* Adds the properties for register_post_type or register_taxonomy
* @param array $args
@@ -393,6 +415,17 @@
return $this->args;
}
+ public function baseless():self
+ {
+ $this->baseless = true;
+ return $this;
+ }
+ public function modify():self
+ {
+ $this->modify = true;
+ return $this;
+ }
+
public function setFields():void
{
$this->fields = new Fields($this->type, $this);
@@ -468,11 +501,19 @@
{
return $this->integrationConfigs;
}
- public function hasIntegration(string $integration) {
+ public function hasIntegration(string $integration):bool
+ {
+ if (!$this->hasIntegrations) {
+ return false;
+ }
return array_key_exists($integration, $this->integrationConfigs);
}
public function hasAnyIntegrations(array $integrations = []):bool
{
+ if (!$this->hasIntegrations) {
+ return false;
+ }
+
if (empty($integrations)) {
$integrations = array_keys($this->integrationConfigs);
return !empty($integrations);
@@ -552,6 +593,9 @@
foreach ($flags as $flag) {
$this->$flag = true;
switch ($flag) {
+ case 'is_calendar':
+ $this->calendar = new MakeCalendarType($this->slug, $this);
+ break;
case 'is_content':
add_action('init', [$this, 'setupContent'], 20);
break;
@@ -562,6 +606,24 @@
}
return $this;
}
+ public function unsetAll(array $flags):self
+ {
+ $flags = array_filter($flags, function($flag) {
+ return in_array($flag, static::$allFlags);
+ });
+ foreach ($flags as $flag) {
+ $this->$flag = false;
+ switch ($flag) {
+ case 'is_content':
+ remove_action('init', [$this, 'setupContent'], 20);
+ break;
+ case 'is_glossary':
+ $this->hide_single = false;
+ break;
+ }
+ }
+ return $this;
+ }
public function prefixWith(string $prefix):self
{
$this->prefix_with = sanitize_title($prefix);
@@ -618,8 +680,8 @@
public static function withIntegration(string $integration, ?string $type = null):array
{
self::ensureInstanced();
-
- if (!Site::has($integration)) {
+ Site::getInstance();
+ if (!Site::hasIntegration($integration)) {
error_log('[Registrar]::withIntegration Integration not available to fetch: '.$integration);
return [];
}
@@ -628,13 +690,13 @@
if (!is_null($type) && $inst->type !== $type) {
return false;
}
- return array_key_exists($integration, $this->integrationConfigs);
+ return array_key_exists($integration, $inst->integrationConfigs);
}));
}
public function config(string $config):mixed
{
- $allowed = ['breadcrumbs','calendar','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
+ $allowed = ['breadcrumbs','calendar','register','login','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
if (!in_array(strtolower($config), $allowed)) {
error_log('Invalid config requested from Registrar: '.$config);
return [];
@@ -643,6 +705,7 @@
'breadcrumbs' => $this->getBreadcrumbs(),
'dashboard' => $this->getDashboard(),
'directory' => $this->getDirectory(),
+ 'register','login' => $this->getLogin(),
'feed' => $this->getFeed(),
'management' => $this->getManagement(),
'has_responses' => $this->getResponses(),
@@ -651,10 +714,17 @@
'verification' => $this->getVerification()
};
}
+ protected function getLogin():Register|false
+ {
+ if (!isset($this->login)) {
+ $this->login = new Register();
+ }
+ return $this->login;
+ }
protected function getBreadcrumbs():Breadcrumbs
{
if (!isset($this->breadcrumbs)) {
- $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ $this->breadcrumbs = new Breadcrumbs($this->slug);
}
return $this->breadcrumbs;
@@ -672,7 +742,7 @@
protected function getDashboard():Dashboard
{
if (!isset($this->dashboard)) {
- $this->dashboard = new Dashboard($this->plural, $this);
+ $this->dashboard = new Dashboard($this->plural);
}
return $this->dashboard;
@@ -705,9 +775,10 @@
public function getSections():array
{
$allSections = array_map(function($section) {
- return $section->getConfig;
+ return $section->getConfig();
}, $this->sections);
+
if (!empty($this->sectionOrder)) {
$allSections['order'] = $this->sectionOrder;
}
@@ -715,11 +786,40 @@
}
public function addSection(string $title):Section
{
- $section = new Section($title, $this);
- $this->sections[] = $section;
- return $section;
+ $slug = sanitize_title($title);
+ if (!array_key_exists($slug, $this->sections)) {
+ $section = new Section($title, $this);
+ $this->sections[$slug] = $section;
+ }
+
+ return $this->sections[$slug];
}
+ public static function maybeBuildSections():void
+ {
+ foreach (self::$instances as $inst) {
+ $inst->buildSections();
+ }
+ }
+ protected function buildSections():void
+ {
+ $fields = $this->getFields();
+ $sections = array_unique(array_values(array_map(function ($f) {
+ return array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ }, $fields)));
+
+ foreach ($sections as $s) {
+ $section = new Section($s, $this);
+ $section->setTitle(ucwords(implode(' ', explode('-', $s))));
+ $sectionFields = array_filter($fields, function ($f) use ($s) {
+ $tmp = array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ return $s === $tmp;
+ });
+ $section->setFields(array_keys($sectionFields));
+ $this->sections[$s] = $section;
+ }
+ }
+
public function setSectionOrder(array $sections):self
{
$allSections = array_map(function($section) {
@@ -767,12 +867,9 @@
$this->hideSingleHandler = new HideSingle($this->slug, $this);
}
if ($this->is_timeline) {
- $this->isTimelineHandler = new MakeTimelineType($this->slug, $this);
+ $this->isTimelineHandler = new MakeTimelineType($this->slug);
$this->registrar->hierarchical = true;
}
- if ($this->is_calendar) {
- $this->isCalendarHandler = new MakeCalendarType($this->slug, $this);
- }
if (!is_null($this->rewrite_taxonomy)) {
$this->registrar->addTaxonomyRewrite($this->rewrite_taxonomy);
@@ -876,16 +973,10 @@
return $this;
}
- public function renderDashPage(string $content, string $page, string $slug):string
+ public function renderDashPage(string $page, string $slug):void
{
- if ($slug === $this->slug) {
- ob_start();
- $crud = new CRUD($slug);
- $crud->render();
- return ob_get_clean();
- }
-
- return $content;
+ $crud = new CRUD($slug);
+ $crud->render();
}
public function setupContent():void
@@ -962,6 +1053,7 @@
unset($processing[$termId]);
}
+
public function renderContent(string $content, array $block):string
{
if (!is_page($this->page)) {
@@ -1104,8 +1196,8 @@
public static function ensureInstanced():void
{
if (empty(self::$instances)) {
- do_action('jvbDefineRegistrar');
- do_action('jvbDefineRegistrarFields');
+ do_action('jvb_define_registrar');
+ do_action('jvb_define_fields');
}
}
@@ -1225,4 +1317,9 @@
return [$images,$fields];
}
+
+ public function setHasIntegrations(bool $has = true):void
+ {
+ $this->hasIntegrations = $has;
+ }
}
--
Gitblit v1.10.0