katello 4.4.0.rc1 → 4.4.0.rc2

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

@@ -60,49 +60,49 @@ const changeRepoState = (state, repoToChange, stateDiff) => (
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case DISABLE_REPOSITORY_REQUEST:
-      return changeRepoState(state, action.repository, { loading: true });
-    case DISABLE_REPOSITORY_FAILURE:
-      return changeRepoState(state, action.payload.repository, { loading: false });
-    case ENABLED_REPOSITORIES_REQUEST:
-      if (!action.silent) {
-        return state.set(['loading'], true);
-      }
-      return state;
-    case ENABLED_REPOSITORIES_SUCCESS: {
-      const {
-        page,
-        per_page, // eslint-disable-line camelcase
-        subtotal,
-        results,
-      } = action.response;
-      return Immutable({
-        repositories: mapRepositories(results),
-        pagination: {
-          page: Number(page) || 1,
-          // server can return per_page: null when there's error in the search query,
-          // don't store it in such case
-          // eslint-disable-next-line camelcase
-          perPage: (per_page || state.pagination.perPage)
-          // eslint-disable-next-line camelcase
-            && Number(per_page || state.pagination.perPage),
-        },
-        itemCount: Number(subtotal),
-        loading: false,
-        searchIsActive: !isEmpty(action.search),
-        search: action.search,
-      });
-    }
-    case ENABLED_REPOSITORIES_FAILURE: {
-      const { error, missingPermissions } = action;
-      return Immutable({
-        repositories: [],
-        loading: false,
-        error,
-        missingPermissions,
-      });
+  case DISABLE_REPOSITORY_REQUEST:
+    return changeRepoState(state, action.repository, { loading: true });
+  case DISABLE_REPOSITORY_FAILURE:
+    return changeRepoState(state, action.payload.repository, { loading: false });
+  case ENABLED_REPOSITORIES_REQUEST:
+    if (!action.silent) {
+      return state.set(['loading'], true);
     }
-    default:
-      return state;
+    return state;
+  case ENABLED_REPOSITORIES_SUCCESS: {
+    const {
+      page,
+      per_page, // eslint-disable-line camelcase
+      subtotal,
+      results,
+    } = action.response;
+    return Immutable({
+      repositories: mapRepositories(results),
+      pagination: {
+        page: Number(page) || 1,
+        // server can return per_page: null when there's error in the search query,
+        // don't store it in such case
+        // eslint-disable-next-line camelcase
+        perPage: (per_page || state.pagination.perPage)
+        // eslint-disable-next-line camelcase
+            && Number(per_page || state.pagination.perPage),
+      },
+      itemCount: Number(subtotal),
+      loading: false,
+      searchIsActive: !isEmpty(action.search),
+      search: action.search,
+    });
+  }
+  case ENABLED_REPOSITORIES_FAILURE: {
+    const { error, missingPermissions } = action;
+    return Immutable({
+      repositories: [],
+      loading: false,
+      error,
+      missingPermissions,
+    });
+  }
+  default:
+    return state;
   }
 };

data/webpack/redux/reducers/RedHatRepositories/repositorySetRepositories.js

@@ -56,48 +56,48 @@ const initialState = Immutable({});
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case ENABLE_REPOSITORY_REQUEST:
-      return changeRepoState(state, action.repository, { loading: true });
-
-    case ENABLE_REPOSITORY_FAILURE:
-      return changeRepoState(state, action.payload.repository, { loading: false, error: true });
-
-    case REPOSITORY_SET_REPOSITORIES_REQUEST:
-      return state.set(action.contentId, {
-        loading: true,
-        repositories: [],
-        error: null,
-      });
-
-    case REPOSITORY_SET_REPOSITORIES_SUCCESS:
-      return state.set(action.contentId, {
-        loading: false,
-        repositories: normalizeContentSetRepositories(
-          action.results,
-          action.contentId,
-          action.productId,
-        ),
-        error: null,
-      });
-
-    case REPOSITORY_SET_REPOSITORIES_FAILURE:
-      return state.set(action.contentId, {
-        loading: false,
-        repositories: [],
-        error: action.error,
-      });
-
-    case REPOSITORY_ENABLED:
-      return changeRepoState(state, action.repository, {
-        enabled: true,
-        loading: false,
-        error: false,
-      });
-
-    case REPOSITORY_DISABLED:
-      return changeRepoState(state, action.repository, { enabled: false });
-
-    default:
-      return state;
+  case ENABLE_REPOSITORY_REQUEST:
+    return changeRepoState(state, action.repository, { loading: true });
+
+  case ENABLE_REPOSITORY_FAILURE:
+    return changeRepoState(state, action.payload.repository, { loading: false, error: true });
+
+  case REPOSITORY_SET_REPOSITORIES_REQUEST:
+    return state.set(action.contentId, {
+      loading: true,
+      repositories: [],
+      error: null,
+    });
+
+  case REPOSITORY_SET_REPOSITORIES_SUCCESS:
+    return state.set(action.contentId, {
+      loading: false,
+      repositories: normalizeContentSetRepositories(
+        action.results,
+        action.contentId,
+        action.productId,
+      ),
+      error: null,
+    });
+
+  case REPOSITORY_SET_REPOSITORIES_FAILURE:
+    return state.set(action.contentId, {
+      loading: false,
+      repositories: [],
+      error: action.error,
+    });
+
+  case REPOSITORY_ENABLED:
+    return changeRepoState(state, action.repository, {
+      enabled: true,
+      loading: false,
+      error: false,
+    });
+
+  case REPOSITORY_DISABLED:
+    return changeRepoState(state, action.repository, { enabled: false });
+
+  default:
+    return state;
   }
 };

data/webpack/redux/reducers/RedHatRepositories/sets.js

@@ -14,36 +14,36 @@ export default (state = initialState, action) => {
   const { payload } = action;
 
   switch (action.type) {
-    case REPOSITORY_SETS_REQUEST:
-      return state.set('loading', true);
-
-    case REPOSITORY_SETS_UPDATE_RECOMMENDED:
-      return state
-        .set('recommended', payload);
-
-    case REPOSITORY_SETS_SUCCESS:
-      return state
-        .set('results', payload.response.results)
-        .set('pagination', {
-          page: Number(payload.response.page),
-          // server can return per_page: null when there's error in the search query,
-          // don't store it in such case
-          // eslint-disable-next-line camelcase
-          perPage: Number(payload.response.per_page || state.pagination.perPage),
-        })
-        .set('itemCount', Number(payload.response.subtotal))
-        .set('loading', false)
-        .set('searchIsActive', !isEmpty(payload.search))
-        .set('search', payload.search);
-
-    case REPOSITORY_SETS_FAILURE:
-      return Immutable({
-        error: payload,
-        loading: false,
-        missingPermissions: get(payload, ['response', 'data', 'error', 'missing_permissions']),
-      });
-
-    default:
-      return state;
+  case REPOSITORY_SETS_REQUEST:
+    return state.set('loading', true);
+
+  case REPOSITORY_SETS_UPDATE_RECOMMENDED:
+    return state
+      .set('recommended', payload);
+
+  case REPOSITORY_SETS_SUCCESS:
+    return state
+      .set('results', payload.response.results)
+      .set('pagination', {
+        page: Number(payload.response.page),
+        // server can return per_page: null when there's error in the search query,
+        // don't store it in such case
+        // eslint-disable-next-line camelcase
+        perPage: Number(payload.response.per_page || state.pagination.perPage),
+      })
+      .set('itemCount', Number(payload.response.subtotal))
+      .set('loading', false)
+      .set('searchIsActive', !isEmpty(payload.search))
+      .set('search', payload.search);
+
+  case REPOSITORY_SETS_FAILURE:
+    return Immutable({
+      error: payload,
+      loading: false,
+      missingPermissions: get(payload, ['response', 'data', 'error', 'missing_permissions']),
+    });
+
+  default:
+    return state;
   }
 };

data/webpack/scenes/AnsibleCollections/AnsibleCollectionsReducer.js

@@ -9,31 +9,31 @@ const initialState = initialApiState;
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case ANSIBLE_COLLECTIONS_REQUEST: {
-      return state.set('loading', true);
-    }
-    case ANSIBLE_COLLECTIONS_SUCCESS: {
-      const {
-        results, page, per_page, subtotal, // eslint-disable-line camelcase
-      } = action.response;
-      return state.merge({
-        results,
-        loading: false,
-        pagination: {
-          page: Number(page),
-          perPage: Number(per_page || state.pagination.perPage), // eslint-disable-line camelcase
-        },
-        itemCount: Number(subtotal),
-      });
-    }
-    case ANSIBLE_COLLECTIONS_ERROR: {
-      return state.merge({
-        error: action.error,
-        loading: false,
-      });
-    }
-    default: {
-      return state;
-    }
+  case ANSIBLE_COLLECTIONS_REQUEST: {
+    return state.set('loading', true);
+  }
+  case ANSIBLE_COLLECTIONS_SUCCESS: {
+    const {
+      results, page, per_page, subtotal, // eslint-disable-line camelcase
+    } = action.response;
+    return state.merge({
+      results,
+      loading: false,
+      pagination: {
+        page: Number(page),
+        perPage: Number(per_page || state.pagination.perPage), // eslint-disable-line camelcase
+      },
+      itemCount: Number(subtotal),
+    });
+  }
+  case ANSIBLE_COLLECTIONS_ERROR: {
+    return state.merge({
+      error: action.error,
+      loading: false,
+    });
+  }
+  default: {
+    return state;
+  }
   }
 };

data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsReducer.js

@@ -7,24 +7,24 @@ import {
 
 export default (state = initialApiState, action) => {
   switch (action.type) {
-    case ANSIBLE_COLLECTION_DETAILS_REQUEST: {
-      return state.set('loading', true);
-    }
-    case ANSIBLE_COLLECTION_DETAILS_SUCCESS: {
-      const ansibleCollectionDetails = action.response;
-      return state.merge({
-        ...ansibleCollectionDetails,
-        loading: false,
-      });
-    }
-    case ANSIBLE_COLLECTION_DETAILS_ERROR: {
-      return state.merge({
-        error: action.payload.message,
-        loading: false,
-      });
-    }
-    default: {
-      return state;
-    }
+  case ANSIBLE_COLLECTION_DETAILS_REQUEST: {
+    return state.set('loading', true);
+  }
+  case ANSIBLE_COLLECTION_DETAILS_SUCCESS: {
+    const ansibleCollectionDetails = action.response;
+    return state.merge({
+      ...ansibleCollectionDetails,
+      loading: false,
+    });
+  }
+  case ANSIBLE_COLLECTION_DETAILS_ERROR: {
+    return state.merge({
+      error: action.payload.message,
+      loading: false,
+    });
+  }
+  default: {
+    return state;
+  }
   }
 };

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

@@ -78,7 +78,7 @@ const ContentTable = ({
 ContentTable.propTypes = {
   selectedContentType: PropTypes.string.isRequired,
   setSelectedContentType: PropTypes.func.isRequired,
-  contentTypes: PropTypes.objectOf(PropTypes.array).isRequired,
+  contentTypes: PropTypes.shape({}).isRequired,
   showContentTypeSelector: PropTypes.bool,
 };
 

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

@@ -61,7 +61,8 @@ const CreateContentViewForm = ({ setModalOpen }) => {
 
   if (redirect) {
     const { id } = response;
-    return (<Redirect to={`/content_views/${id}`} />);
+    if (composite) { return (<Redirect to={`/content_views/${id}#/contentviews`} />); }
+    return (<Redirect to={`/content_views/${id}#/repositories`} />);
   }
 
   const submitDisabled = !name?.length || !label?.length || saving;

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignHostsForm.js

@@ -107,8 +107,8 @@ const CVDeletionReassignHostsForm = () => {
       >
         <AffectedHosts
           {...{
-          cvId,
-        }}
+            cvId,
+          }}
           versionEnvironments={cvEnvironments}
           deleteCV
         />

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -268,7 +268,7 @@ const ContentViewComponents = ({ cvId, details }) => {
               <SplitItem>
                 <ActionList>
                   <ActionListItem>
-                    <Button onClick={addBulk} isDisabled={!(bulkAddEnabled())} variant="secondary" aria-label="bulk_add_components">
+                    <Button onClick={addBulk} isDisabled={!(bulkAddEnabled())} variant="primary" aria-label="bulk_add_components">
                       {__('Add content views')}
                     </Button>
                   </ActionListItem>

data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js

@@ -132,7 +132,7 @@ export const getDockerTags = params => get({
   key: DOCKER_TAGS_CONTENT,
   url: api.getApiUrl('/docker_tags'),
   params,
-  errorToast: error => __(`Something went wrong while getting docker tags! ${getResponseErrorMsgs(error.response)}`),
+  errorToast: error => __(`Something went wrong while getting container tags! ${getResponseErrorMsgs(error.response)}`),
 });
 
 export const getErrata = params => get({

data/webpack/scenes/ContentViews/Details/ContentViewDetailReducer.js

@@ -11,13 +11,13 @@ const initialState = Immutable({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case UPDATE_CONTENT_VIEW:
-      return state.set('updating', true);
-    case UPDATE_CONTENT_VIEW_SUCCESS:
-      return state.merge({ updating: false });
-    case UPDATE_CONTENT_VIEW_FAILURE:
-      return state.set('updating', false);
-    default:
-      return state;
+  case UPDATE_CONTENT_VIEW:
+    return state.set('updating', true);
+  case UPDATE_CONTENT_VIEW_SUCCESS:
+    return state.merge({ updating: false });
+  case UPDATE_CONTENT_VIEW_FAILURE:
+    return state.set('updating', false);
+  default:
+    return state;
   }
 };

data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js

@@ -222,7 +222,7 @@ const AffectedRepositoryTable = ({
               <SplitItem>
                 <ActionList>
                   <ActionListItem>
-                    <Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="secondary" aria-label="add_repositories">
+                    <Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="primary" aria-label="add_repositories">
                       {__('Add repositories')}
                     </Button>
                   </ActionListItem>

data/webpack/scenes/ContentViews/Details/Filters/ArtifactsWithNoErrata.js

@@ -22,14 +22,14 @@ export const ArtifactsWithNoErrataRenderer = ({ filterDetails }) => {
   };
   const getLabel = () => {
     switch (true) {
-      case type === 'modulemd' && inclusion:
-        return __('Include all Module Streams with no errata.');
-      case type === 'modulemd' && !inclusion:
-        return __('Exclude all Module Streams with no errata.');
-      case !inclusion:
-        return __('Exclude all RPMs with no errata.');
-      default:
-        return __('Include all RPMs with no errata.');
+    case type === 'modulemd' && inclusion:
+      return __('Include all Module Streams with no errata.');
+    case type === 'modulemd' && !inclusion:
+      return __('Exclude all Module Streams with no errata.');
+    case !inclusion:
+      return __('Exclude all RPMs with no errata.');
+    default:
+      return __('Include all RPMs with no errata.');
     }
   };
 

data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js

@@ -141,7 +141,7 @@ const CVContainerImageFilterContent = ({
                   <SplitItem>
                     <Button
                       onClick={() => setModalOpen(true)}
-                      variant="secondary"
+                      variant="primary"
                       aria-label="add_filter_rule"
                     >
                       {__('Add filter rule')}

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -252,7 +252,7 @@ const CVErrataDateFilterContent = ({
               <ActionGroup>
                 <Button
                   aria-label="save_filter_rule"
-                  variant="secondary"
+                  variant="primary"
                   isDisabled={saveDisabled}
                   type="submit"
                 >

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -312,7 +312,7 @@ const CVErrataIDFilterContent = ({
                 </SplitItem>
                 {hasPermission(permissions, 'edit_content_views') &&
                   <SplitItem>
-                    <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="secondary" aria-label="add_filter_rule">
+                    <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="primary" aria-label="add_filter_rule">
                       {__('Add errata')}
                     </Button>
                   </SplitItem>

data/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js

@@ -12,24 +12,42 @@ const CVFilterDetailType = ({
   cvId, filterId, inclusion, type, showAffectedRepos, setShowAffectedRepos, rules, details,
 }) => {
   switch (type) {
-    case 'docker':
-      return (<CVContainerImageFilterContent
-        cvId={cvId}
-        filterId={filterId}
-        showAffectedRepos={showAffectedRepos}
-        setShowAffectedRepos={setShowAffectedRepos}
-        details={details}
-      />);
-    case 'package_group':
-      return (<CVPackageGroupFilterContent
-        cvId={cvId}
-        filterId={filterId}
-        showAffectedRepos={showAffectedRepos}
-        setShowAffectedRepos={setShowAffectedRepos}
-        details={details}
-      />);
-    case 'rpm':
-      return (<CVRpmFilterContent
+  case 'docker':
+    return (<CVContainerImageFilterContent
+      cvId={cvId}
+      filterId={filterId}
+      showAffectedRepos={showAffectedRepos}
+      setShowAffectedRepos={setShowAffectedRepos}
+      details={details}
+    />);
+  case 'package_group':
+    return (<CVPackageGroupFilterContent
+      cvId={cvId}
+      filterId={filterId}
+      showAffectedRepos={showAffectedRepos}
+      setShowAffectedRepos={setShowAffectedRepos}
+      details={details}
+    />);
+  case 'rpm':
+    return (<CVRpmFilterContent
+      cvId={cvId}
+      filterId={filterId}
+      inclusion={inclusion}
+      showAffectedRepos={showAffectedRepos}
+      setShowAffectedRepos={setShowAffectedRepos}
+      details={details}
+    />);
+  case 'modulemd':
+    return (<CVModuleStreamFilterContent
+      cvId={cvId}
+      filterId={filterId}
+      showAffectedRepos={showAffectedRepos}
+      setShowAffectedRepos={setShowAffectedRepos}
+      details={details}
+    />);
+  case 'erratum':
+    if (head(rules)?.types) {
+      return (<CVErrataDateFilterContent
         cvId={cvId}
         filterId={filterId}
         inclusion={inclusion}
@@ -37,34 +55,16 @@ const CVFilterDetailType = ({
         setShowAffectedRepos={setShowAffectedRepos}
         details={details}
       />);
-    case 'modulemd':
-      return (<CVModuleStreamFilterContent
-        cvId={cvId}
-        filterId={filterId}
-        showAffectedRepos={showAffectedRepos}
-        setShowAffectedRepos={setShowAffectedRepos}
-        details={details}
-      />);
-    case 'erratum':
-      if (head(rules)?.types) {
-        return (<CVErrataDateFilterContent
-          cvId={cvId}
-          filterId={filterId}
-          inclusion={inclusion}
-          showAffectedRepos={showAffectedRepos}
-          setShowAffectedRepos={setShowAffectedRepos}
-          details={details}
-        />);
-      }
-      return (<CVErrataIDFilterContent
-        cvId={cvId}
-        filterId={filterId}
-        showAffectedRepos={showAffectedRepos}
-        setShowAffectedRepos={setShowAffectedRepos}
-        details={details}
-      />);
-    default:
-      return null;
+    }
+    return (<CVErrataIDFilterContent
+      cvId={cvId}
+      filterId={filterId}
+      showAffectedRepos={showAffectedRepos}
+      setShowAffectedRepos={setShowAffectedRepos}
+      details={details}
+    />);
+  default:
+    return null;
   }
 };
 

data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js

@@ -78,19 +78,19 @@ const CVModuleStreamFilterContent = ({
   const fetchItems = useCallback((params) => {
     const adjustedParams = { ...params };
     switch (selectedIndex) {
-      case 0:
-        adjustedParams.show_all_for = 'content_view_filter';
-        adjustedParams.available_for = undefined;
-        break;
-      case 1:
-        adjustedParams.show_all_for = undefined;
-        adjustedParams.available_for = undefined;
-        break;
-      case 2:
-        adjustedParams.show_all_for = undefined;
-        adjustedParams.available_for = 'content_view_filter';
-        break;
-      default:
+    case 0:
+      adjustedParams.show_all_for = 'content_view_filter';
+      adjustedParams.available_for = undefined;
+      break;
+    case 1:
+      adjustedParams.show_all_for = undefined;
+      adjustedParams.available_for = undefined;
+      break;
+    case 2:
+      adjustedParams.show_all_for = undefined;
+      adjustedParams.available_for = 'content_view_filter';
+      break;
+    default:
     }
 
     return getCVFilterModuleStreams(cvId, filterId, adjustedParams);
@@ -247,7 +247,7 @@ const CVModuleStreamFilterContent = ({
                   <Button
                     isDisabled={!hasNotAddedSelected}
                     onClick={bulkAdd}
-                    variant="secondary"
+                    variant="primary"
                     aria-label="add_filter_rule"
                   >
                     {__('Add filter rule')}