remove role galaxy filter

pulp · Jul 5, 2024 · 469dbc3 · 469dbc3
1 parent 67d3c51
commit 469dbc3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 22 deletions.
diff --git a/cypress/e2e/namespaces/rbac-create.js b/cypress/e2e/namespaces/rbac-create.js
@@ -31,11 +31,6 @@ describe('add and delete roles', () => {
     cy.contains('Save').should('be.disabled');
 
     cy.get('#role_name').clear().type('test');
-    helperText('role_name').should(
-      'have.text',
-      `This field must start with 'galaxy.'.`,
-    );
-
     cy.get('#role_name').clear();
     helperText('role_name').should('have.text', 'This field may not be blank.');
     cy.contains('Save').should('be.disabled');

diff --git a/cypress/e2e/namespaces/rbac-list.js b/cypress/e2e/namespaces/rbac-list.js
@@ -11,11 +11,6 @@ describe('RBAC table contains correct headers and filter', () => {
     cy.visit(`${uiPrefix}roles`);
     cy.contains('Roles');
 
-    // ensure role names begin with 'galaxy.'
-    cy.get('[data-cy="name-field"]').each((name) =>
-      cy.get(name).contains('galaxy.'),
-    );
-
     // ensure proper headers
     [('Role name', 'Description', 'Created', 'Editable')].forEach((item) => {
       cy.get('tr[data-cy="SortTable-headers"] th').contains(item);

diff --git a/src/components/select-roles.tsx b/src/components/select-roles.tsx
@@ -47,10 +47,7 @@ export const SelectRoles: FunctionComponent<SelectRolesProps> = ({
 
   const queryRoles = () => {
     setLoading(true);
-    RoleAPI.list(
-      { name__startswith: 'galaxy.', ...localParams },
-      pulpObjectType,
-    ).then(({ data }) => {
+    RoleAPI.list(localParams, pulpObjectType).then(({ data }) => {
       setRoles(data.results);
       setRolesItemCount(data.count);
       setLoading(false);

diff --git a/src/containers/role-management/role-list.tsx b/src/containers/role-management/role-list.tsx
@@ -81,10 +81,6 @@ export class RoleList extends Component<RouteProps, IState> {
       params['sort'] = 'name';
     }
 
-    if (!params['name__startswith']) {
-      params['name__startswith'] = 'galaxy.';
-    }
-
     this.state = {
       redirect: null,
       roles: [],
@@ -285,12 +281,10 @@ export class RoleList extends Component<RouteProps, IState> {
                     ignoredParams={['page_size', 'page', 'sort', 'ordering']}
                     niceValues={{
                       locked: { true: t`Built-in`, false: t`Editable` },
-                      name__startswith: { 'galaxy.': t`true` },
                     }}
                     niceNames={{
                       locked: t`Editable`,
                       name__icontains: t`Role name`,
-                      name__startswith: t`Galaxy only`,
                     }}
                   />
                 </div>

diff --git a/src/utilities/map-role-errors.ts b/src/utilities/map-role-errors.ts
@@ -16,8 +16,6 @@ export function validateInput(input, field, currentErrors) {
     errors[field] = t`This field can only contain letters and numbers`;
   } else if (input.length <= 2) {
     errors[field] = t`This field must be longer than 2 characters`;
-  } else if (field === 'name' && !input.startsWith('galaxy.')) {
-    errors[field] = t`This field must start with 'galaxy.'.`;
   } else {
     delete errors[field];
   }