foreman_ansible 6.2.0 → 6.3.0

data/webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesImport.test.js

@@ -0,0 +1,39 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import ImportRolesAndVariablesTable from '../AnsibleRolesAndVariables';
+
+const rowsData = [
+  {
+    cells: [
+      'bennojoy.ntp',
+      'Update Role Variables',
+      'Add: 1 Remove: 2 ',
+      '',
+      '',
+    ],
+    kind: 'old',
+    id: 'bennojoy.ntp',
+  },
+  {
+    cells: ['0ta2.git_role', 'Import Role ', 'Add: 5 ', '', ''],
+    kind: 'new',
+    id: '0ta2.git_role',
+  },
+];
+
+const columnsData = [
+  { title: 'Name' },
+  { title: 'Operation' },
+  { title: 'Variables' },
+  { title: 'Hosts Count' },
+  { title: 'Hostgroups count' },
+];
+
+const fixtures = {
+  'should render': {
+    rowsData,
+    columnsData,
+  },
+};
+
+describe('ImportRolesAndVariablesTable', () =>
+  testComponentSnapshotsWithFixtures(ImportRolesAndVariablesTable, fixtures));

data/webpack/components/AnsibleRolesAndVariables/__test__/__snapshots__/AnsibleRolesAndVariablesImport.test.js.snap

@@ -0,0 +1,177 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ImportRolesAndVariablesTable should render 1`] = `
+<div
+  id="import-ansible-roles-variables"
+>
+  <Toolbar>
+    <ToolbarContent
+      isExpanded={false}
+      showClearFiltersButton={false}
+    >
+      <ForwardRef
+        variant="icon-button-group"
+      >
+        <ToolbarItem>
+          <Checkbox
+            aria-label="select all checkbox"
+            className=""
+            id="select-all"
+            isChecked={false}
+            isDisabled={false}
+            isValid={true}
+            label="Select all"
+            name="select-all"
+            onChange={[Function]}
+          />
+        </ToolbarItem>
+      </ForwardRef>
+    </ToolbarContent>
+  </Toolbar>
+  <Table
+    aria-label="import roles and variables"
+    borders={true}
+    canSelectAll={false}
+    canSortFavorites={true}
+    cells={
+      Array [
+        Object {
+          "title": "Name",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+        Object {
+          "title": "Operation",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+        Object {
+          "title": "Variables",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+        Object {
+          "title": "Hosts Count",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+        Object {
+          "title": "Hostgroups count",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+      ]
+    }
+    className=""
+    contentId="expanded-content"
+    dropdownDirection="down"
+    dropdownPosition="right"
+    expandId="expandable-toggle"
+    gridBreakPoint="grid-md"
+    isStickyHeader={false}
+    onSelect={[Function]}
+    ouiaSafe={true}
+    role="grid"
+    rowLabeledBy="simple-node"
+    rows={
+      Array [
+        Object {
+          "cells": Array [
+            "bennojoy.ntp",
+            "Update Role Variables",
+            "Add: 1 Remove: 2 ",
+            "",
+            "",
+          ],
+          "id": "bennojoy.ntp",
+          "kind": "old",
+        },
+        Object {
+          "cells": Array [
+            "0ta2.git_role",
+            "Import Role ",
+            "Add: 5 ",
+            "",
+            "",
+          ],
+          "id": "0ta2.git_role",
+          "kind": "new",
+        },
+      ]
+    }
+    selectVariant="checkbox"
+    variant={null}
+  >
+    <TableHeader />
+    <Component />
+  </Table>
+  <Pagination
+    className=""
+    defaultToFullPage={true}
+    firstPage={1}
+    isCompact={true}
+    isDisabled={false}
+    isSticky={false}
+    itemCount={2}
+    itemsEnd={null}
+    itemsStart={null}
+    offset={0}
+    onFirstClick={[Function]}
+    onLastClick={[Function]}
+    onNextClick={[Function]}
+    onPageInput={[Function]}
+    onPerPageSelect={[Function]}
+    onPreviousClick={[Function]}
+    onSetPage={[Function]}
+    ouiaSafe={true}
+    page={0}
+    perPage={5}
+    perPageOptions={
+      Array [
+        Object {
+          "title": "3",
+          "value": 3,
+        },
+        Object {
+          "title": "5",
+          "value": 5,
+        },
+        Object {
+          "title": "10",
+          "value": 10,
+        },
+      ]
+    }
+    titles={
+      Object {
+        "paginationTitle": "top pagination",
+      }
+    }
+    toggleTemplate={[Function]}
+    variant="top"
+    widgetId="pagination-options-menu"
+  />
+  <div
+    className="submit-cancel-btns"
+  >
+    <br />
+    <br />
+    <Button
+      onClick={[Function]}
+      variant="primary"
+    >
+      Submit
+    </Button>
+    <Button
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+  </div>
+</div>
+`;

data/webpack/components/AnsibleRolesAndVariables/index.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import { push } from 'connected-react-router';
+
+import ImportRolesAndVariablesTable from './AnsibleRolesAndVariables';
+import { onSubmit } from './AnsibleRolesAndVariablesActions';
+import { ANSIBLE_ROLES_INDEX } from './AnsibleRolesAndVariablesConstants';
+
+const WrappedImportRolesAndVariables = props => {
+  const cols = [
+    { title: 'Name' },
+    { title: 'Operation' },
+    { title: 'Variables' },
+    { title: 'Hosts Count' },
+    { title: 'Hostgroups count' },
+  ];
+  const dispatch = useDispatch();
+  const submit = (rows, proxy) => dispatch(onSubmit(rows, proxy));
+  const onCancel = () => {
+    dispatch(push(ANSIBLE_ROLES_INDEX));
+  };
+  return (
+    <ImportRolesAndVariablesTable
+      {...props}
+      columnsData={cols}
+      onSubmit={submit}
+      onCancel={onCancel}
+    />
+  );
+};
+export default WrappedImportRolesAndVariables;

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -7,6 +7,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import AvailableRolesList from './components/AvailableRolesList';
 import AssignedRolesList from './components/AssignedRolesList';
 import AnsibleRolesSwitcherError from './components/AnsibleRolesSwitcherError';
+import OrderedRolesTooltip from './components/OrderedRolesTooltip';
 import { excludeAssignedRolesSearch } from './AnsibleRolesSwitcherHelpers';
 
 class AnsibleRolesSwitcher extends React.Component {
@@ -37,13 +38,11 @@ class AnsibleRolesSwitcher extends React.Component {
       itemCount,
       addAnsibleRole,
       removeAnsibleRole,
+      moveAnsibleRole,
       getAnsibleRoles,
-      changeAssignedPage,
-      assignedPagination,
-      assignedRolesCount,
       assignedRoles,
-      allAssignedRoles,
       unassignedRoles,
+      toDestroyRoles,
       error,
     } = this.props;
 
@@ -57,12 +56,12 @@ class AnsibleRolesSwitcher extends React.Component {
     const onListingChange = paginationArgs =>
       getAnsibleRoles(
         availableRolesUrl,
-        allAssignedRoles,
+        assignedRoles,
         inheritedRoleIds,
         resourceId,
         resourceName,
         paginationArgs,
-        excludeAssignedRolesSearch(allAssignedRoles)
+        excludeAssignedRolesSearch(assignedRoles)
       );
 
     return (
@@ -85,16 +84,18 @@ class AnsibleRolesSwitcher extends React.Component {
 
           <Col sm={6} className="assigned-roles-container">
             <div className="assigned-roles-header">
-              <h2>{__('Assigned Ansible Roles')}</h2>
+              <h2>
+                <OrderedRolesTooltip />
+                {__('Assigned Ansible Roles')}
+              </h2>
             </div>
             <AssignedRolesList
               assignedRoles={assignedRoles}
-              allAssignedRoles={allAssignedRoles}
-              pagination={assignedPagination}
-              itemCount={assignedRolesCount}
-              onPaginationChange={changeAssignedPage}
+              unassignedRoles={unassignedRoles}
               onRemoveRole={removeAnsibleRole}
+              onMoveRole={moveAnsibleRole}
               resourceName={lowerCase(resourceName || '')}
+              toDestroyRoles={toDestroyRoles}
             />
           </Col>
         </Row>
@@ -118,14 +119,9 @@ AnsibleRolesSwitcher.propTypes = {
   itemCount: PropTypes.number.isRequired,
   addAnsibleRole: PropTypes.func.isRequired,
   removeAnsibleRole: PropTypes.func.isRequired,
-  changeAssignedPage: PropTypes.func.isRequired,
-  assignedPagination: PropTypes.shape({
-    page: PropTypes.number,
-    perPage: PropTypes.number,
-  }).isRequired,
-  assignedRolesCount: PropTypes.number.isRequired,
+  moveAnsibleRole: PropTypes.func.isRequired,
   assignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
-  allAssignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  toDestroyRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
   unassignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
   error: PropTypes.shape({
     errorMsg: PropTypes.string,

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.scss

@@ -10,7 +10,7 @@
     }
 
     .list-group-item.ansible-role-movable:hover {
-      cursor: pointer;
+      cursor: grab;
     }
   }
 

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherActions.js

@@ -10,6 +10,7 @@ import {
   ANSIBLE_ROLES_FAILURE,
   ANSIBLE_ROLES_ADD,
   ANSIBLE_ROLES_REMOVE,
+  ANSIBLE_ROLES_MOVE,
   ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE,
 } from './AnsibleRolesSwitcherConstants';
 
@@ -63,6 +64,11 @@ export const removeAnsibleRole = role => ({
   payload: { role },
 });
 
+export const moveAnsibleRole = roles => ({
+  type: ANSIBLE_ROLES_MOVE,
+  payload: { roles },
+});
+
 export const changeAssignedPage = pagination => ({
   type: ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE,
   payload: { pagination },

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherConstants.js

@@ -3,5 +3,4 @@ export const ANSIBLE_ROLES_SUCCESS = 'ANSIBLE_ROLES_SUCCESS';
 export const ANSIBLE_ROLES_FAILURE = 'ANSIBLE_ROLES_FAILURE';
 export const ANSIBLE_ROLES_ADD = 'ANSIBLE_ROLES_ADD';
 export const ANSIBLE_ROLES_REMOVE = 'ANSIBLE_ROLES_REMOVE';
-export const ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE =
-  'ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE';
+export const ANSIBLE_ROLES_MOVE = 'ANSIBLE_ROLE_MOVE';

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherReducer.js

@@ -6,7 +6,7 @@ import {
   ANSIBLE_ROLES_FAILURE,
   ANSIBLE_ROLES_ADD,
   ANSIBLE_ROLES_REMOVE,
-  ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE,
+  ANSIBLE_ROLES_MOVE,
 } from './AnsibleRolesSwitcherConstants';
 
 export const initialState = Immutable({
@@ -17,12 +17,9 @@ export const initialState = Immutable({
     perPage: 10,
   },
   assignedRoles: [],
+  toDestroyRoles: [],
   inheritedRoleIds: [],
   results: [],
-  assignedPagination: {
-    page: 1,
-    perPage: 10,
-  },
   error: { errorMsg: '', status: '', statusText: '' },
 });
 
@@ -49,6 +46,9 @@ const ansibleRoles = (state = initialState, action) => {
     case ANSIBLE_ROLES_ADD:
       return state.merge({
         assignedRoles: state.assignedRoles.concat([payload.role]),
+        toDestroyRoles: state.toDestroyRoles.filter(
+          item => item.id !== payload.role.id
+        ),
         itemCount: state.itemCount - 1,
       });
     case ANSIBLE_ROLES_REMOVE:
@@ -56,11 +56,16 @@ const ansibleRoles = (state = initialState, action) => {
         assignedRoles: Immutable.flatMap(state.assignedRoles, item =>
           item.id === payload.role.id ? [] : item
         ),
-        results: state.results.concat([payload.role]),
+        results: state.results.find(item => payload.role.id === item.id)
+          ? state.results
+          : state.results.concat([payload.role]),
+        toDestroyRoles: state.toDestroyRoles.concat([
+          { ...payload.role, destroy: true },
+        ]),
         itemCount: state.itemCount + 1,
       });
-    case ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE:
-      return state.set('assignedPagination', payload.pagination);
+    case ANSIBLE_ROLES_MOVE:
+      return state.set('assignedRoles', payload.roles);
     default:
       return state;
   }

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherSelectors.js

@@ -1,16 +1,7 @@
-import { differenceBy, slice, includes, uniq } from 'lodash';
+import { differenceBy, includes } from 'lodash';
 import Immutable from 'seamless-immutable';
 import { createSelector } from 'reselect';
-
-const compare = (a, b) => {
-  if (a.name < b.name) {
-    return -1;
-  }
-  if (a.name > b.name) {
-    return 1;
-  }
-  return 0;
-};
+import { propsToCamelCase } from 'foremanReact/common/helpers';
 
 const switcherState = state => state.foremanAnsible.ansibleRolesSwitcher;
 
@@ -21,7 +12,7 @@ const markInheritedRoles = (roles, inheritedRoleIds) =>
 
 export const selectResults = state =>
   Immutable(
-    Immutable.asMutable(uniq(switcherState(state).results)).sort(compare)
+    Immutable.asMutable(switcherState(state).results.map(propsToCamelCase))
   );
 
 export const selectItemCount = state => switcherState(state).itemCount;
@@ -29,16 +20,15 @@ export const selectItemCount = state => switcherState(state).itemCount;
 export const selectAssignedRoles = state =>
   Immutable.asMutable(
     markInheritedRoles(
-      switcherState(state).assignedRoles,
+      switcherState(state).assignedRoles.map(propsToCamelCase),
       switcherState(state).inheritedRoleIds
     )
-  ).sort(compare);
+  );
+
+export const selectToDestroyRoles = state =>
+  switcherState(state).toDestroyRoles;
 
-export const selectAssignedRolesCount = state =>
-  selectAssignedRoles(state).length;
 export const selectLoading = state => switcherState(state).loading;
-export const selectAssignedPagination = state =>
-  switcherState(state).assignedPagination;
 export const selectError = state => switcherState(state).error;
 export const selectPagination = state => switcherState(state).pagination;
 
@@ -56,13 +46,3 @@ export const selectUnassignedRoles = createSelector(
   selectAssignedRoles,
   (results, assignedRoles) => differenceBy(results, assignedRoles, 'id')
 );
-
-export const selectAssignedRolesPage = createSelector(
-  selectAssignedPagination,
-  selectAssignedRoles,
-  (assignedPagination, assignedRoles) => {
-    const offset = (assignedPagination.page - 1) * assignedPagination.perPage;
-
-    return slice(assignedRoles, offset, offset + assignedPagination.perPage);
-  }
-);