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

[WIP] Search bar component in Cloud Tenant module #9225

Closed
wants to merge 1 commit into from
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 .whitesource
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"settingsInheritedFrom": "ManageIQ/whitesource-config@master"
}
}
626 changes: 313 additions & 313 deletions .yarn/releases/yarn-4.2.2.cjs → .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

33 changes: 32 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,35 @@ enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
npmAuditIgnoreAdvisories:
- "1085687" # pending | moderate | GHSA-28hp-fgcr-2r4h | angular <1.6.0 | 1.5.11 brought in by angular-patternfly@npm:3.26.0
- "1087446" # pending | moderate | GHSA-5cp4-xmrw-59wf | angular <1.8.0 | 1.5.11, 1.6.10 brought in by angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1089079" # pending | high | GHSA-89mq-4x47-5v83 | angular <1.7.9 | 1.5.11, 1.6.10 brought in by angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1089210" # pending | moderate | GHSA-m2h2-264f-f486 | angular >=1.7.0 | 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2
- "1093555" # pending | moderate | GHSA-mhp6-pxh8-r675 | angular <1.8.0 | 1.5.11, 1.6.10 brought in by angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1093574" # pending | moderate | GHSA-prc3-vjfx-vhm9 | angular <=1.8.3 | 1.5.11, 1.6.10, 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2, angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1094512" # pending | moderate | GHSA-2vrf-hf26-jrp5 | angular <=1.8.3 | 1.5.11, 1.6.10, 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2, angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1094513" # pending | moderate | GHSA-2qqx-w9hr-q5gx | angular <=1.8.3 | 1.5.11, 1.6.10, 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2, angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1094514" # pending | moderate | GHSA-qwqh-hm9m-p5hr | angular <=1.8.3 | 1.5.11, 1.6.10, 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2, angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1097291" # pending | high | GHSA-4w4v-5hc9-xrr2 | angular >=1.3.0 <=1.8.3 | 1.5.11, 1.6.10, 1.8.3 brought in by angular-bootstrap-switch@npm:0.5.2, angular-patternfly@npm:3.26.0, manageiq-ui-classic@workspace:.
- "1091717" # pending | moderate | GHSA-ph58-4vrj-w6hr | bootstrap <3.4.0 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1091861" # pending | moderate | GHSA-3mgp-fx93-9xv5 | bootstrap <3.4.0 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1094984" # pending | moderate | GHSA-9v3m-8fp8-mj99 | bootstrap >=3.0.0 <3.4.1 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1095421" # pending | moderate | GHSA-4p24-vmcr-4gqj | bootstrap >=2.0.4 <3.4.0 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1095492" # pending | moderate | GHSA-3wqf-4x89-9g79 | bootstrap >=2.3.0 <3.4.0 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1095494" # pending | moderate | GHSA-7mvr-5x2g-wfc8 | bootstrap >=2.3.0 <3.4.0 | 3.3.7 brought in by patternfly@npm:3.31.2
- "1086501" # pending | high | GHSA-9r7h-6639-v5mw | bootstrap-select <1.13.6 | 1.12.2 brought in by patternfly@npm:3.59.5
- "1089856" # pending | moderate | GHSA-7c82-mp33-r854 | bootstrap-select <1.13.6 | 1.12.2 brought in by patternfly@npm:3.59.5
- "1094143" # pending | moderate | GHSA-rmxg-73gg-4p98 | jquery >=1.12.3 <3.0.0 | 2.2.4 brought in by manageiq-ui-classic@workspace:.
- "1094185" # pending | moderate | GHSA-gxr4-xjj5-5px2 | jquery >=1.2.0 <3.5.0 | 2.2.4, 3.2.1, 3.4.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.31.2, patternfly@npm:3.59.5
- "1097145" # pending | moderate | GHSA-6c3j-c64m-qhgq | jquery >=1.1.4 <3.4.0 | 2.2.4, 3.2.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.31.2
- "1097311" # pending | moderate | GHSA-jpcq-cgw6-v4j6 | jquery >=1.0.3 <3.5.0 | 2.2.4, 3.2.1, 3.4.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.31.2, patternfly@npm:3.59.5
- "1085674" # pending | moderate | GHSA-x5rq-j2xg-h7qm | lodash <4.17.11 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1094499" # pending | high | GHSA-4xc9-xhrj-v574 | lodash <4.17.11 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1094500" # pending | moderate | GHSA-29mw-wpgm-hmr9 | lodash <4.17.21 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1096305" # pending | high | GHSA-p6mc-m468-83gw | lodash >=3.7.0 <4.17.19 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1096996" # pending | high | GHSA-35jh-r3h4-6jhm | lodash <4.17.21 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1097130" # pending | moderate | GHSA-fvqr-27wr-82fm | lodash <4.17.5 | 3.10.1 brought in by angular-patternfly@npm:3.26.0
- "1097140" # pending | critical | GHSA-jf85-cpcp-j695 | lodash <4.17.12 | 3.10.1 brought in by angular-patternfly@npm:3.26.0

yarnPath: .yarn/releases/yarn-4.3.1.cjs
5 changes: 2 additions & 3 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class ApplicationController < ActionController::Base
helper ChartingHelper
ManageIQ::Reporting::Charting.load_helpers(self)

include ActionView::Helpers::NumberHelper # bring in the number helpers for number_to_human_size
include ActionView::Helpers::TextHelper
include ActionView::Helpers::DateHelper
include ApplicationHelper
Expand Down Expand Up @@ -1032,14 +1031,14 @@ def get_view_process_search_text(view)
# {Processes,Users,...} in that case, search shoult NOT be applied.
# If loading a form such as provisioning, don't filter records
# FIXME: This needs to be changed to apply search in some explicit way.
return nil if @display || @in_a_form
return nil if @in_a_form

# If we came in through Chart pop-up menu click we don't filter records.
return nil if session[:menu_click]

# Build sub_filter where clause from search text
# This part is for the Hosts screen. In explorer screens we have search (that includes vm_infra and Control/Explorer/Policies)
if (!@parent && @lastaction == "show_list") || @explorer
if (!@parent && @lastaction == "show_list") || @explorer || @display
stxt = @search_text.gsub("_", "`_") # Escape underscores
stxt.gsub!("%", "`%") # and percents

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_group_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def show_list
def textual_group_list
[
%i[properties container_labels container_node_selectors volumes],
%i[relationships conditions smart_management]
%i[relationships conditions smart_management annotations]
]
end
helper_method :textual_group_list
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_node_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def show_list
def textual_group_list
[
%i[properties container_labels compliance miq_custom_attributes],
%i[relationships conditions smart_management]
%i[relationships conditions smart_management annotations]
]
end
helper_method :textual_group_list
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_replicator_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def download_summary_pdf
private

def textual_group_list
[%i[properties container_labels container_selectors compliance], %i[relationships smart_management]]
[%i[properties container_labels container_selectors compliance], %i[relationships smart_management annotations]]
end
helper_method :textual_group_list

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_route_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def download_summary_pdf
private

def textual_group_list
[%i[properties container_labels], %i[relationships smart_management]]
[%i[properties container_labels annotations], %i[relationships smart_management]]
end
helper_method :textual_group_list

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_service_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def download_summary_pdf
private

def textual_group_list
[%i[properties port_configs container_labels container_selectors], %i[relationships smart_management]]
[%i[properties port_configs container_labels container_selectors], %i[relationships smart_management annotations]]
end
helper_method :textual_group_list

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/container_template_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def download_summary_pdf
private

def textual_group_list
[%i[properties parameters objects], %i[relationships container_labels smart_management]]
[%i[properties parameters objects], %i[relationships container_labels smart_management annotations]]
end
helper_method :textual_group_list

Expand Down
15 changes: 15 additions & 0 deletions app/controllers/guest_device_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class GuestDeviceController < ApplicationController
include Mixins::GenericShowMixin
include Mixins::MoreShowActions
include Mixins::GenericSessionMixin
include Mixins::BreadcrumbsMixin

before_action :check_privileges
before_action :get_session_data
Expand All @@ -19,6 +20,12 @@ def model
self.class.model
end

def download_summary_pdf
assert_privileges('embedded_automation_manager_credentials_view')

super
end

def self.table_name
@table_name ||= "guest_device"
end
Expand All @@ -34,4 +41,12 @@ def textual_group_list
]
end
helper_method(:textual_group_list)

def breadcrumbs_options
{
:breadcrumbs => [
{:title => _("Guest Devices"), :url => controller_url},
],
}
end
end
2 changes: 1 addition & 1 deletion app/controllers/mixins/generic_show_mixin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def display_instances
end

def display_images
nested_list(ManageIQ::Providers::CloudManager::Template, :named_scope => :without_volume_templates)
nested_list(ManageIQ::Providers::CloudManager::Template)
end

# options:
Expand Down
6 changes: 5 additions & 1 deletion app/controllers/ops_controller/settings/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ def pglogical_save_subscriptions
task_opts = {:action => "Save subscriptions for global region", :userid => session[:userid]}
queue_opts = {:class_name => "MiqPglogical", :method_name => "save_global_region",
:args => [subscriptions_to_save, subsciptions_to_remove]}
ActiveRecord::Base.yaml_column_permitted_classes |= [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
ActiveRecord.yaml_column_permitted_classes = YamlPermittedClasses.app_yaml_permitted_classes | [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
else
ActiveRecord::Base.yaml_column_permitted_classes = YamlPermittedClasses.app_yaml_permitted_classes | [subscriptions_to_save.first.class, subsciptions_to_remove.first.class]
end
when "remote"
task_opts = {:action => "Configure the database to be a replication remote region",
:userid => session[:userid]}
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module ApplicationHelper
include StiRoutingHelper
include ToolbarHelper
include TextualSummaryHelper
include NumberHelper
ActionView::Helpers::NumberHelper.prepend NumberHelper # override rails number helper with our needs for number_to_human_size
include Title
include ReactjsHelper
include Webpack
Expand Down
19 changes: 10 additions & 9 deletions app/helpers/application_helper/toolbar/miq_templates_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,16 @@ class ApplicationHelper::Toolbar::MiqTemplatesCenter < ApplicationHelper::Toolba
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:miq_template_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected Templates'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :miq_template_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected Templates'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:miq_template_tag,
'pficon pficon-edit fa-lg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,16 @@ class ApplicationHelper::Toolbar::TemplateCloudsCenter < ApplicationHelper::Tool
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:image_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected items'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :image_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected items'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:image_tag,
'pficon pficon-edit fa-lg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,16 @@ class ApplicationHelper::Toolbar::TemplateInfrasCenter < ApplicationHelper::Tool
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:miq_template_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected Templates'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :miq_template_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected Templates'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:miq_template_tag,
'pficon pficon-edit fa-lg',
Expand Down
19 changes: 10 additions & 9 deletions app/helpers/application_helper/toolbar/vm_clouds_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,16 @@ class ApplicationHelper::Toolbar::VmCloudsCenter < ApplicationHelper::Toolbar::B
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:instance_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected items'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :instance_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected items'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:instance_tag,
'pficon pficon-edit fa-lg',
Expand Down
19 changes: 10 additions & 9 deletions app/helpers/application_helper/toolbar/vm_infras_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,16 @@ class ApplicationHelper::Toolbar::VmInfrasCenter < ApplicationHelper::Toolbar::B
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:vm_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected items'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :vm_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected items'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:vm_tag,
'pficon pficon-edit fa-lg',
Expand Down
19 changes: 10 additions & 9 deletions app/helpers/application_helper/toolbar/vms_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,16 @@ class ApplicationHelper::Toolbar::VmsCenter < ApplicationHelper::Toolbar::Basic
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
button(
:vm_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for the selected items'),
N_('Policy Simulation'),
:url_parms => "main_div",
:send_checked => true,
:enabled => false,
:onwhen => "1+"),
# TODO: Add this button back when the page is fixed
# button(
# :vm_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for the selected items'),
# N_('Policy Simulation'),
# :url_parms => "main_div",
# :send_checked => true,
# :enabled => false,
# :onwhen => "1+"),
button(
:vm_tag,
'pficon pficon-edit fa-lg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class ApplicationHelper::Toolbar::XMiqTemplateCenter < ApplicationHelper::Toolba
N_('Manage Policies for this Template'),
N_('Manage Policies'),
:klass => ApplicationHelper::Button::VmTemplatePolicy),
# TODO: Add this button back when the page is fixed
button(
:miq_template_policy_sim,
'fa fa-play-circle-o fa-lg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ class ApplicationHelper::Toolbar::XTemplateCloudCenter < ApplicationHelper::Tool
'pficon pficon-edit fa-lg',
N_('Manage Policies for this Image'),
N_('Manage Policies')),
button(
:image_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for this Image'),
N_('Policy Simulation')),
# TODO: Add this button back when the page is fixed
# button(
# :image_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for this Image'),
# N_('Policy Simulation')),
button(
:image_tag,
'pficon pficon-edit fa-lg',
Expand Down
13 changes: 7 additions & 6 deletions app/helpers/application_helper/toolbar/x_vm_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,13 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic
N_('Manage Policies for this VM'),
N_('Manage Policies'),
:klass => ApplicationHelper::Button::VmTemplatePolicy),
button(
:vm_policy_sim,
'fa fa-play-circle-o fa-lg',
N_('View Policy Simulation for this VM'),
N_('Policy Simulation'),
:klass => ApplicationHelper::Button::VmTemplatePolicy),
# TODO: Add this button back when the page is fixed
# button(
# :vm_policy_sim,
# 'fa fa-play-circle-o fa-lg',
# N_('View Policy Simulation for this VM'),
# N_('Policy Simulation'),
# :klass => ApplicationHelper::Button::VmTemplatePolicy),
button(
:vm_tag,
'pficon pficon-edit fa-lg',
Expand Down
Loading