foreman_remote_execution 4.2.0 → 4.3.1

data/test/functional/ui_job_wizard_controller_test.rb

@@ -0,0 +1,16 @@
+require 'test_plugin_helper'
+
+class UiJobWizardControllerTest < ActionController::TestCase
+  def setup
+    FactoryBot.create(:job_template, :job_category => 'cat1')
+    FactoryBot.create(:job_template, :job_category => 'cat2')
+    FactoryBot.create(:job_template, :job_category => 'cat2')
+  end
+
+  test 'should respond with categories' do
+    get :categories, :params => {}, :session => set_session_user
+    assert_response :success
+    res = JSON.parse @response.body
+    assert_equal ['cat1','cat2'], res['job_categories']
+  end
+end

data/webpack/JobWizard/JobWizard.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import { Wizard } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import history from 'foremanReact/history';
+
+export const JobWizard = () => {
+  const steps = [
+    {
+      name: __('Category and template'),
+      component: <p>Category and template</p>,
+    },
+    { name: __('Target hosts'), component: <p>TargetHosts </p> },
+    { name: __('Advanced fields'), component: <p> AdvancedFields </p> },
+    { name: __('Schedule'), component: <p>Schedule</p> },
+    {
+      name: __('Review details'),
+      component: <p>ReviewDetails</p>,
+      nextButtonText: 'Run',
+    },
+  ];
+  const title = __('Run Job');
+  return (
+    <Wizard
+      onClose={() => history.goBack()}
+      navAriaLabel={`${title} steps`}
+      steps={steps}
+      height="70vh"
+    />
+  );
+};
+
+export default JobWizard;

data/webpack/JobWizard/index.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import { Title, Divider } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { JobWizard } from './JobWizard';
+
+const JobWizardPage = () => {
+  const title = __('Run job');
+  const breadcrumbOptions = {
+    breadcrumbItems: [
+      { caption: __('Jobs'), url: `/jobs` },
+      { caption: title },
+    ],
+  };
+  return (
+    <PageLayout
+      header={title}
+      breadcrumbOptions={breadcrumbOptions}
+      searchable={false}
+    >
+      <React.Fragment>
+        <Title headingLevel="h2" size="2xl">
+          {title}
+        </Title>
+        <Divider component="div" />
+        <JobWizard />
+      </React.Fragment>
+    </PageLayout>
+  );
+};
+
+export default JobWizardPage;

data/webpack/Routes/routes.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import JobWizardPage from '../JobWizard';
+
+const ForemanREXRoutes = [
+  {
+    path: '/experimental/job_wizard',
+    exact: true,
+    render: props => <JobWizardPage {...props} />,
+  },
+];
+
+export default ForemanREXRoutes;

data/webpack/__mocks__/foremanReact/history.js

@@ -0,0 +1 @@
+export default { goBack: () => null };

data/webpack/global_index.js

@@ -0,0 +1,4 @@
+import { registerRoutes } from 'foremanReact/routes/RoutingService';
+import routes from './Routes/routes';
+
+registerRoutes('foreman_remote_execution', routes);

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.js

@@ -39,7 +39,7 @@ const TargetingHostsPage = ({
     <br />
     <TargetingHosts apiStatus={apiStatus} items={items} />
     <Pagination
-      viewType="list"
+      viewType="table"
       itemCount={totalHosts}
       pagination={pagination}
       onChange={args => handlePagination(args)}

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.scss

@@ -1,6 +1,3 @@
-.targeting-hosts-pagination {
-  margin-top: -7px;
-}
 #targeting_hosts {
   min-height: 350px;
 }

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHostsPage.test.js.snap

@@ -62,7 +62,7 @@ exports[`TargetingHostsPage renders 1`] = `
         "perPage": 20,
       }
     }
-    viewType="list"
+    viewType="table"
   />
 </div>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +113,10 @@ files:
 - ".babelrc.js"
 - ".eslintignore"
 - ".eslintrc"
-- ".github/workflows/ci.yml"
+- ".github/workflows/js_ci.yml"
+- ".github/workflows/ruby_ci.yml"
 - ".gitignore"
+- ".prettierrc"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".tx/config"
@@ -160,6 +148,7 @@ files:
 - app/controllers/job_templates_controller.rb
 - app/controllers/remote_execution_features_controller.rb
 - app/controllers/template_invocations_controller.rb
+- app/controllers/ui_job_wizard_controller.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
 - app/helpers/job_invocation_output_helper.rb
@@ -385,6 +374,7 @@ files:
 - test/functional/cockpit_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
+- test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
 - test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
@@ -405,13 +395,18 @@ files:
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
+- webpack/JobWizard/JobWizard.js
+- webpack/JobWizard/index.js
+- webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/constants.js
+- webpack/__mocks__/foremanReact/history.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js
+- webpack/global_index.js
 - webpack/index.js
 - webpack/react_app/components/TargetingHosts/TargetingHosts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
@@ -480,6 +475,7 @@ test_files:
 - test/functional/cockpit_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
+- test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
 - test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb