diff --git a/core/modules/dblog/config/optional/views.view.watchdog.yml b/core/modules/dblog/config/optional/views.view.watchdog.yml index e69de29..dac74dd 100644 --- a/core/modules/dblog/config/optional/views.view.watchdog.yml +++ b/core/modules/dblog/config/optional/views.view.watchdog.yml @@ -0,0 +1,712 @@ +langcode: en +status: true +dependencies: + module: + - dblog + - user +id: watchdog +label: Watchdog +module: views +description: 'Recent log messages' +tag: '' +base_table: watchdog +base_field: wid +core: 8.x +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access site reports' + cache: + type: none + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: false + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: mini + options: + items_per_page: 50 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: ‹‹ + next: ›› + style: + type: table + options: + grouping: { } + row_class: '{{ type }} {{ severity }}' + default_row_class: true + override: true + sticky: false + caption: '' + summary: '' + description: '' + columns: + nothing: nothing + wid: wid + severity: severity + type: type + timestamp: timestamp + message: message + name: name + link: link + info: + nothing: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + wid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + severity: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + timestamp: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + message: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + link: + align: '' + separator: '' + empty_column: false + responsive: priority-low + default: timestamp + empty_table: false + row: + type: fields + fields: + nothing: + id: nothing + table: views + field: nothing + relationship: none + group_type: group + admin_label: Icon + label: '' + exclude: false + alter: + alter_text: true + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: icon + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: false + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: false + plugin_id: custom + wid: + id: wid + table: watchdog + field: wid + relationship: none + group_type: group + admin_label: '' + label: WID + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + plugin_id: standard + severity: + id: severity + table: watchdog + field: severity + relationship: none + group_type: group + admin_label: '' + label: 'Severity level' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + machine_name: false + plugin_id: machine_name + type: + id: type + table: watchdog + field: type + relationship: none + group_type: group + admin_label: '' + label: Type + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + plugin_id: standard + timestamp: + id: timestamp + table: watchdog + field: timestamp + relationship: none + group_type: group + admin_label: '' + label: Date + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + date_format: short + custom_date_format: '' + timezone: '' + plugin_id: date + message: + id: message + table: watchdog + field: message + relationship: none + group_type: group + admin_label: '' + label: Message + exclude: false + alter: + alter_text: false + text: '' + make_link: true + path: 'admin/reports/dblog/event/{{ wid }}' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '{{ message }}' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 56 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: true + preserve_tags: '' + html: true + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + replace_variables: true + plugin_id: dblog_message + name: + id: name + table: users_field_data + field: name + relationship: uid + group_type: group + admin_label: '' + label: User + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: user_name + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: user + entity_field: name + plugin_id: field + link: + id: link + table: watchdog + field: link + relationship: none + group_type: group + admin_label: '' + label: Operations + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + plugin_id: dblog_operations + filters: + type: + id: type + table: watchdog + field: type + relationship: none + group_type: group + admin_label: '' + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: type_op + label: Type + description: '' + use_operator: false + operator: type_op + identifier: type + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + plugin_id: in_operator + severity: + id: severity + table: watchdog + field: severity + relationship: none + group_type: group + admin_label: '' + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: severity_op + label: 'Severity level' + description: '' + use_operator: false + operator: severity_op + identifier: severity + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + plugin_id: in_operator + sorts: + timestamp: + id: timestamp + table: watchdog + field: timestamp + order: DESC + entity_type: null + entity_field: null + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: 'Recent log messages' + header: { } + footer: { } + empty: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: + value: 'No log messages available.' + format: basic_html + plugin_id: text + relationships: + uid: + id: uid + table: watchdog + field: uid + relationship: none + group_type: group + admin_label: User + required: false + plugin_id: standard + arguments: { } + display_extenders: { } + filter_groups: + operator: AND + groups: + 1: AND + css_class: admin-dblog + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + page: + display_plugin: page + id: page + display_title: Page + position: 1 + display_options: + display_extenders: { } + path: admin/reports/dblog + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } \ No newline at end of file diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index ed92d6c..d786bb3 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -12,6 +12,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\views\ViewExecutable; /** * Implements hook_help(). @@ -100,7 +101,7 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo '#type' => 'select', '#title' => t('Database log messages to keep'), '#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'), - '#options' => [0 => t('All')] + array_combine($row_limits, $row_limits), + '#options' => [0 => t('All')] array_combine($row_limits, $row_limits), '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', [':cron' => \Drupal::url('system.status')]) ]; @@ -115,3 +116,12 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo function dblog_logging_settings_submit($form, FormStateInterface $form_state) { \Drupal::configFactory()->getEditable('dblog.settings')->set('row_limit', $form_state->getValue('dblog_row_limit'))->save(); } + +/** + * Implements hook_views_pre_render(). + */ +function dblog_views_pre_render(ViewExecutable $view) { + if (isset($view) && ($view->storage->get('base_table') == 'watchdog')) { + $view->element['#attached']['library'][] = 'dblog/drupal.dblog'; + } +} \ No newline at end of file diff --git a/core/modules/dblog/dblog.post_update.php b/core/modules/dblog/dblog.post_update.php index e69de29..7212acd 100644 --- a/core/modules/dblog/dblog.post_update.php +++ b/core/modules/dblog/dblog.post_update.php @@ -0,0 +1,44 @@ +moduleExists('views')) { + if (!View::load('watchdog')) { + // Save the watchdog view to config. + $module_handler = \Drupal::moduleHandler(); + $optional_install_path = $module_handler->getModule('dblog')->getPath() . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY; + $storage = new FileStorage($optional_install_path); + + \Drupal::entityTypeManager() + ->getStorage('view') + ->create($storage->read('views.view.watchdog')) + ->save(); + + return t('The watchdog view has been created.'); + } + + return t("The watchdog view already exists and was not replaced. To replace the 'Recent log messages' with a view, rename the watchdog view and uninstall and install the 'Database Log' module"); + } +} + +/** + * @} End of "addtogroup updates-8.3.x". + */ \ No newline at end of file diff --git a/core/modules/dblog/dblog.views.inc b/core/modules/dblog/dblog.views.inc index 20ad9ce..41d7157 100644 --- a/core/modules/dblog/dblog.views.inc +++ b/core/modules/dblog/dblog.views.inc @@ -20,11 +20,20 @@ function dblog_views_data() { 'help' => t('Contains a list of log entries.'), ]; + $data['watchdog']['table']['join'] = array( + // Link ourselves to the {users_field_data} table + 'users_field_data' => array( + 'field' => 'uid', + 'left_field' => 'uid', + ), + ); + + $data['watchdog']['wid'] = [ 'title' => t('WID'), 'help' => t('Unique watchdog event ID.'), 'field' => [ - 'id' => 'numeric', + 'id' => 'standard', ], 'filter' => [ 'id' => 'numeric', @@ -41,7 +50,7 @@ function dblog_views_data() { 'title' => t('UID'), 'help' => t('The user ID of the user on which the log entry was written..'), 'field' => [ - 'id' => 'numeric', + 'id' => 'standard', ], 'filter' => [ 'id' => 'numeric', @@ -52,7 +61,7 @@ function dblog_views_data() { 'relationship' => [ 'title' => t('User'), 'help' => t('The user on which the log entry as written.'), - 'base' => 'users', + 'base' => 'users_field_data', 'base field' => 'uid', 'id' => 'standard', ], @@ -120,7 +129,7 @@ function dblog_views_data() { ], 'filter' => [ 'id' => 'in_operator', - 'options callback' => 'Drupal\dblog\Controller\DbLogController::getLogLevelClassMap', + 'options callback' => 'Drupal\Core\Logger\RfcLogLevel::getLevels', ], 'sort' => [ 'id' => 'standard', diff --git a/core/modules/dblog/src/Tests/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php index 79cc038..f267728 100644 --- a/core/modules/dblog/src/Tests/DbLogTest.php +++ b/core/modules/dblog/src/Tests/DbLogTest.php @@ -142,7 +142,7 @@ private function verifyRowLimit($row_limit) { */ private function verifyCron($row_limit) { // Generate additional log entries. - $this->generateLogEntries($row_limit + 10); + $this->generateLogEntries($row_limit 10); // Verify that the database log row count exceeds the row limit. $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField(); $this->assertTrue($count > $row_limit, format_string('Dblog row count of @count exceeds row limit of @limit', ['@count' => $count, '@limit' => $row_limit])); @@ -151,7 +151,7 @@ private function verifyCron($row_limit) { $list = \Drupal::moduleHandler()->getImplementations('cron'); $module_count = count($list); $cron_detailed_count = $this->runCron(); - $this->assertTrue($cron_detailed_count == $module_count + 2, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_detailed_count, '@expected' => $module_count + 2])); + $this->assertTrue($cron_detailed_count == $module_count 2, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_detailed_count, '@expected' => $module_count 2])); // Test disabling of detailed cron logging. $this->config('system.cron')->set('logging', 0)->save(); @@ -212,7 +212,7 @@ private function generateLogEntries($count, $options = []) { $link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle'); // Prepare the fields to be logged - $log = $options + [ + $log = $options [ 'channel' => 'custom', 'message' => 'Dblog test log message', 'variables' => [], @@ -228,7 +228,7 @@ private function generateLogEntries($count, $options = []) { $logger = $this->container->get('logger.dblog'); $message = $log['message'] . ' Entry #'; - for ($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; $i) { $log['message'] = $message . $i; $logger->log($log['severity'], $log['message'], $log); } @@ -281,6 +281,12 @@ private function verifyReports($response = 200) { $this->assertText(t('Recent log messages'), 'DBLog report was displayed'); } + $this->drupalGet('admin/reports/dblog/confirm'); + $this->assertResponse($response); + if ($response == 200) { + $this->assertText(t('Are you sure you want to delete the recent logs?'), 'DBLog clear logs form was displayed'); + } + // View the database log page-not-found report page. $this->drupalGet('admin/reports/page-not-found'); $this->assertResponse($response); @@ -583,7 +589,7 @@ public function testDBLogAddAndClear() { // Add a watchdog entry. $this->container->get('logger.dblog')->log($log['severity'], $log['message'], $log); // Make sure the table count has actually been incremented. - $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), format_string('\Drupal\dblog\Logger\DbLog->log() added an entry to the dblog :count', [':count' => $count])); + $this->assertEqual($count 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), format_string('\Drupal\dblog\Logger\DbLog->log() added an entry to the dblog :count', [':count' => $count])); // Log in the admin user. $this->drupalLogin($this->adminUser); // Post in order to clear the database table. @@ -607,14 +613,14 @@ public function testFilter() { // Generate 9 random watchdog entries. $type_names = []; $types = []; - for ($i = 0; $i < 3; $i++) { + for ($i = 0; $i < 3; $i) { $type_names[] = $type_name = $this->randomMachineName(); $severity = RfcLogLevel::EMERGENCY; - for ($j = 0; $j < 3; $j++) { + for ($j = 0; $j < 3; $j) { $types[] = $type = [ - 'count' => $j + 1, + 'count' => $j 1, 'type' => $type_name, - 'severity' => $severity++, + 'severity' => $severity, ]; $this->generateLogEntries($type['count'], [ 'channel' => $type['type'], @@ -641,7 +647,7 @@ public function testFilter() { $type_count = 0; foreach ($types as $type) { if ($type['type'] == $type_name) { - $type_count += $type['count']; + $type_count = $type['count']; } } @@ -720,7 +726,7 @@ protected function getTypeCount(array $types) { foreach ($entries as $entry) { foreach ($types as $key => $type) { if ($entry['type'] == $type['type'] && $entry['severity'] == $type['severity']) { - $count[$key]++; + $count[$key]; break; } } @@ -821,7 +827,7 @@ public function testOverviewLinks() { $this->drupalGet('admin/reports/dblog'); $this->assertResponse(200); // Make sure HTML tags are filtered out. - $this->assertRaw('title="alert('foo');Lorem ipsum dolor sit amet, consectetur adipiscing & elit. Entry #0"><script>alert('foo');</script>Lorem ipsum dolor sit…'); + $this->assertRaw('title="alert('foo');Lorem'); $this->assertNoRaw(""); // Make sure HTML tags are filtered out in admin/reports/dblog/event/ too. diff --git a/core/modules/dblog/src/Tests/DbLogViewsTest.php b/core/modules/dblog/src/Tests/DbLogViewsTest.php index e69de29..c63d1a8 100644 --- a/core/modules/dblog/src/Tests/DbLogViewsTest.php +++ b/core/modules/dblog/src/Tests/DbLogViewsTest.php @@ -0,0 +1,70 @@ +xpath('.//table[contains(@class, "views-view-table")]'); + } + + /** + * {@inheritdoc} + */ + protected function filterLogsEntries($type = NULL, $severity = NULL) { + $query = array(); + if (!is_null($type)) { + $query['type[]'] = $type; + } + if (!is_null($severity)) { + $query['severity[]'] = $severity; + } + + $this->drupalGet('admin/reports/dblog', array('query' => $query)); + } + + /** + * {@inheritdoc} + */ + public function testDBLogAddAndClear() { + // Is necesary to create the basic_html format because if absent after + // delete the logs, a new log entry is created indicating that basic_html + // format do not exists. + $basic_html_format = FilterFormat::create(array( + 'format' => 'basic_html', + 'name' => 'Basic HTML', + 'filters' => array( + 'filter_html' => array( + 'status' => 1, + 'settings' => array( + 'allowed_html' => '


', + ), + ), + ), + )); + $basic_html_format->save(); + + parent::testDBLogAddAndClear(); + } + +} \ No newline at end of file diff --git a/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php b/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php index e69de29..7eeb06d 100644 --- a/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php +++ b/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php @@ -0,0 +1,40 @@ +databaseDumpFiles = [ + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz', + ]; + } + + /** + * Ensures that update hook is run for dblog module. + */ + public function testUpdate() { + // Make sure the watchog view doesn't exist before the updates. + $view = \Drupal::entityTypeManager()->getStorage('view')->load('watchdog'); + $this->assertNull($view); + + $this->runUpdates(); + + // Ensure the watchdog view is present after run updates. + $view = \Drupal::entityTypeManager()->getStorage('view')->load('watchdog'); + $displays = $view->get('display'); + + $this->assertIdentical($displays['page']['display_options']['path'], 'admin/reports/dblog', 'Recent logs message view exists.'); + } + +} \ No newline at end of file diff --git a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml index d3ebfc8..15c97a9a 100644 --- a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml +++ b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml @@ -37,7 +37,7 @@ display: id: wid table: watchdog field: wid - plugin_id: numeric + plugin_id: standard message: id: message table: watchdog