foreman_ansible 6.0.2 → 6.3.1

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.scss

@@ -0,0 +1,9 @@
+#import-ansible-roles-variables {
+  .submit-cancel-btns {
+    padding-top: 20px;
+
+    button {
+      margin-right: 5px;
+    }
+  }
+}

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesActions.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { post } from 'foremanReact/redux/API';
+import { push } from 'connected-react-router';
+import { prepareResult } from './AnsibleRolesAndVariablesHelpers';
+import {
+  ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
+  ANSIBLE_ROLES_INDEX,
+} from './AnsibleRolesAndVariablesConstants';
+
+export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
+
+export const onSubmit = (rows, proxy) => dispatch => {
+  const params = prepareResult(rows);
+  dispatch(
+    post({
+      key: 'import_ansible_v_r',
+      url: ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
+      params: { changed: params, proxy },
+      handleSuccess: () => {
+        setTimeout(() => dispatch(push(ANSIBLE_ROLES_INDEX)), 500);
+      },
+      successToast: response => (
+        <span>
+          {__('Import roles and variables started: ')}
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href={foremanUrl(`/foreman_tasks/tasks/${response.data?.task?.id}`)}
+          >
+            {__('view the task in progress')}
+          </a>
+        </span>
+      ),
+      errorToast: error =>
+        `${__('Failed to import roles and variables ')} ${error}`,
+    })
+  );
+};

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesConstants.js

@@ -0,0 +1,4 @@
+export const ANSIBLE_ROLES_INDEX = '/ansible/ansible_roles';
+export const ANSIBLE_ROLE_CONFIRM_IMPORT_PATH =
+  '/ansible/ansible_roles/confirm_import';
+export const DEFAULT_PER_PAGE = 5;

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesHelpers.js

@@ -0,0 +1,11 @@
+export const prepareResult = rows => {
+  const result = {};
+  const selectRows = rows.filter(row => row.selected === true);
+  selectRows.forEach(row => {
+    result[row.kind] = {};
+  });
+  selectRows.forEach(row => {
+    result[row.kind][row.role.name] = row.role;
+  });
+  return result;
+};

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

@@ -0,0 +1,50 @@
+import { prepareResult } from '../AnsibleRolesAndVariablesHelpers';
+
+const bennojoy = { created_at: null, id: null, name: 'bennojoy.ntp' };
+const gitRole = { created_at: null, id: null, name: '0ta2.git_role' };
+const jriguera = { created_at: null, id: null, name: 'jriguera.monit' };
+const rows = [
+  {
+    cells: [
+      'bennojoy.ntp',
+      'Update Role Variables',
+      'Add: 1 Remove: 2 ',
+      '',
+      '',
+    ],
+    kind: 'old',
+    id: 'bennojoy.ntp',
+    role: bennojoy,
+    selected: true,
+  },
+  {
+    cells: ['0ta2.git_role', 'Import Role ', 'Add: 5 ', '', ''],
+    kind: 'new',
+    id: '0ta2.git_role',
+    role: gitRole,
+    selected: true,
+  },
+  {
+    cells: ['jriguera.monit', 'Import Role ', 'Add: 12 ', '', ''],
+    kind: 'new',
+    id: 'jriguera.monit',
+    role: jriguera,
+  },
+];
+
+const result = {
+  old: {
+    'bennojoy.ntp': bennojoy,
+  },
+  new: {
+    '0ta2.git_role': gitRole,
+  },
+};
+
+describe('AnsibleRolesAndVariablesHelpers', () => {
+  describe('prepareResult', () => {
+    it('should return correct results', () => {
+      expect(prepareResult(rows)).toStrictEqual(result);
+    });
+  });
+});

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 {
@@ -17,7 +18,7 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
-    } = this.props.data;
+    } = this.props;
 
     this.props.getAnsibleRoles(
       availableRolesUrl,
@@ -37,13 +38,11 @@ class AnsibleRolesSwitcher extends React.Component {
       itemCount,
       addAnsibleRole,
       removeAnsibleRole,
+      moveAnsibleRole,
       getAnsibleRoles,
-      changeAssignedPage,
-      assignedPagination,
-      assignedRolesCount,
       assignedRoles,
-      allAssignedRoles,
       unassignedRoles,
+      toDestroyRoles,
       error,
     } = this.props;
 
@@ -52,17 +51,17 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
-    } = this.props.data;
+    } = this.props;
 
     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>
@@ -104,13 +105,11 @@ class AnsibleRolesSwitcher extends React.Component {
 }
 
 AnsibleRolesSwitcher.propTypes = {
-  data: PropTypes.shape({
-    initialAssignedRoles: PropTypes.arrayOf(PropTypes.object),
-    availableRolesUrl: PropTypes.string,
-    inheritedRoleIds: PropTypes.arrayOf(PropTypes.number),
-    resourceId: PropTypes.number,
-    resourceName: PropTypes.string,
-  }).isRequired,
+  initialAssignedRoles: PropTypes.arrayOf(PropTypes.object),
+  availableRolesUrl: PropTypes.string.isRequired,
+  inheritedRoleIds: PropTypes.arrayOf(PropTypes.number),
+  resourceId: PropTypes.number,
+  resourceName: PropTypes.string,
   getAnsibleRoles: PropTypes.func.isRequired,
   loading: PropTypes.bool.isRequired,
   pagination: PropTypes.shape({
@@ -120,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,
@@ -137,6 +131,10 @@ AnsibleRolesSwitcher.propTypes = {
 
 AnsibleRolesSwitcher.defaultProps = {
   error: {},
+  resourceId: null,
+  resourceName: '',
+  initialAssignedRoles: [],
+  inheritedRoleIds: [],
 };
 
 export default AnsibleRolesSwitcher;