foreman_puppet 6.1.0 → 6.2.0

data/locale/foreman_puppet.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_puppet 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-01 14:06+0200\n"
-"PO-Revision-Date: 2023-06-01 14:06+0200\n"
+"POT-Creation-Date: 2023-09-18 13:52+0200\n"
+"PO-Revision-Date: 2023-09-18 13:52+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -767,51 +767,65 @@ msgid "Can't find a valid Proxy with a Puppet feature"
 msgstr ""
 
 #: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:1
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:5
 msgid "Changed environments"
 msgstr ""
 
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:3
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:4
+#: ../app/views/foreman_puppet/environments/edit.html.erb:5
+#: ../app/views/foreman_puppet/environments/index.html.erb:1
+#: ../app/views/foreman_puppet/environments/new.html.erb:4
+#: ../app/views/foreman_puppet/environments/welcome.html.erb:4
+#: ../webpack/src/Components/Environments/Welcome.js:40
+msgid "Puppet Environments"
+msgstr ""
+
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:8
 msgid "Select the changes you want to apply to Foreman"
 msgstr ""
 
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:5
+#:
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:10
 msgid "Toggle"
 msgstr ""
 
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:6
+#:
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:11
 msgid "New"
 msgstr ""
 
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:8
+#:
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:13
 msgid "Check/Uncheck new"
 msgstr ""
 
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:9
+#:
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:14
 msgid "Updated"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:11
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:16
 msgid "Check/Uncheck updated"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:12
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:17
 msgid "Obsolete"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:14
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:19
 msgid "Check/Uncheck obsolete"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:22
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:27
 msgid "Check/Uncheck all"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:24
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:29
 #: ../app/views/foreman_puppet/environments/_form.html.erb:4
 #: ../app/views/foreman_puppet/puppet_smart_proxies/_environments.html.erb:4
 #: ../app/views/hosts/select_multiple_environment.html.erb:7
@@ -820,47 +834,47 @@ msgid "Environment"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:25
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:30
 msgid "Operation"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:26
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:31
 msgid "Puppet Modules"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:39
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:44
 msgid "Check/Uncheck all %s changes"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:46
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:51
 msgid "Add:"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:46
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:51
 msgid "Remove:"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:46
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:51
 msgid "Update:"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:46
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:51
 msgid "Ignored:"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:59
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:64
 msgid "Cancel"
 msgstr ""
 
 #:
-#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:60
+#: ../app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb:65
 msgid "Update"
 msgstr ""
 
@@ -952,14 +966,6 @@ msgstr ""
 msgid "Organizations"
 msgstr ""
 
-#: ../app/views/foreman_puppet/environments/edit.html.erb:5
-#: ../app/views/foreman_puppet/environments/index.html.erb:1
-#: ../app/views/foreman_puppet/environments/new.html.erb:4
-#: ../app/views/foreman_puppet/environments/welcome.html.erb:4
-#: ../webpack/src/Components/Environments/Welcome.js:40
-msgid "Puppet Environments"
-msgstr ""
-
 #: ../app/views/foreman_puppet/environments/index.html.erb:8
 msgid "Environment|Name"
 msgstr ""
@@ -1107,7 +1113,7 @@ msgid "Puppetclass|Name"
 msgstr ""
 
 #: ../app/views/foreman_puppet/puppetclasses/index.html.erb:10
-#: ../app/views/smart_proxies/plugins/_puppet.html.erb:4
+#: ../app/views/smart_proxies/plugins/_puppet.html.erb:3
 #: ../lib/foreman_puppet/register.rb:168
 msgid "Environments"
 msgstr ""
@@ -1172,11 +1178,11 @@ msgstr ""
 msgid "Add Combination"
 msgstr ""
 
-#: ../app/views/smart_proxies/plugins/_puppet.html.erb:3
+#: ../app/views/smart_proxies/plugins/_puppet.html.erb:2
 msgid "General"
 msgstr ""
 
-#: ../app/views/smart_proxies/plugins/_puppet.html.erb:12
+#: ../app/views/smart_proxies/plugins/_puppet.html.erb:11
 msgid "Hosts managed:"
 msgstr ""
 
@@ -1326,7 +1332,7 @@ msgstr ""
 msgid "Loading parameters..."
 msgstr ""
 
-#: ../webpack/src/foreman_puppet_host_form.js:102
+#: ../webpack/src/foreman_puppet_host_form.js:105
 msgid "Some Puppet Classes are unavailable in the selected environment"
 msgstr ""
 

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

@@ -6,7 +6,7 @@ import Reports from './SubTabs/Reports';
 import ENCPreview from './SubTabs/ENCPreview';
 
 const SecondaryTabRoutes = ({ hostName, hostInfo, status }) => (
-  <Switch>
+  <Switch ouiaId="foreman-puppet-switch">
     <Route path={route('reports')}>
       <Reports hostName={hostName} hostInfo={hostInfo} status={status} />
     </Route>

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

@@ -0,0 +1,10 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import { FOREMAN_PUPPET_LAST_REPORT_KEY } from './ConfigStatusCardConstants';
+
+export const getReportByIdAction = reportId =>
+  get({
+    type: API_OPERATIONS.GET,
+    key: FOREMAN_PUPPET_LAST_REPORT_KEY,
+    url: `/api/config_reports/${reportId}`,
+  });
+export default getReportByIdAction;

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

@@ -0,0 +1 @@
+export const FOREMAN_PUPPET_LAST_REPORT_KEY = 'FOREMAN_PUPPET_LAST_REPORT';

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

@@ -0,0 +1,186 @@
+import PropTypes from 'prop-types';
+import React, { useCallback, useEffect } from 'react';
+import {
+  Divider,
+  Flex,
+  FlexItem,
+  Button,
+  DescriptionList,
+  DescriptionListTerm,
+  DescriptionListGroup,
+  DescriptionListDescription,
+} from '@patternfly/react-core';
+import {
+  TableComposable,
+  TableText,
+  Tr,
+  Tbody,
+  Td,
+} from '@patternfly/react-table';
+import { useSelector, useDispatch } from 'react-redux';
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
+import DefaultLoaderEmptyState from 'foremanReact/components/HostDetails/DetailsCard/DefaultLoaderEmptyState';
+import { statusFormatter } from 'foremanReact/components/HostDetails/Tabs/ReportsTab/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import { getReportByIdAction } from './ConfigStatusCardActions';
+import { FOREMAN_PUPPET_LAST_REPORT_KEY } from './ConfigStatusCardConstants';
+import './styles.scss';
+
+const cardHeaderDivider = () => (
+  <Divider
+    orientation={{
+      default: 'vertical',
+    }}
+    inset={{ default: 'insetMd' }}
+  />
+);
+
+const generateCardHeader = (allReports = [], reportsCount) =>
+  reportsCount > 0 ? (
+    <>
+      {__('Last configuration status')}
+      <Flex>
+        <FlexItem>
+          <Button
+            ouiaId="foreman-puppet-last-report-button"
+            variant="link"
+            component="a"
+            isInline
+            isDisabled={!allReports.length}
+            href={`/config_reports/${allReports[0].id}`}
+          >
+            <RelativeDateTime
+              date={allReports[0].reported_at}
+              defaultValue={__('Never')}
+            />
+          </Button>
+        </FlexItem>
+        <FlexItem>{statusFormatter('failed', allReports[0])}</FlexItem>
+        {cardHeaderDivider()}
+        <FlexItem>{statusFormatter('failed_restarts', allReports[0])}</FlexItem>
+        {cardHeaderDivider()}
+        <FlexItem>{statusFormatter('restarted', allReports[0])}</FlexItem>
+        {cardHeaderDivider()}
+        <FlexItem>{statusFormatter('applied', allReports[0])}</FlexItem>
+        {cardHeaderDivider()}
+        <FlexItem>{statusFormatter('skipped', allReports[0])}</FlexItem>
+        {cardHeaderDivider()}
+        <FlexItem>{statusFormatter('pending', allReports[0])}</FlexItem>
+      </Flex>
+    </>
+  ) : (
+    <> {__('No configuration status available')} </>
+  );
+
+const createPuppetMetricsTableElement = (name, value = '--') => (
+  <>
+    <Td modifier="truncate" key={`metrics-name-${name}`}>
+      <TableText
+        className={name === 'Total' ? 'last-config-puppet-metrics-total' : ''}
+      >
+        {name}
+      </TableText>
+    </Td>
+    <Td modifier="truncate" key={`metrics-name-${value}`}>
+      <TableText
+        className={name === 'Total' ? 'last-config-puppet-metrics-total' : ''}
+      >
+        {value}
+      </TableText>
+    </Td>
+  </>
+);
+
+const createPuppetMetricsTable = (metrics = undefined) => (
+  <TableComposable
+    aria-label="foreman puppet metrics table"
+    variant="compact"
+    borders="compactBorderless"
+    ouiaId="foreman-puppet-metrics-table"
+    key="foreman-puppet-metrics-table"
+  >
+    <Tbody>
+      <Tr>
+        {createPuppetMetricsTableElement(__('Failed'), metrics.failed)}
+        {createPuppetMetricsTableElement(__('Changed'), metrics.changed)}
+        {createPuppetMetricsTableElement(__('Scheduled'), metrics.scheduled)}
+      </Tr>
+      <Tr>
+        {createPuppetMetricsTableElement(
+          __('Failed to start'),
+          metrics.failed_to_start
+        )}
+        {createPuppetMetricsTableElement(__('Restarted'), metrics.restarted)}
+        {createPuppetMetricsTableElement(
+          __('Corrective Change'),
+          metrics.corrective_change
+        )}
+      </Tr>
+      <Tr>
+        {createPuppetMetricsTableElement(__('Skipped'), metrics.skipped)}
+        {createPuppetMetricsTableElement(
+          __('Out of sync'),
+          metrics.out_of_sync
+        )}
+        {createPuppetMetricsTableElement(__('Total'), metrics.total)}
+      </Tr>
+    </Tbody>
+  </TableComposable>
+);
+
+const ConfigStatusCard = ({ hostName, parentStatus }) => {
+  const dispatch = useDispatch();
+  // get already fetched results from reports tab
+  const API_KEY = `get-reports-${hostName}`;
+  const { reports, itemCount } = useSelector(state =>
+    selectAPIResponse(state, API_KEY)
+  );
+
+  // we need to fetch the last Puppet report to get all Puppet metrics
+  const getLastReport = useCallback(() => {
+    if (hostName && reports?.length)
+      dispatch(getReportByIdAction(reports[0].id));
+  }, [hostName, reports, dispatch]);
+
+  useEffect(() => {
+    getLastReport();
+  }, [hostName, reports]);
+
+  const { metrics } = useSelector(state =>
+    selectAPIResponse(state, FOREMAN_PUPPET_LAST_REPORT_KEY)
+  );
+
+  return (
+    <CardTemplate header={generateCardHeader(reports, itemCount)} expandable>
+      <DescriptionList isCompact>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{__('Puppet metrics')}</DescriptionListTerm>
+          <DescriptionListDescription>
+            <SkeletonLoader
+              status={parentStatus}
+              emptyState={<DefaultLoaderEmptyState />}
+            >
+              {metrics && createPuppetMetricsTable(metrics.resources)}
+            </SkeletonLoader>
+          </DescriptionListDescription>
+        </DescriptionListGroup>
+      </DescriptionList>
+    </CardTemplate>
+  );
+};
+
+ConfigStatusCard.propTypes = {
+  hostName: PropTypes.string,
+  parentStatus: PropTypes.string,
+};
+
+ConfigStatusCard.defaultProps = {
+  hostName: undefined,
+  parentStatus: undefined,
+};
+
+export default ConfigStatusCard;

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

@@ -0,0 +1,3 @@
+.last-config-puppet-metrics-total {
+  font-weight: bold;
+}

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

@@ -3,6 +3,7 @@ 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 ConfigStatusCard from './components/ConfigStatusCard';
 import './styles.scss';
 
 const Reports = ({
@@ -18,6 +19,9 @@ const Reports = ({
 }) => (
   <div className="report-tab">
     <Grid hasGutter>
+      <GridItem span={8}>
+        <ConfigStatusCard hostName={hostName} parentStatus={status} />
+      </GridItem>
       <GridItem span={4}>
         <DescriptionCard
           proxyName={proxyName}

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

@@ -8,13 +8,15 @@ import SecondaryTabRoutes from './Routes';
 import { activeTab } from './helpers';
 import { SECONDARY_TABS } from './constants';
 
+import './styles.scss';
+
 const PuppetTab = ({ response, status, location: { pathname } }) => {
   const hashHistory = useHistory();
   return (
     <>
       <Tabs
-        ouiaId="puppet-tabs"
-        className="margin-0-24"
+        ouiaId="foreman-puppet-host-details-tab"
+        className="foreman-puppet-host-details-tab"
         onSelect={(evt, subTab) => hashHistory.push(subTab)}
         isSecondary
         activeKey={activeTab(pathname)}

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

@@ -0,0 +1,9 @@
+
+.pf-c-tabs.pf-m-secondary.foreman-puppet-host-details-tab {
+  overflow: visible;
+}
+
+.foreman-puppet-host-details-tab {
+  margin: 0 24px
+}
+