foreman_discovery 16.3.6 → 17.0.3

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -21,13 +21,6 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
       ForemanDiscovery::UINotifications::NewHost.deliver!(host)
     end
     assert_equal 1, blueprint.notifications.count
-    assert_no_difference('blueprint.notifications.count') do
-      host = FactoryBot.create(:discovered_host)
-      ForemanDiscovery::UINotifications::NewHost.deliver!(host)
-    end
-    assert_no_difference('blueprint.notifications.count') do
-      Host::Discovered.all.last.destroy
-    end
     Host::Discovered.destroy_all
     assert_equal 0, blueprint.notifications.count
   end
@@ -55,9 +48,9 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)
     host2 = FactoryBot.create(:discovered_host)
     ForemanDiscovery::UINotifications::NewHost.deliver!(host2)
-    assert_equal 1, blueprint.notifications.count
+    assert_equal 2, blueprint.notifications.count
     new_host = ::ForemanDiscovery::HostConverter.to_managed(host1, false, false)
     assert new_host.save!
-    assert_equal 1, blueprint.notifications.count
+    assert_equal 2, blueprint.notifications.count
   end
 end

data/test/unit/ui_notifications/new_host_test.rb

@@ -16,14 +16,14 @@ class NewHostNotificationTest < ActiveSupport::TestCase
     end
   end
 
-  test 'multiple discovered hosts should generate only one notification' do
+  test 'multiple discovered hosts should generate multiple notifications' do
     host1 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)
     expired_at = blueprint.notifications.first.expired_at
     Time.any_instance.stubs(:utc).returns(expired_at + 1.hour)
     host2 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host2)
-    assert_equal 1, blueprint.notifications.count
-    assert_not_equal expired_at, blueprint.notifications.first.expired_at
+    assert_equal 2, blueprint.notifications.count
+    assert_not_equal expired_at, blueprint.notifications.last.expired_at
   end
 end

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1,3 @@
+export const translate = s => s;
+
+export const ngettext = s => s;

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -0,0 +1 @@
+export const foremanUrl = path => `${window.URL_PREFIX}${path}`;

data/webpack/__mocks__/foremanReact/common/index.js

@@ -0,0 +1,5 @@
+import EmptyStatePattern from '../components/common/EmptyState/EmptyStatePattern';
+import DefaultEmptyState from '../components/common/EmptyState/DefaultEmptyState';
+
+export default DefaultEmptyState;
+export { EmptyStatePattern };

data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js

@@ -0,0 +1,69 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import { push } from 'connected-react-router';
+import { Button } from '@patternfly/react-core';
+import EmptyStatePattern from './EmptyStatePattern';
+import { defaultEmptyStatePropTypes } from './EmptyStatePropTypes';
+
+const DefaultEmptyState = props => {
+  const {
+    icon,
+    iconType,
+    header,
+    description,
+    documentation,
+    action,
+    secondaryActions,
+  } = props;
+
+  const dispatch = useDispatch();
+  const actionButtonClickHandler = ({ url, onClick }) => {
+    if (onClick) onClick();
+    else if (url) dispatch(push(url));
+  };
+
+  const ActionButton = action ? (
+    <Button
+      component="a"
+      onClick={() => actionButtonClickHandler(action)}
+      variant="primary"
+    >
+      {action.title}
+    </Button>
+  ) : null;
+
+  const SecondaryButton = secondaryActions
+    ? secondaryActions.map(({ title, url, onClick }) => (
+        <Button
+          component="a"
+          key={`sec-button-${title}`}
+          onClick={() => actionButtonClickHandler({ url, onClick })}
+          variant="secondary"
+        >
+          {title}
+        </Button>
+      ))
+    : null;
+
+  return (
+    <EmptyStatePattern
+      icon={icon}
+      iconType={iconType}
+      header={header}
+      description={description}
+      documentation={documentation}
+      action={ActionButton}
+      secondaryActions={SecondaryButton}
+    />
+  );
+};
+
+DefaultEmptyState.propTypes = defaultEmptyStatePropTypes;
+
+DefaultEmptyState.defaultProps = {
+  icon: 'add-circle-o',
+  secondaryActions: [],
+  iconType: 'pf',
+};
+
+export default DefaultEmptyState;

data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js

@@ -0,0 +1,77 @@
+import React from 'react';
+import { Icon } from 'patternfly-react';
+import {
+  Title,
+  EmptyState,
+  EmptyStateVariant,
+  EmptyStateBody,
+  EmptyStateSecondaryActions,
+} from '@patternfly/react-core';
+import { emptyStatePatternPropTypes } from './EmptyStatePropTypes';
+import { translate as __ } from '../../../common/I18n';
+
+const EmptyStatePattern = props => {
+  const {
+    documentation,
+    action,
+    secondaryActions,
+    iconType,
+    icon,
+    header,
+    description,
+  } = props;
+
+  const DocumentationBlock = () => {
+    if (!documentation) {
+      return null;
+    }
+    // The documentation prop can also be a customized node
+    if (React.isValidElement(documentation)) {
+      return documentation;
+    }
+    const {
+      label = __('For more information please see '), // eslint-disable-line react/prop-types
+      buttonLabel = __('documentation'), // eslint-disable-line react/prop-types
+      url, // eslint-disable-line react/prop-types
+    } = documentation;
+    return (
+      <span>
+        {label}
+        <a href={url}>{buttonLabel}</a>
+      </span>
+    );
+  };
+
+  return (
+    <EmptyState variant={EmptyStateVariant.xl}>
+      <span className="empty-state-icon">
+        {/* TODO: Add pf4 icons, Redmine issue: #30865 */}
+        <Icon name={icon} type={iconType} size="2x" />
+      </span>
+      <Title headingLevel="h5" size="4xl">
+        {header}
+      </Title>
+      <EmptyStateBody>
+        <div className="empty-state-description">{description}</div>
+        <DocumentationBlock />
+      </EmptyStateBody>
+      {action}
+      <EmptyStateSecondaryActions>
+        {secondaryActions}
+      </EmptyStateSecondaryActions>
+    </EmptyState>
+  );
+};
+
+EmptyStatePattern.propTypes = emptyStatePatternPropTypes;
+
+EmptyStatePattern.defaultProps = {
+  icon: 'add-circle-o',
+  secondaryActions: [],
+  documentation: {
+    url: '#',
+  },
+  iconType: 'pf',
+};
+
+export default EmptyStatePattern;

data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js

@@ -0,0 +1,29 @@
+import PropTypes from 'prop-types';
+
+export const actionButtonPropTypes = {
+  title: PropTypes.node.isRequired,
+  url: PropTypes.string,
+  onChange: PropTypes.func,
+};
+
+export const emptyStatePatternPropTypes = {
+  icon: PropTypes.string.isRequired,
+  header: PropTypes.string.isRequired,
+  documentation: PropTypes.oneOfType([
+    PropTypes.shape({
+      label: PropTypes.string,
+      buttonLabel: PropTypes.string,
+      url: PropTypes.string.isRequired,
+    }),
+    PropTypes.node,
+  ]),
+  description: PropTypes.string.isRequired,
+  action: PropTypes.node,
+  secondaryActions: PropTypes.node,
+};
+
+export const defaultEmptyStatePropTypes = {
+  ...emptyStatePatternPropTypes,
+  action: PropTypes.shape(actionButtonPropTypes),
+  secondaryActions: PropTypes.arrayOf(PropTypes.shape(actionButtonPropTypes)),
+};

data/webpack/__mocks__/foremanReact/components/common/EmptyState/index.js

@@ -0,0 +1,5 @@
+import EmptyStatePattern from './EmptyStatePattern';
+import DefaultEmptyState from './DefaultEmptyState';
+
+export default DefaultEmptyState;
+export { EmptyStatePattern };

data/webpack/index.js

@@ -1,10 +1,11 @@
 /* eslint import/no-unresolved: [2, { ignore: [foremanReact/*] }] */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable import/extensions */
-import componentRegistry from "foremanReact/components/componentRegistry";
-import { registerReducer } from "foremanReact/common/MountingService";
-import reducers from "./src/reducers";
-import DiscoveredHosts from "./src/ForemanDiscovery/DiscoveredHosts";
+import componentRegistry from 'foremanReact/components/componentRegistry';
+import { registerReducer } from 'foremanReact/common/MountingService';
+import reducers from './src/reducers';
+import DiscoveredHosts from './src/ForemanDiscovery/DiscoveredHosts';
+import DiscoveryRules from './src/ForemanDiscovery/DiscoveryRules';
 
 // register reducers
 Object.entries(reducers).forEach(([key, reducer]) =>
@@ -12,7 +13,7 @@ Object.entries(reducers).forEach(([key, reducer]) =>
 );
 
 // register components for erb mounting
-componentRegistry.register({
-  name: "DiscoveredHosts",
-  type: DiscoveredHosts,
-});
+componentRegistry.registerMultiple([
+  { name: 'DiscoveredHosts', type: DiscoveredHosts },
+  { name: 'DiscoveryRules', type: DiscoveryRules },
+]);

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js

@@ -1,11 +1,11 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { translate as __ } from "foremanReact/common/I18n";
-import ForemanEmptyState from "foremanReact/components/common/EmptyState";
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import ForemanEmptyState from 'foremanReact/components/common/EmptyState';
 
-const EmptyState = (props) => {
+const EmptyState = props => {
   const description = __(
-    "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+    'No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned.'
   );
   const documentation = {
     url: props.docUrl,
@@ -22,7 +22,7 @@ const EmptyState = (props) => {
 };
 
 EmptyState.propTypes = {
-  docUrl: PropTypes.string,
+  docUrl: PropTypes.string.isRequired,
 };
 
 export default EmptyState;

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js

@@ -0,0 +1,12 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import ForemanEmptyState from '../EmptyState';
+
+const fixtures = {
+  'render with Props': { docUrl: 'https://foreman.example.com' },
+};
+
+describe('ForemanEmptyState', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(ForemanEmptyState, fixtures));
+});

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap

@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanEmptyState rendering render with Props 1`] = `
+<DefaultEmptyState
+  description="No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+  documentation={
+    Object {
+      "url": "https://foreman.example.com",
+    }
+  }
+  header="Foreman Discovery"
+  icon="gears"
+  iconType="fa"
+  secondaryActions={Array []}
+/>
+`;

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js

@@ -1 +1 @@
-export { default } from "./EmptyState";
+export { default } from './EmptyState';

data/webpack/src/ForemanDiscovery/DiscoveredHosts/index.js

@@ -1,6 +1,6 @@
-import React from "react";
-import EmptyState from "./Components/EmptyState";
+import React from 'react';
+import EmptyState from './Components/EmptyState';
 
-const DiscoveredHosts = ({ docUrl }) => <EmptyState docUrl={docUrl} />;
+const DiscoveredHosts = props => <EmptyState {...props} />;
 
 export default DiscoveredHosts;

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js

@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import ForemanEmptyState from 'foremanReact/components/common/EmptyState';
+import { foremanUrl } from 'foremanReact/common/helpers';
+
+const EmptyState = props => {
+  const action = {
+    title: __('Create Rule'),
+    url: foremanUrl('/discovery_rules/new'),
+  };
+  const description = __(
+    'No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts'
+  );
+  const documentation = {
+    url: props.docUrl,
+  };
+  return (
+    <ForemanEmptyState
+      header="Discovery Rules"
+      description={description}
+      icon="gavel"
+      iconType="fa"
+      documentation={documentation}
+      action={action}
+    />
+  );
+};
+
+EmptyState.propTypes = {
+  docUrl: PropTypes.string.isRequired,
+};
+
+export default EmptyState;

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/index.js

@@ -0,0 +1 @@
+export { default } from './EmptyState';

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js

@@ -0,0 +1,19 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import ForemanEmptyState from '../EmptyState';
+
+const action = {
+  title: 'action-title',
+  url: `action-url`,
+};
+
+const fixtures = {
+  'render with Props': {
+    docUrl: 'https://foreman.example.com',
+    action,
+  },
+};
+
+describe('ForemanEmptyState', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(ForemanEmptyState, fixtures));
+});

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap

@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanEmptyState rendering render with Props 1`] = `
+<DefaultEmptyState
+  action={
+    Object {
+      "title": "Create Rule",
+      "url": "/discovery_rules/new",
+    }
+  }
+  description="No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+  documentation={
+    Object {
+      "url": "https://foreman.example.com",
+    }
+  }
+  header="Discovery Rules"
+  icon="gavel"
+  iconType="fa"
+  secondaryActions={Array []}
+/>
+`;

data/webpack/src/ForemanDiscovery/DiscoveryRules/index.js

@@ -0,0 +1,6 @@
+import React from 'react';
+import EmptyState from './Components/EmptyState';
+
+const DiscoveryRules = props => <EmptyState {...props} />;
+
+export default DiscoveryRules;

data/webpack/src/reducers.js

@@ -1,5 +1,3 @@
-import { combineReducers } from "redux";
-
 const reducers = {
   foremanDiscovery: {},
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 16.3.6
+  version: 17.0.3
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -21,6 +21,7 @@ authors:
 - David Davis
 - Djebran Lezzoum
 - Dominic Cleal
+- Dominik Matoulek
 - Eric D. Helms
 - Ewoud Kohl van Wijngaarden
 - Frank Wall
@@ -55,6 +56,7 @@ authors:
 - Phirince Philip
 - Rahul Bajaj
 - Robert Antoni Buj Gelonch
+- Ron Lavi
 - Scubafloyd
 - Sean O\'Keeffe
 - Sebastian Gräßl
@@ -71,7 +73,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -105,6 +107,7 @@ files:
 - app/models/nic/managed_extensions.rb
 - app/models/setting/discovered.rb
 - app/services/foreman_discovery/fact_parser.rb
+- app/services/foreman_discovery/fact_to_category_resolver.rb
 - app/services/foreman_discovery/host_converter.rb
 - app/services/foreman_discovery/host_fact_importer.rb
 - app/services/foreman_discovery/import_hook.rb
@@ -120,6 +123,7 @@ files:
 - app/services/foreman_discovery/node_api/power_service.rb
 - app/services/foreman_discovery/subnet_suggestion.rb
 - app/services/foreman_discovery/ui_notifications/destroy_host.rb
+- app/services/foreman_discovery/ui_notifications/failed_discovery.rb
 - app/services/foreman_discovery/ui_notifications/new_host.rb
 - app/views/api/v2/discovered_hosts/base.json.rabl
 - app/views/api/v2/discovered_hosts/index.json.rabl
@@ -152,9 +156,11 @@ files:
 - app/views/discovered_mailer/discovered_summary.text.erb
 - app/views/discovery_rules/_form.html.erb
 - app/views/discovery_rules/_template_inline.erb
+- app/views/discovery_rules/clone.erb
 - app/views/discovery_rules/edit.html.erb
 - app/views/discovery_rules/index.html.erb
 - app/views/discovery_rules/new.html.erb
+- app/views/discovery_rules/welcome.html.erb
 - app/views/foreman_discovery/debian_kexec.erb
 - app/views/foreman_discovery/redhat_kexec.erb
 - config/as_deprecation_whitelist.yaml
@@ -274,16 +280,31 @@ files:
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
+- test/unit/fact_to_category_resolver_test.rb
 - test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
 - test/unit/managed_extensions_test.rb
 - test/unit/setting_discovered_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
+- webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/common/index.js
+- webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js
+- webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js
+- webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js
+- webpack/__mocks__/foremanReact/components/common/EmptyState/index.js
 - webpack/index.js
 - webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js
+- webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js
+- webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap
 - webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js
 - webpack/src/ForemanDiscovery/DiscoveredHosts/index.js
+- webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js
+- webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/index.js
+- webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js
+- webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap
+- webpack/src/ForemanDiscovery/DiscoveryRules/index.js
 - webpack/src/reducers.js
 homepage: https://github.com/theforeman/foreman_discovery
 licenses:
@@ -328,25 +349,26 @@ test_files:
 - test/facts/only-ipv6.json
 - test/facts/skylake-ipv6.json
 - test/functional/api/v2/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
 - test/functional/api/v2/settings_controller_test.rb
-- test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
 - test/integration/discovered_hosts_test.rb
-- test/models/setting_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
 - test/unit/discovered_mailer_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
-- test/unit/fact_parser_test.rb
 - test/unit/lldp_neighbors_test.rb
-- test/unit/setting_discovered_test.rb
+- test/unit/discovery_rule_test.rb
+- test/unit/fact_to_category_resolver_test.rb
 - test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
-- test/unit/host_discovered_test.rb
+- test/unit/fact_parser_test.rb
 - test/unit/managed_extensions_test.rb
-- test/unit/discovery_rule_test.rb
-- test/test_plugin_helper.rb
+- test/unit/setting_discovered_test.rb
+- test/unit/host_discovered_test.rb
+- test/models/setting_test.rb
 - test/test_helper_discovery.rb
+- test/test_plugin_helper.rb