[WIP] Convert order service form to react

.gitattributes

@@ -0,0 +1 @@
+app/javascript/oldjs/locale/*.json -text -diff

.github/CODEOWNERS

@@ -1,8 +1 @@
-# trees
-app/presenters/tree_node/                         @skateman
-app/presenters/tree_builder_*                     @skateman
-# styling and images
-app/assets/stylesheets/                           @epwinchell
-app/assets/images/                                @epwinchell
-# topology services
-app/services/*topology_service.rb                 @skateman
+*   @ManageIQ/committers-ui

.github/workflows/ci.yaml

@@ -1,19 +1,18 @@
+---
 name: CI
-
 on:
   push:
   pull_request:
   workflow_dispatch:
   schedule:
-  - cron: '0 0 * * *'
-
+  - cron: 0 0 * * *
 jobs:
   ci:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby-version:
-        - '2.7'
+        - '3.0'
         node-version:
         - 14
         test-suite:
@@ -24,7 +23,7 @@ jobs:
         - spec:jest
         - spec:routes
         include:
-        - ruby-version: '2.6'
+        - ruby-version: '2.7'
           node-version: 14
           test-suite: spec
     services:
@@ -34,36 +33,39 @@ jobs:
           POSTGRESQL_USER: root
           POSTGRESQL_PASSWORD: smartvm
           POSTGRESQL_DATABASE: vmdb_test
-        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
+        options: "--health-cmd pg_isready --health-interval 2s --health-timeout 5s
+          --health-retries 5"
         ports:
         - 5432:5432
     env:
-      TEST_SUITE: ${{ matrix.test-suite }}
+      TEST_SUITE: "${{ matrix.test-suite }}"
       PGHOST: localhost
       PGPASSWORD: smartvm
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up system
       run: bin/before_install
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: "${{ matrix.ruby-version }}"
         bundler-cache: true
       timeout-minutes: 30
     - name: Set up Node
-      if: ${{ matrix.test-suite == 'spec:compile' || matrix.test-suite == 'spec:javascript' || matrix.test-suite == 'spec:jest' }}
+      if: "${{ matrix.test-suite == 'spec:compile' || matrix.test-suite == 'spec:javascript'
+        || matrix.test-suite == 'spec:jest' }}"
       uses: actions/setup-node@v2
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: "${{ matrix.node-version }}"
         cache: yarn
         registry-url: https://npm.manageiq.org/
     - name: Prepare tests
       run: bin/setup
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' && matrix.test-suite == 'spec' }}
+      if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' &&
+        matrix.test-suite == 'spec' }}"
       continue-on-error: true
       uses: paambaati/[email protected]

app/controllers/application_controller.rb

@@ -1006,6 +1006,7 @@ def get_sort_col
   def process_saved_reports(saved_reports, task)
     success_count = 0
     failure_count = 0
+    params[:miq_grid_checks] = params[:miq_grid_checks]&.split(",")
     MiqReportResult.for_user(current_user).where(:id => saved_reports).order(MiqReportResult.arel_table[:name].lower).each do |rep|
       rep.public_send(task) if rep.respond_to?(task) # Run the task
     rescue StandardError
@@ -1019,6 +1020,7 @@ def process_saved_reports(saved_reports, task)
           :target_class => "MiqReportResult",
           :userid       => current_userid
         )
+        params[:miq_grid_checks]&.delete(rep[:id].to_s)
         success_count += 1
       else
         add_flash(_("\"%{record}\": %{task} successfully initiated") % {:record => rep.name, :task => task})
@@ -1032,6 +1034,7 @@ def process_saved_reports(saved_reports, task)
       add_flash(n_("Error during Saved Report delete from the %{product} Database",
                    "Error during Saved Reports delete from the %{product} Database", failure_count) % {:product => Vmdb::Appliance.PRODUCT_NAME})
     end
+    params[:miq_grid_checks] || []
   end
 
   # Common timeprofiles button handler routines

app/controllers/application_controller/compare.rb

@@ -13,6 +13,8 @@ def create_compare_view
 
     rpt = get_compare_report(@sb[:compare_db])
     session[:miq_sections] = MiqCompare.sections(rpt)
+    selected_sections = session[:miq_sections]&.select { |_key, value| value[:checked] == true }
+    session[:selected_sections] = selected_sections ? selected_sections.keys.map(&:to_s) : []
     ids = session[:miq_selected].collect(&:to_i)
     @compare = MiqCompare.new({:ids     => ids,
                                :include => session[:miq_sections]},
@@ -413,13 +415,11 @@ def sections_field_changed
   end
 
   def set_checked_sections
-    session[:selected_sections] = []
-    params[:all_checked]&.each do |a|
-      s = a.split(':')
-      if s.length > 1
-        session[:selected_sections].push(s[1])
-      end
+    selections = []
+    params[:all_checked]&.each do |item|
+      add_selections!(selection_names(item), selections)
     end
+    session[:selected_sections] = update_selections(params[:id], selections, params[:check])
   end
 
   # Toggle exists/details view
@@ -1851,4 +1851,54 @@ def section_field_compare_values(view, section, field, base_val)
       unset_same_flag unless fld.nil? || base_val == fld[:_value_]
     end
   end
+
+  def validate_name(name)
+    name&.starts_with?('xx-group')
+  end
+
+  # Method to get the selection names from :all_checked and :id params.
+  # individual selected item suggests that the variable name contains ':'
+  # else, the child_names are retrived from the selected_parent item.
+  def selection_names(name)
+    if validate_name(name)
+      count = name.scan(/xx-group/).count
+      count == 1 ? child_names(name) : [name.split(':')[1]]
+    end
+  end
+
+  # Method to get the child names of a selected parent item.
+  # session[:miq_sections] contains all tree names and the keys are filters using the selected group_name[1].
+  def child_names(name)
+    child_names = []
+    group_name = name.split('_')
+    if group_name[1]
+      child_sections = session[:miq_sections]&.select { |_key, value| value[:group] == group_name[1] }
+      if child_sections && child_sections.length > 1
+        child_names = child_sections.keys.map(&:to_s)
+      end
+    end
+    child_names
+  end
+
+  # Method to add or remove selections if an id is present.
+  def update_selections(param_id, selections, check)
+    if param_id
+      names = selection_names(CGI.unescape(param_id))
+      case check
+      when "true" then  add_selections!(names, selections)
+      when "false" then remove_selections!(names, selections)
+      end
+    end
+    selections
+  end
+
+  # Method to add names to the selections.
+  def add_selections!(names, selections)
+    selections.replace(selections | names)
+  end
+
+  # Method to remove names to the selections.
+  def remove_selections!(names, selections)
+    selections.replace(selections - names)
+  end
 end

app/controllers/application_controller/timelines/options.rb

@@ -34,6 +34,8 @@ def update_from_params(params)
       self.levels = params[:tl_levels]&.map(&:to_sym) || group_levels
       self.categories = {}
       params.fetch(:tl_categories, []).each do |category_display_name|
+        next if category_display_name == "Other"
+
         group_data = event_groups[events[category_display_name]]
         category = {
           :display_name => category_display_name,

app/controllers/catalog_controller.rb

@@ -710,6 +710,9 @@ def svc_catalog_provision
         ra, st, svc_catalog_provision_finish_submit_endpoint
       )
       @in_a_form = true
+      @dialog_locals = options[:dialog_locals]
+      # require 'byebug'
+      # byebug
       replace_right_cell(:action => "dialog_provision", :dialog_locals => options[:dialog_locals])
     else
       # if catalog item has no dialog and provision button was pressed from list view

app/controllers/cloud_network_controller.rb

@@ -45,7 +45,7 @@ def create
     when "add"
       options = form_params
       ems = ExtManagementSystem.find(options[:ems_id])
-      if CloudNetwork.class_by_ems(ems).supports?(:create)
+      if CloudNetwork.class_by_ems(ems)&.supports?(:create)
         options.delete(:ems_id)
         task_id = ems.create_cloud_network_queue(session[:userid], options)
         unless task_id.kind_of?(Integer)

app/controllers/container_dashboard_controller.rb

@@ -112,7 +112,7 @@ def breadcrumbs_options
       :breadcrumbs => [
         {:title => _("Compute")},
         {:title => _("Containers")},
-        {:title => _("Overview"), :url => controller_url},
+        {:title => _("Overview"), :url => "#{controller_url}/show"},
       ],
     }
   end

app/controllers/ems_storage_dashboard_controller.rb

@@ -23,6 +23,11 @@ def aggregate_status_data
     render :json => {:data => aggregate_status(params[:id])}
   end
 
+  def aggregate_event_data
+    assert_privileges('ems_storage_show') # TODO: might be ems_event_show
+    render :json => {:data => aggregate_event(params[:id])}
+  end
+
   private
 
   def block_storage_heatmap_data(ems_id)
@@ -33,6 +38,10 @@ def aggregate_status(ems_id)
     EmsStorageDashboardService.new(ems_id, self, EmsStorage).aggregate_status_data
   end
 
+  def aggregate_event(ems_id)
+    EmsStorageDashboardService.new(ems_id, self, EmsStorage).aggregate_event_data
+  end
+
   def get_session_data
     @layout = "ems_storage_dashboard"
   end

app/controllers/floating_ip_controller.rb

@@ -44,7 +44,7 @@ def create
       options = form_params
       ems = ExtManagementSystem.find(options[:ems_id])
 
-      if FloatingIp.class_by_ems(ems).supports?(:create)
+      if FloatingIp.class_by_ems(ems)&.supports?(:create)
         options.delete(:ems_id)
         task_id = ems.create_floating_ip_queue(session[:userid], options)
 

app/controllers/generic_object_definition_controller.rb

@@ -276,6 +276,7 @@ def replace_right_cell
     @explorer = false
 
     node = x_node || params[:id]
+    @node_type = node.split('-').first
 
     v_tb, c_tb = case node_type(node)
                  when :root         then process_root_node(presenter)

app/controllers/mixins/actions/vm_actions/associate_floating_ip.rb

@@ -57,10 +57,6 @@ def associate_floating_ip_form_fields
         def associate_floating_ip_vm
           assert_privileges("instance_associate_floating_ip")
           @record = find_record_with_rbac(VmCloud, params[:id])
-          case params[:button]
-          when "cancel" then associate_handle_cancel_button
-          when "submit" then associate_handle_submit_button
-          end
 
           if @sb[:explorer]
             replace_right_cell
@@ -72,38 +68,6 @@ def associate_floating_ip_vm
             end
           end
         end
-
-        def associate_handle_cancel_button
-          add_flash(_("Association of Floating IP with Instance \"%{name}\" was cancelled by the user") % {:name => @record.name})
-          @record = @sb[:action] = nil
-        end
-
-        def associate_handle_submit_button
-          if @record.supports?(:associate_floating_ip)
-            floating_ip = params[:floating_ip][:address]
-            begin
-              @record.associate_floating_ip_queue(session[:userid], floating_ip)
-              add_flash(_("Associating Floating IP %{address} with Instance \"%{name}\"") % {
-                :address => floating_ip,
-                :name    => @record.name
-              })
-            rescue StandardError => ex
-              add_flash(_("Unable to associate Floating IP %{address} with Instance \"%{name}\": %{details}") % {
-                :address => floating_ip,
-                :name    => @record.name,
-                :details => get_error_message_from_fog(ex.to_s)
-              }, :error)
-            end
-          else
-            add_flash(_("Unable to associate Floating IP with Instance \"%{name}\": %{details}") % {
-              :name    => @record.name,
-              :details => @record.unsupported_reason(:associate_floating_ip)
-            }, :error)
-          end
-          params[:id] = @record.id.to_s # reset id in params for show
-          @record = nil
-          @sb[:action] = nil
-        end
       end
     end
   end

app/controllers/mixins/actions/vm_actions/disassociate_floating_ip.rb

@@ -61,63 +61,6 @@ def disassociate_floating_ip_form_fields
         def disassociate_floating_ip_vm
           assert_privileges("instance_disassociate_floating_ip")
           @record = find_record_with_rbac(VmCloud, params[:id])
-
-          case params[:button]
-          when "cancel" then disassociate_handle_cancel_button
-          when "submit" then disassociate_handle_submit_button
-          end
-        end
-
-        private
-
-        def disassociate_handle_cancel_button
-          add_flash(_("Disassociation of Floating IP from Instance \"%{name}\" was cancelled by the user") % {:name => @record.name})
-          @record = @sb[:action] = nil
-          if @sb[:explorer]
-            replace_right_cell
-          else
-            flash_to_session
-            render :update do |page|
-              page << javascript_prologue
-              page.redirect_to(previous_breadcrumb_url)
-            end
-          end
-        end
-
-        def disassociate_handle_submit_button
-          if @record.supports?(:disassociate_floating_ip)
-            floating_ip = params[:floating_ip][:address]
-            begin
-              @record.disassociate_floating_ip_queue(session[:userid], floating_ip)
-              add_flash(_("Disassociating Floating IP %{address} from Instance \"%{name}\"") % {
-                :address => floating_ip,
-                :name    => @record.name
-              })
-            rescue StandardError => ex
-              add_flash(_("Unable to disassociate Floating IP %{address} from Instance \"%{name}\": %{details}") % {
-                :address => floating_ip,
-                :name    => @record.name,
-                :details => get_error_message_from_fog(ex.to_s)
-              }, :error)
-            end
-          else
-            add_flash(_("Unable to disassociate Floating IP from Instance \"%{name}\": %{details}") % {
-              :name    => @record.name,
-              :details => @record.unsupported_reason(:disassociate_floating_ip)
-            }, :error)
-          end
-          params[:id] = @record.id.to_s # reset id in params for show
-          @record = nil
-          @sb[:action] = nil
-          if @sb[:explorer]
-            replace_right_cell
-          else
-            flash_to_session
-            render :update do |page|
-              page << javascript_prologue
-              page.redirect_to(previous_breadcrumb_url)
-            end
-          end
         end
       end
     end