Control which users may view this dashboard. They will be able to view and clone the dashboard, but will be unable to edit, share or delete it.
+fieldset.edit_permissions.title=Edit permissions +fieldset.edit_permissions.description=Control which users may edit this dashboard. They will be able to view, edit and clone the dashboard, but will be unable to share or delete it.
\ No newline at end of file diff --git a/manifest.json b/manifest.json index 60b40ac..736b9e9 100644 --- a/manifest.json +++ b/manifest.json @@ -3,4 +3,7 @@ , "title" : "Admin Dashboards" , "author" : "Pixl8 Group" , "version" : "$VERSION_NUMBER" + , "dependsOn" : [ + "preside-ext-chart-js" + ] } diff --git a/preside-objects/admin_dashboard.cfc b/preside-objects/admin_dashboard.cfc new file mode 100644 index 0000000..c7157b6 --- /dev/null +++ b/preside-objects/admin_dashboard.cfc @@ -0,0 +1,32 @@ +/** + * @labelField name + * @versioned false + * @dataManagerEnabled true + * @dataManagerGridFields name,owner,view_access,edit_access,datecreated + * @dataManagerDefaultSortOrder name + * @dataManagerHiddenGridFields owner_id,view_groups_list,view_users_list,edit_groups_list,edit_users_list + * @dataManagerAllowedOperations navigate,read,add,edit,clone,delete + */ + +component { + property name="name" type="string" dbtype="varchar" maxlength="50" required=true uniqueIndexes="dashboardName"; + property name="description" type="string" dbtype="varchar" maxlength="300"; + property name="column_count" type="numeric" dbtype="int" default=2; + + property name="owner" relationship="many-to-one" relatedTo="security_user" required=true generate="insert" generator="adminDashboard.owner" cloneable=false; + property name="widgets" relationship="one-to-many" relatedto="admin_dashboard_widget" relationshipKey="dashboard" cloneable=true; + + property name="view_access" type="string" dbtype="varchar" maxlength=10 enum="adminDashboardViewAccess" default="private"; + property name="view_groups" adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_group" relatedVia="admin_dashboard_view_group" cloneable=false; + property name="view_users" adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_user" relatedVia="admin_dashboard_view_user" cloneable=false; + + property name="edit_access" type="string" dbtype="varchar" maxlength=10 enum="adminDashboardEditAccess" default="private"; + property name="edit_groups" adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_group" relatedVia="admin_dashboard_edit_group" cloneable=false; + property name="edit_users" adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_user" relatedVia="admin_dashboard_edit_user" cloneable=false; + + property name="owner_id" adminRenderer="none" type="string" formula="${prefix}owner.id"; + property name="view_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_groups.id )"; + property name="view_users_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_users.id )"; + property name="edit_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_groups.id )"; + property name="edit_users_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_users.id )"; +} \ No newline at end of file diff --git a/preside-objects/admin_dashboard_widget.cfc b/preside-objects/admin_dashboard_widget.cfc new file mode 100644 index 0000000..1f1ddaf --- /dev/null +++ b/preside-objects/admin_dashboard_widget.cfc @@ -0,0 +1,13 @@ +/** + * @versioned false + * @nolabel + */ +component { + property name="dashboard" relationship="many-to-one" relatedto="admin_dashboard" required=true indexes="adminDashboardWidgetDashboard"; + property name="widget_id" type="string" dbtype="varchar" maxlength=100 required=true; + property name="instance_id" type="string" dbtype="varchar" maxlength=100 required=true indexes="adminDashboardWidgetInstance"; + property name="title" type="string" dbtype="varchar" maxlength=50 required=true; + property name="column" type="numeric" dbtype="int"; + property name="slot" type="numeric" dbtype="int"; + property name="config" type="string" dbtype="text"; +} diff --git a/services/AdminDashboardService.cfc b/services/AdminDashboardService.cfc new file mode 100644 index 0000000..1838780 --- /dev/null +++ b/services/AdminDashboardService.cfc @@ -0,0 +1,68 @@ +/** + * @presideService true + * @singleton true + */ +component { + +// CONSTRUCTOR + /** + * + */ + public any function init() { + return this; + } + +// PUBLIC API METHODS + public boolean function userCanViewDashboard( required string dashboardId, string adminUserId=$getAdminLoggedInUserId() ) { + var adminUserGroups = _getAdminUserGroups( arguments.adminUserId ); + + return $getPresideObject( "admin_dashboard" ).dataExists( + filter = { "admin_dashboard.id"=arguments.dashboardId } + , extraFilters = [ { + filter = "view_access = 'public' + or admin_dashboard.owner = :adminUserId + or ( view_access = 'specific' and ( view_users.id = :adminUserId or view_groups.id in ( :adminUserGroups ) ) ) + or ( edit_access = 'specific' and ( edit_users.id = :adminUserId or edit_groups.id in ( :adminUserGroups ) ) )" + , filterParams = { + adminUserId = { type="varchar", value=adminUserId } + , adminUserGroups = { type="varchar", value=adminUserGroups, list=true } + } + } ] + ); + } + + public boolean function userCanEditDashboard( required string dashboardId, string adminUserId=$getAdminLoggedInUserId() ) { + return $getPresideObject( "admin_dashboard" ).dataExists( + filter = { "admin_dashboard.id"=arguments.dashboardId } + , extraFilters = [ { + filter = "admin_dashboard.owner = :adminUserId + or ( edit_access = 'specific' and ( edit_users.id = :adminUserId or edit_groups$users.id = :adminUserId ) )" + , filterParams = { adminUserId={ type="varchar", value=arguments.adminUserId } } + } ] + ); + } + + public boolean function userCanShareDashboard( required string dashboardId, string adminUserId=$getAdminLoggedInUserId() ) { + return $getPresideObject( "admin_dashboard" ).dataExists( + filter = { id=arguments.dashboardId, owner=arguments.adminUserId } + ); + } + + public boolean function userCanDeleteDashboard( required string dashboardId, string adminUserId=$getAdminLoggedInUserId() ) { + return $getPresideObject( "admin_dashboard" ).dataExists( + filter = { id=arguments.dashboardId, owner=arguments.adminUserId } + ); + } + +// PRIVATE HELPERS + private string function _getAdminUserGroups( required string adminUserId ) { + return $getPresideObject( "security_group" ).selectData( + filter = { "users.id"=arguments.adminUserId } + , selectFields = [ "id" ] + ).valueList( "id" ); + } + + +// GETTERS AND SETTERS + +} \ No newline at end of file diff --git a/services/AdminDashboardWidgetService.cfc b/services/AdminDashboardWidgetService.cfc index 361bd97..6387957 100644 --- a/services/AdminDashboardWidgetService.cfc +++ b/services/AdminDashboardWidgetService.cfc @@ -3,19 +3,36 @@ * @singleton true */ component { - // CONSTRUCTOR /** - * @formsService.inject formsService - * + * @configuredWidgets.inject coldbox:setting:widgets + * @dashboardService.inject AdminDashboardService + * @formsService.inject FormsService + * @autoDiscoverDirectories.inject presidecms:directories */ - public any function init( required any formsService ) { + public any function init( + required struct configuredWidgets + , required any dashboardService + , required any formsService + , required array autoDiscoverDirectories + ) { + _setAutoDiscoverDirectories( arguments.autoDiscoverDirectories ); + _setConfiguredWidgets( arguments.configuredWidgets ); + _setDashboardService( arguments.dashboardService ); _setFormsService( arguments.formsService ); + reload(); + return this; } // PUBLIC API METHODS + public struct function getWidgets() { + var widgets = Duplicate( _getWidgets() ); + + return widgets; + } + public string function renderDashboard( required string dashboardId , required array widgets @@ -61,6 +78,7 @@ component { , columnSize = colsize , contextData = _namespaceContextData( widget.contextData ) , configInstanceId = widget.configInstanceId + , title = widget.title ?: "" , ajax = widget.ajax ); } @@ -69,26 +87,89 @@ component { return rendered; } + public struct function renderUserGeneratedDashboard( required string dashboardId, boolean allowEditing=true, struct contextData={} ) { + var dashboard = $getPresideObject( "admin_dashboard" ).selectData( id=arguments.dashboardId ); + var savedWidgets = $getPresideObject( "admin_dashboard_widget" ).selectData( + filter = { dashboard=arguments.dashboardId } + , orderBy = "column,slot" + ); + var columns = isNumeric( dashboard.column_count ) ? dashboard.column_count : 1; + var widget = {}; + var widgets = []; + var dashboardArgs = {}; + var canEdit = arguments.allowEditing && _getDashboardService().userCanEditDashboard( arguments.dashboardId ); + + for( var record in dashboard ) { + dashboardArgs = record; + break; + } + + for( var c=1; c<=columns; c++ ) { + widgets.append( [] ); + } + + for( var savedWidget in savedWidgets ) { + widget = { + id = savedWidget.widget_id + , title = savedWidget.title + , configInstanceId = savedWidget.instance_id + , contextData = isJSON( savedWidget.config ) ? deserializeJSON( savedWidget.config ) : {} + , ajax = true + , column = savedWidget.column <= columns ? savedWidget.column : 1 + , slot = savedWidget.slot + }; + widget.contextData.canEditDashboard = canEdit; + + widgets[ widget.column ].append( renderWidgetContainer( + dashboardId = arguments.dashboardId + , widgetId = widget.id + , contextData = _namespaceContextData( widget.contextData ) + , configInstanceId = widget.configInstanceId + , title = widget.title ?: "" + , ajax = widget.ajax + ) ); + } + + dashboardArgs.widgets = widgets; + dashboardArgs.canEdit = canEdit; + + return dashboardArgs; + } + public string function renderWidgetContainer( required string dashboardId , required string widgetId , numeric columnSize = 6 , struct contextData = {} , string configInstanceId = "" + , string title = "" , boolean ajax = true ) { - var instanceId = "dashboard-widget-" & LCase( Hash( arguments.dashboardId & arguments.widgetId & SerializeJson( arguments.contextData ) ) ); - var menuViewlet = "admin.admindashboards.widget.#arguments.widgetId#.additionalMenu"; - var additionalMenu = ""; - var content = ""; + var instanceId = "dashboard-widget-" & LCase( Hash( arguments.dashboardId & arguments.widgetId & SerializeJson( arguments.contextData ) ) ); + var menuViewlet = "admin.admindashboards.widget.#arguments.widgetId#.additionalMenu"; + var ajaxCallbackViewlet = "admin.admindashboards.widget.#arguments.widgetId#.ajaxCallback"; + var ajaxIncludesViewlet = "admin.admindashboards.widget.#arguments.widgetId#.ajaxIncludes"; + var additionalMenu = ""; + var ajaxCallback = ""; + var content = ""; + var userGeneratedDashboard = _isUserGeneratedDashboard( arguments.dashboardId ); + var canEditDashboard = $helpers.isTrue( arguments.contextData[ "dashboard.widget.data.canEditDashboard" ] ?: "" ); + + var viewletArgs = StructCopy( arguments ); + viewletArgs.contextData = _getContextDataFromRequest( arguments.contextData ); if ( $getColdbox().viewletExists( menuViewlet ) ) { - var args = StructCopy( arguments ); - args.contextData = _getContextDataFromRequest( arguments.contextData ); - additionalMenu = $renderViewlet( event=menuViewlet, args=args ); + additionalMenu &= $renderViewlet( event=menuViewlet, args=viewletArgs ); } - if ( !arguments.ajax ) { + if ( arguments.ajax ) { + if ( $getColdbox().viewletExists( ajaxCallbackViewlet ) ) { + ajaxCallback = $renderViewlet( event=ajaxCallbackViewlet, args=viewletArgs ); + } + if ( $getColdbox().viewletExists( ajaxIncludesViewlet ) ) { + $renderViewlet( event=ajaxIncludesViewlet, args=viewletArgs ); + } + } else { content = renderWidgetContent( dashboardId = arguments.dashboardId , widgetId = arguments.widgetId @@ -99,18 +180,22 @@ component { } var args = { - title = $translateResource( uri="admin.admindashboards.widget.#widgetId#:title" , defaultValue=widgetId ) - , icon = $translateResource( uri="admin.admindashboards.widget.#widgetId#:iconClass" , defaultValue="" ) - , description = $translateResource( uri="admin.admindashboards.widget.#widgetId#:description", defaultValue="" ) - , widgetId = arguments.widgetId - , columnSize = arguments.columnSize - , contextData = arguments.contextData - , ajax = arguments.ajax - , instanceId = instanceId - , configInstanceId = arguments.configInstanceId - , hasConfig = widgetHasConfigForm( arguments.widgetId ) - , additionalMenu = additionalMenu - , content = content + title = !isEmpty( arguments.title ) ? arguments.title : $translateResource( uri="admin.admindashboards.widget.#widgetId#:title", defaultValue=widgetId ) + , icon = $translateResource( uri="admin.admindashboards.widget.#widgetId#:iconClass" , defaultValue="" ) + , description = $translateResource( uri="admin.admindashboards.widget.#widgetId#:description", defaultValue="" ) + , widgetId = arguments.widgetId + , columnSize = arguments.columnSize + , contextData = arguments.contextData + , ajax = arguments.ajax + , ajaxCallback = ajaxCallback + , instanceId = instanceId + , configInstanceId = arguments.configInstanceId + , dashboardId = arguments.dashboardId + , userGeneratedDashboard = userGeneratedDashboard + , hasConfig = widgetHasConfigForm( arguments.widgetId ) && ( !userGeneratedDashboard || canEditDashboard ) + , canDeleteWidget = userGeneratedDashboard && canEditDashboard + , additionalMenu = additionalMenu + , content = content }; $announceInterception( "onRenderAdminWidgetContainer", args ); @@ -120,15 +205,22 @@ component { public string function renderWidgetContent( required string dashboardId, required string widgetId, required string instanceId, required string configInstanceId, required struct requestData ) { return $renderViewlet( event="admin.admindashboards.widget.#widgetId#.render", args={ - dashboardId = arguments.dashboardId - , config = getWidgetConfiguration( arguments.dashboardId, arguments.widgetId, arguments.configInstanceId ) - , contextData = _getContextDataFromRequest( arguments.requestData ) + dashboardId = arguments.dashboardId + , instanceId = arguments.instanceId + , configInstanceId = arguments.configInstanceId + , config = getWidgetConfiguration( arguments.dashboardId, arguments.widgetId, arguments.configInstanceId ) + , contextData = _getContextDataFromRequest( arguments.requestData ) } ); } public string function renderWidgetConfigForm( required string dashboardId, required string widgetId, required string instanceId ) { + var formName = "admin.admindashboards.widget.#widgetId#"; + if ( _isUserGeneratedDashboard( dashboardId ) ) { + formName = _getFormsService().getMergedFormName( formName, "admin.admindashboards.config" ); + } + return _getFormsService().renderForm( - formName = "admin.admindashboards.widget.#widgetId#" + formName = formName , savedData = getWidgetConfiguration( arguments.dashboardId, arguments.widgetId, arguments.instanceId ) ); } @@ -138,13 +230,26 @@ component { } public void function saveWidgetConfiguration( required string dashboardId, required string widgetId, required string instanceId, required struct requestData ) { - var fields = _getFormsService().listFields( formName="admin.admindashboards.widget.#widgetId#" ); - var config = {}; + var fields = _getFormsService().listFields( formName="admin.admindashboards.widget.#widgetId#" ); + var config = {}; for( var field in fields ) { config[ field ] = arguments.requestData[ field ] ?: ""; } + if ( _isUserGeneratedDashboard( dashboardId ) ) { + var data = { config=SerializeJson( config ) }; + if ( structKeyExists( arguments.requestData, "widget_title" ) && len( arguments.requestData.widget_title ) ) { + data.title = arguments.requestData.widget_title; + } + + $getPresideObject( "admin_dashboard_widget" ).updateData( + filter = { dashboard=arguments.dashboardId, widget_id=arguments.widgetId, instance_id=arguments.instanceId } + , data = data + ); + return; + } + var existed = $getPresideObject( "admin_dashboard_widget_configuration" ).updateData( filter = { dashboard_id=arguments.dashboardId, widget_id=arguments.widgetId, instance_id=arguments.instanceId, user=$getAdminLoggedInUserId() } , data = { config = SerializeJson( config ) } @@ -162,29 +267,43 @@ component { } public struct function getWidgetConfiguration( required string dashboardId, required string widgetId, required string instanceId ) { - var configRecord = $getPresideObject( "admin_dashboard_widget_configuration" ).selectData( filter={ - dashboard_id = arguments.dashboardId - , widget_id = arguments.widgetId - , instance_id = arguments.instanceId - , user = $getAdminLoggedInUserId() - } ); - - // backwards compat: attempt to get config - // record where instance ID is null if nothing found for - // specific instance - if ( !configRecord.recordCount ) { + var configRecord = ""; + var result = {}; + var userGeneratedDashboard = _isUserGeneratedDashboard( dashboardId ); + + if ( userGeneratedDashboard ) { + configRecord = $getPresideObject( "admin_dashboard_widget" ).selectData( filter={ + dashboard = arguments.dashboardId + , widget_id = arguments.widgetId + , instance_id = arguments.instanceId + } ); + } else { configRecord = $getPresideObject( "admin_dashboard_widget_configuration" ).selectData( filter={ - dashboard_id = arguments.dashboardId - , widget_id = arguments.widgetId - , instance_id = "" - , user = $getAdminLoggedInUserId() + dashboard_id = arguments.dashboardId + , widget_id = arguments.widgetId + , instance_id = arguments.instanceId + , user = $getAdminLoggedInUserId() } ); - } - var result = {}; + // backwards compat: attempt to get config + // record where instance ID is null if nothing found for + // specific instance + if ( !configRecord.recordCount ) { + configRecord = $getPresideObject( "admin_dashboard_widget_configuration" ).selectData( filter={ + dashboard_id = arguments.dashboardId + , widget_id = arguments.widgetId + , instance_id = "" + , user = $getAdminLoggedInUserId() + } ); + } + } try { result = DeserializeJson( configRecord.config ?: "" ); + + if ( userGeneratedDashboard ) { + result.widget_title = configRecord.title ?: ""; + } } catch( any e ) { result = {}; } @@ -205,9 +324,85 @@ component { ); } - return IsBoolean( result ?: "" ) && result; + return $helpers.isTrue( result ?: "" ); + } + + public boolean function isUserDashboardWidget( required string widgetId ) { + var coldbox = $getColdbox(); + var isUserDashboardWidgetEvent = "admin.admindashboards.widget.#widgetId#.isUserDashboardWidget"; + var result = false; + + if ( coldbox.handlerExists( isUserDashboardWidgetEvent ) ) { + result = coldbox.runEvent( + event = isUserDashboardWidgetEvent + , private = true + , prePostExempt = true + ); + } + + return $helpers.isTrue( result ?: "" ); } + public numeric function nextWidgetSlot( required string dashboardId, required numeric column ) { + var currentMax = $getPresideObject( "admin_dashboard_widget" ).selectData( + filter = { dashboard=arguments.dashboardId, column=arguments.column } + , selectFields = [ "max( slot ) as slot" ] + ); + return val( currentMax.slot ) + 1; + } + + public string function getInstanceTitle( required string dashboardId, required string widgetId ) { + var baseTitle = $translateResource( uri="admin.admindashboards.widget.#arguments.widgetId#:title", defaultValue=arguments.widgetId ); + var title = baseTitle; + var dao = $getPresideObject( "admin_dashboard_widget" ); + + var filter = { dashboard=arguments.dashboardId, title=title }; + var increment = 0; + + while( dao.dataExists( filter=filter ) ) { + title = baseTitle & " (#++increment#)"; + filter.title = title; + } + + return title; + } + + public string function addWidget( + required string dashboardId + , required string widgetId + , required string instanceId + , required string title + , required numeric column + , required numeric slot + , struct config = {} + ) { + return $getPresideObject( "admin_dashboard_widget" ).insertData( data={ + dashboard = arguments.dashboardId + , widget_id = arguments.widgetId + , instance_id = arguments.instanceId + , title = arguments.title + , column = arguments.column + , slot = arguments.slot + , config = serializeJson( arguments.config ) + } ); + } + + public void function deleteWidget( + required string dashboardId + , required string instanceId + ) { + $getPresideObject( "admin_dashboard_widget" ).deleteData( filter={ + dashboard = arguments.dashboardId + , instance_id = arguments.instanceId + } ); + } + + public void function reload() { + _autoDiscoverWidgets(); + _loadWidgetsFromConfig(); + } + + // PRVIATE HELPERS private struct function _namespaceContextData( required struct data ) { var namespaced = {}; @@ -231,8 +426,153 @@ component { return contextData; } + private boolean function _isUserGeneratedDashboard( required string dashboardId ) { + return $getPresideObject( "admin_dashboard" ).dataExists( id=arguments.dashboardId ); + } + + + private void function _loadWidgetsFromConfig() { + var widgets = _getWidgets(); + var configuration = _getConfiguredWidgets(); + + for( var widgetId in configuration ){ + widgets[ widgetId ] = Duplicate( configuration[ widgetId ] ); + + widgets[ widgetId ].id = widgetId; + widgets[ widgetId ].configForm = widgets[ widgetId ].configForm ?: _getFormNameByConvention( widgetId ); + widgets[ widgetId ].viewlet = widgets[ widgetId ].viewlet ?: _getViewletEventByConvention( widgetId ); + widgets[ widgetId ].icon = widgets[ widgetId ].icon ?: _getIconByConvention( widgetId ); + widgets[ widgetId ].title = widgets[ widgetId ].title ?: _getTitleByConvention( widgetId ); + widgets[ widgetId ].description = widgets[ widgetId ].description ?: _getDescriptionByConvention( widgetId ); + } + + _setWidgets( widgets ); + } + + private void function _autoDiscoverWidgets() { + var widgets = {}; + var viewsPath = "/views/admin/adminDashboards/widget"; + var handlersPath = "/handlers/admin/adminDashboards/widget"; + var ids = {}; + var autoDiscoverDirectories = _getAutoDiscoverDirectories(); + var siteTemplateMap = {}; + + for( var dir in autoDiscoverDirectories ) { + dir = ReReplace( dir, "/$", "" ); + var views = DirectoryList( dir & viewsPath , false, "query" ); + var handlers = DirectoryList( dir & handlersPath, false, "query", "*.cfc" ); + var siteTemplate = _getSiteTemplateFromPath( dir ); + + for ( var view in views ) { + var id = ""; + if ( views.type eq "Dir" ) { + id = views.name; + } else if ( views.type == "File" && ReFindNoCase( "\.cfm$", views.name ) && !views.name.reFind( "^_" ) ) { + id = ReReplaceNoCase( views.name, "\.cfm$", "" ); + } else { + continue; + } + + ids[ id ] = 1; + siteTemplateMap[ id ] = siteTemplateMap[ id ] ?: []; + siteTemplateMap[ id ].append( siteTemplate ); + } + + for ( var handler in handlers ) { + if ( handlers.type eq "File" ) { + var id = ReReplace( handlers.name, "\.cfc$", "" ); + ids[ id ] = 1; + + siteTemplateMap[ id ] = siteTemplateMap[ id ] ?: []; + siteTemplateMap[ id ].append( siteTemplate ); + } + } + } + + for( var id in ids ) { + widgets[ id ] = { + id = id + , configForm = _getFormNameByConvention( id ) + , viewlet = _getViewletEventByConvention( id ) + , placeholderViewlet = _getPlaceholderViewletEventByConvention( id ) + , icon = _getIconByConvention( id ) + , title = _getTitleByConvention( id ) + , description = _getDescriptionByConvention( id ) + , siteTemplates = _mergeSiteTemplates( siteTemplateMap[id] ) + , categories = _getWidgetCategoriesFromForm( id ) + }; + } + + _setWidgets( widgets ); + } + + private array function _getWidgetCategoriesFromForm( required string widgetId ) { + var formName = _getFormNameByConvention( arguments.widgetId ); + + if ( _getFormsService().formExists( formName ) ) { + var theForm = _getFormsService().getForm( formName ); + + return ListToArray( theForm.categories ?: "" ); + } + + return []; + } + + private string function _getSiteTemplateFromPath( required string path ) { + var regex = "^.*[\\/]site-templates[\\/]([^\\/]+)$"; + + if ( !ReFindNoCase( regex, arguments.path ) ) { + return "*"; + } + + return ReReplaceNoCase( arguments.path, regex, "\1" ); + } + + private string function _getViewletEventByConvention( required string widgetId ) { + return "admin.admindashboards.widget." & widgetId; + } + + private string function _getPlaceholderViewletEventByConvention( required string widgetId ) { + return "admin.admindashboards.widget." & widgetId & ".placeholder"; + } + + private string function _getIconByConvention( required string widgetId ) { + return "admin.admindashboards.widget.#widgetId#:iconclass"; + } + + private string function _getTitleByConvention( required string widgetId ) { + return "admin.admindashboards.widget.#widgetId#:title"; + } + + private string function _getDescriptionByConvention( required string widgetId ) { + return "admin.admindashboards.widget.#widgetId#:description"; + } + private string function _getFormNameByConvention( required string widgetId ) { + return "admin.admindashboards.widget." & widgetId; + } + private string function _mergeSiteTemplates( required array templates ) ouptut=false { + var merged = ""; + + for( var template in arguments.templates ) { + if ( template == "*" ) { + return "*"; + } + merged = ListAppend( merged, template ); + } + + return merged; + } + + // GETTERS AND SETTERS + private any function _getDashboardService() { + return _dashboardService; + } + private void function _setDashboardService( required any dashboardService ) { + _dashboardService = arguments.dashboardService; + } + private any function _getFormsService() { return _formsService; } @@ -240,4 +580,25 @@ component { _formsService = arguments.formsService; } + private struct function _getWidgets() { + return _widgets; + } + private void function _setWidgets( required struct widgets ) { + _widgets = arguments.widgets; + } + + private struct function _getConfiguredWidgets() { + return _configuredWidgets; + } + private void function _setConfiguredWidgets( required struct configuredWidgets ) { + _configuredWidgets = arguments.configuredWidgets; + } + + private array function _getAutoDiscoverDirectories() { + return _autoDiscoverDirectories; + } + private void function _setAutoDiscoverDirectories( required array autoDiscoverDirectories ) { + _autoDiscoverDirectories = arguments.autoDiscoverDirectories; + } + } \ No newline at end of file diff --git a/views/admin/admindashboards/_userGenerated.cfm b/views/admin/admindashboards/_userGenerated.cfm new file mode 100644 index 0000000..c93a32a --- /dev/null +++ b/views/admin/admindashboards/_userGenerated.cfm @@ -0,0 +1,43 @@ +