foreman_leapp 3.1.0 → 3.3.0

data/locale/ko/foreman_leapp.po

@@ -7,14 +7,14 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2022
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Ondřej Gajdušek, 2026
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_leapp 3.0.0\n"
+"Project-Id-Version: foreman_leapp 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-10-12 12:00+0000\n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
-"n.nl>, 2025\n"
+"Last-Translator: Ondřej Gajdušek, 2026\n"
 "Language-Team: Korean (https://app.transifex.com/foreman/teams/114/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,8 +31,8 @@ msgstr "모두"
 msgid "Command"
 msgstr "명령어"
 
-msgid "Could not retrieve data: %(status) - %(msg)"
-msgstr "%(status) - %(msg) 데이터를 검색할 수 없습니다:"
+msgid "Could not retrieve data: %(status)s - %(msg)s"
+msgstr "데이터를 가져올 수 없습니다:%(status)s - %(msg)s"
 
 msgid "Failed to fetch preupgrade reports from server."
 msgstr "서버에서 사전 업그레이드 보고서를 가져오지 못했습니다."
@@ -136,6 +136,9 @@ msgstr "태그"
 msgid "The preupgrade report could not be generated, check the job details for the reason"
 msgstr "사전 업그레이드 보고서를 생성할 수 없습니다. 해당 사유에 대한 작업 세부 정보를 확인하세요."
 
+msgid "The preupgrade report shows no issues."
+msgstr "사전 업그레이드 보고서에는 문제가 없는 것으로 표시됩니다."
+
 msgid "The preupgrade report will be available after the job finishes"
 msgstr "작업이 완료되면 사전 업그레이드 보고서를 사용할 수 있습니다."
 

data/locale/zh_CN/foreman_leapp.po

@@ -7,14 +7,14 @@
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
 # Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023
+# Ondřej Gajdušek, 2026
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_leapp 2.0.3\n"
+"Project-Id-Version: foreman_leapp 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-10-12 12:00+0000\n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
-"n.nl>, 2023\n"
+"Last-Translator: Ondřej Gajdušek, 2026\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
 "_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -32,8 +32,8 @@ msgstr "全部"
 msgid "Command"
 msgstr "命令"
 
-msgid "Could not retrieve data: %(status) - %(msg)"
-msgstr "无法检索数据：%(status) - %(msg)"
+msgid "Could not retrieve data: %(status)s - %(msg)s"
+msgstr "无法检索数据：%(status)s - %(msg)s"
 
 msgid "Failed to fetch preupgrade reports from server."
 msgstr "从服务器获取预升级报告失败。"
@@ -137,6 +137,9 @@ msgstr "标签"
 msgid "The preupgrade report could not be generated, check the job details for the reason"
 msgstr "无法生成预升级报告，查看作业详情以了解更多信息"
 
+msgid "The preupgrade report shows no issues."
+msgstr "预升级报告没有显示问题。"
+
 msgid "The preupgrade report will be available after the job finishes"
 msgstr "预升级报告将在作业完成后可用"
 

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -119,7 +119,7 @@ const withLoadingState = Component => componentProps => {
       <MessageBox
         key="preupgrade-reports-error"
         icontype="error-circle-o"
-        msg={sprintf(__('Could not retrieve data: %(status) - %(msg)'), {
+        msg={sprintf(__('Could not retrieve data: %(status)s - %(msg)s'), {
           status: error.statusText,
           msg: error.errorMsg,
         })}

data/webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js

@@ -57,9 +57,9 @@ export const idsForInvocationFromReports = reports =>
   idsForInvocationFromEntries(flattenEntries(reports));
 
 export const entriesPage = (entries, pagination) => {
-  const offset = (pagination.page - 1) * pagination.per_page;
+  const offset = (pagination.page - 1) * pagination.perPage;
 
-  return entries.slice(offset, offset + pagination.per_page);
+  return entries.slice(offset, offset + pagination.perPage);
 };
 
 export const filterEntries = (attribute, value, entries) => {

data/webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReports.test.js.snap

@@ -4,7 +4,7 @@ exports[`PreupgradeReports should render error 1`] = `
 <MessageBox
   icontype="error-circle-o"
   key="preupgrade-reports-error"
-  msg="Could not retrieve data: %(status) - %(msg)"
+  msg="Could not retrieve data: Internal server error - Well, this is embarassing"
 />
 `;
 

data/webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsHelpers.test.js.snap

@@ -131,7 +131,31 @@ Array [
 ]
 `;
 
-exports[`PreupgradeReportsHelpers should return entries page 1`] = `Array []`;
+exports[`PreupgradeReportsHelpers should return entries page 1`] = `
+Array [
+  Object {
+    "flags": Array [],
+    "hostname": "foo.example.com",
+    "id": 45,
+    "severity": "low",
+    "title": "Not enough credits",
+  },
+  Object {
+    "flags": Array [],
+    "hostname": "foo.example.com",
+    "id": 46,
+    "severity": "medium",
+    "title": "SELinux is turned off",
+  },
+  Object {
+    "flags": Array [],
+    "hostname": "foo.example.com",
+    "id": 47,
+    "severity": "medium",
+    "title": "Root password is too short",
+  },
+]
+`;
 
 exports[`PreupgradeReportsHelpers should return fixable entries 1`] = `
 Array [

data/webpack/components/PreupgradeReports/components/__snapshots__/NoReports.test.js.snap

@@ -2,18 +2,24 @@
 
 exports[`NoReports should render when reports expected 1`] = `
 <EmptyStatePattern
+  action={null}
   description="The preupgrade report could not be generated, check the job details for the reason"
+  documentation={null}
   header="No Preupgrade Report Available"
   icon="warning-triangle-o"
   iconType="pf"
+  secondaryActions={Array []}
 />
 `;
 
 exports[`NoReports should render when reports not expected 1`] = `
 <EmptyStatePattern
+  action={null}
   description="The preupgrade report will be available after the job finishes"
+  documentation={null}
   header="No Preupgrade Report Available"
   icon="in-progress"
   iconType="pf"
+  secondaryActions={Array []}
 />
 `;

data/webpack/components/PreupgradeReportsList/__tests__/PreupgradeReportsList.test.js

@@ -1,40 +1,124 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import PreupgradeReportsList from '../index';
 
-const allEntries = [
-  { title: 'Fix me!', severity: 'Too severe to talk about' },
-  { title: 'I am broken too', severity: 'medium' },
-  { title: 'Octocat is not happy', severity: 'high' },
-  { title: 'Not enough credits', severity: 'low' },
-];
-
-const isSelected = () => false;
-const toggleSelected = () => {};
-const sort = { attribute: '', order: 'asc' };
-const changeSort = () => {};
-const toggleSelectAll = () => {};
-
-const fixtures = {
-  'should render': {
-    allEntries,
-    fixAllWorking: false,
-    isSelected,
-    toggleSelected,
-    sort,
-    changeSort,
-    toggleSelectAll,
-  },
-  'should render when working': {
-    allEntries,
-    fixAllWorking: true,
-    isSelected,
-    toggleSelected,
-    sort,
-    changeSort,
-    toggleSelectAll,
-  },
+jest.mock('foremanReact/components/Pagination', () => {
+  const MockPagination = () => <div data-testid="pagination">Pagination</div>;
+  return MockPagination;
+});
+
+jest.mock('../components/images/i_severity-high.svg', () => 'severity-high.svg');
+jest.mock('../components/images/i_severity-med.svg', () => 'severity-med.svg');
+jest.mock('../components/images/i_severity-low.svg', () => 'severity-low.svg');
+
+const createMockEntries = count =>
+  Array.from({ length: count }, (_, i) => ({
+    id: i + 1,
+    preupgradeReportId: 100,
+    title: `Entry ${i + 1}`,
+    hostname: `host${i + 1}.example.com`,
+    severity: i % 3 === 0 ? 'high' : i % 3 === 1 ? 'medium' : 'low',
+    flags: i === 0 ? ['inhibitor'] : [],
+    detail: {
+      remediations:
+        i < 2
+          ? [{ type: 'command', context: ['echo', 'fix', 'command'] }]
+          : [],
+    },
+  }));
+
+const defaultProps = {
+  allEntries: createMockEntries(4),
+  isSelected: () => false,
+  toggleSelected: jest.fn(),
+  sort: { attribute: '', order: 'asc' },
+  changeSort: jest.fn(),
+  toggleSelectAll: jest.fn(),
 };
 
-describe('PreupgradeReportsList', () =>
-  testComponentSnapshotsWithFixtures(PreupgradeReportsList, fixtures));
+const renderComponent = (props = {}) =>
+  render(<PreupgradeReportsList {...defaultProps} {...props} />);
+
+describe('PreupgradeReportsList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the list header', () => {
+    renderComponent();
+
+    expect(screen.getByText('Title')).toBeInTheDocument();
+    expect(screen.getByText('Host')).toBeInTheDocument();
+    expect(screen.getByText('Risk Factor')).toBeInTheDocument();
+    expect(screen.getByText('Has Remediation?')).toBeInTheDocument();
+    expect(screen.getByText('Inhibitor?')).toBeInTheDocument();
+  });
+
+  it('renders entry titles', () => {
+    renderComponent();
+
+    expect(screen.getByText('Entry 1')).toBeInTheDocument();
+    expect(screen.getByText('Entry 2')).toBeInTheDocument();
+    expect(screen.getByText('Entry 3')).toBeInTheDocument();
+    expect(screen.getByText('Entry 4')).toBeInTheDocument();
+  });
+
+  it('renders entry hostnames', () => {
+    renderComponent();
+
+    expect(screen.getByText('host1.example.com')).toBeInTheDocument();
+    expect(screen.getByText('host2.example.com')).toBeInTheDocument();
+  });
+
+  it('renders checkboxes for entries', () => {
+    renderComponent();
+
+    const checkboxes = screen.getAllByRole('checkbox');
+    expect(checkboxes.length).toBeGreaterThan(0);
+  });
+
+  it('calls toggleSelectAll when header checkbox is clicked', () => {
+    const toggleSelectAll = jest.fn();
+    renderComponent({ toggleSelectAll });
+
+    const checkboxes = screen.getAllByRole('checkbox');
+    fireEvent.click(checkboxes[0]);
+
+    expect(toggleSelectAll).toHaveBeenCalled();
+  });
+
+  it('renders with empty entries array', () => {
+    renderComponent({ allEntries: [] });
+
+    expect(screen.getByText('Title')).toBeInTheDocument();
+    expect(screen.queryByText('Entry 1')).not.toBeInTheDocument();
+  });
+
+  it('renders entries with selected state', () => {
+    const isSelected = entry => entry.id === 1;
+    renderComponent({ isSelected });
+
+    const checkboxes = screen.getAllByRole('checkbox');
+    const entryCheckboxes = checkboxes.slice(1);
+    expect(entryCheckboxes[0]).toBeChecked();
+    expect(entryCheckboxes[1]).not.toBeChecked();
+  });
+
+  it('calls toggleSelected when entry checkbox is clicked', () => {
+    const toggleSelected = jest.fn();
+    renderComponent({ toggleSelected });
+
+    const checkboxes = screen.getAllByRole('checkbox');
+    fireEvent.click(checkboxes[1]);
+
+    expect(toggleSelected).toHaveBeenCalled();
+  });
+
+  it('renders pagination component', () => {
+    renderComponent();
+
+    expect(screen.getByTestId('pagination')).toBeInTheDocument();
+  });
+});

data/webpack/components/PreupgradeReportsList/index.js

@@ -19,11 +19,10 @@ const PreupgradeReportsList = ({
   changeSort,
   toggleSelectAll,
 }) => {
-  const { perPage, perPageOptions } = useForemanSettings();
+  const { perPage } = useForemanSettings();
   const [pagination, setPagination] = useState({
     page: 1,
-    per_page: perPage,
-    perPageOptions,
+    perPage,
   });
 
   return (

data/webpack/components/PreupgradeReportsTable/PreupgradeReportsTable.scss

@@ -0,0 +1,5 @@
+.leapp-report-details {
+  dd {
+    white-space: pre-wrap;
+  }
+}

data/webpack/components/PreupgradeReportsTable/ReportDetails.js

@@ -0,0 +1,134 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  DescriptionList,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListDescription,
+  Label,
+  LabelGroup,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './PreupgradeReportsTable.scss';
+
+export const renderSeverityLabel = severity => {
+  switch (severity) {
+    case 'high':
+      return <Label color="red">{__('High')}</Label>;
+    case 'medium':
+      return <Label color="orange">{__('Medium')}</Label>;
+    case 'low':
+      return <Label color="blue">{__('Low')}</Label>;
+    case 'info':
+      return <Label color="grey">{__('Info')}</Label>;
+    default:
+      return <Label color="grey">{severity || __('Info')}</Label>;
+  }
+};
+
+const ReportDetails = ({ entry }) => (
+  <DescriptionList isHorizontal isCompact className="leapp-report-details">
+    {entry.title && (
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Title')}</DescriptionListTerm>
+        <DescriptionListDescription>{entry.title}</DescriptionListDescription>
+      </DescriptionListGroup>
+    )}
+
+    {entry.severity && (
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Risk Factor')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {renderSeverityLabel(entry.severity)}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+    )}
+
+    {entry.summary && (
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Summary')}</DescriptionListTerm>
+        <DescriptionListDescription>{entry.summary}</DescriptionListDescription>
+      </DescriptionListGroup>
+    )}
+
+    {entry.tags && entry.tags.length > 0 && (
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Tags')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          <LabelGroup>
+            {entry.tags.map(tag => (
+              <Label key={tag} color="blue">
+                {tag}
+              </Label>
+            ))}
+          </LabelGroup>
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+    )}
+
+    {entry.detail?.external?.filter(link => link.url).length > 0 && (
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Links')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          {entry.detail.external
+            .filter(link => link.url)
+            .map((item, i) => (
+              <div key={item.url || i}>
+                <a href={item.url} target="_blank" rel="noopener noreferrer">
+                  {item.title || item.url}
+                </a>
+              </div>
+            ))}
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+    )}
+
+    {entry.detail?.remediations?.length > 0 &&
+      entry.detail.remediations.map((item, i) => (
+        <DescriptionListGroup key={`remediations-${i}`}>
+          <DescriptionListTerm>
+            {item.type === 'command' ? __('Command') : __('Hint')}
+          </DescriptionListTerm>
+          <DescriptionListDescription>
+            {item.type === 'command' ? (
+              <code>
+                {Array.isArray(item.context)
+                  ? item.context.join(' ')
+                  : item.context}
+              </code>
+            ) : (
+              item.context
+            )}
+          </DescriptionListDescription>
+        </DescriptionListGroup>
+      ))}
+  </DescriptionList>
+);
+
+ReportDetails.propTypes = {
+  entry: PropTypes.shape({
+    title: PropTypes.string,
+    severity: PropTypes.string,
+    summary: PropTypes.string,
+    tags: PropTypes.arrayOf(PropTypes.string),
+    detail: PropTypes.shape({
+      external: PropTypes.arrayOf(
+        PropTypes.shape({
+          url: PropTypes.string,
+          title: PropTypes.string,
+        })
+      ),
+      remediations: PropTypes.arrayOf(
+        PropTypes.shape({
+          type: PropTypes.string,
+          context: PropTypes.oneOfType([
+            PropTypes.string,
+            PropTypes.arrayOf(PropTypes.string),
+          ]),
+        })
+      ),
+    }),
+  }).isRequired,
+};
+
+export default ReportDetails;

data/webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js

@@ -0,0 +1,186 @@
+import React from 'react';
+import {
+  render,
+  screen,
+  waitFor,
+  fireEvent,
+  within,
+} from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { APIActions } from 'foremanReact/redux/API';
+import PreupgradeReportsTable from '../index';
+
+jest.mock('foremanReact/redux/API');
+
+const mockStore = configureMockStore([thunk]);
+
+const mockJobId = 42;
+const mockReportId = 999;
+const mockJobData = {
+  id: mockJobId,
+  template_name: 'Run preupgrade via Leapp',
+};
+
+const mockEntries = Array.from({ length: 12 }, (_, i) => ({
+  id: i + 1,
+  title: `Report Entry ${i + 1}`,
+  hostname: 'example.com',
+  severity: i === 0 ? 'high' : 'low',
+  summary: `Summary for report entry ${i + 1}`,
+  tags: i === 0 ? ['security', 'network'] : [],
+  flags: i === 0 ? ['inhibitor'] : [],
+  detail: {
+    remediations:
+      i === 0 ? [{ type: 'command', context: ['echo', 'fix_command'] }] : [],
+    external:
+      i === 0 ? [{ url: 'http://example.com', title: 'External Link' }] : [],
+  },
+}));
+
+describe('PreupgradeReportsTable', () => {
+  let store;
+
+  beforeEach(() => {
+    store = mockStore({ API: {} });
+    jest.clearAllMocks();
+
+    APIActions.get.mockImplementation(({ key, handleSuccess }) => {
+      return dispatch => {
+        if (key.includes('GET_LEAPP_REPORT_LIST'))
+          handleSuccess({ results: [{ id: mockReportId }] });
+        if (key.includes('GET_LEAPP_REPORT_DETAIL'))
+          handleSuccess({
+            id: mockReportId,
+            preupgrade_report_entries: mockEntries,
+          });
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+  });
+
+  const renderComponent = (data = mockJobData) =>
+    render(
+      <Provider store={store}>
+        <PreupgradeReportsTable data={data} />
+      </Provider>
+    );
+
+  const expandSection = () => {
+    fireEvent.click(screen.getByText('Leapp preupgrade report'));
+  };
+
+  it('renders data', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+    expect(
+      screen.getByText('Report Entry 1', { selector: 'td' })
+    ).toBeInTheDocument();
+  });
+
+  it('expands a row and shows details', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    const rowExpandButtons = screen.getAllByLabelText('Details');
+    fireEvent.click(rowExpandButtons[0]);
+
+    expect(await screen.findByText('Summary')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Summary for report entry 1')
+    ).toBeInTheDocument();
+  });
+
+  it('expands all rows', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    const expandAllButton = screen.getByLabelText('Expand all rows');
+    fireEvent.click(expandAllButton);
+
+    expect(
+      await screen.findByText('Summary for report entry 1')
+    ).toBeInTheDocument();
+    expect(
+      await screen.findByText('Summary for report entry 5')
+    ).toBeInTheDocument();
+  });
+
+  it('paginates to the next page', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    fireEvent.click(screen.getAllByLabelText('Go to next page')[0]);
+    await waitFor(() => screen.getByText('Report Entry 6', { selector: 'td' }));
+
+    expect(
+      screen.getByText('Report Entry 10', { selector: 'td' })
+    ).toBeInTheDocument();
+  });
+
+  it('changes perPage limit to 10', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    fireEvent.click(screen.getAllByLabelText('Items per page')[0]);
+    fireEvent.click(screen.getAllByText('10 per page')[0]);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText('Report Entry 10', { selector: 'td' })
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('renders empty state message when no issues found', async () => {
+    APIActions.get.mockImplementation(({ key, handleSuccess }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST'))
+          handleSuccess({ results: [{ id: mockReportId }] });
+        if (key.includes('GET_LEAPP_REPORT_DETAIL'))
+          handleSuccess({ id: mockReportId, preupgrade_report_entries: [] });
+        return { type: 'EMPTY' };
+      };
+    });
+    renderComponent();
+    expandSection();
+    await waitFor(() => {
+      expect(
+        screen.getByText('The preupgrade report shows no issues.')
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('does not render anything for non-Leapp jobs', () => {
+    const nonLeappData = { id: 55, template_name: 'Standard RHEL Update' };
+    renderComponent(nonLeappData);
+    expect(
+      screen.queryByText('Leapp preupgrade report')
+    ).not.toBeInTheDocument();
+  });
+
+  it('displays correct inhibitor status based on flags', async () => {
+    renderComponent();
+    expandSection();
+    await waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
+
+    const row1 = screen
+      .getByText('Report Entry 1', { selector: 'td' })
+      .closest('tr');
+    const inhibitorCell1 = row1.querySelector('td[data-label="Inhibitor?"]');
+    expect(within(inhibitorCell1).getByText('Yes')).toBeInTheDocument();
+
+    const row2 = screen
+      .getByText('Report Entry 2', { selector: 'td' })
+      .closest('tr');
+    const inhibitorCell2 = row2.querySelector('td[data-label="Inhibitor?"]');
+    expect(within(inhibitorCell2).getByText('No')).toBeInTheDocument();
+  });
+});