katello 4.3.0.rc1 → 4.3.0.rc2

data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js

@@ -2,13 +2,15 @@ import React from 'react';
 import { renderWithRedux, waitFor, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
 import nock, { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_TRACES_KEY } from '../HostTracesConstants';
+import { REX_FEATURES } from '../RemoteExecutionConstants';
+import { HOST_TRACES_KEY, TRACES_SEARCH_QUERY } from '../HostTracesConstants';
 import TracesTab from '../TracesTab';
 import mockTraceData from './traces.fixtures.json';
 import mockResolveTraceTask from './resolveTraces.fixtures.json';
 import emptyTraceResults from './tracerEmptyTraceResults.fixtures.json';
 import mockJobInvocationStatus from './tracerEnableJobInvocation.fixtures.json';
 
+const hostName = 'client.example.com';
 const tracerInstalledResponse = {
   id: 1,
   name: 'client.example.com',
@@ -29,6 +31,8 @@ const renderOptions = isTracerInstalled => ({ // sets initial Redux state
   initialState: {
     API: {
       HOST_DETAILS: {
+        name: hostName,
+        id: 1,
         response: isTracerInstalled ? tracerInstalledResponse : tracerNotInstalledResponse,
         status: 'RESOLVED',
       },
@@ -165,7 +169,6 @@ describe('With tracer installed', () => {
     });
     traceCheckbox.click();
     expect(traceCheckbox.checked).toEqual(true);
-
     const actionMenu = getByLabelText('bulk_actions');
     actionMenu.click();
     const viaRexAction = queryByText('Restart via remote execution');
@@ -177,12 +180,53 @@ describe('With tracer installed', () => {
     assertNockRequest(scope, done);
   });
 
+  test('Can select all, exclude and bulk restart traces via remote execution', async (done) => {
+    // This is the same test as above,
+    // but using the table action bar instead of the Restart app button
+    const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+    const thirdTrace = mockTraceData.results[2];
+    const scope = nockInstance
+      .get(hostTraces)
+      .times(2)
+      .reply(200, mockTraceData);
+    const jobInvocationBody = ({ job_invocation: { inputs } }) =>
+      inputs[TRACES_SEARCH_QUERY] === `id !^ (${firstTrace.id},${thirdTrace.id})`;
+
+    const resolveTracesScope = nockInstance
+      .post(jobInvocations, jobInvocationBody)
+      .reply(201, mockResolveTraceTask);
+
+    const {
+      getByLabelText, getByText,
+    } = renderWithRedux(
+      <TracesTab />,
+      renderOptions(true),
+    );
+
+    let traceCheckbox;
+    // Assert that the traces are now showing on the screen, but wait for them to appear.
+    await patientlyWaitFor(() => {
+      const traceNameNode = getByText(firstTrace.application);
+      traceCheckbox = checkboxToTheLeftOf(traceNameNode);
+    });
+    const selectAllCheckbox = getByLabelText('Select all');
+    fireEvent.click(selectAllCheckbox);
+    expect(traceCheckbox.checked).toEqual(true);
+    fireEvent.click(getByLabelText('Select row 0')); // de select
+    fireEvent.click(getByLabelText('Select row 2')); // de select
+
+    fireEvent.click(getByText('Restart app'));
+
+    assertNockRequest(autocompleteScope);
+    assertNockRequest(resolveTracesScope);
+    assertNockRequest(scope, done);
+  });
+
   test('Can restart a single trace via remote execution', async (done) => {
     const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
 
     const scope = nockInstance
       .get(hostTraces)
-      .times(2)
       .reply(200, mockTraceData);
     const resolveTracesScope = nockInstance
       .post(jobInvocations)
@@ -214,6 +258,7 @@ describe('With tracer installed', () => {
   });
 
   test('Can restart a single trace via customized remote execution', async (done) => {
+    const feature = REX_FEATURES.KATELLO_HOST_TRACER_RESOLVE;
     const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
     const scope = nockInstance
       .get(hostTraces)
@@ -230,7 +275,7 @@ describe('With tracer installed', () => {
       traceActionMenu = actionMenuToTheRightOf(traceNameNode);
       expect(traceActionMenu).toHaveAttribute('aria-label', 'Actions');
     });
-    traceActionMenu.click();
+    fireEvent.click(traceActionMenu);
 
     let viaCustomizedRexAction;
     await patientlyWaitFor(() => {
@@ -239,7 +284,7 @@ describe('With tracer installed', () => {
     });
     expect(viaCustomizedRexAction).toHaveAttribute(
       'href',
-      '/job_invocations/new?feature=katello_host_tracer_resolve&inputs%5Bids%5D=10&host_ids=name%20%5E%20(client.example.com)',
+      `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20=%20${firstTrace.id}`,
     );
 
     assertNockRequest(autocompleteScope);
@@ -248,7 +293,7 @@ describe('With tracer installed', () => {
 
   test('Can bulk restart traces via customized remote execution', async (done) => {
     const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-
+    const feature = REX_FEATURES.KATELLO_HOST_TRACER_RESOLVE;
     const scope = nockInstance
       .get(hostTraces)
       .reply(200, mockTraceData);
@@ -266,13 +311,13 @@ describe('With tracer installed', () => {
     expect(traceCheckbox.checked).toEqual(true);
 
     const actionMenu = getByLabelText('bulk_actions');
-    actionMenu.click();
+    fireEvent.click(actionMenu);
     const viaCustomizedRexAction = queryByText('Restart via customized remote execution');
 
     expect(viaCustomizedRexAction).toBeInTheDocument();
     expect(viaCustomizedRexAction).toHaveAttribute(
       'href',
-      '/job_invocations/new?feature=katello_host_tracer_resolve&inputs%5Bids%5D=10&host_ids=name%20%5E%20(client.example.com)',
+      `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BTraces%20search%20query%5D=id%20%5E%20(${firstTrace.id})`,
     );
 
     assertNockRequest(autocompleteScope);
@@ -359,6 +404,7 @@ describe('Without tracer installed', () => {
   });
 
   test('Can enable tracer via customized remote execution', async () => {
+    const feature = REX_FEATURES.KATELLO_PACKAGE_INSTALL;
     const { getByText, getByRole, queryByText }
       = renderWithRedux(<TracesTab />, renderOptions(false));
 
@@ -378,7 +424,7 @@ describe('Without tracer installed', () => {
     expect(enableTracesModalLink)
       .toHaveAttribute(
         'href',
-        '/job_invocations/new?feature=katello_package_install&inputs%5Bpackage%5D=katello-host-tools-tracer&host_ids=name%20%5E%20(client.example.com)',
+        `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5Bpackage%5D=katello-host-tools-tracer`,
       );
     enableTracesModalLink.click();
     expect(enableTracesModalLink).toHaveClass('pf-m-in-progress');

data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js

@@ -1,20 +1,34 @@
 import { REX_FEATURES } from './RemoteExecutionConstants';
-import { KATELLO_TRACER_PACKAGE } from './HostTracesConstants';
+import { KATELLO_TRACER_PACKAGE, TRACES_SEARCH_QUERY } from './HostTracesConstants';
+import { ERRATA_SEARCH_QUERY } from '../HostErrata/HostErrataConstants';
 
-export const katelloPackageInstallUrl = ({ hostname }) => {
-  const urlQuery = encodeURI([
-    `feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}`,
-    `inputs[package]=${KATELLO_TRACER_PACKAGE}`,
+export const createJob = ({
+  hostname, feature, inputs,
+}) => {
+  const inputParams = Object.keys(inputs).map(key => `inputs[${key}]=${inputs[key]}`);
+  const params = [
+    `feature=${feature}`,
     `host_ids=name ^ (${hostname})`,
-  ].join('&'));
+    ...inputParams,
+  ];
+  const urlQuery = encodeURI(params.join('&'));
   return `/job_invocations/new?${urlQuery}`;
 };
 
-export const resolveTraceUrl = ({ hostname, ids }) => {
-  const urlQuery = encodeURI([
-    `feature=${REX_FEATURES.KATELLO_HOST_TRACER_RESOLVE}`,
-    `inputs[ids]=${ids.join(',')}`,
-    `host_ids=name ^ (${hostname})`,
-  ].join('&'));
-  return `/job_invocations/new?${urlQuery}`;
-};
+export const katelloPackageInstallUrl = ({ hostname }) => createJob({
+  hostname,
+  feature: REX_FEATURES.KATELLO_PACKAGE_INSTALL,
+  inputs: { package: KATELLO_TRACER_PACKAGE },
+});
+
+export const resolveTraceUrl = ({ hostname, search }) => createJob({
+  hostname,
+  feature: REX_FEATURES.KATELLO_HOST_TRACER_RESOLVE,
+  inputs: { [TRACES_SEARCH_QUERY]: search },
+});
+
+export const errataInstallUrl = ({ hostname, search }) => createJob({
+  hostname,
+  feature: REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL,
+  inputs: { [ERRATA_SEARCH_QUERY]: search },
+});

data/webpack/containers/Application/overrides.scss

@@ -10,13 +10,15 @@ html .pagination-pf-pagesize.btn-group {
 
 // necessary because of !important table margin css from foreman
 // https://github.com/theforeman/foreman/blob/develop/app/assets/stylesheets/base.scss#L242
-.table + .table-view-pf-pagination {
+.table+.table-view-pf-pagination {
   margin-top: -6px !important;
 }
 
 // don't use this class if you need a dropdown menu to extend outside the table cell
 .neat-table-cells {
-  td, th {
+
+  td,
+  th {
     overflow: auto;
     word-wrap: break-word;
   }
@@ -30,6 +32,7 @@ html .pagination-pf-pagesize.btn-group {
     word-wrap: break-word;
   }
 }
+
 // override foreman's .editable styles, that are conflicting with the patternfly ones
 .pf-table-inline-edit {
   .editable {
@@ -45,14 +48,16 @@ html .pagination-pf-pagesize.btn-group {
 // needed to ensure correct spacing between buttons and the button
 // container
 .toolbar-pf .form-group {
+
   .btn,
   .btn-group,
   .btn-container,
   .tooltip-button-helper {
-    + .btn,
-    + .btn-group,
-    + .btn-container,
-    + .tooltip-button-helper {
+
+    +.btn,
+    +.btn-group,
+    +.btn-container,
+    +.tooltip-button-helper {
       margin-left: 5px;
     }
   }
@@ -67,17 +72,34 @@ html .pagination-pf-pagesize.btn-group {
   margin: 24px 0px;
 }
 
+// Modal sizing fix
 .pf-l-bullseye .pf-c-modal-box {
   margin-top: 76px;
   max-height: calc(100vh - 76px);
+
   @media (min-width: 768px) {
     max-width: calc(100vw - 240px);
     margin-left: 200px;
   }
 }
 
+// Makes question tooltips have a hover state
+.foreman-spaced-icon {
+  margin: 0 8px;
+
+  svg {
+    color: var(--pf-global--Color--200)
+  }
+
+  svg:hover {
+    color: var(--pf-global--Color--100)
+  }
+}
+
 @keyframes hideme {
-  0%, 70% {
+
+  0%,
+  70% {
     opacity: 1;
   }
 
@@ -87,10 +109,10 @@ html .pagination-pf-pagesize.btn-group {
 }
 
 .tooltip {
-  margin:auto;
+  margin: auto;
   animation-direction: normal;
   animation-name: hideme;
   animation-duration: 2s;
   animation-iteration-count: 1;
   animation-fill-mode: forwards;
-}
+}

data/webpack/global_index.js

@@ -8,6 +8,7 @@ import ContentTab from './components/extensions/HostDetails/Tabs/ContentTab';
 import ContentViewDetailsCard from './components/extensions/HostDetails/Cards/ContentViewDetailsCard';
 
 // import SubscriptionTab from './components/extensions/HostDetails/Tabs/SubscriptionTab';
+import RepositorySetsTab from './components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab';
 import TracesTab from './components/extensions/HostDetails/Tabs/TracesTab';
 import extendReducer from './components/extensions/reducers';
 import rootReducer from './redux/reducers';
@@ -17,9 +18,10 @@ registerReducer('katello', rootReducer);
 
 addGlobalFill('aboutFooterSlot', '[katello]AboutSystemStatuses', <SystemStatuses key="katello-system-statuses" />, 100);
 addGlobalFill('registrationAdvanced', '[katello]RegistrationCommands', <RegistrationCommands key="katello-reg" />, 100);
-addGlobalFill('host-details-page-tabs', 'Content', <ContentTab key="content" />, 100);
+addGlobalFill('host-details-page-tabs', 'Content', <ContentTab key="content" />, 900);
 /* eslint-disable max-len */
 // addGlobalFill('host-details-page-tabs', 'Subscription', <SubscriptionTab key="subscription" />, 100);
-addGlobalFill('host-details-page-tabs', 'Traces', <TracesTab key="traces" />, 100);
+addGlobalFill('host-details-page-tabs', 'Traces', <TracesTab key="traces" />, 800);
+addGlobalFill('host-details-page-tabs', 'Repository sets', <RepositorySetsTab key="repository-sets" />, 700);
 
 addGlobalFill('details-cards', 'Content View Details', <ContentViewDetailsCard key="content-view-details" />);

data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js

@@ -56,7 +56,6 @@ export const requestSuccessResponse = Immutable({
       },
       last_sync: null,
       content_counts: {
-        ostree_branch: 0,
         docker_manifest: 0,
         docker_manifest_list: 0,
         docker_tag: 0,
@@ -97,7 +96,6 @@ export const requestSuccessResponse = Immutable({
       },
       last_sync: null,
       content_counts: {
-        ostree_branch: 0,
         docker_manifest: 0,
         docker_manifest_list: 0,
         docker_tag: 0,

data/webpack/scenes/Content/ContentConfig.js

@@ -5,7 +5,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import ContentInfo from './Details/ContentInfo';
 import LastSync from '../ContentViews/Details/Repositories/LastSync';
 import ContentRepositories from './Details/ContentRepositories';
-import ContentCounts from './Details/ContentCounts';
+import ContentCounts from '../ContentViews/Details/Repositories/ContentCounts';
 
 export default () => [
   {
@@ -54,13 +54,16 @@ export default () => [
           {
             title: __('Sync Status'),
             getProperty: unit =>
-              <LastSync lastSyncWords={unit?.last_sync_words} lastSync={unit?.last_sync} />,
+              (<LastSync
+                startedAt={unit?.last_sync?.started_at}
+                lastSyncWords={unit?.last_sync_words}
+                lastSync={unit?.last_sync}
+              />),
           },
           {
             title: __('Content Count'),
-            getProperty: (unit, singularLabel) =>
+            getProperty: unit =>
               (<ContentCounts
-                typeSingularLabel={singularLabel}
                 productId={unit.product.id}
                 repoId={unit.id}
                 counts={unit.content_counts}
@@ -70,6 +73,16 @@ export default () => [
       },
     ],
   },
+  {
+    names: {
+      pluralTitle: __('OSTree Refs'),
+      singularTitle: __('OSTree Ref'),
+      pluralLowercase: __('OSTree refs'),
+      singularLowercase: __('OSTree ref'),
+      pluralLabel: 'ostree_refs',
+      singularLabel: 'ostree_ref',
+    },
+  },
   {
     names: {
       pluralTitle: __('Ansible Collections'),
@@ -119,13 +132,16 @@ export default () => [
           {
             title: __('Sync Status'),
             getProperty: unit =>
-              <LastSync lastSyncWords={unit?.last_sync_words} lastSync={unit?.last_sync} />,
+              (<LastSync
+                startedAt={unit?.started_at}
+                lastSyncWords={unit?.last_sync_words}
+                lastSync={unit?.last_sync}
+              />),
           },
           {
             title: __('Content Count'),
-            getProperty: (unit, singularLabel) =>
+            getProperty: unit =>
               (<ContentCounts
-                typeSingularLabel={singularLabel}
                 productId={unit.product.id}
                 repoId={unit.id}
                 counts={unit.content_counts}

data/webpack/scenes/ContentCredentials/ContentCredentialActions.js

@@ -0,0 +1,18 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import api, { orgId } from '../../services/api';
+import { GET_CONTENT_CREDENTIALS_KEY } from './ContentCredentialConstants';
+
+export const getContentCredentials = (params = {}) => {
+  const defaultParams = {
+    organization_id: orgId(),
+  };
+
+  return get({
+    type: API_OPERATIONS.GET,
+    key: GET_CONTENT_CREDENTIALS_KEY,
+    url: api.getApiUrl('/content_credentials'),
+    params: { ...defaultParams, ...params },
+  });
+};
+
+export default getContentCredentials;

data/webpack/scenes/ContentCredentials/ContentCredentialConstants.js

@@ -0,0 +1,2 @@
+export const GET_CONTENT_CREDENTIALS_KEY = 'GET_CONTENT_CREDENTIALS';
+export const CONTENT_CREDENTIAL_CERT_TYPE = 'cert';

data/webpack/scenes/ContentCredentials/ContentCredentialSelectors.js

@@ -0,0 +1,12 @@
+import {
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+
+import { GET_CONTENT_CREDENTIALS_KEY } from './ContentCredentialConstants';
+
+export const selectContentCredentials = (state) => {
+  const response = selectAPIResponse(state, GET_CONTENT_CREDENTIALS_KEY);
+  return response.results;
+};
+
+export default selectContentCredentials;

data/webpack/scenes/ContentCredentials/__tests__/contentCredentials.fixtures.js

@@ -0,0 +1,73 @@
+import Immutable from 'seamless-immutable';
+
+const contentCredentialsResponse = Immutable({
+  total: 2,
+  subtotal: 2,
+  selectable: 2,
+  page: 1,
+  per_page: 20,
+  error: null,
+  search: null,
+  sort: {
+    by: 'name',
+    order: 'asc',
+  },
+  results: [
+    {
+      name: 'DevelServerCA',
+      content_type: 'cert',
+      content: '-----BEGIN CERTIFICATE-----\r\nMIIHHzCCBQegAwIBAgIJAIUIoI5kWBt2MA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD\r\nVQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp\r\nZ2gxEDAOBgNVBAoMB0thdGVsbG8xFDASBgNVBAsMC1NvbWVPcmdVbml0MTEwLwYD\r\nVQQDDChjZW50b3M3LWthdGVsbG8tZGV2ZWwuanR1cmVsLmV4YW1wbGUuY29tMB4X\r\nDTIxMDcyOTE1MDgwNVoXDTM4MDExODE1MDgwNVowgZMxCzAJBgNVBAYTAlVTMRcw\r\nFQYDVQQIDA5Ob3J0aCBDYXJvbGluYTEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UE\r\nCgwHS2F0ZWxsbzEUMBIGA1UECwwLU29tZU9yZ1VuaXQxMTAvBgNVBAMMKGNlbnRv\r\nczcta2F0ZWxsby1kZXZlbC5qdHVyZWwuZXhhbXBsZS5jb20wggIiMA0GCSqGSIb3\r\nDQEBAQUAA4ICDwAwggIKAoICAQC4WsCZQpmOrRis/o9IsyW03vUon4FXPD00zm33\r\nykygAktyD93FAY0QhDMGnir+c9Uo3kU194QDyLTcGrOTw2POLHR/GDX7G4H5qEO9\r\nq1ZrGho4bYcgFqMBaGtFwpOuU4MhbgbKnwvfqNqPypshNpah74zcih9tey7fyCxd\r\nSIkarp8zB1bGcec5uvVDEd1EwjnrCSGx7Me1v61n0Fb7SrGlPa3qJC2bsL+jj1DF\r\nMukGEVsUxqvRMXe6i1jy4W7rWNUIsX2vIne1wup4qeojJy9zWWhwi5aGx6mIsUHN\r\nCqyfG+qNgkuJ1DfaZ2DwC8VJ6H17Gzzw7HdkQ4aYqk1hGvpJMS2WXR3vsP7OUO1S\r\n3qeGipksp5e/IEVX7fq+RUEMwrTDDgBsIeHL8R9hOsdtdqOm4RJ1IcGG0tgMA64q\r\nH0qFj0YheqO0x5rM5fD0Xh6TokQO9slSZRjjc4LfhcsRf8oqHfzm8v8dT0HQToNI\r\nDfvmg2TyxPAGsun0/b+9k5UBEIqpoByFPjR5oaH46oAzjiQm40lw8aMkEWK0n/41\r\n601neQMqwJdXsXt20Zz3UeLf8n09lDGUSYVztJkglV3vMNlrWn7hYrPPr1xq7zMs\r\ntfziExBctw2j5xOjOCMf7rt67SqmrQwurr4hSLJ3Iz+4JOd2ksVrjfHfv3/bc/Nk\r\nqgGQZwIDAQABo4IBcjCCAW4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAaYwHQYD\r\nVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBEGCWCGSAGG+EIBAQQEAwICRDA1\r\nBglghkgBhvhCAQ0EKBYmS2F0ZWxsbyBTU0wgVG9vbCBHZW5lcmF0ZWQgQ2VydGlm\r\naWNhdGUwHQYDVR0OBBYEFEgCBjRDDqs9/Vb4D/rDuddgqGTGMIHIBgNVHSMEgcAw\r\ngb2AFEgCBjRDDqs9/Vb4D/rDuddgqGTGoYGZpIGWMIGTMQswCQYDVQQGEwJVUzEX\r\nMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVpZ2gxEDAOBgNV\r\nBAoMB0thdGVsbG8xFDASBgNVBAsMC1NvbWVPcmdVbml0MTEwLwYDVQQDDChjZW50\r\nb3M3LWthdGVsbG8tZGV2ZWwuanR1cmVsLmV4YW1wbGUuY29tggkAhQigjmRYG3Yw\r\nDQYJKoZIhvcNAQELBQADggIBAAVm6c0Rv5m2twcqAwlPLPQVBqBVE3k0+2/4zO0d\r\nNkVz9FPoD5v6psKEBnQS/qQ5pMmCTqJipG4BtVTHh0nLahi0bjHo1uesj/kZg5hg\r\nVbRPDIAhFXAOg1M2qV74DHCaCv1ALYgz6TlZFkeBfg4m/H9eucIKezgZaV/CNhWk\r\nBeKaOgh7qQl8qTCp0CL97csmfmxLe51EzejNXAXjwwZ2R4438mR2K252fbzts0LS\r\nq9Dfx1XK0HmS0l5dhMFYfBQ4nY0ZQ/jgb/h8SxLTeKPJOHHdhzse6IL1f2rBIWL2\r\nmH7bLn8rfQaqyXZh/iKpY/xxVauCSsQcYVNaXOF66h20/wtPIQWx1xxzgnUa3/xW\r\nuMCocIzG3vBBBDeVs8M0mTTxMGRtfx2KMj7wZv6trq2SSyUtVk1CWn80iv8PQUfn\r\nOQwecX1cMdh5K21fK16aAlB48VKXpuxKQPxGYdNSFYVnadMgXvdQAyofjwGWCzWL\r\n9C/N37gtz8WsFXr54QYWkKlbuvYM1tuUNaZdySTW0RPO4Eqbmogh3ffDtrq8RaHh\r\nPBtTLwxf0LZgqqOCxGFhgPrVt3vhj8K9G5IC9dzl7lGamQ8YDJRuBkAhmtD5yxL7\r\nwAmqhAMBTDvNRT83b9WiMAakRVjuWgwIcDwzgeCErjCPCVTFP7Gvl1HveVvFsPXR\r\n7GZO\r\n-----END CERTIFICATE-----\r\n',
+      id: 6,
+      organization_id: 4,
+      organization: {
+        name: 'ISS',
+        label: 'ISS',
+        id: 4,
+      },
+      created_at: '2021-10-28 16:50:48 -0400',
+      updated_at: '2021-10-28 16:50:48 -0400',
+      gpg_key_products: [],
+      gpg_key_repos: [],
+      ssl_ca_products: [],
+      ssl_ca_root_repos: [],
+      ssl_client_products: [],
+      ssl_client_root_repos: [],
+      ssl_key_products: [],
+      ssl_key_root_repos: [],
+      permissions: {
+        view_content_credenials: true,
+        edit_content_credenials: true,
+        destroy_content_credenials: true,
+      },
+    },
+    {
+      name: 'UpstreamServerCA',
+      content_type: 'cert',
+      content: '-----BEGIN CERTIFICATE-----\nMIIHGTCCBQGgAwIBAgIJAK+PvWdMGcRbMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYD\nVQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp\nZ2gxEDAOBgNVBAoMB0thdGVsbG8xFDASBgNVBAsMC1NvbWVPcmdVbml0MS8wLQYD\nVQQDDCZjZW50b3M3LWthdGVsbG8tNC0yLmp0dXJlbC5leGFtcGxlLmNvbTAeFw0y\nMTEwMjYxNTQzMjlaFw0zODAxMTcxNTQzMjlaMIGRMQswCQYDVQQGEwJVUzEXMBUG\nA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVpZ2gxEDAOBgNVBAoM\nB0thdGVsbG8xFDASBgNVBAsMC1NvbWVPcmdVbml0MS8wLQYDVQQDDCZjZW50b3M3\nLWthdGVsbG8tNC0yLmp0dXJlbC5leGFtcGxlLmNvbTCCAiIwDQYJKoZIhvcNAQEB\nBQADggIPADCCAgoCggIBALKfp6gXOiyUU9z7b1Zrg4arCQ1QK8J2PvwVJo+NeNZC\nVnUzw3hof0rIovL4/cUUpZYGtCME0PSthxsnYwRSXALW2Gmy3qIm6k+3K524+yYX\n9PWE1CVCPjgboLfBIrkb1WlviZZ4pKdoPxF2DUUksw4T9inpeir/Nlul9dEvbGHw\nIXkNxolVrkrD2bD9C0z+JjzfLwlJ8CH/FX/tan3jMUqKF70Gi5MEyL6TDhHmduGG\nNPywwdC5oH6jUg94w38SdVovI7uHb/Pu5Kgw9sVBAZ4I+7vQqFL0M8YG/Di/kp/V\nLlqqRxjn1T7FepMo/gNWb3Yc9ZBcSyxHgqHlZi/dy4zW+l/y3OgCGekGkma5IjzY\n9qJyNxGUXennAMkjW1+P40CLFuqN77rmV7dYwIR+jcPmzhz1eEhkLNyNfvcQlVTf\nCCkqaX53kVH4Cu4MFcWFs74W9v5BiPydhhzfy7O3rhDCrIu7Z9A5Qt0d3Ctj5x/C\ny2sj+oO35QGhj0KsjuvCfR3HxojSNfjM65tkKzdSRDt9hYP8+Up2YT6EDo72Mp6m\ndAiwrPxiAUOQDVEhzeEjMN8Cgsb3vyOy1cnYCttgiPXvTdGOt5NTUoolWn4ubBOY\nnLROTPyJmqevhQjcxQdSwsjPkFnZWFx6xB6WT10leFGFhclUa2lHVWHn5r9ZZf75\nAgMBAAGjggFwMIIBbDAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBpjAdBgNVHSUE\nFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwEQYJYIZIAYb4QgEBBAQDAgJEMDUGCWCG\nSAGG+EIBDQQoFiZLYXRlbGxvIFNTTCBUb29sIEdlbmVyYXRlZCBDZXJ0aWZpY2F0\nZTAdBgNVHQ4EFgQUdMirW7cQqNXyPyRXrrEb38l2sq8wgcYGA1UdIwSBvjCBu4AU\ndMirW7cQqNXyPyRXrrEb38l2sq+hgZekgZQwgZExCzAJBgNVBAYTAlVTMRcwFQYD\nVQQIDA5Ob3J0aCBDYXJvbGluYTEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwH\nS2F0ZWxsbzEUMBIGA1UECwwLU29tZU9yZ1VuaXQxLzAtBgNVBAMMJmNlbnRvczct\na2F0ZWxsby00LTIuanR1cmVsLmV4YW1wbGUuY29tggkAr4+9Z0wZxFswDQYJKoZI\nhvcNAQELBQADggIBAFriP91uFIPUOwrgVqbFDWykSWQtcP8NrvPJ5LPCkjhSgh6u\nnOL9ZDL2w6/oYzO70q/tQmWbBwnYfv+D5lrHjkXejXIpR2rjOPZbTSKLst0qtTF3\nwqK33vty7jTx/l91dV8HY/Ip/WoXPmGT8FmDN8UWXX6MGA6m6nPMQCJuDYCmXaEz\nMQNd6Hgew0ArtgY4dPTvK0vmvMgEXw9v3FY8xIbgoAzoZ44/C/X5OodkJRPL8qwx\nwEWlPLe4a53WD/jU+qKJA71J4DL+QiXREDfVeuoqRAvWt4NrN0emEgDGlXn+gybS\nbU4s2GotQQKgqbmk9yA0/ZsZbd8zAV13CtRhiApsCPwO6YmIgzG0yqbM8VV6hATo\nkYiLmrgaMaIUJpyZze7P4PDSwAeMjqXs9p4oYA/aBD+pJ+OWI/PhPIdyl5e4kr7L\ne8hZkcuOo7Mw7kyvjKWo8zI/v9NJVSDAFXvBWVY+nYXLc7ovfX/msYgvyF2ylAHq\nNqJR6OZQoS1nWz2kYRqn4p3ygNSKUfctNA24CgorMqKLJ0XNJEBSoNV9rRczKghY\nXKScr3j4HnfLeyHmIo05XFPCCh1SfnQDG0H0rDHXNGABJhfNc35Y6TyXZhUgMxit\nQ9Vgl2JTl8+5swzfVdLemBXg4N6ITISkvyL3/keCca3U+4UTPCw9w/qx7+pd\n-----END CERTIFICATE-----',
+      id: 4,
+      organization_id: 4,
+      organization: {
+        name: 'ISS',
+        label: 'ISS',
+        id: 4,
+      },
+      created_at: '2021-10-28 12:14:10 -0400',
+      updated_at: '2021-10-28 16:25:06 -0400',
+      gpg_key_products: [],
+      gpg_key_repos: [],
+      ssl_ca_products: [],
+      ssl_ca_root_repos: [],
+      ssl_client_products: [],
+      ssl_client_root_repos: [],
+      ssl_key_products: [],
+      ssl_key_root_repos: [],
+      permissions: {
+        view_content_credenials: true,
+        edit_content_credenials: true,
+        destroy_content_credenials: true,
+      },
+    },
+  ],
+});
+
+export default contentCredentialsResponse;

data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js

@@ -65,7 +65,7 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
         <Button
           aria-label="copy_content_view"
           variant="primary"
-          isDisabled={saving}
+          isDisabled={name.length <= 2 || saving}
           type="submit"
         >
           {__('Copy content view')}

data/webpack/scenes/ContentViews/Create/ContentViewFormComponents.js

@@ -32,7 +32,7 @@ export const LabelComponent = () => (
 
 export const LabelDependencies = () => (
   <Flex>
-    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Solve Dependencies')}</FlexItem>
+    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Solve dependencies')}</FlexItem>
     <FlexItem>
       {HelpToolTip(dependenciesHelpText)}
     </FlexItem>
@@ -41,7 +41,7 @@ export const LabelDependencies = () => (
 
 export const LabelAutoPublish = () => (
   <Flex>
-    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Auto Publish')}</FlexItem>
+    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Auto publish')}</FlexItem>
     <FlexItem>
       {HelpToolTip(autoPublishHelpText)}
     </FlexItem>
@@ -50,7 +50,7 @@ export const LabelAutoPublish = () => (
 
 export const LabelImportOnly = () => (
   <Flex>
-    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Import Only')}</FlexItem>
+    <FlexItem spacer={{ default: 'spacerSm' }}>{__('Import only')}</FlexItem>
     <FlexItem>
       {HelpToolTip(importOnlyHelpText)}
     </FlexItem>

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js

@@ -10,6 +10,7 @@ import { createContentView } from '../ContentViewsActions';
 import { selectCreateContentViews, selectCreateContentViewStatus, selectCreateContentViewError } from './ContentViewCreateSelectors';
 import { LabelDependencies, LabelAutoPublish, LabelImportOnly } from './ContentViewFormComponents';
 import ContentViewIcon from '../components/ContentViewIcon';
+import './CreateContentViewForm.scss';
 
 const CreateContentViewForm = ({ setModalOpen }) => {
   const dispatch = useDispatch();
@@ -63,6 +64,8 @@ const CreateContentViewForm = ({ setModalOpen }) => {
     return (<Redirect to={`/content_views/${id}`} />);
   }
 
+  const submitDisabled = name.length <= 2 || label.length <= 2 || saving;
+
   return (
     <Form onSubmit={(e) => {
       e.preventDefault();
@@ -106,6 +109,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
         <Grid hasGutter>
           <GridItem span={6}>
             <Tile
+              style={{ height: '100%' }}
               isStacked
               aria-label="component_tile"
               icon={<ContentViewIcon composite={false} />}
@@ -114,11 +118,12 @@ const CreateContentViewForm = ({ setModalOpen }) => {
               onClick={() => { setComponent(true); setComposite(false); }}
               isSelected={component}
             >
-              {__('Single content view consisting of repositories')}
+              {__('Single content view consisting of e.g. repositories')}
             </Tile>
           </GridItem>
           <GridItem span={6}>
             <Tile
+              style={{ height: '100%' }}
               isStacked
               aria-label="composite_tile"
               icon={<ContentViewIcon composite />}
@@ -166,7 +171,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
         <Button
           aria-label="create_content_view"
           variant="primary"
-          isDisabled={saving}
+          isDisabled={submitDisabled}
           type="submit"
         >
           {__('Create content view')}

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.scss

@@ -0,0 +1,7 @@
+.pf-c-tile__title {
+  font-size: 16px;
+}
+
+.pf-c-tile__icon {
+  min-height: 38px;
+}

data/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js

@@ -69,9 +69,9 @@ test('Displays dependent fields correctly', () => {
   expect(getByText('Label')).toBeInTheDocument();
   expect(getByText('Composite content view')).toBeInTheDocument();
   expect(getByText('Component content view')).toBeInTheDocument();
-  expect(getByText('Solve Dependencies')).toBeInTheDocument();
-  expect(queryByText('Auto Publish')).not.toBeInTheDocument();
-  expect(getByText('Import Only')).toBeInTheDocument();
+  expect(getByText('Solve dependencies')).toBeInTheDocument();
+  expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(getByText('Import only')).toBeInTheDocument();
 
   // label auto_set
   fireEvent.change(getByLabelText('input_name'), { target: { value: '123 2123' } });
@@ -79,13 +79,13 @@ test('Displays dependent fields correctly', () => {
 
   // display Auto Publish when Composite CV
   fireEvent.click(getByLabelText('composite_tile'));
-  expect(queryByText('Solve Dependencies')).not.toBeInTheDocument();
-  expect(getByText('Auto Publish')).toBeInTheDocument();
-  expect(queryByText('Import Only')).not.toBeInTheDocument();
+  expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
+  expect(getByText('Auto publish')).toBeInTheDocument();
+  expect(queryByText('Import only')).not.toBeInTheDocument();
 
   // display Solve Dependencies when Component CV
   fireEvent.click(getByLabelText('component_tile'));
-  expect(getByText('Solve Dependencies')).toBeInTheDocument();
-  expect(queryByText('Auto Publish')).not.toBeInTheDocument();
-  expect(getByText('Import Only')).toBeInTheDocument();
+  expect(getByText('Solve dependencies')).toBeInTheDocument();
+  expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(getByText('Import only')).toBeInTheDocument();
 });