diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx index b30f21b35f..9b40ac470f 100644 --- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx +++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx @@ -17,6 +17,57 @@ const readTeams = async queryParams => TeamsAPI.read(queryParams); const readTeamsOptions = async () => TeamsAPI.readOptions(); +const userSearchColumns = [ + { + name: t`Username`, + key: 'username__icontains', + isDefault: true, + }, + { + name: t`First Name`, + key: 'first_name__icontains', + }, + { + name: t`Last Name`, + key: 'last_name__icontains', + }, +]; +const userSortColumns = [ + { + name: t`Username`, + key: 'username', + }, + { + name: t`First Name`, + key: 'first_name', + }, + { + name: t`Last Name`, + key: 'last_name', + }, +]; +const teamSearchColumns = [ + { + name: t`Name`, + key: 'name', + isDefault: true, + }, + { + name: t`Created By (Username)`, + key: 'created_by__username', + }, + { + name: t`Modified By (Username)`, + key: 'modified_by__username', + }, +]; + +const teamSortColumns = [ + { + name: t`Name`, + key: 'name', + }, +]; function AddResourceRole({ onSave, onClose, roles, resource, onError }) { const history = useHistory(); @@ -119,58 +170,6 @@ function AddResourceRole({ onSave, onClose, roles, resource, onError }) { }); } - const userSearchColumns = [ - { - name: t`Username`, - key: 'username__icontains', - isDefault: true, - }, - { - name: t`First Name`, - key: 'first_name__icontains', - }, - { - name: t`Last Name`, - key: 'last_name__icontains', - }, - ]; - const userSortColumns = [ - { - name: t`Username`, - key: 'username', - }, - { - name: t`First Name`, - key: 'first_name', - }, - { - name: t`Last Name`, - key: 'last_name', - }, - ]; - const teamSearchColumns = [ - { - name: t`Name`, - key: 'name', - isDefault: true, - }, - { - name: t`Created By (Username)`, - key: 'created_by__username', - }, - { - name: t`Modified By (Username)`, - key: 'modified_by__username', - }, - ]; - - const teamSortColumns = [ - { - name: t`Name`, - key: 'name', - }, - ]; - let wizardTitle = ''; switch (selectedResource) {