listing, removing the methods and refactorign the code

app/controllers/miq_ae_class_controller.rb

@@ -1816,14 +1816,15 @@ def namespace
   end
 
   def ae_domains
-    domains = MiqAeDomain.where("ancestry is null and enabled = ?", true).order("name").select("name,id")
+    domains = MiqAeDomain.where("ancestry is null and enabled = ?", true).order("name").select("id, name")
     render :json => {:domains => domains}
   end
 
   def ae_methods
-    methods = MiqAeMethod.all.order('name')
+    methods = MiqAeMethod.all.order('name').select("id, relative_path, name")
     methods = methods.where('name ILIKE ? or relative_path ILIKE ?', "%#{params[:search]}%", "%#{params[:search]}%") if params[:search]
     methods = methods.where('domain_id = ?', params[:domain_id]) if params[:domain_id]
+    methods = methods.where(id: params[:ids].split(',').map(&:to_i)) if params[:ids]
     render :json => {:methods => methods}
   end
 

app/javascript/components/AeInlineMethod/FilterNamespace.jsx

@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { TextInput, Select, SelectItem } from 'carbon-components-react';
+import { noSelect } from './helper';
+
+const FilterNamespace = ({ domains, filterOnChange }) => {
+  /** Function to render the search text. */
+  const renderSearchText = () => (
+    <TextInput
+      id="search-method"
+      labelText={__('Search')}
+      placeholder={__('Search with Name or Relative path')}
+      onChange={(event) => filterOnChange({ text: event.target.value || noSelect })}
+    />
+  );
+
+  /** Function to render the domain items in a drop-down list. */
+  const renderDomainList = () => (
+    <Select
+      id="domain_id"
+      labelText="Select a domain"
+      defaultValue="option"
+      onChange={(event) => filterOnChange({ selectedDomain: event.target.value })}
+    >
+      <SelectItem value={noSelect} text="None" />
+      {
+        domains.map((domain) => <SelectItem key={domain.id} value={domain.id} text={domain.name} />)
+      }
+    </Select>
+  );
+
+  return (
+    <div className="inline-filters">
+      {renderSearchText()}
+      {domains && renderDomainList()}
+    </div>
+  );
+};
+
+export default FilterNamespace;
+
+FilterNamespace.propTypes = {
+  domains: PropTypes.arrayOf(PropTypes.any),
+  filterOnChange: PropTypes.func.isRequired,
+};
+
+FilterNamespace.defaultProps = {
+  domains: undefined,
+};

app/javascript/components/AeInlineMethod/NamespaceSelector.jsx

@@ -1,130 +1,82 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import {
-  TextInput, Select, SelectItem, Loading,
-} from 'carbon-components-react';
+import { Loading } from 'carbon-components-react';
+import FilterNamespace from './FilterNamespace';
 import MiqDataTable from '../miq-data-table';
 import NotificationMessage from '../notification-message';
+import { CellAction } from '../miq-data-table/helper';
+import {
+  methodSelectorHeaders, formatMethods, searchUrl, namespaceUrls,
+} from './helper';
 import './style.scss';
 
 /** Component to search and select AeMethods. */
-const NamespaceSelector = ({ onSelectMethod }) => {
-  const aeMethodsUrl = '/miq_ae_class/ae_methods';
-  const aeDomainsUrl = '/miq_ae_class/ae_domains';
-
+const NamespaceSelector = ({ onSelectMethod, selectedIds }) => {
   const [data, setData] = useState({
-    loading: true,
     domains: [],
-    searchText: undefined,
     methods: [],
+    loading: true,
+    searchText: undefined,
     selectedDomain: undefined,
   });
 
-  /** Function to format the method data needed for the data-table list. */
-  const formatMethods = (methods) => (methods.map((item) => ({
-    id: item.id.toString(),
-    name: { text: item.name, icon: 'icon node-icon fa-ruby' },
-    path: item.relative_path,
-    code: item.data,
-  })));
-
   /** Loads the 'domains' and 'methods' from its respective URL's during the component's onLoad event. */
   useEffect(() => {
     Promise.all([
-      http.get(aeDomainsUrl),
-      http.get(aeMethodsUrl)])
+      http.get(namespaceUrls.aeDomainsUrl),
+      http.get(namespaceUrls.aeMethodsUrl)])
       .then(([{ domains }, { methods }]) => {
         setData({
           ...data,
+          domains,
           loading: false,
           methods: formatMethods(methods),
-          domains,
         });
       });
   }, []);
 
-  /** Headers needed for the data-table list. */
-  const miqHeaders = [
-    {
-      key: 'name',
-      header: 'Name',
-    },
-    {
-      key: 'path',
-      header: 'Relative path',
-    },
-  ];
-
-  /** Function to return a conditional URL based on the selected filters. */
-  const searchUrl = (selectedDomain, text) => {
-    const queryParams = [];
-    if (selectedDomain) {
-      queryParams.push(`domain_id=${selectedDomain}`);
-    }
-    if (text) {
-      queryParams.push(`search=${text}`);
-    }
-    const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
-    return `${aeMethodsUrl}${queryString}`;
-  };
-
   /** Function to handle search text and drop-down item onchange events. */
-  const handleInputChange = (text, selectedDomain) => {
+  const handleFilterOnChange = (filterData) => {
+    const text = filterData.text ? filterData.text : data.searchText;
+    const selectedDomain = filterData.selectedDomain ? filterData.selectedDomain : data.selectedDomain;
     const url = searchUrl(selectedDomain, text);
     http.get(url)
       .then(({ methods }) => {
         setData({
           ...data,
-          methods: formatMethods(methods),
-          searchText: text,
           selectedDomain,
+          searchText: text,
+          methods: formatMethods(methods),
         });
       });
   };
 
-  /** Function to render the search text. */
-  const renderSearchText = () => (
-    <TextInput
-      id="search-method"
-      labelText={__('Search')}
-      placeholder={__('Search with Name or Relative path')}
-      onChange={(event) => handleInputChange(event.target.value, data.selectedDomain)}
-    />
-  );
-
-  /** Function to render the domain items in a drop-down list. */
-  const renderDomainList = () => (
-    <Select
-      id="select-3"
-      labelText="Select an domain"
-      defaultValue="option-3"
-      onChange={(event) => handleInputChange(data.searchText, event.target.value)}
-    >
-      <SelectItem value="" text="None" />
-      {
-        data.domains.map((domain) => <SelectItem key={domain.id} value={domain.id} text={domain.name} />)
-      }
-    </Select>
-  );
+  /** Function to handle the click events for the list. */
+  const onCellClickHandler = (selectedRow, cellType, checked) => {
+    const selectedItems = cellType === CellAction.selectAll
+      ? data.methods.map((item) => item.id)
+      : [selectedRow];
+    onSelectMethod({ selectedItems, cellType, checked });
+  };
 
   /** Function to render the contents of the list. */
   const renderContents = () => (data.methods && data.methods.length > 0
     ? (
       <MiqDataTable
-        headers={miqHeaders}
+        headers={methodSelectorHeaders}
         rows={data.methods}
         mode="miq-inline-method-list"
-        onCellClick={(selectedRow) => onSelectMethod(selectedRow)}
+        rowCheckBox
+        sortable={false}
+        gridChecks={selectedIds}
+        onCellClick={(selectedRow, cellType, event) => onCellClickHandler(selectedRow, cellType, event.target.checked)}
       />
     )
     : <NotificationMessage type="error" message={__('No methods available.')} />);
 
   return (
     <div className="inline-method-selector">
-      <div className="inline-filters">
-        {renderSearchText()}
-        {data.domains && renderDomainList()}
-      </div>
+      <FilterNamespace domains={data.domains} filterOnChange={(filterData) => handleFilterOnChange(filterData)} />
       <div className="inline-contents-wrapper">
         {
           data.loading
@@ -140,4 +92,5 @@ export default NamespaceSelector;
 
 NamespaceSelector.propTypes = {
   onSelectMethod: PropTypes.func.isRequired,
+  selectedIds: PropTypes.arrayOf(PropTypes.any).isRequired,
 };

app/javascript/components/AeInlineMethod/helper.js

@@ -0,0 +1,59 @@
+export const namespaceUrls = {
+  aeMethodsUrl: '/miq_ae_class/ae_methods',
+  aeDomainsUrl: '/miq_ae_class/ae_domains',
+};
+
+export const noSelect = 'NONE';
+
+/** Headers needed for the data-table list. */
+export const methodSelectorHeaders = [
+  {
+    key: 'name',
+    header: 'Name',
+  },
+  {
+    key: 'path',
+    header: 'Relative path',
+  },
+];
+
+export const methodListHeaders = [
+  ...methodSelectorHeaders,
+  { key: 'delete', header: __('Delete') },
+];
+
+/** Function to format the method data needed for the data-table list. */
+export const formatMethods = (methods) => (methods.map((item) => ({
+  id: item.id.toString(),
+  name: { text: item.name, icon: 'icon node-icon fa-ruby' },
+  path: item.relative_path,
+})));
+
+const deleteMethodButton = () => ({
+  is_button: true,
+  title: __('Delete'),
+  text: __('Delete'),
+  alt: __('Delete'),
+  kind: 'ghost',
+  callback: 'removeMethod',
+});
+
+export const formatListMethods = (methods) => (methods.map((item, index) => ({
+  id: item.id.toString(),
+  name: { text: item.name, icon: 'icon node-icon fa-ruby' },
+  path: item.relative_path,
+  delete: deleteMethodButton(item, index),
+})));
+
+/** Function to return a conditional URL based on the selected filters. */
+export const searchUrl = (selectedDomain, text) => {
+  const queryParams = [];
+  if (selectedDomain && selectedDomain !== noSelect) {
+    queryParams.push(`domain_id=${selectedDomain}`);
+  }
+  if (text && text !== noSelect) {
+    queryParams.push(`search=${text}`);
+  }
+  const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
+  return `${namespaceUrls.aeMethodsUrl}${queryString}`;
+};