katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/__test__/RepositorySetRepository.test.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import configureMockStore from 'redux-mock-store';
+import RepositorySetRepository from '../RepositorySetRepository';
+
+jest.mock('../../../../../move_to_foreman/foreman_toast_notifications');
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({});
+
+describe('RepositorySetRepository Component', () => {
+  let shallowWrapper;
+  beforeEach(() => {
+    shallowWrapper = shallow(<RepositorySetRepository
+      store={store}
+      contentId={1}
+      productId={1}
+      label="some label"
+      arch="foo"
+      releaseVer="1.1.1"
+      type="foo"
+      enabledPagination={{}}
+      setRepositoryEnabled={() => {}}
+      loadEnabledRepos={() => {}}
+      enableRepository={() => {}}
+    />);
+  });
+
+  afterEach(() => {
+    store.clearActions();
+  });
+
+  it('should render', async () => {
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
+  });
+});

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/__test__/__snapshots__/RepositorySetRepository.test.js.snap

@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RepositorySetRepository Component should render 1`] = `
+<ListViewItem
+  actions={
+    <Spinner
+      className=""
+      inline={true}
+      inverse={false}
+      loading={false}
+      size="md"
+    >
+      <OverlayTrigger
+        defaultOverlayShown={false}
+        overlay={
+          <Tooltip
+            bsClass="tooltip"
+            id="enable"
+            placement="right"
+          >
+            Enable
+          </Tooltip>
+        }
+        placement="bottom"
+        rootClose={false}
+        trigger={
+          Array [
+            "hover",
+            "focus",
+          ]
+        }
+      >
+        <button
+          onClick={[Function]}
+          style={
+            Object {
+              "backgroundColor": "initial",
+              "border": "none",
+              "color": "#0388ce",
+            }
+          }
+        >
+          <i
+            className="fa-2x fa fa-plus-circle"
+          />
+        </button>
+      </OverlayTrigger>
+    </Spinner>
+  }
+  additionalInfo={null}
+  checkboxInput={null}
+  className="list-item-with-divider "
+  compoundExpand={false}
+  compoundExpanded={false}
+  description={null}
+  heading={
+    <span>
+      foo
+       
+      
+    </span>
+  }
+  hideCloseIcon={false}
+  leftContent={null}
+  onCloseCompoundExpand={[Function]}
+  onExpand={[Function]}
+  onExpandClose={[Function]}
+  stacked={true}
+/>
+`;

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/index.js

@@ -0,0 +1,18 @@
+import { connect } from 'react-redux';
+import { setRepositoryEnabled, enableRepository } from '../../../../redux/actions/RedHatRepositories/repositorySetRepositories';
+import { loadEnabledRepos } from '../../../../redux/actions/RedHatRepositories/enabled';
+import RepositorySetRepository from './RepositorySetRepository';
+
+const mapStateToProps = (
+  { katello: { redHatRepositories: { enabled } } },
+  props,
+) => ({
+  ...props,
+  enabledPagination: enabled.pagination,
+  enabledSearch: enabled.search,
+});
+
+export default connect(
+  mapStateToProps,
+  { setRepositoryEnabled, loadEnabledRepos, enableRepository },
+)(RepositorySetRepository);

data/webpack/scenes/RedHatRepositories/components/SearchBar.js

@@ -30,7 +30,7 @@ class SearchBar extends Component {
     this.state = {
       query: '',
       searchList: 'available',
-      filters: [],
+      filters: ['rpm'],
     };
 
     this.onSearch = this.onSearch.bind(this);
@@ -81,7 +81,7 @@ class SearchBar extends Component {
         perPage: this.props.enabledRepositories.pagination.perPage,
         search: enabledSearch,
       };
-      this.props.loadEnabledRepos(enabledParams, enabledSearch);
+      this.props.loadEnabledRepos(enabledParams);
     }
   }
 
@@ -97,7 +97,8 @@ class SearchBar extends Component {
         <MultiSelect
           value={this.state.filters}
           options={filterOptions}
-          noneSelectedText={__("Filter by type")}
+          defaultValues={['rpm']}
+          noneSelectedText={__('Filter by type')}
           onChange={(e) => {
             const values = [...e.target.options]
               .filter(({ selected }) => selected)

data/webpack/scenes/RedHatRepositories/components/__tests__/RepositorySetRepositories.test.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import configureMockStore from 'redux-mock-store';
+import RepositorySetRepositories from '../RepositorySetRepositories';
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ katello: { redHatRepositories: { repositorySetRepositories: [] } } });
+
+describe('RepositorySetRepositories Component', () => {
+  let shallowWrapper;
+  beforeEach(() => {
+    shallowWrapper = shallow(<RepositorySetRepositories
+      store={store}
+      contentId={1}
+      productId={2}
+      type="foo"
+    />);
+  });
+
+  it('sorts repos correctly', async () => {
+    const repos = [
+      { arch: 'x86_64', releasever: '5.11' },
+      { arch: 'x86_64', releasever: '7Server' },
+      { arch: 'x86_64', releasever: '7.10' },
+      { arch: 'x86_64', releasever: '7.1' },
+      { arch: 'i386', releasever: '5.11' },
+      { arch: 'i386', releasever: '5Workstation' },
+      { arch: 'x86_64', releasever: '7.11' }];
+
+    const result = shallowWrapper.dive().instance().sortedRepos(repos);
+
+    const expectedIndices = [1, 5, 6, 2, 3, 0, 4];
+
+    expectedIndices.forEach((expected, i) => {
+      expect(result[i]).toEqual(repos[expected]);
+    });
+  });
+
+  it('should render', async () => {
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
+  });
+});

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RepositorySetRepositories.test.js.snap

@@ -0,0 +1,48 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RepositorySetRepositories Component should render 1`] = `
+<RepositorySetRepositories
+  contentId={1}
+  data={
+    Object {
+      "error": null,
+      "loading": true,
+      "repositories": Array [],
+    }
+  }
+  loadRepositorySetRepos={[Function]}
+  productId={2}
+  store={
+    Object {
+      "clearActions": [Function],
+      "dispatch": [Function],
+      "getActions": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+    }
+  }
+  storeSubscription={
+    Subscription {
+      "listeners": Object {
+        "clear": [Function],
+        "get": [Function],
+        "notify": [Function],
+        "subscribe": [Function],
+      },
+      "onStateChange": [Function],
+      "parentSub": undefined,
+      "store": Object {
+        "clearActions": [Function],
+        "dispatch": [Function],
+        "getActions": [Function],
+        "getState": [Function],
+        "replaceReducer": [Function],
+        "subscribe": [Function],
+      },
+      "unsubscribe": [Function],
+    }
+  }
+  type="foo"
+/>
+`;

data/webpack/scenes/RedHatRepositories/helpers.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ListView } from 'patternfly-react';
-import { sprintf } from 'jed';
+import { sprintf } from 'foremanReact/common/I18n';
 
 import PaginationRow from '../../components/PaginationRow/index';
 import RepositorySet from './components/RepositorySet';
@@ -14,7 +14,7 @@ export const getSetsComponent = (repoSetsState, onPaginationChange) => {
     itemCount,
   } = repoSetsState;
 
-  if (results.length === 0) {
+  if (itemCount === 0) {
     if (searchIsActive) {
       return <p>{__('No repository sets match your search criteria.')}</p>;
     }
@@ -32,12 +32,14 @@ export const getSetsComponent = (repoSetsState, onPaginationChange) => {
   }
   return (
     <ListView>
-      <PaginationRow
-        viewType="list"
-        itemCount={itemCount}
-        pagination={pagination}
-        onChange={onPaginationChange}
-      />
+      <div className="sticky-pagination">
+        <PaginationRow
+          viewType="list"
+          itemCount={itemCount}
+          pagination={pagination}
+          onChange={onPaginationChange}
+        />
+      </div>
       {results.map(set => <RepositorySet id={set.id} key={set.id} {...set} />)}
     </ListView>
   );
@@ -51,7 +53,7 @@ export const getEnabledComponent = (enabledReposState, onPaginationChange) => {
     itemCount,
   } = enabledReposState;
 
-  if (repositories.length === 0) {
+  if (itemCount === 0) {
     if (searchIsActive) {
       return <p>{__('No enabled repositories match your search criteria.')}</p>;
     }
@@ -60,12 +62,14 @@ export const getEnabledComponent = (enabledReposState, onPaginationChange) => {
 
   return (
     <ListView>
-      <PaginationRow
-        viewType="list"
-        itemCount={itemCount}
-        pagination={pagination}
-        onChange={onPaginationChange}
-      />
+      <div className="sticky-pagination sticky-pagination-grey">
+        <PaginationRow
+          viewType="list"
+          itemCount={itemCount}
+          pagination={pagination}
+          onChange={onPaginationChange}
+        />
+      </div>
       {repositories.map(repo => <EnabledRepository key={repo.id} {...repo} />)}
     </ListView>
   );

data/webpack/scenes/RedHatRepositories/index.js

@@ -20,7 +20,7 @@ class RedHatRepositoriesPage extends Component {
 
   loadData() {
     this.props.loadEnabledRepos();
-    this.props.loadRepositorySets();
+    this.props.loadRepositorySets({ search: { filters: ['rpm'] } });
   }
 
   render() {
@@ -85,8 +85,6 @@ RedHatRepositoriesPage.propTypes = {
   updateRecommendedRepositorySets: PropTypes.func.isRequired,
   enabledRepositories: PropTypes.shape({}).isRequired,
   repositorySets: PropTypes.shape({}).isRequired,
-  history: PropTypes.shape({}).isRequired,
-  location: PropTypes.shape({}).isRequired,
 };
 
 const mapStateToProps = ({

data/webpack/scenes/RedHatRepositories/index.scss

@@ -16,6 +16,10 @@
 }
 
 #redhatRepositoriesPage {
+  .deemphasize {
+    color: lightgray;
+  }
+
   .list-group-item-header .list-view-pf-description,
   .enabled-repositories-container .list-view-pf-description {
     width: 100%;
@@ -74,3 +78,15 @@
     }
   }
 }
+
+.sticky-pagination {
+  position: sticky;
+  top: 60px;
+  z-index: 2;
+  background-color: white;
+  padding-top: 10px;
+}
+
+.sticky-pagination-grey {
+  background-color: $color-pf-black-200;
+}

data/webpack/scenes/Settings/Tables/TableActions.js

@@ -0,0 +1,73 @@
+import { foremanApi, userId } from '../../../services/api';
+
+import {
+  TABLES_REQUEST,
+  TABLES_SUCCESS,
+  TABLES_FAILURE,
+  CREATE_TABLE,
+  CREATE_TABLE_SUCCESS,
+  CREATE_TABLE_FAILURE,
+  UPDATE_TABLE,
+  UPDATE_TABLE_SUCCESS,
+  UPDATE_TABLE_FAILURE,
+} from './TableConstants';
+
+const getResponseError = ({ data }) => data && (data.displayMessage || data.error);
+
+export const loadTables = () => (dispatch) => {
+  dispatch({ type: TABLES_REQUEST, params: {} });
+
+  return foremanApi
+    .get(`/users/${userId()}/table_preferences`, {})
+    .then(({ data }) => {
+      dispatch({
+        type: TABLES_SUCCESS,
+        payload: data,
+      });
+    })
+    .catch((result) => {
+      const { response } = result;
+      dispatch({
+        type: TABLES_FAILURE,
+        error: getResponseError(response),
+      });
+    });
+};
+
+export const createColumns = (params = {}) => (dispatch) => {
+  dispatch({ type: CREATE_TABLE, params });
+
+  return foremanApi
+    .post(`/users/${userId()}/table_preferences`, params)
+    .then(({ data }) => {
+      dispatch({
+        type: CREATE_TABLE_SUCCESS,
+        payload: [data],
+      });
+    })
+    .catch((result) => {
+      dispatch({
+        type: CREATE_TABLE_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
+};
+export const updateColumns = (params = {}) => (dispatch) => {
+  dispatch({ type: UPDATE_TABLE, params });
+  const updateParams = { columns: params.columns };
+  return foremanApi
+    .put(`/users/${userId()}/table_preferences/${params.name}`, updateParams)
+    .then(({ data }) => {
+      dispatch({
+        type: UPDATE_TABLE_SUCCESS,
+        payload: [data],
+      });
+    })
+    .catch((result) => {
+      dispatch({
+        type: UPDATE_TABLE_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
+};
+export default loadTables;

data/webpack/scenes/Settings/Tables/TableConstants.js

@@ -0,0 +1,11 @@
+export const TABLES_REQUEST = 'TABLES_REQUEST';
+export const TABLES_SUCCESS = 'TABLES_SUCCESS';
+export const TABLES_FAILURE = 'TABLES_FAILURE';
+
+export const CREATE_TABLE = 'CREATE_TABLE';
+export const CREATE_TABLE_SUCCESS = 'CREATE_TABLE_SUCCESS';
+export const CREATE_TABLE_FAILURE = 'CREATE_TABLE_FAILURE';
+
+export const UPDATE_TABLE = 'UPDATE_TABLE';
+export const UPDATE_TABLE_SUCCESS = 'UPDATE_TABLE_SUCCESS';
+export const UPDATE_TABLE_FAILURE = 'UPDATE_TABLE_FAILURE';