Component Builder (v.5.0.3-beta2)
+ Component Builder (v.5.0.3-beta3)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index ec6b61476..5e26a86b2 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -116,7 +116,7 @@
5.0.3-beta
https://dev.vdm.io
- https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta2.zip
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta3.zip
beta
@@ -131,10 +131,10 @@
pkg_component_builder
package
site
- 5.0.3-beta2
+ 5.0.3-beta3
https://dev.vdm.io
- https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta2.zip
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta3.zip
beta
diff --git a/images/vdm/icon/detail.png b/images/vdm/icon/detail.png
new file mode 100644
index 000000000..561ba56cb
Binary files /dev/null and b/images/vdm/icon/detail.png differ
diff --git a/images/vdm/icon/file.png b/images/vdm/icon/file.png
new file mode 100644
index 000000000..ec0fe4af6
Binary files /dev/null and b/images/vdm/icon/file.png differ
diff --git a/images/vdm/icon/index.html b/images/vdm/icon/index.html
new file mode 100644
index 000000000..fa6d84e80
--- /dev/null
+++ b/images/vdm/icon/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/vdm/icon/look.png b/images/vdm/icon/look.png
new file mode 100644
index 000000000..be886d8ee
Binary files /dev/null and b/images/vdm/icon/look.png differ
diff --git a/images/vdm/icon/look_add.png b/images/vdm/icon/look_add.png
new file mode 100644
index 000000000..3994821e0
Binary files /dev/null and b/images/vdm/icon/look_add.png differ
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsets.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsets.php
index 23aaf3945..a99866e49 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsets.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsets.php
@@ -329,10 +329,11 @@ final class ConfigFieldsets
$field['custom_value']
))
{
- // add array if found
- if ((strpos((string) $field['custom_value'], '["') !== false)
- && (strpos((string) $field['custom_value'], '"]')
- !== false))
+ // add array or object if found
+ if (((strpos((string) $field['custom_value'], '["') !== false)
+ && (strpos((string) $field['custom_value'], '"]') !== false)) ||
+ ((strpos((string) $field['custom_value'], '{"') !== false)
+ && (strpos((string) $field['custom_value'], '"}') !== false)))
{
// load the Global checkin defautls
$this->extensionsparams->add('component', '"' . $fieldName
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
index be0f88fd7..308cac4b3 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
@@ -154,7 +154,7 @@ final class InputButton implements InputButtonInterface
. "\$button_code_name = \$this->getAttribute('name');";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the input from url";
- $addButton[] = Indent::_(3) . "\$app = Factory::getApplication();";
+ $addButton[] = Indent::_(3) . "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
$addButton[] = Indent::_(3) . "\$jinput = \$app->input;";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the view name & id";
@@ -181,7 +181,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " get the return value.";
$addButton[] = Indent::_(4)
- . "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+ . "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
$addButton[] = Indent::_(4)
. "\$_return = urlencode(base64_encode(\$_uri));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -206,7 +206,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " get the return value.";
$addButton[] = Indent::_(4)
- . "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+ . "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
$addButton[] = Indent::_(4)
. "\$_return = urlencode(base64_encode(\$_uri));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -231,7 +231,7 @@ final class InputButton implements InputButtonInterface
. "\$button_label = ucfirst(strtolower(\$button_label));";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get user object";
- $addButton[] = Indent::_(3) . "\$user = Factory::getApplication()->getIdentity();";
+ $addButton[] = Indent::_(3) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " only add if user allowed to create " . $fieldData['view'];
// check if the item has permissions.
@@ -272,7 +272,11 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "\$script[] = \"";
$addButton[] = Indent::_(5) . "document.addEventListener('DOMContentLoaded', function() {";
$addButton[] = Indent::_(6)
- . "document.getElementById('jform_\".\$button_code_name.\"').addEventListener('change', function(e) {";
+ . "let \".\$button_code_name.\"Field = document.getElementById('jform_\".\$button_code_name.\"');";
+ $addButton[] = Indent::_(6)
+ . "if (!\".\$button_code_name.\"Field) { return; }";
+ $addButton[] = Indent::_(6)
+ . "\".\$button_code_name.\"Field.addEventListener('change', function(e) {";
$addButton[] = Indent::_(7) . "e.preventDefault();";
$addButton[] = Indent::_(7)
. "let \".\$button_code_name.\"Value = this.value;";
@@ -280,7 +284,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
$addButton[] = Indent::_(6) . "});";
$addButton[] = Indent::_(6)
- . "let \".\$button_code_name.\"Value = document.getElementById('jform_\".\$button_code_name.\"').value;";
+ . "let \".\$button_code_name.\"Value = \".\$button_code_name.\"Field.value;";
$addButton[] = Indent::_(6)
. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
$addButton[] = Indent::_(5) . "});";
@@ -324,7 +328,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Load the needed script.";
$addButton[] = Indent::_(4)
- . "\$document = Factory::getApplication()->getDocument();";
+ . "\$document = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getDocument();";
$addButton[] = Indent::_(4)
. "\$document->addScriptDeclaration(implode(' ',\$script));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
index 22e61bf14..cdc0cba39 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
@@ -154,7 +154,7 @@ final class InputButton implements InputButtonInterface
. "\$button_code_name = \$this->getAttribute('name');";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the input from url";
- $addButton[] = Indent::_(3) . "\$app = Factory::getApplication();";
+ $addButton[] = Indent::_(3) . "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
$addButton[] = Indent::_(3) . "\$jinput = \$app->input;";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get the view name & id";
@@ -181,7 +181,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " get the return value.";
$addButton[] = Indent::_(4)
- . "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+ . "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
$addButton[] = Indent::_(4)
. "\$_return = urlencode(base64_encode(\$_uri));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -206,7 +206,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " get the return value.";
$addButton[] = Indent::_(4)
- . "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+ . "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
$addButton[] = Indent::_(4)
. "\$_return = urlencode(base64_encode(\$_uri));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -231,7 +231,7 @@ final class InputButton implements InputButtonInterface
. "\$button_label = ucfirst(strtolower(\$button_label));";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " get user object";
- $addButton[] = Indent::_(3) . "\$user = Factory::getApplication()->getIdentity();";
+ $addButton[] = Indent::_(3) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
. " only add if user allowed to create " . $fieldData['view'];
// check if the item has permissions.
@@ -272,7 +272,11 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "\$script[] = \"";
$addButton[] = Indent::_(5) . "document.addEventListener('DOMContentLoaded', function() {";
$addButton[] = Indent::_(6)
- . "document.getElementById('jform_\".\$button_code_name.\"').addEventListener('change', function(e) {";
+ . "let \".\$button_code_name.\"Field = document.getElementById('jform_\".\$button_code_name.\"');";
+ $addButton[] = Indent::_(6)
+ . "if (!\".\$button_code_name.\"Field) { return; }";
+ $addButton[] = Indent::_(6)
+ . "\".\$button_code_name.\"Field.addEventListener('change', function(e) {";
$addButton[] = Indent::_(7) . "e.preventDefault();";
$addButton[] = Indent::_(7)
. "let \".\$button_code_name.\"Value = this.value;";
@@ -280,7 +284,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
$addButton[] = Indent::_(6) . "});";
$addButton[] = Indent::_(6)
- . "let \".\$button_code_name.\"Value = document.getElementById('jform_\".\$button_code_name.\"').value;";
+ . "let \".\$button_code_name.\"Value = \".\$button_code_name.\"Field.value;";
$addButton[] = Indent::_(6)
. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
$addButton[] = Indent::_(5) . "});";
@@ -324,7 +328,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " Load the needed script.";
$addButton[] = Indent::_(4)
- . "\$document = Factory::getApplication()->getDocument();";
+ . "\$document = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getDocument();";
$addButton[] = Indent::_(4)
. "\$document->addScriptDeclaration(implode(' ',\$script));";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
index ea02e1601..60031e7fb 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php
@@ -1588,7 +1588,7 @@ class Infusion extends Interpretation
// DASHBOARDICONACCESS
CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASHBOARDICONACCESS',
- $this->setDashboardIconAccess()
+ CFactory::_('Compiler.Builder.Permission.Dashboard')->build()
);
// DASH_MODEL_METHODS
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
index ffd5b35b9..2f26d8a17 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
@@ -21424,6 +21424,15 @@ class Interpretation extends Fields
}
public function setDashboardDisplayData()
+ {
+ if (CFactory::_('Config')->get('joomla_version', 3) == 3)
+ {
+ return $this->setDashboardDisplayDataJ3();
+ }
+ return $this->setDashboardDisplayDataJ4();
+ }
+
+ public function setDashboardDisplayDataJ3()
{
// display array reset
$display = [];
@@ -21435,13 +21444,7 @@ class Interpretation extends Fields
$row_class = 'row-fluid';
$form_class = 'form-horizontal';
$uitab = 'bootstrap';
- if (CFactory::_('Config')->get('joomla_version', 3) != 3)
- {
- $width_class = 'col-md-';
- $row_class = 'row';
- $form_class = 'main-card';
- $uitab = 'uitab';
- }
+
// check if we have custom tabs
if (CFactory::_('Component')->isArray('dashboard_tab'))
{
@@ -21574,6 +21577,120 @@ class Interpretation extends Fields
return PHP_EOL . implode(PHP_EOL, $display);
}
+ public function setDashboardDisplayDataJ4()
+ {
+ // display array reset
+ $display = [];
+ $mainAccordianName = 'cPanel';
+ $builder = [];
+ $tab = Indent::_(3);
+ $loadTabs = false;
+ $width_class = 'col-md-';
+ $row_class = 'row';
+ $form_class = 'main-card';
+ $uitab = 'uitab';
+
+ // check if we have custom tabs
+ if (CFactory::_('Component')->isArray('dashboard_tab'))
+ {
+ // build the tabs and accordians
+ foreach (CFactory::_('Component')->get('dashboard_tab') as $data)
+ {
+ $builder[$data['name']][$data['header']]
+ = CFactory::_('Placeholder')->update_(
+ $data['html']
+ );
+ }
+ // since we have custom tabs we must load the tab structure around the cpanel
+ $display[] = '';
+ $display[] = Indent::_(1) . '
-