foreman_ansible 6.0.2 → 6.3.1

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';
 
@@ -21,7 +22,7 @@ export const getAnsibleRoles = (
   resourceName,
   pagination,
   search
-) => dispatch => {
+) => async dispatch => {
   dispatch({ type: ANSIBLE_ROLES_REQUEST });
 
   const params = {
@@ -30,19 +31,19 @@ export const getAnsibleRoles = (
     ...propsToSnakeCase({ resourceId, resourceName }),
   };
 
-  return api
-    .get(url, {}, params)
-    .then(({ data }) =>
-      dispatch({
-        type: ANSIBLE_ROLES_SUCCESS,
-        payload: {
-          initialAssignedRoles,
-          inheritedRoleIds,
-          ...propsToCamelCase(data),
-        },
-      })
-    )
-    .catch(error => dispatch(errorHandler(ANSIBLE_ROLES_FAILURE, error)));
+  try {
+    const res = await api.get(url, {}, params);
+    return dispatch({
+      type: ANSIBLE_ROLES_SUCCESS,
+      payload: {
+        initialAssignedRoles,
+        inheritedRoleIds,
+        ...propsToCamelCase(res.data),
+      },
+    });
+  } catch (error) {
+    return dispatch(errorHandler(ANSIBLE_ROLES_FAILURE, error));
+  }
 };
 
 const errorHandler = (msg, err) => {
@@ -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);
-  }
-);

data/webpack/components/AnsibleRolesSwitcher/__fixtures__/ansibleRolesSwitcherReducer.fixtures.js

@@ -23,6 +23,7 @@ export const successState = Immutable({
     ...ansibleRolesLong.slice(4, 6),
   ],
   results: ansibleRolesLong,
+  toDestroyRoles: [],
   assignedPagination: {
     page: 1,
     perPage: 20,

data/webpack/components/AnsibleRolesSwitcher/__tests__/AnsibleRolesSwitcher.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AnsibleRolesSwitcher from '../AnsibleRolesSwitcher';
 
@@ -13,16 +13,18 @@ const fixtures = {
     itemCount: 20,
     addAnsibleRole: noop,
     removeAnsibleRole: noop,
+    moveAnsibleRole: noop,
     getAnsibleRoles: noop,
     changeAssignedPage: noop,
     assignedPagination: { page: 1, perPage: 12 },
     assignedRolesCount: 2,
     assignedRoles: [],
     unassignedRoles: [],
-    data: {
-      initialAssignedRoles: [],
-    },
+    initialAssignedRoles: [],
     error: { statusText: '', errorMsg: '' },
+    allAssignedRoles: [],
+    toDestroyRoles: [],
+    availableRolesUrl: 'http://test/roles',
   },
 };
 

data/webpack/components/AnsibleRolesSwitcher/__tests__/AnsibleRolesSwitcherReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import reducer, { initialState } from '../AnsibleRolesSwitcherReducer';
 import { ansibleRolesLong } from '../__fixtures__/ansibleRolesData.fixtures';
@@ -15,7 +15,6 @@ import {
   ANSIBLE_ROLES_FAILURE,
   ANSIBLE_ROLES_ADD,
   ANSIBLE_ROLES_REMOVE,
-  ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE,
 } from '../AnsibleRolesSwitcherConstants';
 
 const fixtures = {
@@ -60,13 +59,6 @@ const fixtures = {
       payload: { role: ansibleRolesLong[5] },
     },
   },
-  'should change pagination for assigned roles': {
-    state: successState,
-    action: {
-      type: ANSIBLE_ROLES_ASSIGNED_PAGE_CHANGE,
-      payload: { pagination: { page: 20, perPage: 5 } },
-    },
-  },
 };
 
 describe('AnsibleRolesSwitcherReducer', () =>

data/webpack/components/AnsibleRolesSwitcher/__tests__/AnsibleRolesSwitcherSelectors.test.js

@@ -1,13 +1,7 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
-import {
-  selectUnassignedRoles,
-  selectAssignedRolesPage,
-} from '../AnsibleRolesSwitcherSelectors';
-import {
-  ansibleRolesShort,
-  ansibleRolesLong,
-} from '../__fixtures__/ansibleRolesData.fixtures';
+import { selectUnassignedRoles } from '../AnsibleRolesSwitcherSelectors';
+import { ansibleRolesShort } from '../__fixtures__/ansibleRolesData.fixtures';
 
 const stateFactory = obj => ({
   foremanAnsible: {
@@ -25,18 +19,11 @@ const state2 = {
   assignedRoles: [],
 };
 
-const state3 = {
-  assignedRoles: ansibleRolesLong,
-  assignedPagination: { page: 2, perPage: 5 },
-};
-
 const fixtures = {
   'should return unassigned roles': () =>
     selectUnassignedRoles(stateFactory(state1)),
   'should return all roles when no roles assigned': () =>
     selectUnassignedRoles(stateFactory(state2)),
-  'should return requested page': () =>
-    selectAssignedRolesPage(stateFactory(state3)),
 };
 
 describe('AnsibleRolesSwitcherSelectors', () =>

data/webpack/components/AnsibleRolesSwitcher/__tests__/__snapshots__/AnsibleRolesSwitcher.test.js.snap

@@ -57,21 +57,17 @@ exports[`AnsibleRolesSwitcher should render 1`] = `
         className="assigned-roles-header"
       >
         <h2>
+          <OrderedRolesTooltip />
           Assigned Ansible Roles
         </h2>
       </div>
       <AssignedRolesList
         assignedRoles={Array []}
-        itemCount={2}
-        onPaginationChange={[Function]}
+        onMoveRole={[Function]}
         onRemoveRole={[Function]}
-        pagination={
-          Object {
-            "page": 1,
-            "perPage": 12,
-          }
-        }
         resourceName=""
+        toDestroyRoles={Array []}
+        unassignedRoles={Array []}
       />
     </Col>
   </Row>

data/webpack/components/AnsibleRolesSwitcher/__tests__/__snapshots__/AnsibleRolesSwitcherReducer.test.js.snap

@@ -82,87 +82,7 @@ Object {
       "name": "anonymous.something",
     },
   ],
-}
-`;
-
-exports[`AnsibleRolesSwitcherReducer should change pagination for assigned roles 1`] = `
-Object {
-  "assignedPagination": Object {
-    "page": 20,
-    "perPage": 5,
-  },
-  "assignedRoles": Array [
-    Object {
-      "id": 4,
-      "inherited": true,
-      "name": "geerlingguy.java",
-    },
-    Object {
-      "id": 5,
-      "name": "naftulikay.golang",
-    },
-    Object {
-      "id": 6,
-      "name": "theforeman.foreman_scap_client",
-    },
-  ],
-  "error": Object {
-    "errorMsg": "",
-    "status": "",
-    "statusText": "",
-  },
-  "itemCount": 11,
-  "loading": false,
-  "pagination": Object {
-    "page": 1,
-    "perPage": 5,
-  },
-  "results": Array [
-    Object {
-      "id": 1,
-      "name": "sthirugn.motd",
-    },
-    Object {
-      "id": 2,
-      "name": "jtyr.ntp",
-    },
-    Object {
-      "id": 3,
-      "name": "rvm.ruby",
-    },
-    Object {
-      "id": 4,
-      "name": "geerlingguy.java",
-    },
-    Object {
-      "id": 5,
-      "name": "naftulikay.golang",
-    },
-    Object {
-      "id": 6,
-      "name": "theforeman.foreman_scap_client",
-    },
-    Object {
-      "id": 7,
-      "name": "ansible.ansible",
-    },
-    Object {
-      "id": 8,
-      "name": "puppet.puppet",
-    },
-    Object {
-      "id": 9,
-      "name": "chef.chef",
-    },
-    Object {
-      "id": 10,
-      "name": "salt.salt",
-    },
-    Object {
-      "id": 11,
-      "name": "anonymous.something",
-    },
-  ],
+  "toDestroyRoles": Array [],
 }
 `;
 
@@ -239,7 +159,10 @@ Object {
       "id": 11,
       "name": "anonymous.something",
     },
+  ],
+  "toDestroyRoles": Array [
     Object {
+      "destroy": true,
       "id": 6,
       "name": "theforeman.foreman_scap_client",
     },
@@ -249,10 +172,6 @@ Object {
 
 exports[`AnsibleRolesSwitcherReducer should return initial state 1`] = `
 Object {
-  "assignedPagination": Object {
-    "page": 1,
-    "perPage": 10,
-  },
   "assignedRoles": Array [],
   "error": Object {
     "errorMsg": "",
@@ -267,15 +186,12 @@ Object {
     "perPage": 10,
   },
   "results": Array [],
+  "toDestroyRoles": Array [],
 }
 `;
 
 exports[`AnsibleRolesSwitcherReducer should start loading on Ansible roles request 1`] = `
 Object {
-  "assignedPagination": Object {
-    "page": 1,
-    "perPage": 10,
-  },
   "assignedRoles": Array [],
   "error": Object {
     "errorMsg": "",
@@ -290,15 +206,12 @@ Object {
     "perPage": 10,
   },
   "results": Array [],
+  "toDestroyRoles": Array [],
 }
 `;
 
 exports[`AnsibleRolesSwitcherReducer should stop loading on Ansible roles error 1`] = `
 Object {
-  "assignedPagination": Object {
-    "page": 1,
-    "perPage": 10,
-  },
   "assignedRoles": Array [],
   "error": Object {
     "errorMsg": "Failed to fetch Ansible Roles from server.",
@@ -312,15 +225,12 @@ Object {
     "perPage": 10,
   },
   "results": Array [],
+  "toDestroyRoles": Array [],
 }
 `;
 
 exports[`AnsibleRolesSwitcherReducer should stop loading on Ansible roles success 1`] = `
 Object {
-  "assignedPagination": Object {
-    "page": 1,
-    "perPage": 10,
-  },
   "assignedRoles": Array [
     Object {
       "id": 4,
@@ -395,5 +305,6 @@ Object {
       "name": "anonymous.something",
     },
   ],
+  "toDestroyRoles": Array [],
 }
 `;