katello 3.15.0.rc1.3 → 3.15.0.rc2

data/webpack/scenes/Tasks/__tests__/TaskSelectors.test.js

@@ -0,0 +1,21 @@
+import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import {
+  selectIsPollingTask,
+  selectIsPollingTasks,
+} from '../TaskSelectors';
+
+const state = {
+  intervals: {
+    TEST_POLL_TASK: 1,
+    TEST_TASK_SEARCH: 3,
+  },
+};
+
+const fixtures = {
+  'selects if polling a task': () => selectIsPollingTask(state, 'TEST'),
+  'selects if not polling a task': () => selectIsPollingTask({}),
+  'selects if polling tasks': () => selectIsPollingTasks(state, 'TEST'),
+  'selects if not polling tasks': () => selectIsPollingTasks({}),
+};
+
+describe('Task selectors', () => testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/scenes/Tasks/__tests__/__snapshots__/TaskActions.test.js.snap

@@ -0,0 +1,57 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`task actions can poll a task 1`] = `
+Object {
+  "interval": 1000,
+  "key": "TEST_POLL_TASK",
+  "type": "API_GET",
+  "url": "/foreman_tasks/api/tasks/12345",
+}
+`;
+
+exports[`task actions can search tasks 1`] = `
+Object {
+  "interval": 1000,
+  "key": "TEST_TASK_SEARCH",
+  "params": Object {
+    "search": "",
+  },
+  "type": "API_GET",
+  "url": "/foreman_tasks/api/tasks",
+}
+`;
+
+exports[`task actions can stop polling a task 1`] = `
+Object {
+  "key": "TEST_POLL_TASK",
+  "type": "STOP_INTERVAL",
+}
+`;
+
+exports[`task actions can stop searching tasks 1`] = `
+Object {
+  "key": "TEST_TASK_SEARCH",
+  "type": "STOP_INTERVAL",
+}
+`;
+
+exports[`task actions can toast a finished task 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "link": Object {
+            "children": "Go to task page",
+            "href": "/foreman_tasks/tasks/eb1b6271-8a69-4d98-84fc-bea06ddcc166/",
+          },
+          "message": "Task Refresh Manifest completed with a result of pending.
+  ",
+          "type": "pending",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;

data/webpack/scenes/Tasks/__tests__/__snapshots__/TaskSelectors.test.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Task selectors selects if not polling a task 1`] = `false`;
+
+exports[`Task selectors selects if not polling tasks 1`] = `false`;
+
+exports[`Task selectors selects if polling a task 1`] = `true`;
+
+exports[`Task selectors selects if polling tasks 1`] = `true`;

data/webpack/scenes/Tasks/__tests__/task.fixtures.js

@@ -1,15 +1,5 @@
 import Immutable from 'seamless-immutable';
 
-export const initialState = Immutable({
-  loading: false,
-  results: [],
-});
-
-export const loadingState = Immutable({
-  loading: true,
-  results: [],
-});
-
 export const getTaskSuccessResponse = Immutable({
   id: 'eb1b6271-8a69-4d98-84fc-bea06ddcc166',
   label: 'Actions::Katello::Organization::ManifestRefresh',
@@ -59,75 +49,3 @@ export const getTaskPendingResponse = {
   ...getTaskSuccessResponse,
   pending: true,
 };
-
-export const bulkSearchSuccessResponse = Immutable([
-  {
-    search_params: {
-      search_id: 'pollBulkSearch',
-      type: 'all',
-      active_only: true,
-      action_types: [
-        'Actions::Katello::Organization::ManifestImport',
-        'Actions::Katello::Organization::ManifestRefresh',
-        'Actions::Katello::Organization::ManifestDelete',
-      ],
-    },
-    results: [getTaskSuccessResponse],
-  },
-]);
-
-export const successState = Immutable({
-  loading: false,
-  results: bulkSearchSuccessResponse,
-});
-
-export const errorState = Immutable({
-  loading: false,
-  error: 'Unable to process request.',
-  results: [],
-});
-
-export const bulkSearchSuccessActions = [
-  {
-    type: 'TASK_BULK_SEARCH_REQUEST',
-  },
-  {
-    response: bulkSearchSuccessResponse,
-    type: 'TASK_BULK_SEARCH_SUCCESS',
-  },
-];
-
-export const buildBulkSearchFailureActions = (errorCode = 422) => ([
-  {
-    type: 'TASK_BULK_SEARCH_REQUEST',
-  },
-  {
-    result: new Error(`Request failed with status code ${errorCode}`),
-    type: 'TASK_BULK_SEARCH_FAILURE',
-  },
-]);
-
-export const buildTaskSuccessActions = response => ([
-  {
-    type: 'GET_TASK_REQUEST',
-  },
-  {
-    response,
-    type: 'GET_TASK_SUCCESS',
-  },
-]);
-
-export const getTaskSuccessActions = buildTaskSuccessActions(getTaskSuccessResponse);
-
-export const getTaskPendingActions = buildTaskSuccessActions(getTaskPendingResponse);
-
-export const buildTaskFailureActions = (errorCode = 422) => ([
-  {
-    type: 'GET_TASK_REQUEST',
-  },
-  {
-    result: new Error(`Request failed with status code ${errorCode}`),
-    type: 'GET_TASK_FAILURE',
-  },
-]);
-

data/webpack/scenes/Tasks/helpers.js

@@ -2,6 +2,9 @@ import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 
+export const bulkSearchKey = key => `${key}_TASK_SEARCH`;
+export const pollTaskKey = key => `${key}_POLL_TASK`;
+
 const link = id => ({
   children: __('Go to task page'),
   href: urlBuilder('foreman_tasks/tasks', '', id),
@@ -27,15 +30,19 @@ export const renderTaskStartedToast = (task) => {
   });
 };
 
-export const renderTaskFinishedToast = (task) => {
-  if (!task) return;
-
-  const message = __(`Task ${task.action} completed with a result of ${task.result}.
+export const taskFinishedToast = (task) => {
+  const message = __(`Task ${task.humanized.action} completed with a result of ${task.result}.
   ${task.errors ? getErrors(task) : ''}`);
 
-  window.tfm.toastNotifications.notify({
+  return {
     message,
     type: task.result,
     link: link(task.id),
-  });
+  };
+};
+
+export const renderTaskFinishedToast = (task) => {
+  if (!task) return;
+
+  window.tfm.toastNotifications.notify(taskFinishedToast(task));
 };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.15.0.rc1.3
+  version: 3.15.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -932,6 +932,7 @@ files:
 - app/lib/actions/pulp3/capsule_content/refresh_distribution.rb
 - app/lib/actions/pulp3/capsule_content/sync.rb
 - app/lib/actions/pulp3/content_migration.rb
+- app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/import_migration.rb
 - app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
@@ -958,6 +959,7 @@ files:
 - app/lib/actions/pulp3/repository/delete.rb
 - app/lib/actions/pulp3/repository/delete_distributions.rb
 - app/lib/actions/pulp3/repository/delete_remote.rb
+- app/lib/actions/pulp3/repository/delete_version.rb
 - app/lib/actions/pulp3/repository/import_upload.rb
 - app/lib/actions/pulp3/repository/presenters/abstract_sync_presenter.rb
 - app/lib/actions/pulp3/repository/presenters/content_unit_presenter.rb
@@ -3586,6 +3588,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/common.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/module-stream-actions.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/select-action-dropdown.directive.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/registration.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/select-action-dropdown.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html
@@ -4257,7 +4260,10 @@ files:
 - webpack/__mocks__/foremanReact/components/common/ModalProgressBar.js
 - webpack/__mocks__/foremanReact/components/common/table.js
 - webpack/__mocks__/foremanReact/redux.js
+- webpack/__mocks__/foremanReact/redux/API.js
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
+- webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js
+- webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/index.js
 - webpack/common_index.js
 - webpack/components/Content/ContentPage.js
 - webpack/components/Content/ContentTable.js
@@ -4609,8 +4615,11 @@ files:
 - webpack/scenes/Subscriptions/components/SubscriptionsToolbar/index.js
 - webpack/scenes/Subscriptions/index.js
 - webpack/scenes/Tasks/TaskActions.js
-- webpack/scenes/Tasks/TaskConstants.js
+- webpack/scenes/Tasks/TaskSelectors.js
 - webpack/scenes/Tasks/__tests__/TaskActions.test.js
+- webpack/scenes/Tasks/__tests__/TaskSelectors.test.js
+- webpack/scenes/Tasks/__tests__/__snapshots__/TaskActions.test.js.snap
+- webpack/scenes/Tasks/__tests__/__snapshots__/TaskSelectors.test.js.snap
 - webpack/scenes/Tasks/__tests__/task.fixtures.js
 - webpack/scenes/Tasks/helpers.js
 - webpack/services/api/index.js

data/webpack/scenes/Tasks/TaskConstants.js

@@ -1,9 +0,0 @@
-export const GET_TASK_REQUEST = 'GET_TASK_REQUEST';
-export const GET_TASK_SUCCESS = 'GET_TASK_SUCCESS';
-export const GET_TASK_FAILURE = 'GET_TASK_FAILURE';
-
-export const TASK_BULK_SEARCH_REQUEST = 'TASK_BULK_SEARCH_REQUEST';
-export const TASK_BULK_SEARCH_SUCCESS = 'TASK_BULK_SEARCH_SUCCESS';
-export const TASK_BULK_SEARCH_FAILURE = 'TASK_BULK_SEARCH_FAILURE';
-export const RESET_TASKS = 'RESET_TASKS';
-export const POLL_TASK_INTERVAL = 5000;