katello 4.3.0.rc1 → 4.3.0.rc2

data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js

@@ -33,7 +33,7 @@ const PublishContentViewWizard = ({
   const steps = [
     {
       id: 1,
-      name: 'Publish',
+      name: __('Publish'),
       component: <CVPublishForm
         description={description}
         setDescription={setDescription}
@@ -47,11 +47,11 @@ const PublishContentViewWizard = ({
       />,
     },
     {
-      id: 2, name: 'Review', component: <CVPublishReview details={details} userCheckedItems={userCheckedItems} show={show} />, nextButtonText: 'Finish',
+      id: 2, name: __('Review details'), component: <CVPublishReview details={details} userCheckedItems={userCheckedItems} show={show} />, nextButtonText: 'Finish',
     },
     {
       id: 3,
-      name: 'Finish',
+      name: __('Finish'),
       component: <CVPublishFinish
         description={description}
         setDescription={setDescription}

data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js

@@ -23,9 +23,9 @@ test('Can call API and show Wizard', async (done) => {
   const { getByText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
     show
-    setIsOpen={() => {}}
+    setIsOpen={() => { }}
     currentStep={1}
-    setCurrentStep={() => {}}
+    setCurrentStep={() => { }}
   />);
 
   await patientlyWaitFor(() => expect(getByText('Publish new version - 6.0')).toBeInTheDocument());
@@ -44,9 +44,9 @@ test('Can show Wizard and show environment paths', async (done) => {
   const { getByText, getByLabelText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
     show
-    setIsOpen={() => {}}
+    setIsOpen={() => { }}
     currentStep={1}
-    setCurrentStep={() => {}}
+    setCurrentStep={() => { }}
   />);
 
   await patientlyWaitFor(() => expect(getByText('Publish new version - 6.0')).toBeInTheDocument());
@@ -75,9 +75,9 @@ test('Can show and hide force promotion alert', async (done) => {
   } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
     show
-    setIsOpen={() => {}}
+    setIsOpen={() => { }}
     currentStep={1}
-    setCurrentStep={() => {}}
+    setCurrentStep={() => { }}
   />);
 
   await patientlyWaitFor(() => expect(getByText('Publish new version - 6.0')).toBeInTheDocument());
@@ -95,24 +95,24 @@ test('Can show and hide force promotion alert', async (done) => {
 
   // check outOfOrderEnv
   fireEvent.click(getByLabelText(outOfOrderEnv));
-  expect(getByText('Force Promotion')).toBeInTheDocument();
+  expect(getByText('Force promotion')).toBeInTheDocument();
   expect(getAllByText(outOfOrderEnv)[0].closest('a'))
     .toHaveAttribute('href', '/lifecycle_environments/5');
 
   // check outOfOrder env in 2nd path
   fireEvent.click(getByLabelText(outOfOrderEnv2));
-  expect(getByText('Force Promotion')).toBeInTheDocument();
+  expect(getByText('Force promotion')).toBeInTheDocument();
   expect(getAllByText(outOfOrderEnv2)[0].closest('a'))
     .toHaveAttribute('href', '/lifecycle_environments/7');
 
   // uncheck outOfOrderEnv
   fireEvent.click(getByLabelText(outOfOrderEnv));
   fireEvent.click(getByLabelText(outOfOrderEnv2));
-  expect(queryByText('Force Promotion')).not.toBeInTheDocument();
+  expect(queryByText('Force promotion')).not.toBeInTheDocument();
 
   // Check inOrderEnv
   fireEvent.click(getByLabelText(inOrderEnv));
-  expect(queryByText('Force Promotion')).not.toBeInTheDocument();
+  expect(queryByText('Force promotion')).not.toBeInTheDocument();
 
   useSelectorMock.mockClear();
   assertNockRequest(scope, done);
@@ -128,9 +128,9 @@ test('Can show Wizard form and move to review', async (done) => {
   const { getByText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
     show
-    setIsOpen={() => {}}
+    setIsOpen={() => { }}
     currentStep={1}
-    setCurrentStep={() => {}}
+    setCurrentStep={() => { }}
   />);
   const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSelectorMock.mockReturnValue(environmentPathsData);
@@ -164,9 +164,9 @@ test('Can move to Finish step and publish CV', async (done) => {
   const { getByText } = renderWithRedux(<PublishContentViewWizard
     details={cvDetailData}
     show
-    setIsOpen={() => {}}
+    setIsOpen={() => { }}
     currentStep={1}
-    setCurrentStep={() => {}}
+    setCurrentStep={() => { }}
   />);
   const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSelectorMock.mockReturnValue(environmentPathsData);

data/webpack/scenes/ContentViews/Publish/cvPublishForm.scss

@@ -1,3 +1,9 @@
 .pf-c-switch {
   --pf-c-switch__input--focus__toggle--OutlineWidth: 0;
+}
+
+.pf-c-wizard__main-body {
+  display: flex;
+  grid-gap: 16px;
+  flex-direction: column;
 }

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useSelector, useDispatch } from 'react-redux';
-import { omit } from 'lodash';
+import { omit, upperCase } from 'lodash';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import { Button } from '@patternfly/react-core';
@@ -24,6 +24,7 @@ const ContentViewTable = () => {
   const status = useSelector(selectContentViewStatus);
   const error = useSelector(selectContentViewError);
   const [table, setTable] = useState({ rows: [], columns: [] });
+  const [sortBy, setSortBy] = useState({});
   const [rowMappingIds, setRowMappingIds] = useState([]);
   const [searchQuery, updateSearchQuery] = useState('');
   const loadingResponse = status === STATUS.PENDING;
@@ -104,12 +105,16 @@ const ContentViewTable = () => {
         setRowMappingIds(newRowMappingIds);
         setCvTableStatus(tableStatus());
       }
+      return () => {
+        // This sets the loading state so that the table doesn't flicker on return
+        setCvTableStatus(STATUS.PENDING);
+      };
     },
     [response, status, loadingResponse, setTable, setRowMappingIds,
       setCvResults, setCvTableStatus, setCurrentStep, cvResults, rowMappingIds],
   );
 
-  const onCollapse = (event, rowId, isOpen) => {
+  const onCollapse = (_event, rowId, isOpen) => {
     let rows;
     if (rowId === -1) {
       rows = table.rows.map(row => ({ ...row, isOpen }));
@@ -159,11 +164,45 @@ const ContentViewTable = () => {
     ];
   };
 
-  const additionalListeners = new Array(isPublishModalOpen);
+  const indexToSortVariable = (key) => {
+    switch (key) {
+      case 2:
+        return 'name';
+      default:
+        return undefined;
+    }
+  };
+
+  const onSort = (_event, index, direction) => {
+    setCvTableStatus(STATUS.PENDING);
+    setSortBy({ index, direction });
+  };
+
+  const { index: sortByIndex, direction } = sortBy;
+  const fetchItems = useCallback(
+    params =>
+      getContentViews({
+        ...params,
+        ...sortByIndex ? {
+          sort_by: indexToSortVariable(sortByIndex),
+          sort_order: upperCase(direction),
+        } : {},
+      }),
+    [sortByIndex, direction],
+  );
+
   const emptyContentTitle = __("You currently don't have any Content Views.");
   const emptyContentBody = __('A content view can be added by using the "Create content view" button above.');
   const emptySearchTitle = __('No matching content views found');
   const emptySearchBody = __('Try changing your search settings.');
+  const {
+    id,
+    latestVersionId,
+    latestVersionName,
+    latestVersionEnvironments,
+    environments,
+    versions,
+  } = actionableCvDetails;
 
   const { rows, columns } = table;
   return (
@@ -179,12 +218,14 @@ const ContentViewTable = () => {
         actionResolver,
         searchQuery,
         updateSearchQuery,
-        additionalListeners,
+        fetchItems,
       }}
+      additionalListeners={[isPublishModalOpen, sortByIndex, direction]}
+      sortBy={sortBy}
+      onSort={onSort}
       bookmarkController="katello_content_views"
       variant={TableVariant.compact}
       status={cvTableStatus}
-      fetchItems={useCallback(getContentViews, [])}
       onCollapse={onCollapse}
       canSelectAll={false}
       cells={columns}
@@ -210,17 +251,17 @@ const ContentViewTable = () => {
           }
           {isPromoteModalOpen &&
             <ContentViewVersionPromote
-              cvId={actionableCvDetails.id}
-              versionIdToPromote={actionableCvDetails.latestVersionId}
-              versionNameToPromote={actionableCvDetails.latestVersionName}
-              versionEnvironments={actionableCvDetails.latestVersionEnvironments}
+              cvId={id && Number(id)}
+              versionIdToPromote={latestVersionId}
+              versionNameToPromote={latestVersionName}
+              versionEnvironments={latestVersionEnvironments}
               setIsOpen={setIsPromoteModalOpen}
             />
           }
           {isDeleteModalOpen && <ContentViewDeleteWizard
-            cvId={actionableCvDetails.id}
-            cvEnvironments={actionableCvDetails.environments}
-            cvVersions={actionableCvDetails.versions}
+            cvId={id && Number(id)}
+            cvEnvironments={environments}
+            cvVersions={versions}
             show={isDeleteModalOpen}
             setIsOpen={setIsDeleteModalOpen}
             currentStep={currentStep}

data/webpack/scenes/ContentViews/Table/tableDataGenerator.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { fitContent, expandable } from '@patternfly/react-table';
+import { fitContent, expandable, sortable } from '@patternfly/react-table';
 import { Link } from 'react-router-dom';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -12,7 +12,13 @@ import LastSync from '../Details/Repositories/LastSync';
 
 export const buildColumns = () => [
   { title: __('Type'), cellFormatters: [expandable], transforms: [fitContent] },
-  __('Name'), __('Last published'), __('Last task'), __('Latest version'),
+  {
+    title: __('Name'),
+    transforms: [sortable],
+  },
+  __('Last published'),
+  __('Last task'),
+  __('Latest version'),
 ];
 
 const buildRow = (contentView) => {
@@ -22,12 +28,12 @@ const buildRow = (contentView) => {
     latest_version_environments: latestVersionEnvironments, last_task: lastTask,
   } = contentView;
   /* eslint-enable max-len */
-  const { last_sync_words: lastSyncWords } = lastTask || {};
+  const { last_sync_words: lastSyncWords, started_at: startedAt } = lastTask || {};
   const row = [
     { title: <ContentViewIcon composite={composite ? true : undefined} /> },
     { title: <Link to={`${urlBuilder('content_views', '')}${id}`}>{name}</Link> },
     { title: lastPublished ? <LongDateTime date={lastPublished} showRelativeTimeTooltip /> : <InactiveText text={__('Not yet published')} /> },
-    { title: <LastSync lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /> },
+    { title: <LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /> },
     {
       title: latestVersion ? <ContentViewVersionCell {...{
         id, latestVersion, latestVersionId, latestVersionEnvironments,
@@ -87,8 +93,8 @@ const buildExpandableRows = (contentViews) => {
             cvName={name}
             cvComposite={composite}
             {...{
- activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
-}}
+              activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
+            }}
           />,
           props: {
             colSpan: 2,

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -355,9 +355,9 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(queryByText('Label')).not.toBeInTheDocument();
   expect(queryByText('Composite content view')).not.toBeInTheDocument();
   expect(queryByText('Component content view')).not.toBeInTheDocument();
-  expect(queryByText('Solve Dependencies')).not.toBeInTheDocument();
-  expect(queryByText('Auto Publish')).not.toBeInTheDocument();
-  expect(queryByText('Import Only')).not.toBeInTheDocument();
+  expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
+  expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(queryByText('Import only')).not.toBeInTheDocument();
 
   getByLabelText('create_content_view').click();
 
@@ -366,9 +366,9 @@ test('Displays Create Content View and opens modal with Form', async () => {
   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();
 });
 
 /* eslint-enable no-useless-escape */

data/webpack/scenes/ContentViews/components/ContentViewIcon.js

@@ -1,18 +1,19 @@
 import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import { EnterpriseIcon, RegistryIcon } from '@patternfly/react-icons';
 import './contentViewIcon.scss';
 
 const ContentViewIcon = ({ composite, count, description }) => {
   const props = {
-    title: composite ? 'composite' : 'component',
-    className: 'svg-icon-centered',
+    title: composite ? __('Composite') : __('Component'),
+    className: composite ? 'svg-icon-composite' : 'svg-icon-component',
   };
   return (
     <div aria-label="content_view_icon" className="svg-centered-container">
-      {count}
-      {composite ? <RegistryIcon {...props} /> : <EnterpriseIcon {...props} />}
-      {description}
+      {count && <span className="composite-component-count">{count}</span>}
+      {composite ? <RegistryIcon size="md" {...props} /> : <EnterpriseIcon size="sm" {...props} />}
+      <span>{description}</span>
     </div>
   );
 };

data/webpack/scenes/ContentViews/components/ContentViewsCounter.js

@@ -18,7 +18,7 @@ const ContentViewsCounter = () => {
         <b>
           <Flex>
             <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite={false} description={__('Component content views')} count={component || <InProgressIcon />} />
+              <ContentViewIcon composite={false} description={__('Component content views')} count={(component || component === 0) ? component : <InProgressIcon />} />
             </FlexItem>
             <FlexItem>
               <Tooltip
@@ -37,7 +37,7 @@ const ContentViewsCounter = () => {
         <b>
           <Flex>
             <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite description={__('Composite content views')} count={composite || <InProgressIcon />} />
+              <ContentViewIcon composite description={__('Composite content views')} count={(composite || composite === 0) ? composite : <InProgressIcon />} />
             </FlexItem>
             <FlexItem>
               <Tooltip

data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Form, FormGroup, Checkbox } from '@patternfly/react-core';
+import { FormGroup, Checkbox, TextContent } from '@patternfly/react-core';
 import { selectEnvironmentPaths, selectEnvironmentPathsStatus } from './EnvironmentPathSelectors';
 import EnvironmentLabels from '../EnvironmentLabels';
 import './EnvironmentPaths.scss';
@@ -36,41 +36,40 @@ const EnvironmentPaths = ({
   /* eslint-disable react/no-array-index-key */
   return (
     <>
-      <b
-        style={{ marginBottom: '1em' }}
-      >{headerText}
-      </b>
-      <Form style={{ marginTop: '1em' }}>{results.map((path, count) => {
-        const {
-          environments,
-        } = path || {};
-        return (
-          <React.Fragment key={count}>
-            <FormGroup key={`fg-${count}`} isInline fieldId="environment-checkbox-group">
-              {environments.map(env =>
+      <TextContent>{headerText}</TextContent>
+      <div>
+        {results.map((path, index) => {
+          const {
+            environments,
+          } = path || {};
+          return (
+            <div className="env-path" key={index}>
+              {index === 0 && <hr />}
+              <FormGroup key={`fg-${index}`} isInline fieldId="environment-checkbox-group">
+                {environments.map(env =>
                 (<Checkbox
                   isChecked={(publishing && env.library) ||
-                  envCheckedInList(env, userCheckedItems) ||
-                  envCheckedInList(env, promotedEnvironments)}
+                    envCheckedInList(env, userCheckedItems) ||
+                    envCheckedInList(env, promotedEnvironments)}
                   isDisabled={(publishing && env.library)
-                  || envCheckedInList(env, promotedEnvironments)}
-                  style={{ marginRight: '3px', marginBottom: '1px' }}
-                  className="env-labels-with-pointer"
-                  key={`${env.id}${count}`}
-                  id={`${env.id}${count}`}
+                    || envCheckedInList(env, promotedEnvironments)}
+                  className="env-path__labels-with-pointer"
+                  key={`${env.id}${index}`}
+                  id={`${env.id}${index}`}
                   label={<EnvironmentLabels environments={env} />}
                   aria-label={env.label}
                   onChange={checked => oncheckedChange(checked, env)}
                 />))}
-            </FormGroup>
-            <hr key={`hr${count}`} style={{ margin: '0em' }} />
-          </React.Fragment>
-        );
-      })}
-      </Form>
+              </FormGroup>
+              <hr />
+            </div>
+          );
+        })
+          /* eslint-enable react/no-array-index-key */
+        }
+      </div>
     </>
   );
-  /* eslint-enable react/no-array-index-key */
 };
 
 EnvironmentPaths.propTypes = {

data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.scss

@@ -1,8 +1,20 @@
-.env-labels-with-pointer {
-  &:not(:last-child):after {
-    content: '>';
-    margin-top: 3px;
+.env-path {
+  .pf-c-form__group {
+    margin: 20px 0;
+  }
+
+  .env-path__labels-with-pointer {
+    &:not(:last-child):after {
+      content: '>';
+      margin-top: 3px;
+    }
+
+    display: inline-flex;
+    margin: 3px 1px;
+    align-items: center;
+  }
+
+  hr {
+    margin: 0;
   }
-  display: inline-flex;
-  margin-top: 3px;
 }

data/webpack/scenes/ContentViews/components/WizardHeader.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Grid, TextContent, Text, TextVariants, Flex, FlexItem } from '@patternfly/react-core';
+
+const WizardHeader = ({
+  title,
+  description,
+}) => (
+  <Grid style={{ gridGap: '24px' }}>
+    {title &&
+      <TextContent>
+        <Text component={TextVariants.h2}>{title}</Text>
+      </TextContent>}
+    {description &&
+      <TextContent>
+        <Flex flex={{ default: 'inlineFlex' }}>
+          <FlexItem>
+            <TextContent>
+              {description}
+            </TextContent>
+          </FlexItem>
+        </Flex>
+      </TextContent>}
+  </Grid>
+);
+
+WizardHeader.propTypes = {
+  title: PropTypes.oneOfType([
+    PropTypes.node,
+    PropTypes.string,
+  ]),
+  description: PropTypes.oneOfType([
+    PropTypes.node,
+    PropTypes.string,
+  ]),
+};
+
+WizardHeader.defaultProps = {
+  title: undefined,
+  description: undefined,
+};
+
+
+export default WizardHeader;

data/webpack/scenes/ContentViews/components/contentViewIcon.scss

@@ -1,9 +1,20 @@
 .svg-centered-container {
   display: flex;
   align-items: center;
+  align-content: center;
+
+  .composite-component-count {
+    min-width: 10px;
+    text-align: center;
+  }
 }
 
-.svg-icon-centered {
-  margin: 0 5px;
+.svg-icon-composite {
+  margin: 0 6px;
   display: block;
 }
+
+.svg-icon-component {
+  margin: 0 9px;
+  display: block;
+}

data/webpack/scenes/Organizations/OrganizationActions.js

@@ -1,4 +1,6 @@
+import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToSnakeCase } from 'foremanReact/common/helpers';
+import { API_OPERATIONS, put } from 'foremanReact/redux/API';
 
 import api, { orgId } from '../../services/api';
 
@@ -6,10 +8,9 @@ import {
   GET_ORGANIZATION_REQUEST,
   GET_ORGANIZATION_SUCCESS,
   GET_ORGANIZATION_FAILURE,
-  SAVE_ORGANIZATION_REQUEST,
-  SAVE_ORGANIZATION_SUCCESS,
-  SAVE_ORGANIZATION_FAILURE,
+  UPDATE_CDN_CONFIGURATION_KEY,
 } from './OrganizationConstants';
+import { getResponseErrorMsgs } from '../../utils/helpers';
 
 export const loadOrganization = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: GET_ORGANIZATION_REQUEST });
@@ -32,28 +33,25 @@ export const loadOrganization = (extendedParams = {}) => async (dispatch) => {
   }
 };
 
-export const saveOrganization = (extendedParams = {}) => async (dispatch) => {
-  dispatch({ type: SAVE_ORGANIZATION_REQUEST });
+const updateCdnConfigurationSuccessToast = () => __('CDN Configuration updated.');
+const updateCdnConfigurationErrorToast = (error) => {
+  const messages = getResponseErrorMsgs(error.response);
+  return messages;
+};
 
-  const params = {
-    ...{ id: orgId() },
-    ...propsToSnakeCase(extendedParams),
-  };
-  try {
-    const { data } = await api.put(`/organizations/${orgId()}`, params);
-    const result = dispatch({
-      type: SAVE_ORGANIZATION_SUCCESS,
-      response: data,
-    });
-    // TODO: Necessary because of https://projects.theforeman.org/issues/26420
-    dispatch(loadOrganization());
-    return result;
-  } catch (error) {
-    return dispatch({
-      type: SAVE_ORGANIZATION_FAILURE,
-      result: error,
-    });
-  }
+export const updateCdnConfiguration = (params) => {
+  const nonNullParams = Object.keys(params)
+    .filter(key => params[key] !== null)
+    .reduce((a, k) => ({ ...a, [k]: params[k] }), {});
+
+  return put({
+    type: API_OPERATIONS.PUT,
+    key: UPDATE_CDN_CONFIGURATION_KEY,
+    url: api.getApiUrl(`/organizations/${orgId()}/cdn_configuration`),
+    params: nonNullParams,
+    errorToast: error => updateCdnConfigurationErrorToast(error),
+    successToast: response => updateCdnConfigurationSuccessToast(response),
+  });
 };
 
 export default loadOrganization;

data/webpack/scenes/Organizations/OrganizationConstants.js

@@ -2,6 +2,4 @@ export const GET_ORGANIZATION_REQUEST = 'GET_ORGANIZATION_REQUEST';
 export const GET_ORGANIZATION_SUCCESS = 'GET_ORGANIZATION_SUCCESS';
 export const GET_ORGANIZATION_FAILURE = 'GET_ORGANIZATION_FAILURE';
 
-export const SAVE_ORGANIZATION_REQUEST = 'SAVE_ORGANIZATION_REQUEST';
-export const SAVE_ORGANIZATION_SUCCESS = 'SAVE_ORGANIZATION_SUCCESS';
-export const SAVE_ORGANIZATION_FAILURE = 'SAVE_ORGANIZATION_FAILURE';
+export const UPDATE_CDN_CONFIGURATION_KEY = 'UPDATE_CDN_CONFIGURATION';

data/webpack/scenes/Organizations/OrganizationReducer.js

@@ -4,9 +4,6 @@ import {
   GET_ORGANIZATION_REQUEST,
   GET_ORGANIZATION_SUCCESS,
   GET_ORGANIZATION_FAILURE,
-  SAVE_ORGANIZATION_REQUEST,
-  SAVE_ORGANIZATION_SUCCESS,
-  SAVE_ORGANIZATION_FAILURE,
 } from './OrganizationConstants';
 
 const initialState = Immutable({ loading: false });
@@ -14,16 +11,12 @@ const initialState = Immutable({ loading: false });
 export default (state = initialState, action) => {
   switch (action.type) {
     case GET_ORGANIZATION_REQUEST:
-    case SAVE_ORGANIZATION_REQUEST:
       return state.set('loading', true);
 
     case GET_ORGANIZATION_SUCCESS:
-    case SAVE_ORGANIZATION_SUCCESS: {
       return Immutable({ loading: false, ...action.response });
-    }
 
     case GET_ORGANIZATION_FAILURE:
-    case SAVE_ORGANIZATION_FAILURE:
       return Immutable({ error: action.error });
 
     default:

data/webpack/scenes/Organizations/OrganizationSelectors.js

@@ -1,3 +1,13 @@
+import {
+  selectAPIStatus,
+} from 'foremanReact/redux/API/APISelectors';
+
+import { STATUS } from 'foremanReact/constants';
+
+import {
+  UPDATE_CDN_CONFIGURATION_KEY,
+} from './OrganizationConstants';
+
 export const selectOrganizationState = state => state.katello.organization;
 
 export const selectManifestName = state =>
@@ -16,3 +26,9 @@ export const selectIsManifestImported = state =>
 
 export const selectSimpleContentAccessEnabled = state =>
   selectOrganizationState(state).simple_content_access;
+
+export const selectCdnConfigurationUpdateStatus = state =>
+  selectAPIStatus(state, UPDATE_CDN_CONFIGURATION_KEY);
+
+export const selectUpdatingCdnConfiguration = state =>
+  selectCdnConfigurationUpdateStatus(state) === STATUS.PENDING;