katello 4.4.1 → 4.5.0

data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js

@@ -0,0 +1,149 @@
+import React from 'react';
+import * as reactRedux from 'react-redux';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import api, { foremanApi } from '../../../../services/api';
+import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../test-utils/nockWrapper';
+import ACSTable from '../../MainTable/ACSTable';
+import contentCredentialResult from './contentCredentials.fixtures';
+import smartProxyResult from './smartProxy.fixtures';
+
+const ACSIndexPath = api.getApiUrl('/alternate_content_sources');
+const ACSCreatePath = api.getApiUrl('/alternate_content_sources');
+const contentCredentialPath = api.getApiUrl('/content_credentials');
+const smartProxyPath = foremanApi.getApiUrl('/smart_proxies');
+const autocompleteUrl = '/alternate_content_sources/auto_complete_search';
+
+const createACSDetails = {
+  upstream_username: 'username',
+  upstream_password: 'password',
+  name: 'acs_test',
+  description: '',
+  base_url: 'https://test_url.com/',
+  subpaths: ['test/repo1/', 'test/repo2/'],
+  smart_proxy_names: ['centos7-katello-devel-stable.example.com'],
+  content_type: 'yum',
+  alternate_content_source_type: 'custom',
+  verify_ssl: false,
+  ssl_ca_cert_id: '',
+};
+
+const noResults = {
+  total: 0,
+  subtotal: 0,
+  page: 1,
+  per_page: 20,
+  results: [],
+};
+
+let searchDelayScope;
+let autoSearchScope;
+beforeEach(() => {
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can show add ACS button', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(ACSIndexPath)
+    .query(true)
+    .reply(200, noResults);
+
+  const { queryByText } = renderWithRedux(<ACSTable />);
+
+  expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  expect(queryByText('Add source')).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can display create wizard and create ACS', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(ACSIndexPath)
+    .query(true)
+    .reply(200, noResults);
+
+  const contentCredentialScope = nockInstance
+    .get(contentCredentialPath)
+    .query(true)
+    .reply(200, contentCredentialResult);
+
+  const smartProxyScope = nockInstance
+    .get(smartProxyPath)
+    .query(true)
+    .reply(200, smartProxyResult);
+
+  const createScope = nockInstance
+    .post(ACSCreatePath, createACSDetails)
+    .reply(201, { id: 22 });
+
+  const {
+    getByLabelText, getByText, getAllByRole, queryByText,
+  } = renderWithRedux(<ACSTable />);
+
+  expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  expect(queryByText('Add source')).toBeInTheDocument();
+  fireEvent.click(getByText('Add source'));
+
+  // First step: Select source
+  await patientlyWaitFor(() => {
+    expect(getByText('Add an alternate content source')).toBeInTheDocument();
+    expect(queryByText('Indicate the source type.')).toBeInTheDocument();
+  });
+
+  // Choose ACS type, content_type defaults to yum
+  fireEvent.click(getByText('Custom'));
+
+  // Go to next step: Name source
+  fireEvent.click(getByText('Next'));
+
+  await patientlyWaitFor(() => {
+    expect(getByText('Enter a name for your source.')).toBeInTheDocument();
+  });
+  // Enter Name
+  fireEvent.change(getByLabelText('acs_name_field'), { target: { value: 'acs_test' } });
+
+  // Mock smart proxy selector to go to next page
+  const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useSelectorMock.mockReturnValue(smartProxyResult);
+  fireEvent.click(getByText('Next'));
+  fireEvent.click(getByLabelText('Add all'));
+
+  // Go to URL and subpath step
+  fireEvent.click(getByText('Next'));
+
+  fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'https://test_url.com/' } });
+  expect(getByLabelText('acs_base_url_field')).toHaveAttribute('value', 'https://test_url.com/');
+  fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'test/repo1/,test/repo2/' } });
+
+  // Mock content credential data
+  useSelectorMock.mockReturnValue(contentCredentialResult.results);
+  fireEvent.click(getByText('Next'));
+  const manualAuthRadio = getAllByRole('radio', { name: 'Manual authentication' })[0];
+  fireEvent.click(manualAuthRadio);
+  await patientlyWaitFor(() => {
+    expect(getByText('Username')).toBeInTheDocument();
+    expect(getByText('Password')).toBeInTheDocument();
+  });
+  fireEvent.change(getByLabelText('acs_username_field'), { target: { value: 'username' } });
+  fireEvent.change(getByLabelText('acs_password_field'), { target: { value: 'password' } });
+
+  fireEvent.click(getByText('Next'));
+  fireEvent.click(getByText('Add'));
+
+  useSelectorMock.mockClear();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(contentCredentialScope);
+  assertNockRequest(smartProxyScope);
+  assertNockRequest(createScope, done);
+});

data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreateData.fixtures.json

@@ -0,0 +1,3 @@
+{
+  "id": 22,
+}

data/webpack/scenes/AlternateContentSources/Create/__tests__/contentCredentials.fixtures.json

@@ -0,0 +1,69 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "selectable": 2,
+  "page": 1,
+  "per_page": 20,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "name",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "name": "test",
+      "content_type": "cert",
+      "content": "abcdef",
+      "id": 1,
+      "organization_id": 1,
+      "organization": {
+        "name": "Default Organization",
+        "label": "Default_Organization",
+        "id": 1
+      },
+      "created_at": "2022-05-02 16:21:58 -0400",
+      "updated_at": "2022-05-02 16:21:58 -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": "test1",
+      "content_type": "gpg_key",
+      "content": "abcdef",
+      "id": 2,
+      "organization_id": 1,
+      "organization": {
+        "name": "Default Organization",
+        "label": "Default_Organization",
+        "id": 1
+      },
+      "created_at": "2022-05-02 16:22:30 -0400",
+      "updated_at": "2022-05-02 16:22:30 -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
+      }
+    }
+  ]
+}

data/webpack/scenes/AlternateContentSources/Create/__tests__/smartProxy.fixtures.json

@@ -0,0 +1,65 @@
+{
+  "total": 1,
+  "subtotal": 1,
+  "page": 1,
+  "per_page": 20,
+  "search": null,
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "created_at": "2022-05-02 10:17:57 -0400",
+      "updated_at": "2022-05-02 10:24:21 -0400",
+      "hosts_count": 0,
+      "name": "centos7-katello-devel-stable.example.com",
+      "id": 1,
+      "url": "https://centos7-katello-devel-stable.example.com:9090",
+      "remote_execution_pubkey": "foreman-proxy@centos7-katello-devel-stable.example.com",
+      "download_policy": "on_demand",
+      "supported_pulp_types": [
+        "ansible_collection",
+        "deb",
+        "docker",
+        "file",
+        "python",
+        "yum"
+      ],
+      "features": [
+        {
+          "capabilities": [
+            "single",
+            "ssh"
+          ],
+          "name": "Dynflow",
+          "id": 17
+        },
+        {
+          "capabilities": [],
+          "name": "SSH",
+          "id": 18
+        },
+        {
+          "capabilities": [
+            "ansible",
+            "certguard",
+            "container",
+            "core",
+            "deb",
+            "file",
+            "python",
+            "rpm"
+          ],
+          "name": "Pulpcore",
+          "id": 3
+        },
+        {
+          "capabilities": [],
+          "name": "Logs",
+          "id": 13
+        }
+      ]
+    }
+  ]
+}

data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js

@@ -0,0 +1,162 @@
+import React, { useState, useCallback } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Button } from '@patternfly/react-core';
+import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import TableWrapper from '../../../components/Table/TableWrapper';
+import {
+  selectAlternateContentSources, selectAlternateContentSourcesError,
+  selectAlternateContentSourcesStatus,
+} from '../ACSSelectors';
+import { useTableSort } from '../../../components/Table/TableHooks';
+import getAlternateContentSources, { deleteACS, refreshACS } from '../ACSActions';
+import ACSCreateWizard from '../Create/ACSCreateWizard';
+import LastSync from '../../ContentViews/Details/Repositories/LastSync';
+
+const ACSTable = () => {
+  const response = useSelector(selectAlternateContentSources);
+  const status = useSelector(selectAlternateContentSourcesStatus);
+  const error = useSelector(selectAlternateContentSourcesError);
+  const [searchQuery, updateSearchQuery] = useState('');
+  const [isCreateWizardOpen, setIsCreateWizardOpen] = useState(false);
+  const dispatch = useDispatch();
+  const { results, ...metadata } = response;
+  const columnHeaders = [
+    __('Name'),
+    __('Type'),
+    __('Last Refresh'),
+  ];
+
+  const COLUMNS_TO_SORT_PARAMS = {
+    [columnHeaders[0]]: 'name',
+    [columnHeaders[1]]: 'alternate_content_source_type',
+  };
+
+  const {
+    pfSortParams, apiSortParams,
+    activeSortColumn, activeSortDirection,
+  } = useTableSort({
+    allColumns: columnHeaders,
+    columnsToSortParams: COLUMNS_TO_SORT_PARAMS,
+    initialSortColumnName: 'Name',
+  });
+
+  const fetchItems = useCallback(
+    params =>
+      getAlternateContentSources({
+        ...apiSortParams,
+        ...params,
+      }),
+    [apiSortParams],
+  );
+
+  const onDelete = (id) => {
+    dispatch(deleteACS(id, () =>
+      dispatch(getAlternateContentSources())));
+  };
+
+  const onRefresh = (id) => {
+    dispatch(refreshACS(id, () =>
+      dispatch(getAlternateContentSources())));
+  };
+
+  const createButtonOnclick = () => {
+    setIsCreateWizardOpen(true);
+  };
+
+  const rowDropdownItems = ({ id }) => [
+    {
+      title: __('Delete'),
+      ouiaId: `remove-acs-${id}`,
+      onClick: () => {
+        onDelete(id);
+      },
+    },
+    {
+      title: __('Refresh'),
+      ouiaId: `remove-acs-${id}`,
+      onClick: () => {
+        onRefresh(id);
+      },
+    },
+  ];
+
+  const emptyContentTitle = __("You currently don't have any alternate content sources.");
+  const emptyContentBody = __('An alternate content source can be added by using the "Add source" button above.');
+  const emptySearchTitle = __('No matching alternate content sources found');
+  const emptySearchBody = __('Try changing your search settings.');
+  /* eslint-disable react/no-array-index-key */
+  return (
+    <TableWrapper
+      {...{
+        metadata,
+        emptyContentTitle,
+        emptyContentBody,
+        emptySearchTitle,
+        emptySearchBody,
+        searchQuery,
+        updateSearchQuery,
+        error,
+        status,
+        fetchItems,
+      }}
+      ouiaId="alternate-content-sources-table"
+      variant={TableVariant.compact}
+      additionalListeners={[activeSortColumn, activeSortDirection]}
+      autocompleteEndpoint="/alternate_content_sources/auto_complete_search"
+      actionButtons={
+        <>
+          <Button ouiaId="create-acs" onClick={createButtonOnclick} variant="primary" aria-label="create_acs">
+            {__('Add source')}
+          </Button>
+          {isCreateWizardOpen &&
+            <ACSCreateWizard
+              show={isCreateWizardOpen}
+              setIsOpen={setIsCreateWizardOpen}
+            />
+          }
+        </>
+      }
+    >
+      <Thead>
+        <Tr>
+          {columnHeaders.map(col => (
+            <Th
+              key={col}
+              sort={COLUMNS_TO_SORT_PARAMS[col] ? pfSortParams(col) : undefined}
+            >
+              {col}
+            </Th>
+          ))}
+        </Tr>
+      </Thead>
+      <Tbody>
+        {results?.map((acs, index) => {
+          const {
+            name,
+            alternate_content_source_type: acsType,
+            last_refresh: lastTask,
+          } = acs;
+          const { last_refresh_words: lastRefreshWords, started_at: startedAt } = lastTask ?? {};
+          return (
+            <Tr key={index}>
+              <Td>{name}</Td>
+              <Td>{acsType}</Td>
+              <Td><LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastRefreshWords} emptyMessage="N/A" /></Td>
+              <Td
+                actions={{
+                  items: rowDropdownItems(acs),
+                }}
+              />
+            </Tr>
+          );
+        })
+      }
+      </Tbody>
+    </TableWrapper>
+  );
+  /* eslint-enable react/no-array-index-key */
+};
+
+export default ACSTable;
+

data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsIndex.fixtures.json

@@ -0,0 +1,91 @@
+{
+  "total": 3,
+  "subtotal": 3,
+  "selectable": 3,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "name",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "name": "test_acs_file_1",
+      "base_url": "https://fixtures.pulpproject.org/",
+      "subpaths": [
+        "file/"
+      ],
+      "content_type": "file",
+      "alternate_content_source_type": "custom",
+      "smart_proxies": [
+        {
+          "id": 1,
+          "name": "centos7-katello-devel-stable.example.com",
+          "url": "https://centos7-katello-devel-stable.example.com:9090",
+          "created_at": "2022-05-02T10:17:57.044-04:00",
+          "updated_at": "2022-05-02T10:24:21.666-04:00",
+          "pubkey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bzUlVINCZqDFEcBmWI3d3rytod1XtlGNrTp4JXeLVmT74/gbpeUkM221RZxfNDrU6BPHxwbuzeAF3/DU4nT6w9WkRSemeNxzLSZPqNiJuqjDwIkI2KTmTkyOF+jYObC+0ir7pCD7IdCVdf2RxJIJjPB8GnLYAzBjPRwtUFuDZfzpBGf4iTlmMd8oSfSnUOSrdI30ag2DkvoqGII+z+QVIGRj/bKL55DW4C/5ykH5B7kpZSFfRcmYzA6f1bNHuWuOkopkT3CcpotEb7kx3qeh16skJsgPABYBTm41klUPIFJS609dF8jJwbF+ZhNkIv96OYT/7nZR+Kcf/S2qBbXP foreman-proxy@centos7-katello-devel-stable.example.com",
+          "expired_logs": "0",
+          "puppet_path": null,
+          "download_policy": "on_demand"
+        }
+      ],
+      "upstream_username": null,
+      "id": 3,
+      "label": "test_acs_file_1",
+      "description": null
+    },
+    {
+      "name": "test_acs_file_2",
+      "base_url": "https://fixtures.pulpproject.org/",
+      "subpaths": [
+        "file/"
+      ],
+      "content_type": "file",
+      "alternate_content_source_type": "custom",
+      "smart_proxies": [
+        {
+          "id": 1,
+          "name": "centos7-katello-devel-stable.example.com",
+          "url": "https://centos7-katello-devel-stable.example.com:9090",
+          "created_at": "2022-05-02T10:17:57.044-04:00",
+          "updated_at": "2022-05-02T10:24:21.666-04:00",
+          "pubkey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bzUlVINCZqDFEcBmWI3d3rytod1XtlGNrTp4JXeLVmT74/gbpeUkM221RZxfNDrU6BPHxwbuzeAF3/DU4nT6w9WkRSemeNxzLSZPqNiJuqjDwIkI2KTmTkyOF+jYObC+0ir7pCD7IdCVdf2RxJIJjPB8GnLYAzBjPRwtUFuDZfzpBGf4iTlmMd8oSfSnUOSrdI30ag2DkvoqGII+z+QVIGRj/bKL55DW4C/5ykH5B7kpZSFfRcmYzA6f1bNHuWuOkopkT3CcpotEb7kx3qeh16skJsgPABYBTm41klUPIFJS609dF8jJwbF+ZhNkIv96OYT/7nZR+Kcf/S2qBbXP foreman-proxy@centos7-katello-devel-stable.example.com",
+          "expired_logs": "0",
+          "puppet_path": null,
+          "download_policy": "on_demand"
+        }
+      ],
+      "upstream_username": null,
+      "id": 1,
+      "label": "test_acs_file_2",
+      "description": null
+    },
+    {
+      "name": "test_acs_yum_1",
+      "base_url": "https://fixtures.pulpproject.org/",
+      "subpaths": ["file/", "package/"],
+      "content_type": "yum",
+      "alternate_content_source_type": "custom",
+      "smart_proxies": [
+        {
+          "id": 1,
+          "name": "centos7-katello-devel-stable.example.com",
+          "url": "https://centos7-katello-devel-stable.example.com:9090",
+          "created_at": "2022-05-02T10:17:57.044-04:00",
+          "updated_at": "2022-05-02T10:24:21.666-04:00",
+          "pubkey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bzUlVINCZqDFEcBmWI3d3rytod1XtlGNrTp4JXeLVmT74/gbpeUkM221RZxfNDrU6BPHxwbuzeAF3/DU4nT6w9WkRSemeNxzLSZPqNiJuqjDwIkI2KTmTkyOF+jYObC+0ir7pCD7IdCVdf2RxJIJjPB8GnLYAzBjPRwtUFuDZfzpBGf4iTlmMd8oSfSnUOSrdI30ag2DkvoqGII+z+QVIGRj/bKL55DW4C/5ykH5B7kpZSFfRcmYzA6f1bNHuWuOkopkT3CcpotEb7kx3qeh16skJsgPABYBTm41klUPIFJS609dF8jJwbF+ZhNkIv96OYT/7nZR+Kcf/S2qBbXP foreman-proxy@centos7-katello-devel-stable.example.com",
+          "expired_logs": "0",
+          "puppet_path": null,
+          "download_policy": "on_demand"
+        }
+      ],
+      "upstream_username": null,
+      "id": 4,
+      "label": "test_acs_yum_1",
+      "description": null
+    }
+  ]
+}

data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js

@@ -0,0 +1,67 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+
+import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../test-utils/nockWrapper';
+import api from '../../../../services/api';
+import ACSTable from '../ACSTable';
+import acsData from './acsIndex.fixtures.json';
+
+const acsURL = api.getApiUrl('/alternate_content_sources');
+const autocompleteUrl = '/alternate_content_sources/auto_complete_search';
+
+let firstAcs;
+let searchDelayScope;
+let autoSearchScope;
+
+beforeEach(() => {
+  const { results } = acsData;
+  [firstAcs] = results;
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can call API and show ACS on page load', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(acsURL)
+    .query(true)
+    .reply(200, acsData);
+
+  const { getByText, queryByText } = renderWithRedux(<ACSTable />);
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(firstAcs.name)).toBeNull();
+  // Assert that the ACS name is now showing on the screen, but wait for it to appear.
+  await patientlyWaitFor(() => expect(getByText(firstAcs.name)).toBeInTheDocument());
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can handle no ACS being present', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    per_page: 20,
+    results: [],
+  };
+  const scope = nockInstance
+    .get(acsURL)
+    .query(true)
+    .reply(200, noResults);
+
+  const { queryByText } = renderWithRedux(<ACSTable />);
+
+  expect(queryByText(firstAcs.name)).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});

data/webpack/scenes/AlternateContentSources/index.js

@@ -0,0 +1,4 @@
+import { withRouter } from 'react-router-dom';
+import ACSIndexPage from './ACSIndexPage';
+
+export default withRouter(ACSIndexPage);

data/webpack/scenes/Content/Details/ContentRepositories.js

@@ -42,6 +42,7 @@ const ContentRepositories = ({ contentType, id, tabKey }) => {
         emptySearchBody,
         emptyContentBody,
       }}
+      ouiaId="content-repositories-table"
       variant={TableVariant.compact}
       autocompleteEndpoint="/repositories/auto_complete_search"
       fetchItems={useCallback(

data/webpack/scenes/Content/Table/ContentTable.js

@@ -30,6 +30,7 @@ const ContentTable = ({
         error,
         status,
       }}
+      ouiaId="content-table"
       key={selectedContentType}
       variant={TableVariant.compact}
       autocompleteEndpoint={`/${contentTypes[selectedContentType][1]}/auto_complete_search`}

data/webpack/scenes/ContentCredentials/ContentCredentialSelectors.js

@@ -1,6 +1,8 @@
 import {
+  selectAPIStatus,
   selectAPIResponse,
 } from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
 
 import { GET_CONTENT_CREDENTIALS_KEY } from './ContentCredentialConstants';
 
@@ -9,4 +11,5 @@ export const selectContentCredentials = (state) => {
   return response.results;
 };
 
-export default selectContentCredentials;
+export const selectContentCredentialsStatus = state =>
+  selectAPIStatus(state, GET_CONTENT_CREDENTIALS_KEY) || STATUS.PENDING;

data/webpack/scenes/ContentViews/ContentViewsActions.js

@@ -54,12 +54,16 @@ export const copyContentView = params => post({
   errorToast: error => cvErrorToast(error),
 });
 
-export const publishContentView = params => post({
+export const publishContentView = (params, handleSuccess, handleError) => post({
   type: API_OPERATIONS.POST,
   key: cvVersionPublishKey(params.id, params.versionCount),
   url: api.getApiUrl(`/content_views/${params.id}/publish`),
   params,
-  handleSuccess: response => renderTaskStartedToast(response.data),
+  handleSuccess: (response) => {
+    if (handleSuccess) handleSuccess(response);
+    return renderTaskStartedToast(response.data);
+  },
+  handleError,
   errorToast: error => cvErrorToast(error),
 });