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.

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/focus from 3.13.2 to 3.13.3 #596

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ component {
};
// cfformat-ignore-end

//applicationStop();abort;
// applicationStop();abort;

/*****************************************************************************************************/
/************************************** CF APP LISTENERS *********************************************/
Expand Down
8 changes: 4 additions & 4 deletions modules/contentbox/migrations/2020_01_01_150933_init.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
component {

// DI
property name = "migrationService" inject = "MigrationService@cfmigrations";
property name="migrationService" inject="MigrationService@cfmigrations";

// Include Utils
include template = "./util/MigrationUtils.cfm";
Expand Down Expand Up @@ -53,10 +53,10 @@ component {
migrations.each( ( migration, record ) => {
systemOutput( "Migrating [#migration#]...", true );

if( !schema.hasTable( record.table ) ){
if ( !schema.hasTable( record.table ) ) {
newDB = true;
systemOutput( "- Table doesn't exist (#record.table#) creating it...", true );
new "init.create_#migration#"().up( schema, query );
new "init.create_#migration#"( ).up( schema, query );
} else {
systemOutput( "√ Table (#record.table#) already exists, skipping...", true );
}
Expand All @@ -66,7 +66,7 @@ component {

// Seed the database only if we created the tables
// This protects agains seeding an already ran migration
if( newDB ){
if ( newDB ) {
systemOutput( "- Database seeding required, starting...", true );

new init.seed_permissions().seed( schema, query );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ component {
.where( "isCore", 1 )
.first();

if( !structKeyExists( mediaRoot, "value" ) ){
systemoutput( "Media root doesn't exist, skipping migration", true );
if ( !structKeyExists( mediaRoot, "value" ) ) {
systemOutput( "Media root doesn't exist, skipping migration", true );
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ component {
include template="./util/MigrationUtils.cfm";

function up( schema, qb ){
var today = now();
var today = now();
var permID = createUUID();
qb
.newQuery()
qb.newQuery()
.from( "cb_permission" )
.insert( {
"permissionID" : permID,
Expand All @@ -37,13 +36,9 @@ component {
.where( "role", "Administrator" )
.first();

qb
.newQuery()
qb.newQuery()
.from( "cb_rolePermissions" )
.insert( {
"FK_roleID" : admin.roleID,
"FK_permissionID" : permID
} );
.insert( { "FK_roleID" : admin.roleID, "FK_permissionID" : permID } );
systemOutput( "√ - Admin role updated with new permissions", true );

var editor = qb
Expand All @@ -53,15 +48,10 @@ component {
.where( "role", "Editor" )
.first();

qb
.newQuery()
qb.newQuery()
.from( "cb_rolePermissions" )
.insert( {
"FK_roleID" : editor.roleID,
"FK_permissionID" : permID
} );
.insert( { "FK_roleID" : editor.roleID, "FK_permissionID" : permID } );
systemOutput( "√ - Editor role updated with new permissions", true );

}

function down( schema, qb ){
Expand Down
10 changes: 5 additions & 5 deletions modules/contentbox/migrations/init/create_author.cfc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
component{
component {

function up( schema, query ){

schema.create( "cb_author", ( table ) => {
// Base Columns
table.string( "authorID", 36 ).primaryKey();
Expand All @@ -23,7 +22,10 @@ component{

// Relationships
table.string( "FK_roleID", 36 );
table.foreignKey( "FK_roleID" ).references( "roleID" ).onTable( "cb_role" );
table
.foreignKey( "FK_roleID" )
.references( "roleID" )
.onTable( "cb_role" );

// Indexes
table.index( [ "email" ], "idx_email" );
Expand All @@ -33,8 +35,6 @@ component{
table.index( [ "is2FactorAuth" ], "idx_2factorauth" );
table.index( [ "username", "password", "isActive" ], "idx_login" );
} );

}


}
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
component {
function up( schema, query ){

schema.create( "cb_authorPermissionGroups", function(table) {

function up( schema, query ){
schema.create( "cb_authorPermissionGroups", function( table ){
table.string( "FK_permissionGroupID", 36 );
table.string( "FK_authorID", 36 );

table.foreignKey( "FK_permissionGroupID" ).references( "permissionGroupID" ).onTable( "cb_permissionGroup" );
table.foreignKey( "FK_authorID" ).references( "authorID" ).onTable( "cb_author" );
table
.foreignKey( "FK_permissionGroupID" )
.references( "permissionGroupID" )
.onTable( "cb_permissionGroup" );
table
.foreignKey( "FK_authorID" )
.references( "authorID" )
.onTable( "cb_author" );
} );

}

function down( schema, query ){
Expand Down
16 changes: 10 additions & 6 deletions modules/contentbox/migrations/init/create_author_permissions.cfc
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
component {
function up( schema, query ){

schema.create( "cb_authorPermissions", function(table) {

function up( schema, query ){
schema.create( "cb_authorPermissions", function( table ){
table.string( "FK_permissionID", 36 );
table.string( "FK_authorID", 36 );

table.foreignKey( "FK_permissionID" ).references( "permissionID" ).onTable( "cb_permission" );
table.foreignKey( "FK_authorID" ).references( "authorID" ).onTable( "cb_author" );
table
.foreignKey( "FK_permissionID" )
.references( "permissionID" )
.onTable( "cb_permission" );
table
.foreignKey( "FK_authorID" )
.references( "authorID" )
.onTable( "cb_author" );
} );

}

function down( schema, query ){
Expand Down
11 changes: 6 additions & 5 deletions modules/contentbox/migrations/init/create_category.cfc
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
component {
function up( schema, query ){

schema.create( "cb_category", function(table) {

function up( schema, query ){
schema.create( "cb_category", function( table ){
// Base Columns
table.string( "categoryID", 36 ).primaryKey();
table.datetime( "createdDate" ).withCurrent();
Expand All @@ -15,15 +14,17 @@ component {

// Relationships
table.string( "FK_siteID", 36 );
table.foreignKey( "FK_siteID" ).references( "siteID" ).onTable( "cb_site" );
table
.foreignKey( "FK_siteID" )
.references( "siteID" )
.onTable( "cb_site" );

// Index
table.index( [ "isPublic" ], "idx_isPublic" );
table.index( [ "slug" ], "idx_categorySlug" );
table.index( [ "category" ], "idx_categoryName" );
table.index( [ "isDeleted" ], "idx_deleted" );
} );

}

function down( schema, query ){
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
component {
function up( schema, query ){

schema.create( "cb_commentSubscriptions", function(table) {

function up( schema, query ){
schema.create( "cb_commentSubscriptions", function( table ){
table.string( "subscriptionID", 36 );
table.string( "FK_contentID", 36 );

table.foreignKey( "subscriptionID" ).references( "subscriptionID" ).onTable( "cb_subscriptions" );
table.foreignKey( "FK_contentID" ).references( "contentID" ).onTable( "cb_content" );
table
.foreignKey( "subscriptionID" )
.references( "subscriptionID" )
.onTable( "cb_subscriptions" );
table
.foreignKey( "FK_contentID" )
.references( "contentID" )
.onTable( "cb_content" );
} );

}

function down( schema, query ){
Expand Down
11 changes: 5 additions & 6 deletions modules/contentbox/migrations/init/create_comments.cfc
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
component{
component {

function up( schema, query ){

schema.create( "cb_comment", ( table ) => {

// Base Columns
table.string( "commentID", 36 ).primaryKey();
table.datetime( "createdDate" ).withCurrent();
Expand All @@ -19,15 +17,16 @@ component{

// Relationships
table.string( "FK_contentID", 36 );
table.foreignKey( "FK_contentID" ).references( "contentID" ).onTable( "cb_content" );
table
.foreignKey( "FK_contentID" )
.references( "contentID" )
.onTable( "cb_content" );

// Indexes
table.index( [ "isApproved", "FK_contentID" ], "idx_contentComment" );
table.index( [ "isApproved" ], "idx_approved" );
table.index( [ "isDeleted" ], "idx_deleted" );
} );

}


}
21 changes: 14 additions & 7 deletions modules/contentbox/migrations/init/create_content.cfc
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
component {
function up( schema, query ){

schema.create( "cb_content", function(table) {

function up( schema, query ){
schema.create( "cb_content", function( table ){
// Base Columns
table.string( "contentID", 36 ).primaryKey();
table.datetime( "createdDate" ).withCurrent();
Expand All @@ -29,11 +28,20 @@ component {

// Relationships
table.string( "FK_siteID", 36 );
table.foreignKey( "FK_siteID" ).references( "siteID" ).onTable( "cb_site" );
table
.foreignKey( "FK_siteID" )
.references( "siteID" )
.onTable( "cb_site" );
table.string( "FK_authorID", 36 );
table.foreignKey( "FK_authorID" ).references( "authorID" ).onTable( "cb_author" );
table
.foreignKey( "FK_authorID" )
.references( "authorID" )
.onTable( "cb_author" );
table.string( "FK_parentID", 36 ).nullable();
table.foreignKey( "FK_parentID" ).references( "contentID" ).onTable( "cb_content" );
table
.foreignKey( "FK_parentID" )
.references( "contentID" )
.onTable( "cb_content" );

// Index
table.index( [ "contentType" ], "idx_discriminator" );
Expand All @@ -48,7 +56,6 @@ component {
table.index( [ "cacheLastAccessTimeout" ], "idx_cachelastaccesstimeout" );
table.index( [ "showInSearch" ], "idx_showInSearch" );
} );

}

function down( schema, query ){
Expand Down
16 changes: 10 additions & 6 deletions modules/contentbox/migrations/init/create_contentStore.cfc
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
component {
function up( schema, query ){

schema.create( "cb_contentStore", function(table) {

function up( schema, query ){
schema.create( "cb_contentStore", function( table ){
table.string( "contentID", 36 ).primaryKey();
table.integer( "order" ).default( 0 ).nullable();
table
.integer( "order" )
.default( 0 )
.nullable();
table.string( "description", 500 ).nullable();

// Relationships
table.foreignKey( "contentID" ).references( "contentID" ).onTable( "cb_content" );
table
.foreignKey( "contentID" )
.references( "contentID" )
.onTable( "cb_content" );
} );

}

function down( schema, query ){
Expand Down
16 changes: 10 additions & 6 deletions modules/contentbox/migrations/init/create_content_categories.cfc
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
component {
function up( schema, query ){

schema.create( "cb_contentCategories", function(table) {

function up( schema, query ){
schema.create( "cb_contentCategories", function( table ){
table.string( "FK_contentID", 36 );
table.string( "FK_categoryID", 36 );

table.foreignKey( "FK_contentID" ).references( "contentID" ).onTable( "cb_content" );
table.foreignKey( "FK_categoryID" ).references( "categoryID" ).onTable( "cb_category" );
table
.foreignKey( "FK_contentID" )
.references( "contentID" )
.onTable( "cb_content" );
table
.foreignKey( "FK_categoryID" )
.references( "categoryID" )
.onTable( "cb_category" );
} );

}

function down( schema, query ){
Expand Down
11 changes: 8 additions & 3 deletions modules/contentbox/migrations/init/create_content_templates.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ component {

function up( schema, qb ){
schema.create( "cb_contentTemplate", ( table ) => {

// Base Columns
table.string( "templateID", 36 ).primaryKey();
table.datetime( "createdDate" ).withCurrent();
Expand All @@ -21,9 +20,15 @@ component {

// Relationships
table.string( "FK_authorID", 36 );
table.foreignKey( "FK_authorID" ).references( "authorID" ).onTable( "cb_author" );
table
.foreignKey( "FK_authorID" )
.references( "authorID" )
.onTable( "cb_author" );
table.string( "FK_siteID", 36 );
table.foreignKey( "FK_siteID" ).references( "siteID" ).onTable( "cb_site" );
table
.foreignKey( "FK_siteID" )
.references( "siteID" )
.onTable( "cb_site" );

// Indexes
table.index( [ "contentType" ], "idx_contentType" );
Expand Down
Loading