foreman_remote_execution 16.3.1 → 16.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f3605e5f510dbb583d0af3208b3f80f7fdea955420f5d65425d896a37997b3c
-  data.tar.gz: '092f3cddbb03c09274aaedb3517b4d3cb9aafe2e08399e8361ac1772591d8d5d'
+  metadata.gz: 2db78eb6979bd486194e94b58c14978db6d08c02f675a042bd9827c9101b0639
+  data.tar.gz: c9060344c28a222b93fed7f26794fde15827030ae7b3b6197a66b9f86413b656
 SHA512:
-  metadata.gz: f7295aee226fb5438f923dc74a629e427d01a967cc309404297417dd1b850bec2051350f0a465e26d3345ff707907abf963b4e547be7707095ce0e8d5e33f090
-  data.tar.gz: 7a3a7d1d9730a007208053c240fba27a1cef39d8121af9c0242c293641b93d77c99c1b1c573674e0a5d9bebcb161263cf7f262260830ff29ec8ffcc8ccd0f406
+  metadata.gz: 478f4cc9af2467020b4498bdd757d9f3b33a5e233c65b0b941cb0eda2deacf0689077907298e111c7cc1ec13e64508c9cd33d0870df70fe8a7247dd99e9433a9
+  data.tar.gz: f2bf38fe739e5043ba595448090a4231a52ef923464eec41b470d71c8ccdf3f83c8faec3a47627c5a606601d343b42302093a3a22474f57dded90375933a506e

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -116,13 +116,11 @@ module Api
       def hosts
         set_hosts_and_template_invocations
         set_statuses_and_smart_proxies
-        @total = @job_invocation.targeting.hosts.size
+        @total = @hosts.size
         @hosts = @hosts.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page], :per_page => params[:per_page])
+        @subtotal = @hosts.total_entries
         if params[:awaiting]
           @hosts = @hosts.select { |host| @host_statuses[host.id] == 'N/A' }
-          @subtotal = @hosts.size
-        else
-          @subtotal = @hosts.respond_to?(:total_entries) ? @hosts.total_entries : @hosts.sizes
         end
         render :hosts, :layout => 'api/v2/layouts/index_layout'
       end
@@ -303,7 +301,7 @@ module Api
         @pattern_template_invocations = @job_invocation.pattern_template_invocations.includes(:input_values)
         @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
 
-        unless params[:search].nil?
+        if params[:search].present?
           @hosts = @hosts.joins(:template_invocations)
                          .where(:template_invocations => { :job_invocation_id => @job_invocation.id})
         end

data/app/lib/proxy_api/remote_execution_ssh.rb

@@ -11,6 +11,15 @@ module ::ProxyAPI
       raise ProxyException.new(url, e, N_('Unable to fetch public key'))
     end
 
+    def ca_pubkey
+      get('ca_pubkey')&.strip
+    rescue RestClient::ResourceNotFound => e
+      Rails.logger.warn(format(N_("Unable to fetch CA public key: %{error}"), error: e.message))
+      nil
+    rescue => e
+      raise ProxyException.new(url, e, N_('Unable to fetch CA public key'))
+    end
+
     def drop_from_known_hosts(hostname)
       delete('known_hosts/' + hostname)
     rescue => e

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -108,7 +108,12 @@ module ForemanRemoteExecution
     end
 
     def remote_execution_ssh_keys
-      remote_execution_proxies(%w(SSH Script), false).values.flatten.uniq.map { |proxy| proxy.pubkey }.compact.uniq
+      # only include public keys from SSH proxies that don't have SSH cert verification configured
+      remote_execution_proxies(%w(SSH Script), false).values.flatten.uniq.map { |proxy| proxy.pubkey if proxy.ca_pubkey.blank? }.compact.uniq
+    end
+
+    def remote_execution_ssh_ca_keys
+      remote_execution_proxies(%w(SSH Script), false).values.flatten.uniq.map { |proxy| proxy.ca_pubkey }.compact.uniq
     end
 
     def drop_execution_interface_cache
@@ -139,10 +144,13 @@ module ForemanRemoteExecution
 
     def extend_host_params_hash(params)
       keys = remote_execution_ssh_keys
+      ca_keys = remote_execution_ssh_ca_keys
       source = 'global'
-      if keys.present?
-        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
-        params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
+      {keys: keys, ca_keys: ca_keys}.each do |key_set_name, key_set|
+        if key_set.present?
+          value, safe_value = params.fetch("remote_execution_ssh_#{key_set_name}", {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
+          params["remote_execution_ssh_#{key_set_name}"] = {:value => value + key_set, :safe_value => safe_value + key_set, :source => source}
+        end
       end
       [:remote_execution_ssh_user, :remote_execution_effective_user_method,
        :remote_execution_connect_by_ip].each do |key|

data/app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb

@@ -11,6 +11,10 @@ module ForemanRemoteExecution
       self[:pubkey] || update_pubkey
     end
 
+    def ca_pubkey
+      self[:ca_pubkey] || update_ca_pubkey
+    end
+
     def update_pubkey
       return unless has_feature?(%w(SSH Script))
 
@@ -19,6 +23,15 @@ module ForemanRemoteExecution
       key
     end
 
+    def update_ca_pubkey
+      return unless has_feature?(%w(SSH Script))
+
+      # smart proxy is not required to have a CA pubkey, in which case an empty string is returned
+      key = ::ProxyAPI::RemoteExecutionSSH.new(:url => url).ca_pubkey&.presence
+      self.update_attribute(:ca_pubkey, key)
+      key
+    end
+
     def drop_host_from_known_hosts(host)
       ::ProxyAPI::RemoteExecutionSSH.new(:url => url).drop_from_known_hosts(host)
     end
@@ -26,6 +39,7 @@ module ForemanRemoteExecution
     def refresh
       errors = super
       update_pubkey
+      update_ca_pubkey
       errors
     end
   end

data/app/views/api/v2/smart_proxies/ca_pubkey.json.rabl

@@ -0,0 +1 @@
+attribute :ca_pubkey => :remote_execution_ca_pubkey

data/db/migrate/20250606125543_add_ca_pub_key_to_smart_proxy.rb

@@ -0,0 +1,5 @@
+class AddCAPubKeyToSmartProxy < ActiveRecord::Migration[7.0]
+  def change
+    add_column :smart_proxies, :ca_pubkey, :text
+  end
+end

data/lib/foreman_remote_execution/plugin.rb

@@ -213,6 +213,7 @@ Foreman::Plugin.register :foreman_remote_execution do
   extend_template_helpers ForemanRemoteExecution::RendererMethods
 
   extend_rabl_template 'api/v2/smart_proxies/main', 'api/v2/smart_proxies/pubkey'
+  extend_rabl_template 'api/v2/smart_proxies/main', 'api/v2/smart_proxies/ca_pubkey'
   extend_rabl_template 'api/v2/interfaces/main', 'api/v2/interfaces/execution_flag'
   extend_rabl_template 'api/v2/subnets/show', 'api/v2/subnets/remote_execution_proxies'
   extend_rabl_template 'api/v2/hosts/main', 'api/v2/host/main'

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.3.1'.freeze
+  VERSION = '16.4.0'.freeze
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -12,6 +12,7 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
 
     before do
       SmartProxy.any_instance.stubs(:pubkey).returns(sshkey)
+      SmartProxy.any_instance.stubs(:ca_pubkey).returns(nil)
       Setting[:remote_execution_ssh_user] = 'root'
       Setting[:remote_execution_effective_user_method] = 'sudo'
     end
@@ -61,6 +62,48 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
     end
   end
 
+  describe 'has ssh CA key configured' do
+    let(:host) { FactoryBot.create(:host, :with_execution) }
+    let(:sshkey) { 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQ foo@example.com' }
+    let(:ca_sshkey) { 'ssh-rsa AAAAB3NzaC1yc2EAAAABJE bar@example.com' }
+
+    before do
+      SmartProxy.any_instance.stubs(:pubkey).returns(sshkey)
+      SmartProxy.any_instance.stubs(:ca_pubkey).returns(ca_sshkey)
+      Setting[:remote_execution_ssh_user] = 'root'
+      Setting[:remote_execution_effective_user_method] = 'sudo'
+    end
+
+    it 'has CA ssh keys in the parameters' do
+      assert_includes host.remote_execution_ssh_ca_keys, ca_sshkey
+    end
+
+    it 'excludes ssh keys from proxies that have SSH CA key configured' do
+      assert_empty host.remote_execution_ssh_keys
+    end
+
+    it 'merges ssh CA keys from host parameters and proxies' do
+      key = 'ssh-rsa not-even-a-key something@somewhere.com'
+      host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_ca_keys', :value => [key])
+      assert_includes host.host_param('remote_execution_ssh_ca_keys'), key
+      assert_includes host.host_param('remote_execution_ssh_ca_keys'), ca_sshkey
+    end
+
+    it 'has ssh CA keys in the parameters even when no user specified' do
+      FactoryBot.create(:smart_proxy, :ssh)
+      host.interfaces.first.subnet.remote_execution_proxies.clear
+      User.current = nil
+      assert_includes host.remote_execution_ssh_ca_keys, ca_sshkey
+    end
+
+    it 'merges ssh CA key as a string from host parameters and proxies' do
+      key = 'ssh-rsa not-even-a-key something@somewhere.com'
+      host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_ca_keys', :value => key)
+      assert_includes host.host_param('remote_execution_ssh_ca_keys'), key
+      assert_includes host.host_param('remote_execution_ssh_ca_keys'), ca_sshkey
+    end
+  end
+
   context 'host has multiple nics' do
     let(:host) { FactoryBot.build(:host, :with_execution) }
 

data/webpack/JobInvocationDetail/JobInvocationDetail.scss

@@ -74,6 +74,10 @@ section.job-additional-info {
     margin-left: 10px;
     margin-right: 15px;
   }
+  
+  .pf-v5-c-table__tbody > tr.row-hidden {
+    display: none;
+  }
 }
 
 .template-invocation {

data/webpack/JobInvocationDetail/JobInvocationHostTable.js

@@ -24,7 +24,13 @@ import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableInde
 import { getControllerSearchProps } from 'foremanReact/constants';
 import { Icon } from 'patternfly-react';
 import PropTypes from 'prop-types';
-import React, { useEffect, useMemo, useState, useRef } from 'react';
+import React, {
+  useEffect,
+  useMemo,
+  useState,
+  useRef,
+  useCallback,
+} from 'react';
 import { FormattedMessage } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
@@ -61,9 +67,47 @@ const JobInvocationHostTable = ({
   const [allHostsIds, setAllHostsIds] = useState([]);
 
   // Expansive items
-  const [expandedHost, setExpandedHost] = useState([]);
+  const [expandedHost, setExpandedHost] = useState(new Set());
   const prevStatusLabel = useRef(statusLabel);
 
+  const [hostInvocationStates, setHostInvocationStates] = useState({});
+
+  const getInvocationState = hostId =>
+    hostInvocationStates[hostId] || {
+      showOutputType: { stderr: true, stdout: true, debug: true },
+      showTemplatePreview: false,
+      showCommand: false,
+    };
+
+  const updateInvocationState = (hostId, stateKey, value) => {
+    setHostInvocationStates(prevStates => {
+      const currentHostState = getInvocationState(hostId);
+
+      const newValue =
+        typeof value === 'function' ? value(currentHostState[stateKey]) : value;
+
+      return {
+        ...prevStates,
+        [hostId]: {
+          ...currentHostState,
+          [stateKey]: newValue,
+        },
+      };
+    });
+  };
+
+  const isHostExpanded = hostId => expandedHost.has(hostId);
+  const setHostExpanded = (hostId, isExpanding = true) =>
+    setExpandedHost(prevExpandedSet => {
+      const newSet = new Set(prevExpandedSet);
+      if (isExpanding) {
+        newSet.add(hostId);
+      } else {
+        newSet.delete(hostId);
+      }
+      return newSet;
+    });
+
   // Page table params
   // Parse URL
   const {
@@ -93,19 +137,22 @@ const JobInvocationHostTable = ({
   });
 
   // Search filter
-  const constructFilter = (filter = initialFilter, search = urlSearchQuery) => {
-    const dropdownFilterClause =
-      filter && filter !== 'all_statuses'
-        ? `job_invocation.result = ${filter}`
-        : null;
-    const parts = [dropdownFilterClause, search];
-    return parts
-      .filter(x => x)
-      .map(fragment => `(${fragment})`)
-      .join(' AND ');
-  };
+  const constructFilter = useCallback(
+    (filter = initialFilter, search = urlSearchQuery) => {
+      const dropdownFilterClause =
+        filter && filter !== 'all_statuses'
+          ? `job_invocation.result = ${filter}`
+          : null;
+      const parts = [dropdownFilterClause, search];
+      return parts
+        .filter(x => x)
+        .map(fragment => `(${fragment})`)
+        .join(' AND ');
+    },
+    [initialFilter, urlSearchQuery]
+  );
 
-  const handleResponse = (data, key) => {
+  const handleResponse = useCallback((data, key) => {
     if (key === JOB_INVOCATION_HOSTS) {
       const ids = data.data.results.map(i => i.id);
 
@@ -114,76 +161,94 @@ const JobInvocationHostTable = ({
     }
 
     setStatus(STATUS_UPPERCASE.RESOLVED);
-  };
+  }, []);
 
   // Call hosts data with params
-  const makeApiCall = (requestParams, callParams = {}) => {
-    dispatch(
-      APIActions.get({
-        key: callParams.key ?? ALL_JOB_HOSTS,
-        url: callParams.url ?? `/api/job_invocations/${id}/hosts`,
-        params: requestParams,
-        handleSuccess: data => handleResponse(data, callParams.key),
-        handleError: () => setStatus(STATUS_UPPERCASE.ERROR),
-        errorToast: ({ response }) =>
-          response?.data?.error?.full_messages?.[0] || response,
-      })
-    );
-  };
+  const makeApiCall = useCallback(
+    (requestParams, callParams = {}) => {
+      dispatch(
+        APIActions.get({
+          key: callParams.key ?? ALL_JOB_HOSTS,
+          url: callParams.url ?? `/api/job_invocations/${id}/hosts`,
+          params: requestParams,
+          handleSuccess: data => handleResponse(data, callParams.key),
+          handleError: () => setStatus(STATUS_UPPERCASE.ERROR),
+          errorToast: ({ response }) =>
+            response?.data?.error?.full_messages?.[0] || response,
+        })
+      );
+    },
+    [dispatch, id, handleResponse]
+  );
 
-  const filterApiCall = newAPIOptions => {
-    const newParams = newAPIOptions?.params ?? newAPIOptions ?? {};
+  const filterApiCall = useCallback(
+    newAPIOptions => {
+      const newParams = newAPIOptions?.params ?? newAPIOptions ?? {};
 
-    const filterSearch = constructFilter(
-      initialFilter,
-      newParams.search ?? urlSearchQuery
-    );
+      const filterSearch = constructFilter(
+        initialFilter,
+        newParams.search ?? urlSearchQuery
+      );
 
-    const finalParams = {
-      ...defaultParams,
-      ...newParams,
-    };
+      const finalParams = {
+        ...defaultParams,
+        ...newParams,
+      };
 
-    if (filterSearch === AWAITING_STATUS_FILTER) {
-      finalParams.awaiting = 'true';
-    } else if (filterSearch !== '') {
-      finalParams.search = filterSearch;
-    }
+      if (filterSearch === AWAITING_STATUS_FILTER) {
+        finalParams.awaiting = 'true';
+      } else if (filterSearch !== '') {
+        finalParams.search = filterSearch;
+      }
 
-    makeApiCall(finalParams, { key: JOB_INVOCATION_HOSTS });
+      makeApiCall(finalParams, { key: JOB_INVOCATION_HOSTS });
 
-    const urlSearchParams = new URLSearchParams(window.location.search);
+      const urlSearchParams = new URLSearchParams(window.location.search);
 
-    ['page', 'per_page', 'order'].forEach(key => {
-      if (finalParams[key]) urlSearchParams.set(key, finalParams[key]);
-    });
+      ['page', 'per_page', 'order'].forEach(key => {
+        if (finalParams[key]) urlSearchParams.set(key, finalParams[key]);
+      });
 
-    history.push({ search: urlSearchParams.toString() });
-  };
+      history.push({ search: urlSearchParams.toString() });
+    },
+    [
+      initialFilter,
+      urlSearchQuery,
+      defaultParams,
+      makeApiCall,
+      history,
+      constructFilter,
+    ]
+  );
 
   // Filter change
-  const handleFilterChange = newFilter => {
-    onFilterUpdate(newFilter);
-  };
+  const handleFilterChange = useCallback(
+    newFilter => {
+      onFilterUpdate(newFilter);
+    },
+    [onFilterUpdate]
+  );
 
   // Effects
   // run after mount
+  const initializedRef = useRef(false);
   useEffect(() => {
-    // Job Invo template load
-    makeApiCall(
-      {},
-      {
-        url: `/job_invocations/${id}/hosts`,
-        key: LIST_TEMPLATE_INVOCATIONS,
+    if (!initializedRef.current) {
+      // Job Invo template load
+      makeApiCall(
+        {},
+        {
+          url: `/job_invocations/${id}/hosts`,
+          key: LIST_TEMPLATE_INVOCATIONS,
+        }
+      );
+
+      if (initialFilter === '') {
+        onFilterUpdate('all_statuses');
       }
-    );
-
-    if (initialFilter === '') {
-      onFilterUpdate('all_statuses');
+      initializedRef.current = true;
     }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [makeApiCall, id, initialFilter, onFilterUpdate]);
 
   useEffect(() => {
     if (initialFilter !== '') filterApiCall();
@@ -192,8 +257,7 @@ const JobInvocationHostTable = ({
       prevStatusLabel.current = statusLabel;
       filterApiCall();
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [initialFilter, statusLabel, id]);
+  }, [initialFilter, statusLabel, id, filterApiCall]);
 
   const {
     updateSearchQuery: updateSearchQueryBulk,
@@ -307,29 +371,18 @@ const JobInvocationHostTable = ({
     </Tr>
   );
 
-  const isHostExpanded = host => expandedHost.includes(host.id);
-
-  const setHostExpanded = (host, isExpanding = true) =>
-    setExpandedHost(prevExpanded => {
-      const otherExpandedHosts = prevExpanded.filter(h => h !== host.id);
-      return isExpanding
-        ? [...otherExpandedHosts, host.id]
-        : otherExpandedHosts;
-    });
-
   const pageHostIds = results.map(h => h.id);
 
   const areAllPageRowsExpanded =
     pageHostIds.length > 0 &&
-    pageHostIds.every(hostId => expandedHost.includes(hostId));
+    pageHostIds.every(hostId => expandedHost.has(hostId));
 
   const onExpandAll = () => {
     setExpandedHost(() => {
       if (areAllPageRowsExpanded) {
-        return [];
+        return new Set();
       }
-
-      return pageHostIds;
+      return new Set(pageHostIds);
     });
   };
 
@@ -393,54 +446,88 @@ const JobInvocationHostTable = ({
           isDeleteable={false}
           childrenOutsideTbody
         >
-          {results.map((result, rowIndex) => (
-            <Tbody key={result.id} isExpanded={isHostExpanded(result)}>
-              <Tr ouiaId={`table-row-${result.id}`}>
-                <Td
-                  expand={{
-                    rowIndex,
-                    isExpanded: isHostExpanded(result),
-                    onToggle: () =>
-                      setHostExpanded(result, !isHostExpanded(result)),
-                    expandId: 'host-expandable',
-                  }}
-                />
-                <RowSelectTd rowData={result} {...{ selectOne, isSelected }} />
-                {columnNamesKeys.map(k => (
-                  <Td key={k}>{columns[k].wrapper(result)}</Td>
-                ))}
-                <Td isActionCell>
-                  <RowActions hostID={result.id} jobID={id} />
-                </Td>
-              </Tr>
-              <Tr
-                isExpanded={isHostExpanded(result)}
-                ouiaId="table-row-expanded-sections"
-              >
-                <Td
-                  dataLabel={`${result.id}-expandable-content`}
-                  colSpan={columnNamesKeys.length + 3}
+          {results.map((result, rowIndex) => {
+            const currentInvocationState = getInvocationState(result.id);
+            return (
+              <Tbody key={result.id}>
+                <Tr ouiaId={`table-row-${result.id}`}>
+                  <Td
+                    expand={{
+                      rowIndex,
+                      isExpanded: isHostExpanded(result.id),
+                      onToggle: () =>
+                        setHostExpanded(result.id, !isHostExpanded(result.id)),
+                      expandId: 'host-expandable',
+                    }}
+                  />
+                  <RowSelectTd
+                    rowData={result}
+                    selectOne={selectOne}
+                    isSelected={isSelected}
+                  />
+                  {columnNamesKeys.map(k => (
+                    <Td key={k}>{columns[k].wrapper(result)}</Td>
+                  ))}
+                  <Td isActionCell>
+                    <RowActions hostID={result.id} jobID={id} />
+                  </Td>
+                </Tr>
+                <Tr
+                  isExpanded={isHostExpanded(result.id)}
+                  ouiaId="table-row-expanded-sections"
+                  className={!isHostExpanded(result.id) ? 'row-hidden' : ''}
                 >
-                  <ExpandableRowContent>
-                    {result.job_status === 'cancelled' ||
-                    result.job_status === 'N/A' ? (
-                      <div>
-                        {__('A task for this host has not been started')}
-                      </div>
-                    ) : (
-                      <TemplateInvocation
-                        key={`${result.id}-${result.job_status}`}
-                        hostID={result.id}
-                        jobID={id}
-                        isInTableView
-                        isExpanded={isHostExpanded(result)}
-                      />
-                    )}
-                  </ExpandableRowContent>
-                </Td>
-              </Tr>
-            </Tbody>
-          ))}
+                  <Td
+                    dataLabel={`${result.id}-expandable-content`}
+                    colSpan={columnNamesKeys.length + 3}
+                  >
+                    <ExpandableRowContent>
+                      {result.job_status === 'cancelled' ||
+                      result.job_status === 'N/A' ? (
+                        <div>
+                          {__('A task for this host has not been started')}
+                        </div>
+                      ) : (
+                        <TemplateInvocation
+                          key={result.id}
+                          hostID={result.id}
+                          jobID={id}
+                          isInTableView
+                          isExpanded={isHostExpanded(result.id)}
+                          showOutputType={currentInvocationState.showOutputType}
+                          showTemplatePreview={
+                            currentInvocationState.showTemplatePreview
+                          }
+                          showCommand={currentInvocationState.showCommand}
+                          setShowOutputType={value =>
+                            updateInvocationState(
+                              result.id,
+                              'showOutputType',
+                              value
+                            )
+                          }
+                          setShowTemplatePreview={value =>
+                            updateInvocationState(
+                              result.id,
+                              'showTemplatePreview',
+                              value
+                            )
+                          }
+                          setShowCommand={value =>
+                            updateInvocationState(
+                              result.id,
+                              'showCommand',
+                              value
+                            )
+                          }
+                        />
+                      )}
+                    </ExpandableRowContent>
+                  </Td>
+                </Tr>
+              </Tbody>
+            );
+          })}
         </Table>
       </TableIndexPage>
     </>