foreman-tasks 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb59b3cde7c9b2cf5ffb6164584597ee6cf50ff827567ab3ac650446f9bc6b24
-  data.tar.gz: 0c98300b211d4949b800fd2c2ee5b64f33a3dbb12bfe8bbb0284a6922eb2c422
+  metadata.gz: 523767f29aa2c7e5485b4f18978a03120eb2369e510f5340ecb940d03372229e
+  data.tar.gz: 8db1c0c802560d5d8f910f0b8ae30be95640a4ad99c19145529aab2c6ab67ba8
 SHA512:
-  metadata.gz: ddb084939964bfdada51a988c183e9c3cd2187c87b39c20e22eae9c4b254c8e5a45bf0d96462db545119fd9e5c1b1c910c96a306e01c74bfcdd3214275ea5959
-  data.tar.gz: 46470595733a1b94473b63f73d7e3d554176e15e8c005e9173aea05b28a10334fba5cad1f22e3f6038f3fd8ff3b87c563bea85b3e74b29ec02514e9af7c10fb7
+  metadata.gz: 284dc372bba144d11030df2ca96bfc01a716726e74e2d9797f88508984fe053d49d917f34b717b6e1806f2719df28e050750d274fe114ca0d6189b32ac5819bc
+  data.tar.gz: 4f7cdfc025e74b30177d8a437b5e01a7eb9be1159ef68eb8ab4243301850547fc9d72bbabbb629223dbcab0e77a3416ccd5a4586bf39f6f2240a09cb26b63a11

data/.eslintrc

@@ -1,24 +1,4 @@
 {
-  "plugins": ["patternfly-react"],
-  "extends": [
-    "plugin:patternfly-react/recommended",
-    "./node_modules/@theforeman/vendor-dev/eslint.extends.js"
-  ],
-  "rules": {
-    "prettier/prettier": ["error", {
-      "singleQuote": true,
-      "trailingComma": "es5"
-    }],
-    "import/no-unresolved": ["error", {
-      "ignore": ['foremanReact/.*']
-    }],
-    "import/extensions": ["error", {
-      "ignore": ['foremanReact/.*']
-    }]
-  },
-  "settings": {
-    "import/resolver": {
-      "babel-module": {}
-    }
-  }
+  "plugins": ["@theforeman/foreman"],
+  "extends": ["plugin:@theforeman/foreman/core", "plugin:@theforeman/foreman/plugins"]
 }

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -240,7 +240,7 @@ module ForemanTasks
         sort_by = ordering_params[:sort_by] || 'started_at'
         sort_by = 'foreman_tasks_tasks.' + sort_by if sort_by == 'started_at'
         sort_order = ordering_params[:sort_order] || 'DESC'
-        scope = scope.select("*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration")
+        scope = scope.select("foreman_tasks_tasks.*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration")
         scope.order("#{sort_by} #{sort_order}")
       end
 

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.25.0'
+        requires_foreman '>= 2.0.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 = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/package.json

@@ -4,14 +4,14 @@
   "description": "Foreman Tasks =============",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/",
-    "test": "node node_modules/.bin/jest --no-cache",
-    "test:watch": "node node_modules/.bin/jest --watchAll",
-    "test:current": "node node_modules/.bin/jest --watch",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "storybook": "start-storybook -p 6006",
-    "storybook:build": "node --max_old_space_size=2048 ./node_modules/.bin/build-storybook --config-dir .storybook --output-dir .storybook-dist",
-    "storybook:deploy": "surge --project .storybook-dist",
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin",
+    "test:watch": "tfm-test --plugin --watchAll",
+    "test:current": "tfm-test --plugin --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "stories:deploy": "surge --project .storybook-dist",
     "create-react-component": "yo react-domain"
   },
   "repository": {
@@ -21,81 +21,29 @@
   "bugs": {
     "url": "http://projects.theforeman.org/projects/foreman-tasks/issues"
   },
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 4.0.2"
+  },
   "dependencies": {
-    "@theforeman/vendor": "^3.3.2",
     "c3": "^0.4.11",
     "humanize-duration": "^3.20.1",
     "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/env": "^3.3.2",
-    "@theforeman/builder": "^3.3.2",
-    "@theforeman/vendor-dev": "^3.3.2",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/eslint-plugin-foreman": "4.0.5",
+    "@theforeman/stories": "^4.0.2",
+    "@theforeman/test": "^4.0.2",
+    "@theforeman/vendor-dev": "^4.0.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": "^5.1.0",
-    "eslint-plugin-patternfly-react": "0.2.0",
+    "eslint": "^6.7.2",
     "identity-obj-proxy": "^3.0.0",
     "jed": "^1.1.1",
-    "jest-cli": "^24.9.0",
-    "jest-prop-type-error": "^1.1.0",
-    "node-sass": "^4.5.0",
-    "patternfly": "^3.58.0",
     "prettier": "^1.13.5",
-    "raf": "^3.4.0",
-    "react-redux-test-utils": "^0.1.1",
     "react-remarkable": "^1.1.3",
-    "sass-loader": "^6.0.7",
     "stylelint": "^9.3.0",
     "stylelint-config-standard": "^18.0.0",
     "surge": "^0.20.3"
-  },
-  "jest": {
-    "verbose": true,
-    "testMatch": [
-      "**/*.test.js"
-    ],
-    "testURL": "http://localhost/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "webpack/**/*.js",
-      "!webpack/index.js",
-      "!webpack/test_setup.js",
-      "!webpack/**/bundle*",
-      "!webpack/stories/**",
-      "!webpack/**/*stories.js"
-    ],
-    "coverageReporters": [
-      "lcov"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy"
-    },
-    "globals": {
-      "__testing__": true
-    },
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules",
-      "webpack"
-    ],
-    "setupFiles": [
-      "raf/polyfill",
-      "jest-prop-type-error",
-      "./webpack/test_setup.js"
-    ]
   }
 }

data/test/controllers/api/tasks_controller_test.rb

@@ -27,6 +27,15 @@ module ForemanTasks
           _(data['results'].count).must_equal 5
         end
 
+        it 'renders task ids when searching by resource id' do
+          task = FactoryBot.create(:dynflow_task, :product_create_task)
+          ForemanTasks::Lock.create!(name: "create", resource_type: "Katello::Product", resource_id: 1, task_id: task.id)
+          get :index, params: { :search => "label = Actions::Katello::Product::Create and resource_id = 1" }
+          assert_response :success
+          data = JSON.parse(response.body)
+          _(data['results'].first["id"]).must_equal task.id
+        end
+
         it 'supports ordering by duration' do
           get :index, params: { :sort_by => 'duration' }
           assert_response :success

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Errors.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import Errors from '../Errors';
 

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Locks.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import Locks from '../Locks';
 

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Raw.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import Raw from '../Raw';
 

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/RunningSteps.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import RunningSteps from '../RunningSteps';
 

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Task.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import Task from '../Task';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskInfo from '../TaskInfo';
 

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

@@ -1,5 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 import TaskDetails from './TaskDetails';
 
-storiesOf('TaskDetails', module).add('TaskDetails', () => <TaskDetails />);
+export default {
+  title: 'TaskDetails',
+  component: TaskDetails,
+};
+
+export const Basic = () => <TaskDetails />;

data/webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskDetails from '../TaskDetails';
 

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

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import {
   taskReloadStop,

data/webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS,

data/webpack/ForemanTasks/Components/TaskDetails/__tests__/integration.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import API from 'foremanReact/API';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
 import TaskDetails, { reducers } from '../index';
 import { selectForemanTasks } from '../../../ForemanTasksSelectors';

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.stories.js

@@ -1,7 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs, number, select } from '@storybook/addon-knobs';
-import { action } from '@storybook/addon-actions';
+import { action, number, select } from '@theforeman/stories';
 import { withCardsDecorator } from '../../../../../../../stories/decorators';
 
 import {
@@ -11,41 +9,47 @@ import {
 } from '../../../../TasksDashboardConstants';
 import PausedTasksCard from './PausedTasksCard';
 
-storiesOf('TasksDashboard/TasksCardsGrid', module)
-  .addDecorator(withKnobs)
-  .addDecorator(withCardsDecorator)
-  .add('PausedTasksCard', () => {
-    const selectTime = select(
-      'time',
-      TASKS_DASHBOARD_AVAILABLE_TIMES,
-      PausedTasksCard.defaultProps.time
-    );
+export default {
+  title: 'TasksDashboard/TasksCardsGrid/Cards/PausedTasksCard',
+  component: PausedTasksCard,
+  decorators: [withCardsDecorator],
+  parameters: {
+    centered: { disable: true },
+  },
+};
 
-    const selectMode = select(
-      'mode',
-      { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
-      'none'
-    );
-    return (
-      <PausedTasksCard
-        data={{
-          last: number('data.last', 3),
-          older: number('data.older', 5),
-        }}
-        time={selectTime}
-        query={{
-          state: select(
-            'query.state',
-            {
-              ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
-              NONE: null,
-            },
-            TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED
-          ),
-          mode: selectMode,
-          time: selectTime,
-        }}
-        updateQuery={action('updateQuery')}
-      />
-    );
-  });
+export const Basic = () => {
+  const selectTime = select(
+    'time',
+    TASKS_DASHBOARD_AVAILABLE_TIMES,
+    PausedTasksCard.defaultProps.time
+  );
+
+  const selectMode = select(
+    'mode',
+    { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
+    'none'
+  );
+  return (
+    <PausedTasksCard
+      data={{
+        last: number('data.last', 3),
+        older: number('data.older', 5),
+      }}
+      time={selectTime}
+      query={{
+        state: select(
+          'query.state',
+          {
+            ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
+            NONE: null,
+          },
+          TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED
+        ),
+        mode: selectMode,
+        time: selectTime,
+      }}
+      updateQuery={action('updateQuery')}
+    />
+  );
+};

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import PausedTasksCard from './PausedTasksCard';
 

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/RunningTasksCard/RunningTasksCard.stories.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs, number, select } from '@storybook/addon-knobs';
-import { action } from '@storybook/addon-actions';
+import { number, select, action } from '@theforeman/stories';
+
 import { withCardsDecorator } from '../../../../../../../stories/decorators';
 
 import {
@@ -11,41 +10,47 @@ import {
 } from '../../../../TasksDashboardConstants';
 import RunningTasksCard from './RunningTasksCard';
 
-storiesOf('TasksDashboard/TasksCardsGrid', module)
-  .addDecorator(withKnobs)
-  .addDecorator(withCardsDecorator)
-  .add('RunningTasksCard', () => {
-    const selectTime = select(
-      'time',
-      TASKS_DASHBOARD_AVAILABLE_TIMES,
-      RunningTasksCard.defaultProps.time
-    );
+export default {
+  title: 'TasksDashboard/TasksCardsGrid/Cards/RunningTasksCard',
+  component: RunningTasksCard,
+  decorators: [withCardsDecorator],
+  parameters: {
+    centered: { disable: true },
+  },
+};
+
+export const Basic = () => {
+  const selectTime = select(
+    'time',
+    TASKS_DASHBOARD_AVAILABLE_TIMES,
+    RunningTasksCard.defaultProps.time
+  );
 
-    const selectMode = select(
-      'mode',
-      { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
-      'none'
-    );
-    return (
-      <RunningTasksCard
-        data={{
-          last: number('data.last', 3),
-          older: number('data.older', 5),
-        }}
-        time={selectTime}
-        query={{
-          state: select(
-            'query.state',
-            {
-              ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
-              NONE: null,
-            },
-            TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING
-          ),
-          mode: selectMode,
-          time: selectTime,
-        }}
-        updateQuery={action('updateQuery')}
-      />
-    );
-  });
+  const selectMode = select(
+    'mode',
+    { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
+    'none'
+  );
+  return (
+    <RunningTasksCard
+      data={{
+        last: number('data.last', 3),
+        older: number('data.older', 5),
+      }}
+      time={selectTime}
+      query={{
+        state: select(
+          'query.state',
+          {
+            ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
+            NONE: null,
+          },
+          TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING
+        ),
+        mode: selectMode,
+        time: selectTime,
+      }}
+      updateQuery={action('updateQuery')}
+    />
+  );
+};