Skip to content

0.0.0-rc.12 #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oyeaussie merged 29 commits into from
Mar 6, 2025
Merged

0.0.0-rc.12 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3cde7d4
fix issue #640
oyeaussie Feb 25, 2025
cd1c8db
fix issue #641
oyeaussie Feb 25, 2025
f2f8be6
issue #640, fix bug with child process hitting the checkProcessIsRunning
oyeaussie Feb 25, 2025
2bdd4e0
minor bug fix for issue #637
oyeaussie Feb 25, 2025
1e71dd0
minor fix issue #633
oyeaussie Feb 25, 2025
711562d
fix issue #642
oyeaussie Feb 25, 2025
38cf944
fix issue #643
oyeaussie Feb 26, 2025
f8510b7
fix issue #644
oyeaussie Feb 26, 2025
3151210
fix issue #645
oyeaussie Feb 26, 2025
0e276ce
update #640, fixed some minor bugs.
oyeaussie Feb 26, 2025
74dc025
fix issue #646
oyeaussie Feb 27, 2025
06a21de
minor bug fix for issue #640
oyeaussie Feb 27, 2025
b3c5903
minor bug fix for issue #643
oyeaussie Feb 27, 2025
a464189
minor bug fix for #640
oyeaussie Feb 28, 2025
8927fec
fix issue #648
oyeaussie Feb 28, 2025
dd5998a
fix issue #649
oyeaussie Mar 1, 2025
b4a6e56
update issue #649
oyeaussie Mar 1, 2025
19d21b9
update issue #649. Added details of each process to be sent to the cl…
oyeaussie Mar 1, 2025
5bf2895
fix minor bug #649
oyeaussie Mar 1, 2025
818e37c
fix minor bug #649
oyeaussie Mar 1, 2025
f5fcc55
update issue #649
oyeaussie Mar 2, 2025
b47ee07
Initial commit issue #650
oyeaussie Mar 3, 2025
bbac370
update issue #649
oyeaussie Mar 3, 2025
72abae6
fix issue #651
oyeaussie Mar 4, 2025
37f52fa
fix issue #652. Changed method to include .fileHashes file for views …
oyeaussie Mar 4, 2025
fb8f36d
fix issue #653
oyeaussie Mar 4, 2025
452fe95
update issue #650. Rewrite the FF method to get relation data increas…
oyeaussie Mar 6, 2025
705c98d
update issue #650. If index is searched, we do not need to search aga…
oyeaussie Mar 6, 2025
2c63fb7
update issue #650. removed writing of relationship information to fie…
oyeaussie Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/Core/Components/Devtools/Modules/ModulesComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public function viewAction()
foreach ($modulesTypeArr['childs'] as $childKey => &$child) {
$child = $this->modulesPackage->validateFilesHash($child);

if ($child['repoExists'] && !$child['isModified']) {
if ($child['repoExists'] && !$child['isModified'] && $child['latestRelease']) {
unset($modules[$moduleType]['childs'][$childKey]);
}
}
Expand Down
370 changes: 201 additions & 169 deletions apps/Core/Packages/Devtools/Modules/DevtoolsModules.php
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 13 additions & 3 deletions apps/Core/Views/Default/html/devtools/modules/changes/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- htmlhint tag-pair:false -->
<!-- htmlhint tag-pair:false --><!-- htmlmin:ignore -->
{% set changesHtml = '' %}
{% if modules|length > 0 %}
{% for moduleType, modulesArr in modules %}
Expand All @@ -11,8 +11,14 @@
'</button>'
%}
{% set moduleUrl = '-' %}
{% if moduleArr['repoExists'] != false and moduleArr['repo_details']['details']['html_url'] is defined %}
{% set moduleUrl = '<a href="' ~ moduleArr['repo_details']['details']['html_url'] ~ '" target="blank">' ~ moduleArr['repo_details']['details']['html_url'] %}
{% set moduleVersion = '-' %}
{% if moduleArr['repoExists'] != false %}
{% if moduleArr['repo_details']['details']['html_url'] is defined %}
{% set moduleUrl = '<a href="' ~ moduleArr['repo_details']['details']['html_url'] ~ '" target="blank">' ~ moduleArr['repo_details']['details']['html_url'] %}
{% endif %}
{% if moduleArr['repo_details']['latestRelease'] is defined %}
{% set moduleVersion = moduleArr['repo_details']['latestRelease']['name'] %}
{% endif %}
{% endif %}
{% set moduleModified = '-' %}
{% if moduleArr['isModified'] != false %}
Expand All @@ -22,6 +28,7 @@
' <td>' ~ moduleArr['name'] ~ '</td>' ~
' <td>' ~ moduleArr['module_type'] ~ '</td>' ~
' <td>' ~ moduleUrl ~ '</td>' ~
' <td>' ~ moduleVersion ~ '</td>' ~
' <td>' ~ moduleModified ~ '</td>' ~
' <td id="{{componentId}}-{{sectionId}}-changes-modules-' ~ moduleArr['name'] ~ '">' ~ moduleEdit ~ '</td>' ~
' </tr>' %}
Expand Down Expand Up @@ -61,6 +68,7 @@
<th class="text-uppercase">Name</th>
<th class="text-uppercase">Module Type</th>
<th class="text-uppercase">Repository</th>
<th class="text-uppercase">Latest Version</th>
<th class="text-uppercase">Modified</th>
<th class="text-uppercase">Edit</th>
</tr>
Expand Down Expand Up @@ -111,6 +119,7 @@
null,
null,
null,
null,
{ orderable: false }
],
lengthMenu: [
Expand Down Expand Up @@ -199,3 +208,4 @@
dataCollectionSectionForm['funcs']['init']();
});
</script>
<!-- htmlmin:ignore -->
2 changes: 1 addition & 1 deletion apps/Core/Views/Default/html/devtools/modules/module.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@
'{{componentId}}-{{sectionId}}-id' : { },
'{{componentId}}-{{sectionId}}-type' : { },
'{{componentId}}-{{sectionId}}-app_type' : {
'placeholder' : 'SELECT APP TYPE OR CREATE NEW'
'placeholder' : 'SELECT APP TYPE'
},
'{{componentId}}-{{sectionId}}-module_type' : {
'placeholder' : 'SELECT MODULE TYPE'
Expand Down
1 change: 0 additions & 1 deletion apps/Core/Views/Default/html/devtools/modules/module/info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
'fieldBazPostOnCreate' : true,
'fieldBazPostOnUpdate' : true,
'fieldBazScan' : true,
'fieldDataSelect2Create' : true,
'fieldDataSelect2OptionsArray' : true,
'fieldDataSelect2Options' : appTypes,
'fieldDataSelect2OptionsKey' : 'id',
Expand Down
2 changes: 1 addition & 1 deletion apps/Core/Views/Default/html/modules/queue/analyse.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
dataCollectionSectionForm['vars']['queue'] = JSON.parse('{{queue}}');
dataCollectionSectionForm['funcs'] = { };
dataCollectionSectionForm['funcs']['init'] = function() {
BazProgress.buildProgressBar($('#installer-progress'), false, true, true);
BazProgress.buildProgressBar($('#installer-progress'), false, true, true, false);

if ($.fn.DataTable && !$.fn.DataTable.isDataTable('#{{componentId}}-{{sectionId}}-queue-table')) {
$('#{{componentId}}-{{sectionId}}-queue-table').DataTable({
Expand Down
9 changes: 5 additions & 4 deletions public/core/default/js/footer/core/Baz/BazContentSectionWithListing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,10 +1266,11 @@
// Control Column
if (datatableOptions.rowControls) {
listColumns[thisOptions.listOptions.tableName].push({
data : '__control',
title : 'ACTIONS',
orderable : false,
className : classes
data : '__control',
title : 'ACTIONS',
orderable : false,
className : classes,
responsivePriority : -1
});
}

Expand Down
32 changes: 31 additions & 1 deletion public/core/default/js/footer/core/Baz/BazHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,37 @@
output += bazCreateHtmlList(obj[k]);
output += '</li>';
} else {
output += '<li>' + k + ' : ' + obj[k] + '</li>';
if (typeof obj[k] === 'string') {
if (obj[k].startsWith('{')) {
var regex = /{.*}/g;

var found = obj[k].match(regex);

if (found) {
//eslint-disable-next-line
var data = found[0].replaceAll('\"', '"');

Check warning

Code scanning / CodeQL

Replacement of a substring with itself Medium

This replaces '"' with itself.

Copilot Autofix

AI 11 months ago

To fix the problem, we need to ensure that the replacement string correctly escapes the double quotes. Instead of using '\"', which is interpreted as just a double quote, we should use '\\\"' to properly escape the double quotes. This change will ensure that the replacement operation correctly replaces double quotes with escaped double quotes.

Suggested changeset 1
public/core/default/js/footer/core/Baz/BazHelpers.js

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/public/core/default/js/footer/core/Baz/BazHelpers.js b/public/core/default/js/footer/core/Baz/BazHelpers.js
--- a/public/core/default/js/footer/core/Baz/BazHelpers.js
+++ b/public/core/default/js/footer/core/Baz/BazHelpers.js
@@ -118,3 +118,3 @@
                             //eslint-disable-next-line
-                            var data = found[0].replaceAll('\"', '"');
+                            var data = found[0].replaceAll('"', '\\"');
                             //eslint-disable-next-line
EOF
@@ -118,3 +118,3 @@
//eslint-disable-next-line
var data = found[0].replaceAll('\"', '"');
var data = found[0].replaceAll('"', '\\"');
//eslint-disable-next-line
Copilot is powered by AI and may make mistakes. Always verify output.
//eslint-disable-next-line
data = data.replaceAll('\\', '\\\\\\\\');
//eslint-disable-next-line
data = data.replaceAll('\\\\\\u0022', '"');
var objObject = JSON.parse(data);

if (objObject) {
output += '<li>' + k + ' : ';
output += bazCreateHtmlList(objObject);
output += '</li>';
} else {
output += '<li>' + k + ' : ' + obj[k] + '</li>';
}
} else {
output += '<li>' + k + ' : ' + obj[k] + '</li>';
}
} else {
output += '<li>' + k + ' : ' + obj[k] + '</li>';
}
} else {
output += '<li>' + k + ' : ' + obj[k] + '</li>';
}
}
});
output += '</ul>';
Expand Down
Loading