foreman_puppet 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9af296430c3c3ffb44c6744eea7aa8f18cd2cd6b195c73f27f356fb68af1b1
-  data.tar.gz: 6d75360d29551bacfcc3de197d402bbca296d7662b6b16bc9ebbfbfdb2b201de
+  metadata.gz: 7761d1dddaf8e696fe6b367953ec5618ae906d369b56fe5b75dbfacb56c46b63
+  data.tar.gz: 0ec6e1ba0db133d84b23b64d69b776671edf68ce26fff816d1b733e8e6ca685b
 SHA512:
-  metadata.gz: bc212cd1425120f47123df2f388c560a76676b84c19394cbfb1ef86a7d889bd6e433e1166a222cfa6501a4cbccebfb9d69ead01028db7915d7a57e963e08e7cf
-  data.tar.gz: 955978e6e835750771a828e0fbc2d44362014e83adfe052c2c4ccaf6258c9ba4e6074d626b2f3403f3756d82c1da9e72c695cfb272e49b521409e4c12fad138f
+  metadata.gz: 7114fbf6e9bd9743e7a5a61ccd1e5a83461e9ccbeb69b03173197be66cbca67a7269c108939c7d6b37624bee0bff21ea68d4a7126f7c9f706cee9be59dc4fdb7
+  data.tar.gz: 6e66ddc14019c5c92c1ec53dd9fe00565e739ed0b61bc425c589594ce1542a3ad47d41b430b37957a4de995583e1bcbdc04c5191ac54b7da5452bb63f9ddc731

data/lib/foreman_puppet/register.rb

@@ -1,7 +1,7 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.0.0'
+  requires_foreman '>= 3.3.0'
   # Add Global JS file for extending foreman-core components and routes
-  register_global_js_file 'fills'
+  register_global_js_file 'global'
 
   settings do
     category(:facts, N_('Facts')) do

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '3.0.6'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/package.json

@@ -21,17 +21,17 @@
     "url": "http://projects.theforeman.org/projects/foreman_puppet/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^8.15.0"
+    "@theforeman/vendor": "^10.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@sheerun/mutationobserver-shim": "^0.3.3",
-    "@theforeman/builder": "^8.15.0",
-    "@theforeman/eslint-plugin-foreman": "^8.15.0",
-    "@theforeman/find-foreman": "^8.15.0",
-    "@theforeman/stories": "^8.15.0",
-    "@theforeman/test": "^8.15.0",
-    "@theforeman/vendor-dev": "^8.15.0",
+    "@theforeman/builder": "^10.1.0",
+    "@theforeman/eslint-plugin-foreman": "^10.1.0",
+    "@theforeman/find-foreman": "^10.1.0",
+    "@theforeman/stories": "^10.1.0",
+    "@theforeman/test": "^10.1.0",
+    "@theforeman/vendor-dev": "^10.1.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "jed": "^1.1.1",

data/test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb

@@ -75,8 +75,12 @@ module ForemanPuppet
               post :create, params: { smart_class_parameter_id: lookup_key.id, override_value: override_value }
             end
             response = ActiveSupport::JSON.decode(@response.body)
-            param_not_posted = (override_value.keys.first.to_s == 'match') ? 'Value' : 'Match' # The opposite of override_value is missing
-            assert_match(/Validation failed: #{param_not_posted} can't be blank/, response['error']['message'])
+            if override_value.keys.first.to_s == 'match'
+              # The opposite of override_value is missing and should fail
+              assert_match(/Validation failed: Value can't be blank/, response['error']['message'])
+            else # match is missing
+              assert_match(/Failed to save the record/, response['error']['message'])
+            end
             assert_response :error
           end
         end

data/test/models/foreman_puppet/host_test.rb

@@ -110,6 +110,12 @@ module ForemanPuppet
     end
 
     describe '#info puppet bits' do
+      test 'ENC YAML omits environment if no puppet facet' do
+        host = FactoryBot.build_stubbed(:host)
+        enc = host.info
+        assert_not_includes enc.keys, 'environment'
+      end
+
       test 'ENC YAML uses Classification::ClassParam for parameterized output' do
         skip 'No idea whats wrong here'
         host = FactoryBot.build_stubbed(:host, :with_environment)

data/webpack/global_index.js

@@ -0,0 +1,11 @@
+import { registerReducer } from 'foremanReact/common/MountingService';
+import reducers from './src/reducers';
+import { registerFills } from './src/Extends/Fills';
+import { registerLegacy } from './legacy';
+
+// register reducers
+registerReducer('puppet', reducers);
+// add fills
+registerFills();
+// TODO: the checkForUnavailablePuppetclasses is very nasty
+registerLegacy();

data/webpack/index.js

@@ -2,16 +2,9 @@
 /* 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 ForemanPuppet from './src/ForemanPuppet';
 import { WelcomeEnv } from './src/Components/Environments/Welcome';
 
-// register reducers
-Object.entries(reducers).forEach(([key, reducer]) =>
-  registerReducer(key, reducer)
-);
-
 // register components for erb mounting
 componentRegistry.register({ name: 'WelcomeEnv', type: WelcomeEnv });
 componentRegistry.register({ name: 'ForemanPuppet', type: ForemanPuppet });

data/webpack/legacy.js

@@ -0,0 +1,31 @@
+import $ from 'jquery';
+import * as classEditor from './src/foreman_class_edit';
+import * as hostForm from './src/foreman_puppet_host_form';
+
+export const registerLegacy = () => {
+  window.tfm = Object.assign(window.tfm || {}, {
+    classEditor,
+    puppetEnc: {
+      hostForm,
+    },
+  });
+
+  // TODO: the checkForUnavailablePuppetclasses is very nasty
+  $(document)
+    .on('change', '.hostgroup-select', evt => {
+      const form = $('form.host-form')[0];
+      if (form && form.dataset.id) hostForm.updatePuppetclasses(evt.target);
+    })
+    .on('change', '.interface_domain', evt => {
+      hostForm.reloadPuppetclassParams();
+    })
+    .on('change', '.host-architecture-os-select', evt => {
+      hostForm.reloadPuppetclassParams();
+    })
+    .on('ContentLoad', evt => {
+      hostForm.checkForUnavailablePuppetclasses();
+    });
+  $(window).on('load', evt => {
+    hostForm.checkForUnavailablePuppetclasses();
+  });
+};

data/webpack/src/Extends/Fills/index.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import PuppetTab from '../Host/PuppetTab';
+
+const fills = [
+  {
+    slot: 'host-details-page-tabs',
+    name: 'Puppet',
+    component: props => <PuppetTab {...props} />,
+    weight: 500,
+    metadata: { title: __('Puppet') },
+  },
+];
+
+export const registerFills = () => {
+  fills.forEach(({ slot, name, component: Component, weight, metadata }) =>
+    addGlobalFill(
+      slot,
+      name,
+      <Component key={`puppet-fill-${name}`} />,
+      weight,
+      metadata
+    )
+  );
+};

data/webpack/src/Extends/Host/PuppetTab/Routes.js

@@ -0,0 +1,42 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Route, Switch, Redirect } from 'react-router-dom';
+import { route } from './helpers';
+import EmptyPage from './SubTabs/EmptyPage';
+import Reports from './SubTabs/Reports';
+
+const SecondaryTabRoutes = ({ hostName, hostInfo, status }) => (
+  <Switch>
+    <Route path={route('reports')}>
+      {hostName ? (
+        <Reports hostName={hostName} hostInfo={hostInfo} status={status} />
+      ) : (
+        <EmptyPage header="Reports" />
+      )}
+    </Route>
+    <Route path={route('assigned')}>
+      <EmptyPage header="Assigned classes" />
+    </Route>
+    <Route path={route('smart-classes')}>
+      <EmptyPage header="Smart class parameters" />
+    </Route>
+    <Route path={route('yaml')}>
+      <EmptyPage header="YAML" />
+    </Route>
+    <Redirect to={route('reports')} />
+  </Switch>
+);
+
+SecondaryTabRoutes.propTypes = {
+  hostName: PropTypes.string,
+  hostInfo: PropTypes.object,
+  status: PropTypes.string,
+};
+
+SecondaryTabRoutes.defaultProps = {
+  hostName: '',
+  hostInfo: {},
+  status: undefined,
+};
+
+export default SecondaryTabRoutes;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/EmptyPage.js

@@ -0,0 +1,19 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import PFEmptyPage from 'foremanReact/components/common/EmptyState/EmptyStatePattern';
+
+const EmptyPage = ({ header }) => (
+  <div className="host-details-tab-item">
+    <PFEmptyPage
+      icon="enterprise"
+      header={header}
+      description="This is a demo for adding content to the new host page"
+    />
+  </div>
+);
+
+EmptyPage.propTypes = {
+  header: PropTypes.string.isRequired,
+};
+
+export default EmptyPage;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/components/DescriptionCard.js

@@ -0,0 +1,71 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
+import {
+  DescriptionList,
+  DescriptionListTerm,
+  DescriptionListGroup,
+  DescriptionListDescription,
+} from '@patternfly/react-core';
+import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
+import DefaultLoaderEmptyState from 'foremanReact/components/HostDetails/DetailsCard/DefaultLoaderEmptyState';
+import { STATUS } from 'foremanReact/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const DescriptionCard = ({ proxyName, caProxy, env, status }) => (
+  <CardTemplate header={__('Puppet details')} expandable>
+    <DescriptionList isCompact>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Puppet environment')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          <SkeletonLoader
+            emptyState={<DefaultLoaderEmptyState />}
+            status={status}
+          >
+            {env && (
+              <a href={`/foreman_puppet/environments/${env}/edit`}>{env}</a>
+            )}
+          </SkeletonLoader>
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Puppet smart proxy')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          <SkeletonLoader
+            emptyState={<DefaultLoaderEmptyState />}
+            status={status}
+          >
+            {proxyName}
+          </SkeletonLoader>
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+      <DescriptionListGroup>
+        <DescriptionListTerm>{__('Puppet server CA')}</DescriptionListTerm>
+        <DescriptionListDescription>
+          <SkeletonLoader
+            emptyState={<DefaultLoaderEmptyState />}
+            status={status}
+          >
+            {caProxy}
+          </SkeletonLoader>
+        </DescriptionListDescription>
+      </DescriptionListGroup>
+    </DescriptionList>
+  </CardTemplate>
+);
+
+DescriptionCard.propTypes = {
+  caProxy: PropTypes.string,
+  env: PropTypes.string,
+  proxyName: PropTypes.string,
+  status: PropTypes.string,
+};
+
+DescriptionCard.defaultProps = {
+  caProxy: undefined,
+  env: undefined,
+  proxyName: undefined,
+  status: STATUS.PENDING,
+};
+
+export default DescriptionCard;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/index.js

@@ -0,0 +1,45 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Grid, GridItem } from '@patternfly/react-core';
+import ReportsTab from 'foremanReact/components/HostDetails/Tabs/ReportsTab';
+import DescriptionCard from './components/DescriptionCard';
+import './styles.scss';
+
+const Reports = ({
+  hostName,
+  status,
+  hostInfo: {
+    puppet_proxy_name: proxyName,
+    puppet_ca_proxy_name: caProxy,
+    environment_name: env,
+  },
+}) => (
+  <div className="report-tab">
+    <Grid hasGutter>
+      <GridItem span={4}>
+        <DescriptionCard
+          proxyName={proxyName}
+          caProxy={caProxy}
+          env={env}
+          status={status}
+        />
+      </GridItem>
+      <GridItem span={12}>
+        <ReportsTab hostName={hostName} origin="Puppet" />
+      </GridItem>
+    </Grid>
+  </div>
+);
+
+Reports.propTypes = {
+  hostName: PropTypes.string.isRequired,
+  hostInfo: PropTypes.object,
+  status: PropTypes.string,
+};
+
+Reports.defaultProps = {
+  hostInfo: {},
+  status: undefined,
+};
+
+export default Reports;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/styles.scss

@@ -0,0 +1,7 @@
+.report-tab {
+  padding: 16px 24px;
+
+  .pf-c-card {
+    height: 100%;
+  }
+}

data/webpack/src/Extends/Host/PuppetTab/constants.js

@@ -0,0 +1,8 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const SECONDARY_TABS = [
+  { key: 'reports', title: __('Reports') },
+  { key: 'assigned', title: __('Assigned classes') },
+  { key: 'smart-classes', title: __('Smart class parameters') },
+  { key: 'yaml', title: __('YAML') },
+];

data/webpack/src/Extends/Host/PuppetTab/helpers.js

@@ -0,0 +1,3 @@
+export const hashRoute = subpath => `#/Puppet/${subpath}`;
+export const route = subpath => hashRoute(subpath).substring(1);
+export const activeTab = path => path.split('/')[2];

data/webpack/src/Extends/Host/PuppetTab/index.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
+import { STATUS } from 'foremanReact/constants';
+
+import SecondaryTabRoutes from './Routes';
+import { activeTab } from './helpers';
+import { SECONDARY_TABS } from './constants';
+
+const PuppetTab = ({ response, status, location: { pathname } }) => {
+  const hashHistory = useHistory();
+  return (
+    <>
+      <Tabs
+        className="margin-0-24"
+        onSelect={(evt, subTab) => hashHistory.push(subTab)}
+        isSecondary
+        activeKey={activeTab(pathname)}
+      >
+        {SECONDARY_TABS.map(({ key, title }) => (
+          <Tab
+            key={key}
+            eventKey={key}
+            title={<TabTitleText>{title}</TabTitleText>}
+          />
+        ))}
+      </Tabs>
+      <SecondaryTabRoutes
+        hostName={response.name}
+        hostInfo={response}
+        status={status}
+      />
+    </>
+  );
+};
+
+PuppetTab.propTypes = {
+  response: PropTypes.object,
+  status: PropTypes.string,
+  location: PropTypes.shape({
+    pathname: PropTypes.string,
+  }),
+};
+PuppetTab.defaultProps = {
+  location: { pathname: '' },
+  response: { name: '' },
+  status: STATUS.PENDING,
+};
+
+export default PuppetTab;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -332,9 +332,19 @@ files:
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/foremanReact/redux/index.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
-- webpack/fills_index.js
+- webpack/global_index.js
 - webpack/index.js
+- webpack/legacy.js
 - webpack/src/Components/Environments/Welcome.js
+- webpack/src/Extends/Fills/index.js
+- webpack/src/Extends/Host/PuppetTab/Routes.js
+- webpack/src/Extends/Host/PuppetTab/SubTabs/EmptyPage.js
+- webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/components/DescriptionCard.js
+- webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/index.js
+- webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/styles.scss
+- webpack/src/Extends/Host/PuppetTab/constants.js
+- webpack/src/Extends/Host/PuppetTab/helpers.js
+- webpack/src/Extends/Host/PuppetTab/index.js
 - webpack/src/ForemanPuppet.js
 - webpack/src/Router/__snapshots__/routes.test.js.snap
 - webpack/src/Router/index.js

data/webpack/fills_index.js

@@ -1,30 +0,0 @@
-import $ from 'jquery';
-
-import * as classEditor from './src/foreman_class_edit';
-import * as hostForm from './src/foreman_puppet_host_form';
-
-window.tfm = Object.assign(window.tfm || {}, {
-  classEditor,
-  puppetEnc: {
-    hostForm,
-  },
-});
-
-// TODO: the checkForUnavailablePuppetclasses is very nasty
-$(document)
-  .on('change', '.hostgroup-select', evt => {
-    const form = $('form.host-form')[0];
-    if (form && form.dataset.id) hostForm.updatePuppetclasses(evt.target);
-  })
-  .on('change', '.interface_domain', evt => {
-    hostForm.reloadPuppetclassParams();
-  })
-  .on('change', '.host-architecture-os-select', evt => {
-    hostForm.reloadPuppetclassParams();
-  })
-  .on('ContentLoad', evt => {
-    hostForm.checkForUnavailablePuppetclasses();
-  });
-$(window).on('load', evt => {
-  hostForm.checkForUnavailablePuppetclasses();
-});