Merge branch 'master' into substring-check

Author: liu-samuel

.yarn/releases/yarn-4.3.1.cjs

@@ -41,4 +41,4 @@ npmAuditExcludePackages:
 # pending | moderate | GHSA-fvqr-27wr-82fm | lodash <4.17.5          | 3.10.1 brought in by angular-patternfly@npm:3.26.0
 # 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
+yarnPath: .yarn/releases/yarn-4.5.3.cjs

.yarn/releases/yarn-4.5.3.cjs

@@ -33,36 +33,6 @@ def resolve_button_throw
   end
   private :resolve_button_throw
 
-  # Copy current URI as an automate button
-  def resolve_button_copy
-    session[:resolve_object] = copy_hash(@resolve)
-    head :ok
-  end
-  private :resolve_button_copy
-
-  # Copy current URI as an automate button
-  def resolve_button_paste
-    @resolve = copy_hash(session[:resolve_object])
-    @edit = session[:edit]
-    @custom_button = @edit[:custom_button]
-    @edit[:instance_names]       = @resolve[:instance_names]
-    @edit[:new][:instance_name]  = @resolve[:new][:instance_name]
-    @edit[:new][:object_message] = @resolve[:new][:object_message]
-    @edit[:new][:object_request] = @resolve[:new][:object_request]
-    @edit[:new][:attrs]          = @resolve[:new][:attrs]
-    @edit[:new][:target_class]   = @resolve[:target_class] = @resolve[:new][:target_class]
-    @edit[:uri] = @resolve[:uri]
-    (ApplicationController::AE_MAX_RESOLUTION_FIELDS - @resolve[:new][:attrs].length).times { @edit[:new][:attrs].push([]) }
-    @changed = (@edit[:new] != @edit[:current])
-    render :update do |page|
-      page << javascript_prologue
-      page.replace_html("main_div", :partial => "shared/buttons/ab_list")
-      page << javascript_for_miq_button_visibility_changed(@changed)
-      page << "miqSparkle(false);"
-    end
-  end
-  private :resolve_button_paste
-
   # Copy current URI as an automate button
   def resolve_button_simulate
     @edit = copy_hash(session[:resolve])
@@ -126,8 +96,6 @@ def resolve
 
     case params[:button]
     when "throw", "retry" then resolve_button_throw
-    when "copy"     then resolve_button_copy
-    when "paste"    then resolve_button_paste
     when "simulate" then resolve_button_simulate
     else                 resolve_button_reset_or_none
     end

.yarnrc.yml

@@ -685,8 +685,7 @@ def settings_replace_right_cell(nodetype, presenter)
                            @edit ? _("Editing Schedule \"%{name}\"") % {:name => @schedule.name} : _("Schedule \"%{name}\"") % {:name => @schedule.name}
                          end
     else
-      if %w[accordion_select change_tab tree_select].include?(params[:action]) &&
-         params[:tab_id] != "settings_advanced"
+      if %w[accordion_select change_tab tree_select].include?(params[:action])
         presenter.replace(:ops_tabs, r[:partial => "all_tabs"])
       elsif %w[zone_delete].include?(params[:pressed])
         presenter.replace(:ops_tabs, r[:partial => "all_tabs"])

app/controllers/application_controller/automate.rb

@@ -859,6 +859,8 @@ def settings_get_info(nodetype = x_node)
     nodes = nodetype.downcase.split("-")
     case nodes[0]
     when "root"
+      @settings_tab, @settings_tab_length = settings_tab_index_by_name(@sb[:active_tab])
+      @subtab = settings_tags_tab_index_by_name(@sb[:active_subtab])
       @right_cell_text = _("%{product} Region \"%{name}\"") %
                          {:name    => "#{MiqRegion.my_region.description} [#{MiqRegion.my_region.region}]",
                           :product => Vmdb::Appliance.PRODUCT_NAME}
@@ -870,9 +872,9 @@ def settings_get_info(nodetype = x_node)
         @in_a_form = true
       when "settings_tags"
         case @sb[:active_subtab]
-        when "settings_co_categories"
+        when "settings_my_company_categories"
           category_get_all
-        when "settings_co_tags"
+        when "settings_my_company_tags"
           # dont hide the disabled categories, so user can remove tags from the disabled ones
           cats = Classification.categories.sort_by(&:description)  # Get the categories, sort by name
           @cats = {}                                               # Classifications array for first chooser
@@ -887,15 +889,15 @@ def settings_get_info(nodetype = x_node)
           @edit[:key] = "#{@sb[:active_tab]}_edit__#{@sb[:selected_server_id]}"
           add_flash(_("Locate and upload a file to start the import process"), :info)
           @in_a_form = true
-        when "settings_import" # Import tab
+        when "settings_import_variables" # Import tab
           @edit = {}
           @edit[:new] = {}
           @edit[:key] = "#{@sb[:active_tab]}_edit__#{@sb[:selected_server_id]}"
           @edit[:new][:upload_type] = nil
           @sb[:good] = nil unless @sb[:show_button]
           add_flash(_("Choose the type of custom variables to be imported"), :info)
           @in_a_form = true
-        when "settings_label_tag_mapping"
+        when "settings_map_tags"
           label_tag_mapping_get_all
         end
       when "settings_help_menu"

app/controllers/ops_controller.rb

@@ -60,7 +60,7 @@ def upload_form_field_changed
     @sb[:good] = nil
     render :update do |page|
       page << javascript_prologue
-      page.replace_html("settings_import", :partial => "settings_import_tab")
+      page.replace_html("import_variables", :partial => "settings_import_tab")
     end
   end
 

app/controllers/ops_controller/settings/common.rb

@@ -1,12 +1,2 @@
 class ApplicationHelper::Toolbar::MiqAeToolsSimulateCenter < ApplicationHelper::Toolbar::Basic
-  button_group('miq_ae_tools_vmdb', [
-    button(
-      :ae_copy_simulate,
-      'fa fa-files-o fa-lg',
-      N_('Copy object details for use in a Button'),
-      N_('Copy'),
-      :url       => "resolve",
-      :url_parms => "?button=copy",
-      :klass     => ApplicationHelper::Button::AeCopySimulate),
-  ])
 end

app/controllers/ops_controller/settings/upload.rb

@@ -9,6 +9,8 @@ module OpsHelper
   include SettingsLabelTagMappingHelper
   include SettingsScheduleHelper
   include SettingsServerDescHelper
+  include SettingsTabsHelper
+  include SettingsTagsHelper
   include SettingsUsersHelper
   include SettingsZoneHelper
   include SettingsRbacTagHelper

app/helpers/application_helper/button/ae_copy_simulate.rb

@@ -0,0 +1,37 @@
+module SettingsTabsHelper
+  SETTINGS_TAB_IDS = %w[
+    settings_details
+    settings_cu_collection
+    settings_tags
+    settings_replication
+    settings_help_menu
+    settings_advanced
+  ]
+
+  def settings_tab_configuration
+    [:details, :cu_collection, :tags, :replication, :help_menu, :advanced]
+  end
+
+  def settings_tab_content(key_name, &block)
+    if settings_tabs_types[key_name]
+      tag.div(:id => "settings_#{key_name}", :class => 'tab_content', &block)
+    end
+  end
+
+def settings_tab_index_by_name(name)
+  [SETTINGS_TAB_IDS.index(name) || -1, SETTINGS_TAB_IDS.length]
+end
+
+  private
+
+  def settings_tabs_types
+    {
+      :details       => _('Details'),
+      :cu_collection => _('C & U Collection'),
+      :tags          => _('Tags'),
+      :replication   => _('Replication'),
+      :help_menu     => _('Help Menu'),
+      :advanced      => _('Advanced'),
+    }
+  end
+end

app/helpers/application_helper/toolbar/miq_ae_tools_simulate_center.rb

@@ -0,0 +1,36 @@
+module SettingsTagsHelper
+
+  SETTINGS_TAGS_TABS_IDS = %w[
+  settings_my_company_categories
+  settings_my_company_tags
+  settings_import_tags
+  settings_import_variables
+  settings_map_tags
+]
+
+  def settings_tags_configuration
+    [:my_company_categories, :my_company_tags, :import_tags, :import_variables, :map_tags]
+  end
+
+  def settings_tags_content(key_name, &block)
+    if settings_tags_types[key_name]
+      tag.div(:id => key_name, :class => 'tab_content', &block)
+    end
+  end
+
+  def settings_tags_tab_index_by_name(name)
+    SETTINGS_TAGS_TABS_IDS.index(name) || -1
+  end
+
+  private
+
+  def settings_tags_types
+    {
+      :my_company_categories => _('My Company Categories'),
+      :my_company_tags       => _('My Company Tags'),
+      :import_tags           => _('Import Tags'),
+      :import_variables      => _('Import Variables'),
+      :map_tags              => _('Map Tags'),
+    }
+  end
+end

app/helpers/ops_helper.rb

@@ -28,13 +28,33 @@ const requestInfo = {
   network: __('Network'),
 };
 
+/** Tab labels used for settings in application settings page. */
+const settings = {
+  details: __('Details'),
+  cu_collection: __('C & U Collection'),
+  tags: __('Tags'),
+  replication: __('Replication'),
+  help_menu: __('Help'),
+  advanced: __('Advanced'),
+};
+
+const settingsTags = {
+  my_company_categories: __('My Company Categories'),
+  my_company_tags: __('My Company Tags'),
+  import_tags: ('Import Tags'),
+  import_variables: __('Import Variables'),
+  map_tags: __('Map Tags'),
+};
+
 /** Function to select the tab labels. */
 export const labelConfig = (type) => {
   const configMap = {
     CATALOG_SUMMARY: catalog,
     CATALOG_EDIT: catalog,
     UTILIZATION: utilization,
     CATALOG_REQUEST_INFO: requestInfo,
+    SETTINGS: settings,
+    SETTINGS_TAGS: settingsTags,
   };
 
   return configMap[type];

app/helpers/settings_tabs_helper.rb

@@ -1,13 +1,17 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Tabs, Tab } from 'carbon-components-react';
 import { useDispatch } from 'react-redux';
 import { miqCustomTabActions } from '../../miq-redux/actions/miq-custom-tab-actions';
 import { labelConfig, tabText } from './helper';
 
-const MiqCustomTab = ({ containerId, tabLabels, type }) => {
+const MiqCustomTab = ({
+  containerId, tabLabels, type, activeTab, subtab, tabLength,
+}) => {
   const dispatch = useDispatch();
   const [data, setData] = useState({ loading: false });
+  const activeTabClassName = 'bx--tabs--scrollable__nav-item--selected';
+  const selectedClassName = 'bx--tabs__nav-item--selected';
 
   /** Labels used for a Tab found from the 'type'. */
   const selectedLabels = labelConfig(type);
@@ -23,6 +27,13 @@ const MiqCustomTab = ({ containerId, tabLabels, type }) => {
     { type: 'CATALOG_EDIT', js: () => name === 'detail' && dispatch(miqCustomTabActions.incrementClickCount()) },
     { type: 'CATALOG_REQUEST_INFO', url: `/miq_request/prov_field_changed?tab_id=${name}&edit_mode=true` },
     { type: 'UTILIZATION' },
+    {
+      type: 'SETTINGS',
+      url: name === 'tags'
+        ? `/ops/change_tab?tab_id=settings_my_company_categories&parent_tab_id=settings_${name}`
+        : `/ops/change_tab?tab_id=settings_${name}`,
+    },
+    { type: 'SETTINGS_TAGS', url: `/ops/change_tab?parent_tab_id=settings_tags&tab_id=settings_${name}` },
   ];
 
   const configuration = (name) => tabConfigurations(name).find((item) => item.type === type);
@@ -78,6 +89,7 @@ const MiqCustomTab = ({ containerId, tabLabels, type }) => {
 
   /** Function to handle tab click events. */
   const onTabSelect = (name) => {
+    setData(true);
     if (!data.loading) {
       miqSparkleOn();
       const config = configuration(name);
@@ -91,6 +103,23 @@ const MiqCustomTab = ({ containerId, tabLabels, type }) => {
     <Tab key={`tab${label}`} label={`${tabText(selectedLabels, label)}`} onClick={() => onTabSelect(label)} />
   ));
 
+  useEffect(() => {
+    if (activeTab) {
+      let elements = document.getElementsByClassName('bx--tabs--scrollable__nav-item');
+      elements.forEach((element) => {
+        element.classList.remove(activeTabClassName);
+        element.classList.remove(selectedClassName);
+      });
+      if (subtab !== undefined && subtab !== -1) {
+        elements[tabLength].classList.remove(activeTabClassName);
+        elements[subtab + tabLength].classList.add(activeTabClassName);
+      }
+      elements[activeTab].classList.add(activeTabClassName);
+
+      elements = document.getElementsByClassName('bx--tabs--scrollable__nav-item');
+    }
+  }, [data.loading]);
+
   return (
     <Tabs className="miq_custom_tabs" id={tabIdentifier('')}>
       {renderTabs()}
@@ -104,4 +133,13 @@ MiqCustomTab.propTypes = {
   containerId: PropTypes.string.isRequired,
   tabLabels: PropTypes.arrayOf(PropTypes.string).isRequired,
   type: PropTypes.string.isRequired,
+  activeTab: PropTypes.number,
+  subtab: PropTypes.number,
+  tabLength: PropTypes.number,
+};
+
+MiqCustomTab.defaultProps = {
+  activeTab: undefined,
+  subtab: undefined,
+  tabLength: undefined,
 };

app/helpers/settings_tags_helper.rb

@@ -100,9 +100,11 @@ const MiqDataTable = ({
         isSortable={isSortable}
         isSortHeader={sortHeader}
         sortDirection={sortDirection}
-        className={
-          classNames('miq-data-table-header', (header.contentButton ? 'header-button' : ''), (header.actionCell ? 'action-cell-holder' : ''))
-        }
+        className={classNames(
+          'miq-data-table-header',
+          header.contentButton ? 'header-button' : '',
+          header.actionCell ? 'action-cell-holder' : ''
+        )}
       >
         {headerLabel(header.header)}
       </TableHeader>
@@ -148,15 +150,17 @@ const MiqDataTable = ({
         stickyHeader={stickyHeader}
       >
         {({
-          rows, getTableProps, getHeaderProps, getRowProps, getSelectionProps,
+          rows, headers, getTableProps, getHeaderProps, getRowProps, getSelectionProps,
         }) => (
           <Table {...getTableProps()}>
-            <TableHead>
-              <TableRow>
-                {rowCheckBox && selectAll(getSelectionProps)}
-                {renderHeaders(getHeaderProps)}
-              </TableRow>
-            </TableHead>
+            {headers[0] && headers[0].header !== '' ? (
+              <TableHead>
+                <TableRow>
+                  {rowCheckBox && selectAll(getSelectionProps)}
+                  {renderHeaders(getHeaderProps)}
+                </TableRow>
+              </TableHead>
+            ) : undefined}
             <TableBody>
               {sortableRows(rows).map((row, index) => {
                 const item = propRows[index];

app/javascript/components/miq-custom-tab/helper.js

@@ -4,8 +4,12 @@ import classNames from 'classnames';
 
 /** Component to print the text value inside a cell. */
 const MiqStructuredListText = ({ value }) => {
-  const text = (value === null || value === undefined ? '' : String(value));
-
+  let text;
+  if (Array.isArray(value)) {
+    text = value.join('\n');
+  } else {
+    text = (value === null || value === undefined ? '' : String(value));
+  }
   return (
     <div className={classNames(text ? 'expand' : '', 'wrap_text')}>
       {text}