foreman-tasks 0.17.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4e3250fe2916ec688e6f9c00499f89b5bebe513ddbd783850a3fe7e9c990f7
-  data.tar.gz: bcbd6c4b489aab5f9a166b5ba48cac75849746d13f5f9f40d425dae792db3629
+  metadata.gz: eb59b3cde7c9b2cf5ffb6164584597ee6cf50ff827567ab3ac650446f9bc6b24
+  data.tar.gz: 0c98300b211d4949b800fd2c2ee5b64f33a3dbb12bfe8bbb0284a6922eb2c422
 SHA512:
-  metadata.gz: a7c6f1a0aefbc547a84c10ff6e64c96631de2a9056638084184c423274dfeaed77924f58b827c4fea8b1a53b19d12e049ce85d8d79489700b2aaa3c339942e42
-  data.tar.gz: 3741f57f5fc0b34109f254afda46ccadcb80e46ab4e828ce185ecfd4c1f6952d2fae114314e5a1a3207759f0cbac03797cc59ef093a054249120b8ba5bc23563
+  metadata.gz: ddb084939964bfdada51a988c183e9c3cd2187c87b39c20e22eae9c4b254c8e5a45bf0d96462db545119fd9e5c1b1c910c96a306e01c74bfcdd3214275ea5959
+  data.tar.gz: 46470595733a1b94473b63f73d7e3d554176e15e8c005e9173aea05b28a10334fba5cad1f22e3f6038f3fd8ff3b87c563bea85b3e74b29ec02514e9af7c10fb7

data/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['@theforeman/builder/babel'],
+};

data/.storybook/webpack.config.js

@@ -1,3 +1,4 @@
+const babelOptions = require('../.babelrc.js');
 let path = require('path');
 
 module.exports = {
@@ -7,22 +8,11 @@ module.exports = {
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        options: {
-          presets: [
-            path.join(__dirname, '..', 'node_modules/babel-preset-react'),
-            path.join(__dirname, '..', 'node_modules/babel-preset-env')
-          ],
-          plugins: [
-            path.join(__dirname, '..', 'node_modules/babel-plugin-transform-class-properties'),
-            path.join(__dirname, '..', 'node_modules/babel-plugin-transform-object-rest-spread'),
-            path.join(__dirname, '..', 'node_modules/babel-plugin-transform-object-assign'),
-            path.join(__dirname, '..', 'node_modules/babel-plugin-syntax-dynamic-import')
-          ]
-        }
+        options: babelOptions,
       },
       {
         test: /(\.png|\.gif)$/,
-        loader: 'url-loader?limit=32767'
+        loader: 'url-loader?limit=32767',
       },
       {
         test: /\.css$/,
@@ -30,30 +20,61 @@ module.exports = {
       },
       {
         test: /\.scss$/,
-        loaders: ['style-loader', 'css-loader', {
-          loader: 'sass-loader',
-          options: {
-            includePaths: [
-              // teach webpack to resolve patternfly dependencies
-              path.resolve(__dirname, '..', 'node_modules', 'patternfly', 'dist', 'sass'),
-              path.resolve(__dirname, '..', 'node_modules', 'bootstrap-sass', 'assets', 'stylesheets'),
-              path.resolve(__dirname, '..', 'node_modules', 'font-awesome-sass', 'assets', 'stylesheets')
-            ]
-          }
-        }]
+        loaders: [
+          'style-loader',
+          'css-loader',
+          {
+            loader: 'sass-loader',
+            options: {
+              includePaths: [
+                // teach webpack to resolve patternfly dependencies
+                path.resolve(
+                  __dirname,
+                  '..',
+                  'node_modules',
+                  'patternfly',
+                  'dist',
+                  'sass'
+                ),
+                path.resolve(
+                  __dirname,
+                  '..',
+                  'node_modules',
+                  'bootstrap-sass',
+                  'assets',
+                  'stylesheets'
+                ),
+                path.resolve(
+                  __dirname,
+                  '..',
+                  'node_modules',
+                  'font-awesome-sass',
+                  'assets',
+                  'stylesheets'
+                ),
+              ],
+            },
+          },
+        ],
       },
       {
         test: /\.md$/,
-        loaders: ['raw-loader']
+        loaders: ['raw-loader'],
       },
       {
         test: /(\.ttf|\.woff|\.woff2|\.eot|\.svg|\.jpg)$/,
-        loaders: ['url-loader']
+        loaders: ['url-loader'],
       },
     ],
   },
 
   resolve: {
+    alias: {
+      foremanReact: path.join(
+        __dirname,
+        '../../foreman/webpack/assets/javascripts/react_app'
+      ),
+    },
     modules: [
       path.join(__dirname, '..', 'webpack'),
       path.join(__dirname, '..', 'node_modules'),

data/.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - '8' # current LTS
-  - '10' # future LTS
+  - '10'
+  - '12'
 script: ./script/travis_run_js_tests.sh

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -28,7 +28,7 @@ module ForemanTasks
     def troubleshooting_info_text
       return if @task.state != 'paused' || @task.main_action.nil?
       helper = TroubleshootingHelpGenerator.new(@task.main_action)
-      helper.generate_html
+      helper.generate_text
     end
 
     def username_link_task(owner, username)

data/app/services/foreman_tasks/troubleshooting_help_generator.rb

@@ -44,6 +44,10 @@ module ForemanTasks
       # rubocop:enable Rails/OutputSafety
     end
 
+    def generate_text
+      (description + link_descriptions_html).join("\n")
+    end
+
     def link_descriptions_html
       links.map do |link|
         link.description % { link: %(<a href="%{href}">%{title}</a>) % link.to_h }

data/lib/foreman_tasks/engine.rb

@@ -34,7 +34,7 @@ module ForemanTasks
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 1.24.0'
+        requires_foreman '>= 1.25.0'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.17.6'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/package.json

@@ -22,40 +22,32 @@
     "url": "http://projects.theforeman.org/projects/foreman-tasks/issues"
   },
   "dependencies": {
-    "@theforeman/vendor": "^1.4.0",
+    "@theforeman/vendor": "^3.3.2",
     "c3": "^0.4.11",
     "humanize-duration": "^3.20.1",
-    "react-html-parser": "^2.0.2",
     "react-intl": "^2.8.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.0",
     "@storybook/addon-actions": "^5.0.1",
     "@storybook/addon-knobs": "^5.0.1",
     "@storybook/react": "^5.0.1",
-    "@theforeman/vendor-dev": "^1.4.0",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.3",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
-    "babel-plugin-module-resolver": "^3.2.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.5.0",
+    "@theforeman/env": "^3.3.2",
+    "@theforeman/builder": "^3.3.2",
+    "@theforeman/vendor-dev": "^3.3.2",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^24.9.0",
+    "babel-loader": "^8.0.0",
     "coveralls": "^3.0.0",
     "enzyme": "^3.4.0",
     "enzyme-adapter-react-16": "^1.4.0",
     "enzyme-to-json": "^3.2.1",
     "eslint": "^4.10.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
+    "eslint-import-resolver-babel-module": "^5.1.0",
     "eslint-plugin-patternfly-react": "0.2.0",
     "identity-obj-proxy": "^3.0.0",
     "jed": "^1.1.1",
-    "jest-cli": "^23.6.0",
+    "jest-cli": "^24.9.0",
     "jest-prop-type-error": "^1.1.0",
     "node-sass": "^4.5.0",
     "patternfly": "^3.58.0",
@@ -96,6 +88,7 @@
       "^.+\\.js$": "babel-jest"
     },
     "moduleDirectories": [
+      "node_modules/@theforeman/vendor-core/node_modules",
       "node_modules",
       "webpack"
     ],

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskInfo.js

@@ -4,7 +4,6 @@ import { Grid, Row, Col, ProgressBar } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
-import ReactHtmlParser from 'react-html-parser';
 
 class TaskInfo extends Component {
   isDelayed = () => {
@@ -174,7 +173,14 @@ class TaskInfo extends Component {
                   <b>{__('Troubleshooting')}</b>
                 </span>
               </p>
-              <p>{ReactHtmlParser(help)}</p>
+              <p>
+                {help.split('\n').map((item, i) => (
+                  <React.Fragment key={i}>
+                    {item}
+                    <br />
+                  </React.Fragment>
+                ))}
+              </p>
             </Col>
           </Row>
         )}

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskInfo.test.js.snap

@@ -56,7 +56,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -115,7 +115,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -168,7 +168,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date={null}
         defaultValue="N/A"
       />
@@ -359,7 +359,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />
@@ -418,7 +418,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />
@@ -469,7 +469,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js

@@ -66,10 +66,10 @@ export const fetchTaskDetails = (
   id,
   timeoutId,
   refetchTaskDetailsAction
-) => dispatch => {
+) => async dispatch => {
   showLoading();
   dispatch(startRequest());
-  getTasksDetails(id, dispatch, timeoutId, refetchTaskDetailsAction);
+  await getTasksDetails(id, dispatch, timeoutId, refetchTaskDetailsAction);
 };
 
 const getTasksDetails = async (

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -30,7 +30,7 @@ export const selectErrors = state => {
 
 export const selectProgress = state =>
   selectTaskDetails(state).progress
-    ? parseFloat((selectTaskDetails(state).progress * 100).toFixed(2))
+    ? selectTaskDetails(state).progress.toFixed(4) * 100
     : 0;
 
 export const selectUsername = state =>

data/webpack/ForemanTasks/Components/TasksTable/TasksTableConstants.js

@@ -1,6 +1,10 @@
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 export const TASKS_TABLE_ID = 'TASKS_TABLE';
+export const TASKS_CONTROLLER = 'tasks';
+export const TASKS_SUCCESS = 'TASKS_SUCCESS';
+export const TASKS_REQUEST = 'TASKS_REQUEST';
+export const TASKS_FAILURE = 'TASKS_FAILURE';
 export const SELECT_ROWS = 'SELECT_ROWS';
 export const UNSELECT_ROWS = 'UNSELECT_ROWS';
 export const UNSELECT_ALL_ROWS = 'UNSELECT_ALL_ROWS';
@@ -9,7 +13,4 @@ export const RESUME = 'RESUME';
 export const CLOSED = 'CLOSED';
 
 export const TASKS_TABLE_SELECTED_MODAL = 'TASKS_TABLE_SELECTED_MODAL';
-export const TASKS_SEARCH_PROPS = {
-  ...getControllerSearchProps('tasks'),
-  controller: 'foreman_tasks/tasks'
-};
+export const TASKS_SEARCH_PROPS = getControllerSearchProps('tasks');

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTablePage.test.js.snap

@@ -13,7 +13,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
   />
   <PageLayout
     beforeToolbarComponent={
-      <Connect(TasksDashboard)
+      <UNDEFINED
         history={
           Object {
             "location": Object {
@@ -137,7 +137,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
   />
   <PageLayout
     beforeToolbarComponent={
-      <Connect(TasksDashboard)
+      <UNDEFINED
         history={
           Object {
             "location": Object {

data/webpack/test_setup.js

@@ -1,4 +1,5 @@
-import 'babel-polyfill';
+import 'core-js/shim';
+import 'regenerator-runtime/runtime';
 
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -107,7 +107,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".babelrc"
+- ".babelrc.js"
 - ".eslintrc"
 - ".gitignore"
 - ".prettierrc"

data/.babelrc

@@ -1,35 +0,0 @@
-{
-  "presets": [
-    "env",
-    "react"
-  ],
-  "plugins": [
-    ["module-resolver", {
-      "alias": {
-        "root": ["./"],
-        "foremanReact": "../foreman/webpack/assets/javascripts/react_app"
-      }
-    }],
-    "transform-class-properties",
-    "transform-object-rest-spread",
-    "transform-object-assign",
-    "syntax-dynamic-import"
-  ],
-  "env": {
-    "test": {
-      "presets": ["@theforeman/vendor-dev/babel.preset.js"],
-      "plugins": [
-        ["module-resolver", {
-          "alias": {
-            "root": ["./"],
-            "foremanReact": "./webpack/__mocks__/foremanReact"
-          }
-        }],
-        "dynamic-import-node"
-      ]
-    },
-    "storybook": {
-      "presets": ["@theforeman/vendor-dev/babel.preset.js"]
-    }
-  }
-}