Skip to content
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

[Snyk] Upgrade alpinejs from 3.13.0 to 3.13.1 #585

Merged
merged 2 commits into from
Oct 24, 2023
Merged

[Snyk] Upgrade alpinejs from 3.13.0 to 3.13.1 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0345756
fix: upgrade alpinejs from 3.13.0 to 3.13.1
snyk-bot Oct 23, 2023
d8215d4
Apply cfformat changes
lmajano Oct 23, 2023
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
3 changes: 1 addition & 2 deletions modules/contentbox/migrations/2023_07_13_092814_v_6_0_0_ContentTemplates.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ component {

function up( schema, qb ){
// Content Templates
if( !schema.hasTable( "cb_contentTemplate" ) ){
if ( !schema.hasTable( "cb_contentTemplate" ) ) {
arguments.schema.create( "cb_contentTemplate", ( table ) => {
// Columns
table.string( "templateID", 36 ).primaryKey();
Expand Down Expand Up @@ -65,7 +65,6 @@ component {
} else {
systemOutput( "- skipping 'cb_content.FK_childContentTemplateID' creation, column already there", true );
}

}

function down( schema, qb ){
Expand Down
7 changes: 3 additions & 4 deletions modules/contentbox/migrations/2023_10_18_173527_v_6_0_0_SiteDomainAliases.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
component {

// Include Utils
// Include Utils
include template="./_MigrationUtils.cfm";

function up( schema, qb ){
Expand All @@ -15,8 +15,7 @@ component {
}
}

function down( schema, qb ) {

}
function down( schema, qb ){
}

}
4 changes: 2 additions & 2 deletions modules/contentbox/models/importers/ContentBoxImporter.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ component accessors=true {
// get all content
var descriptorContents = getDescriptorContents( true );
// Fix for null priorites, this should go away in later versions
for( var fixKey in descriptorContents.content ){
if( isNull( descriptorContents.content[ fixKey ].priority ) ){
for ( var fixKey in descriptorContents.content ) {
if ( isNull( descriptorContents.content[ fixKey ].priority ) ) {
descriptorContents.content[ fixKey ].priority = 1;
}
}
Expand Down
8 changes: 5 additions & 3 deletions modules/contentbox/models/system/SettingService.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,11 +776,13 @@ component
// iterate and import
for ( var thisSetting in arguments.importData ) {
// Site Setting or Global Setting
var oSetting = findWhere( {
var oSetting = findWhere( {
name : thisSetting.name,
site : isNull( thisSetting.site.siteID ) ? javaCast( "null", "" ) : siteService.get( thisSetting.site.siteID )
site : isNull( thisSetting.site.siteID ) ? javacast( "null", "" ) : siteService.get(
thisSetting.site.siteID
)
} );
oSetting = ( isNull( oSetting ) ? new () : oSetting );
oSetting = ( isNull( oSetting ) ? new () : oSetting );

// Check for boolean values
if ( isSimpleValue( thisSetting.value ) && isBoolean( thisSetting.value ) ) {
Expand Down
15 changes: 6 additions & 9 deletions modules/contentbox/modules/contentbox-admin/handlers/authors.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,16 +459,13 @@ component extends="baseHandler" {
// save Author preference
variables.authorService.save( prc.oCurrentAuthor );
// response
response
.setData( { "preference" : rc.preference, "value" : rc.value } )
.addMessage( "Preference saved!" );
response.setData( { "preference" : rc.preference, "value" : rc.value } ).addMessage( "Preference saved!" );
} else {
response
.setErrorMessage(
"No preference sent",
event.STATUS.BAD_REQUEST,
response.400
);
response.setErrorMessage(
"No preference sent",
event.STATUS.BAD_REQUEST,
response.400
);
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/contentbox/modules/contentbox-admin/handlers/menus.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ component extends="baseHandler" {
};

// set new or persisted id in args
if( args.menuItem.isLoaded() ){
if ( args.menuItem.isLoaded() ) {
args.menuItemID = args.menuItem.getMenuItemID();
} else {
args.menuItemID = "new-#createUUID()#";
Expand All @@ -147,7 +147,7 @@ component extends="baseHandler" {
class=""dd-item dd3-item""
data-id=""#encodeForHTMLAttribute( args.menuItemID )#""
:key=""#encodeForHTMLAttribute( args.menuItemID )#"">" )
writeOutput( view( view : "menus/provider", args : args ) );
writeOutput( view( view: "menus/provider", args: args ) );
writeOutput( "</li>" );
};

Expand Down
6 changes: 3 additions & 3 deletions modules/contentbox/modules/contentbox-admin/handlers/settings.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,10 @@ component extends="baseHandler" {
* @return html
*/
function authLogs( event, rc, prc ){
prc.featureEnabled = prc.cbsettings.cb_security_login_blocker;
prc.xehTruncate = "#prc.cbAdminEntryPoint#.settings.truncateAuthLogs";
prc.featureEnabled = prc.cbsettings.cb_security_login_blocker;
prc.xehTruncate = "#prc.cbAdminEntryPoint#.settings.truncateAuthLogs";
// Get all logs
prc.logs = variables.loginTrackerService.getAll( sortOrder = "attempts", asQuery = false );
prc.logs = variables.loginTrackerService.getAll( sortOrder = "attempts", asQuery = false );
// Raw tab
prc.tabSystem_authLogs = true;
// View
Expand Down
4 changes: 2 additions & 2 deletions modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ component extends="cbadmin.handlers.baseHandler" {

// Exit handlers
prc.xehFBDownload = "#prc.fbModEntryPoint#/download";
prc.xehFBUpload = "#prc.fbModEntryPoint#/upload";
prc.xehFBUpload = "#prc.fbModEntryPoint#/upload";

// Store directory roots and web root
prc.fbDirRoot = prc.fbSettings.directoryRoot;
Expand Down Expand Up @@ -380,7 +380,7 @@ component extends="cbadmin.handlers.baseHandler" {
// param values
event.paramValue( "path", "" ).paramValue( "manual", false );

systemoutput( "path: [#rc.path#]", true );
systemOutput( "path: [#rc.path#]", true );

// clean incoming path for destination directory
rc.path = cleanIncomingPath( urlDecode( trim( rc.path ) ) );
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@alpinejs/ui": "^3.10.4-beta.5",
"@fortawesome/fontawesome-free": "^5.15.4",
"@popperjs/core": "^2.11.8",
"alpinejs": "^3.13.0",
"alpinejs": "^3.13.1",
"animate.css": "^3.5.2",
"bootbox": "^5.5.3",
"bootstrap-datepicker": "^1.10.0",
Expand Down
15 changes: 7 additions & 8 deletions tests/specs/contentbox-web/contentbox/unit/importers/ContentBoxImporterSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,21 @@ component extends="tests.resources.BaseTest" {

it( "can import settings", function(){
withRollback( () => {
var importData = deserializeJSON( fileRead( expandPath( "/tests/resources/exports/setting.json" ) ) );
var importLog = createObject( "java", "java.lang.StringBuilder" ).init(
""
var importData = deserializeJSON(
fileRead( expandPath( "/tests/resources/exports/setting.json" ) )
);
var importLog = createObject( "java", "java.lang.StringBuilder" ).init( "" );

var output = getInstance( "settingService@contentbox" ).importFromData(
importData : importData,
override : false,
importData: importData,
override : false,
importLog : importLog
);

expect( output ).notToBeEmpty();
expect( output ).toInclude( "No settings imported as none where found or able to be overriden from the import file." );
})
});

} )
} );
} );
}

Expand Down