Commit b28d811c authored by baldwinlouie's avatar baldwinlouie Committed by Yas Naoi
Browse files

Issue #3279271 by baldwinlouie: Remove duplicate block titles from dashboard

parent 14826d00

css/twocol_tabbed_bricks.css

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
.layout--twocol-tabbed-bricks .tab-content .pane-content {

  display: flex;

  flex-wrap: wrap;

  margin-top: 10px;

}



.layout--twocol-tabbed-bricks .layout__region {

modules/cloud_orchestrator_tour/cloud_orchestrator_tour.install

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ function cloud_orchestrator_tour_update_8301() { 
}



/**

 * Update the capitalization of launch instance

 * Update the capitalization of launch instance.

 */

function cloud_orchestrator_tour_update_8302() {

  $files = [

src/Controller/DashboardController.php

+4 −30
Original line number Diff line number Diff line
@@ -82,46 +82,26 @@ class DashboardController extends ControllerBase implements DashboardControllerI 
    $aws_blocks['top'] = $this->getBlock(

      'aws_cloud_resources_block',

      [

        'label' => $this->t('AWS resources'),

        'cloud_context' => '',

      ]);

    $aws_blocks['first_above'][] = $this->getBlock(

      'aws_cloud_launch_instance_block',

      [

        'label' => $this->t('Launch instances'),

      ]);

    $aws_blocks['first_above'][] = $this->getBlock(

      'aws_cloud_long_running_instances_block',

      [

        'label' => $this->t('Long running instances'),

      ]);

    $aws_blocks['first_above'][] = $this->getBlock('aws_cloud_launch_instance_block');

    $aws_blocks['first_above'][] = $this->getBlock('aws_cloud_long_running_instances_block');

    $aws_blocks['first_above'][] = $this->getBlock(

      'aws_cloud_low_utilization_instances_block',

      [

        'label' => $this->t('Low utilization instances'),

        'low_utilization_block_cache_interval' => 3600,

      ]);

    $aws_blocks['first_above'][] = $this->getBlock(

      'aws_cloud_detached_volumes_block',

      [

        'label' => $this->t('Detached volumes'),

      ]);

    $aws_blocks['second_above'][] = $this->getBlock(

      'aws_cloud_unused_elastic_ips_block',

      [

        'label' => $this->t('Unused Elastic IPs'),

      ]);

    $aws_blocks['first_above'][] = $this->getBlock('aws_cloud_detached_volumes_block');

    $aws_blocks['second_above'][] = $this->getBlock('aws_cloud_unused_elastic_ips_block');

    $aws_blocks['second_above'][] = $this->getBlock(

      'aws_cloud_snapshots_block',

      [

        'label' => $this->t('Disassociated snapshots'),

        'cloud_context' => '',

        'snapshot_block_type' => 'disassociated_snapshots',

      ]);

    $aws_blocks['second_above'][] = $this->getBlock(

      'aws_cloud_snapshots_block',

      [

        'label' => $this->t('Stale snapshots'),

        'cloud_context' => '',

        'snapshot_block_type' => 'stale_snapshots',

      ]);
@@ -140,34 +120,29 @@ class DashboardController extends ControllerBase implements DashboardControllerI 
    $k8s_blocks['top'] = $this->getBlock(

      'k8s_resources_block',

      [

        'label' => $this->t('K8s resources'),

        'cloud_context' => '',

      ]);

    $k8s_blocks['first_above'] = $this->getBlock(

      'k8s_node_allocated_resources',

      [

        'label' => $this->t('K8s node allocated resources'),

        'display_view_k8s_node_list_only' => 0,

        'display_in_admin_pages' => 0,

      ]);

    $k8s_blocks['second_above'][] = $this->getBlock(

      'k8s_node_heatmap',

      [

        'label' => $this->t('K8s node heatmap'),

        'display_view_k8s_node_list_only' => 0,

        'display_in_admin_pages' => 0,

      ]);

    $k8s_blocks['second_above'][] = $this->getBlock(

      'k8s_node_costs',

      [

        'label' => $this->t('K8s node costs'),

        'display_in_admin_pages' => 0,

        'display_view_k8s_node_list_only' => 0,

      ]);

    $k8s_blocks['middle'][] = $this->getBlock(

      'k8s_namespace_costs_chart',

      [

        'label' => $this->t('K8s namespace costs chart'),

        'display_in_admin_pages' => 0,

        'display_view_k8s_namespace_list_only' => 0,

        'aws_cloud_chart_period' => '1',
@@ -176,7 +151,6 @@ class DashboardController extends ControllerBase implements DashboardControllerI 
    $k8s_blocks['middle'][] = $this->getBlock(

      'k8s_namespace_costs',

      [

        'label' => $this->t('K8s namespace costs'),

        'display_view_k8s_namespace_list_only' => 0,

        'aws_cloud_ec2_cost_type' => 'ri_one_year',

      ]);