diff --git a/config/shared.config.js b/config/shared.config.js index ac3829c..e9c2fdc 100644 --- a/config/shared.config.js +++ b/config/shared.config.js @@ -12,9 +12,9 @@ const webpack = require('webpack'); const isBuild = process.env.NODE_ENV === 'production'; -// only run git when HUB_UI_VERSION is NOT provided +// only run git when PULP_UI_VERSION is NOT provided const gitCommit = - process.env.HUB_UI_VERSION || + process.env.PULP_UI_VERSION || execSync('git rev-parse HEAD', { encoding: 'utf-8' }).trim(); const docsURL = 'https://docs.pulpproject.org/'; diff --git a/cypress/e2e/approval-modal/approval-multiple-repos-list.js b/cypress/e2e/approval-modal/approval-multiple-repos-list.js index abc3c97..2e10b1e 100644 --- a/cypress/e2e/approval-modal/approval-multiple-repos-list.js +++ b/cypress/e2e/approval-modal/approval-multiple-repos-list.js @@ -81,11 +81,11 @@ describe('Approval Dashboard process with multiple repos', () => { it('should test paging', () => { openModal(); - cy.contains('.modal-body .hub-toolbar', '1 - 10 of 11'); + cy.contains('.modal-body .pulp-toolbar', '1 - 10 of 11'); cy.contains('.modal-body', 'repo1'); cy.contains('.modal-body', 'published'); - cy.get('.modal-body .hub-toolbar [data-action="next"]').click(); - cy.contains('.modal-body .hub-toolbar', '11 - 11 of 11'); + cy.get('.modal-body .pulp-toolbar [data-action="next"]').click(); + cy.contains('.modal-body .pulp-toolbar', '11 - 11 of 11'); cy.contains('.modal-body', 'repo9'); }); @@ -117,7 +117,7 @@ describe('Approval Dashboard process with multiple repos', () => { openModal(); // deselect all - cy.get('.hub-toolbar [aria-label="Select"] svg').click(); + cy.get('.pulp-toolbar [aria-label="Select"] svg').click(); cy.contains('a', 'Deselect all (0 items)').click(); reposList.forEach((repo) => { cy.contains('[aria-label="Label group category"]', repo).should( @@ -126,7 +126,7 @@ describe('Approval Dashboard process with multiple repos', () => { }); // select page - cy.get('.hub-toolbar [aria-label="Select"] svg').click(); + cy.get('.pulp-toolbar [aria-label="Select"] svg').click(); cy.contains('a', 'Select page (10 items)').click(); cy.contains('.pf-v5-c-label.pf-m-overflow', 'more').click(); @@ -145,7 +145,7 @@ describe('Approval Dashboard process with multiple repos', () => { cy.contains('Clear all filters').click(); // deselect page and repo9 should remain here - cy.get('.hub-toolbar [aria-label="Select"] svg').click(); + cy.get('.pulp-toolbar [aria-label="Select"] svg').click(); cy.contains('a', 'Deselect page (10 items)').click(); reposList.forEach((repo) => { diff --git a/cypress/e2e/approval-modal/approval-multiple-repos.js b/cypress/e2e/approval-modal/approval-multiple-repos.js index c4af254..268564f 100644 --- a/cypress/e2e/approval-modal/approval-multiple-repos.js +++ b/cypress/e2e/approval-modal/approval-multiple-repos.js @@ -127,7 +127,7 @@ describe('Approval Dashboard process with multiple repos', () => { rejectItem('published'); // 2 items should be left there - cy.contains('.hub-toolbar', '1 - 2 of 2'); + cy.contains('.pulp-toolbar', '1 - 2 of 2'); cy.get('[data-cy="ApprovalRow-rejected-namespace-collection1"]'); cy.get('[data-cy="ApprovalRow-repo2-namespace-collection1"]'); cy.get('[data-cy="ApprovalRow-repo1-namespace-collection1"]').should( @@ -149,7 +149,7 @@ describe('Approval Dashboard process with multiple repos', () => { cy.visit(`${uiPrefix}approval-dashboard`); cy.contains('Clear all filters').click(); - cy.contains('.hub-toolbar', '1 - 2 of 2'); + cy.contains('.pulp-toolbar', '1 - 2 of 2'); cy.get('[data-cy="ApprovalRow-repo2-namespace-collection1"]'); cy.get('[data-cy="ApprovalRow-repo1-namespace-collection1"]'); cy.get('[data-cy="ApprovalRow-published-namespace-collection1"]').should( diff --git a/cypress/e2e/approval/approval-dashboard-list.js b/cypress/e2e/approval/approval-dashboard-list.js index 2c6e62f..64830b1 100644 --- a/cypress/e2e/approval/approval-dashboard-list.js +++ b/cypress/e2e/approval/approval-dashboard-list.js @@ -119,11 +119,11 @@ describe('Approval Dashboard list tests for sorting, paging and filtering', () = '[data-cy="body"] [data-cy="compound_filter"] a', 'Collection name', ).click(); - cy.get('[data-cy="body"] .hub-toolbar input').type( + cy.get('[data-cy="body"] .pulp-toolbar input').type( 'approval_dashboard_collection_test0{enter}', ); - cy.get('[data-cy="body"] .hub-toolbar button:first').click(); + cy.get('[data-cy="body"] .pulp-toolbar button:first').click(); cy.contains( '[data-cy="body"] [data-cy="compound_filter"] a', 'Namespace', diff --git a/cypress/e2e/approval/approval-process.js b/cypress/e2e/approval/approval-process.js index 90b8168..dcb6b79 100644 --- a/cypress/e2e/approval/approval-process.js +++ b/cypress/e2e/approval/approval-process.js @@ -25,7 +25,7 @@ describe('Approval Dashboard process', () => { cy.visit(`${uiPrefix}approval-dashboard`); cy.contains('[data-cy^="ApprovalRow"]', 'Needs review'); cy.contains('[data-cy^="ApprovalRow"] button', 'Sign and approve').click(); - cy.contains('.body', 'No results found', { timeout: 8000 }); + cy.contains('.pulp-section', 'No results found', { timeout: 8000 }); cy.visit(`${uiPrefix}approval-dashboard`); cy.contains('button', 'Clear all filters').click(); cy.contains('[data-cy^="ApprovalRow"]', 'Signed and approved'); diff --git a/cypress/e2e/collections/collection-detail.js b/cypress/e2e/collections/collection-detail.js index 1e2f804..137da0c 100644 --- a/cypress/e2e/collections/collection-detail.js +++ b/cypress/e2e/collections/collection-detail.js @@ -76,25 +76,25 @@ describe('Collection detail', () => { // better synchronization, wait for the rest of the page to load if (tab.name == 'Documentation') { - cy.contains('.hub-docs-container', 'Documentation'); + cy.contains('.pulp-docs-container', 'Documentation'); } if (tab.name == 'Import log') { - cy.contains('.body', 'Approval status', { + cy.contains('.pulp-section', 'Approval status', { timeout: 10000, }); } if (tab.name == 'Contents') { - cy.contains('.body', 'Description'); + cy.contains('.pulp-section', 'Description'); } if (tab.name == 'Dependencies') { - cy.contains('.body', 'No dependencies'); + cy.contains('.pulp-section', 'No dependencies'); } if (tab.name == 'Install') { - cy.contains('.body', 'License'); + cy.contains('.pulp-section', 'License'); } }); }); @@ -102,11 +102,11 @@ describe('Collection detail', () => { it('should have working UI on install tab', () => { cy.visit(baseURL); // should have Install, License and Installation strings, and correct docs link - cy.get('.body').contains('Install'); - cy.get('.body').contains('License'); - cy.get('.body').contains('Installation'); + cy.get('.pulp-section').contains('Install'); + cy.get('.pulp-section').contains('License'); + cy.get('.pulp-section').contains('Installation'); - cy.get('.body').contains( + cy.get('.pulp-section').contains( `a[href="${uiPrefix}repo/published/collection_detail_test_namespace/collection_detail_test_collection/docs/"]`, 'Go to documentation', ); @@ -131,37 +131,37 @@ describe('Collection detail', () => { it('should have working UI on docs tab', () => { cy.visit(`${baseURL}/docs`); // should have the search field - cy.get('.body').get('input[aria-label="find-content"'); + cy.get('.pulp-section').get('input[aria-label="find-content"'); // should have Readme menu item - cy.get('.hub-docs-sidebar').contains('Readme'); + cy.get('.pulp-docs-sidebar').contains('Readme'); // should still show the readme when searching readme cy.get('input[aria-label="find-content"').type('readme'); - cy.get('.hub-docs-sidebar').contains('Readme'); + cy.get('.pulp-docs-sidebar').contains('Readme'); // should not display readme if searching for no entry cy.get('input[aria-label="find-content"').type('no entry'); - cy.get('.hub-docs-sidebar').not(':contains("Readme")'); + cy.get('.pulp-docs-sidebar').not(':contains("Readme")'); }); it('should have a search field and the table headers on contents tab', () => { cy.visit(`${baseURL}/content`); - cy.get('.body').get('input[aria-label="find-content"'); - cy.get('.body').contains('th', 'Name'); - cy.get('.body').contains('th', 'Type'); - cy.get('.body').contains('th', 'Description'); + cy.get('.pulp-section').get('input[aria-label="find-content"'); + cy.get('.pulp-section').contains('th', 'Name'); + cy.get('.pulp-section').contains('th', 'Type'); + cy.get('.pulp-section').contains('th', 'Description'); }); it('should display import log tab', () => { cy.visit(`${baseURL}/import-log`); - cy.get('.body').get('.title-bar'); - cy.get('.body').get('.message-list'); + cy.get('.pulp-section').get('.title-bar'); + cy.get('.pulp-section').get('.message-list'); }); it('should display "No Dependencies" when opening the tab', () => { cy.visit(`${baseURL}/dependencies`); - cy.get('.body').contains('Dependencies'); - cy.get('.body').contains('No dependencies'); + cy.get('.pulp-section').contains('Dependencies'); + cy.get('.pulp-section').contains('No dependencies'); }); }); diff --git a/cypress/e2e/collections/collections-list.js b/cypress/e2e/collections/collections-list.js index 5c65f70..ba95abb 100644 --- a/cypress/e2e/collections/collections-list.js +++ b/cypress/e2e/collections/collections-list.js @@ -5,9 +5,9 @@ const uiPrefix = Cypress.env('uiPrefix'); describe('Collections list Tests', () => { function deprecate(list) { - const container = list ? '.hub-list' : '.hub-cards'; + const container = list ? '.pulp-list' : '.pulp-cards'; - cy.get('[data-cy=hub-list-toolbar]') + cy.get('[data-cy=pulp-list-toolbar]') .get('[aria-label="keywords"]:first') .type('my_collection0{enter}'); cy.get(container).contains('my_collection2').should('not.exist'); @@ -92,31 +92,31 @@ describe('Collections list Tests', () => { it('paging', () => { // there should be 11 items in db, 10 per page + 1 view more cy.get('.collection-container') - .get('.hub-c-card-collection-container') + .get('.pulp-c-card-collection-container') .should('have.length', 11); - cy.get('.hub-cards').get('[aria-label="Go to next page"]:first').click(); + cy.get('.pulp-cards').get('[aria-label="Go to next page"]:first').click(); cy.get('.collection-container') - .get('.hub-c-card-collection-container') + .get('.pulp-c-card-collection-container') .should('have.length', 1); }); it('filter', () => { - cy.get('.hub-cards') + cy.get('.pulp-cards') .get('[aria-label="keywords"]:first') .type('my_collection0{enter}'); - cy.get('.hub-cards').contains('my_collection0'); - cy.get('.hub-cards').contains('my_collection1').should('not.exist'); + cy.get('.pulp-cards').contains('my_collection0'); + cy.get('.pulp-cards').contains('my_collection1').should('not.exist'); }); it('set page size', () => { - cy.get('.hub-cards') + cy.get('.pulp-cards') .get('[data-ouia-component-type="PF5/Pagination"] button:first') .click(); - cy.get('.hub-cards').get('[data-action="per-page-20"]').click(); + cy.get('.pulp-cards').get('[data-action="per-page-20"]').click(); cy.get('.collection-container') - .get('.hub-c-card-collection-container') + .get('.pulp-c-card-collection-container') .should('have.length', 11); }); @@ -128,11 +128,11 @@ describe('Collections list Tests', () => { it('Can delete collection in collection list', () => { cy.get('[data-cy="view_type_list"] svg').click(); - cy.get('[data-cy=hub-list-toolbar]') + cy.get('[data-cy=pulp-list-toolbar]') .get('[aria-label="keywords"]:first') .type('my_collection0{enter}'); - cy.get('.hub-list').contains('my_collection2').should('not.exist'); - cy.get('.hub-list').contains('my_collection0'); + cy.get('.pulp-list').contains('my_collection2').should('not.exist'); + cy.get('.pulp-list').contains('my_collection0'); cy.get('.collection-container [aria-label="Actions"]').click(); cy.contains('Delete collection from system').click(); @@ -146,12 +146,12 @@ describe('Collections list Tests', () => { it('Can delete collection in namespace collection list', () => { cy.visit(`${uiPrefix}namespaces/my_namespace`); - cy.get('[data-cy=hub-list-toolbar]') + cy.get('[data-cy=pulp-list-toolbar]') .get('[aria-label="keywords"]:first') .type('my_collection1{enter}'); - cy.get('.body').contains('my_collection1'); - cy.get('.body [aria-label="Actions"]').click(); + cy.get('.pulp-section').contains('my_collection1'); + cy.get('.pulp-section [aria-label="Actions"]').click(); cy.contains('Delete collection from system').click(); cy.get('[data-cy=modal_checkbox] input').click(); cy.get('[data-cy=delete-button] button').click(); diff --git a/cypress/e2e/namespaces/group-list.js b/cypress/e2e/namespaces/group-list.js index ebb6acc..f393868 100644 --- a/cypress/e2e/namespaces/group-list.js +++ b/cypress/e2e/namespaces/group-list.js @@ -30,39 +30,39 @@ describe('Group list tests for sorting, paging and filtering', () => { }); it('paging', () => { - cy.get('.body').contains(items[0]); + cy.get('.pulp-section').contains(items[0]); - cy.get('.body').get('[aria-label="Go to next page"]:first').click(); - cy.get('.body').contains(items[10]); + cy.get('.pulp-section').get('[aria-label="Go to next page"]:first').click(); + cy.get('.pulp-section').contains(items[10]); - cy.get('.body').get('[aria-label="Go to next page"]:first').click(); - cy.get('.body').contains(items[20]); + cy.get('.pulp-section').get('[aria-label="Go to next page"]:first').click(); + cy.get('.pulp-section').contains(items[20]); }); it('sorting', () => { - cy.get('.body').get('[data-cy="sort_name"]').click(); - cy.get('.body tbody tr:first td:first').contains(items[20]); - cy.get('.body').contains(items[0]).should('not.exist'); + cy.get('.pulp-section').get('[data-cy="sort_name"]').click(); + cy.get('.pulp-section tbody tr:first td:first').contains(items[20]); + cy.get('.pulp-section').contains(items[0]).should('not.exist'); }); it('filter', () => { - cy.get('.body') + cy.get('.pulp-section') .get('[placeholder="Filter by group name"]:first') .type('group_test0{enter}'); - cy.get('.body').contains('group_test0'); - cy.get('.body').contains('group_test1').should('not.exist'); + cy.get('.pulp-section').contains('group_test0'); + cy.get('.pulp-section').contains('group_test1').should('not.exist'); }); it('set page size', () => { - cy.get('.body') + cy.get('.pulp-section') .get('[data-ouia-component-type="PF5/Pagination"] button:first') .click(); - cy.get('.body').contains('20 per page').click(); + cy.get('.pulp-section').contains('20 per page').click(); range(20).forEach((i) => { - cy.get('.body').contains(items[i]); + cy.get('.pulp-section').contains(items[i]); }); - cy.get('.body').contains(items[20]).should('not.exist'); + cy.get('.pulp-section').contains(items[20]).should('not.exist'); }); }); diff --git a/cypress/e2e/namespaces/group-management.js b/cypress/e2e/namespaces/group-management.js index 96b8a8e..b14dd0a 100644 --- a/cypress/e2e/namespaces/group-management.js +++ b/cypress/e2e/namespaces/group-management.js @@ -63,7 +63,7 @@ function removeUserFromGroupManually(groupName, userName) { cy.contains('[data-cy=main-tabs]', userName).should('not.exist'); } -describe('Hub Group Management Tests', () => { +describe('Pulp Group Management Tests', () => { before(() => { cy.deleteTestGroups(); cy.deleteTestGroups(); diff --git a/cypress/e2e/namespaces/group-roles.js b/cypress/e2e/namespaces/group-roles.js index 683399d..fdf5aac 100644 --- a/cypress/e2e/namespaces/group-roles.js +++ b/cypress/e2e/namespaces/group-roles.js @@ -60,7 +60,7 @@ describe('Group Roles Tests', () => { cy.get('[data-cy=add-roles]').click(); cy.get( - '.hub-custom-wizard-layout [data-ouia-component-type="PF5/Pagination"] button:first', + '.pulp-custom-wizard-layout [data-ouia-component-type="PF5/Pagination"] button:first', ).click(); cy.contains('100 per page').click(); @@ -118,9 +118,9 @@ describe('Group Roles Tests', () => { cy.get('[data-cy=add-roles]').click(); cy.get( - '.hub-custom-wizard-layout [data-ouia-component-type="PF5/Pagination"] button:first', + '.pulp-custom-wizard-layout [data-ouia-component-type="PF5/Pagination"] button:first', ).click(); - cy.get('.hub-custom-wizard-layout').contains('100 per page').click(); + cy.get('.pulp-custom-wizard-layout').contains('100 per page').click(); cy.get( `[data-cy="RoleListTable"] [data-cy="RoleListTable-CheckboxRow-row-${testRole.name}"] [type="checkbox"]`, @@ -137,12 +137,12 @@ describe('Group Roles Tests', () => { .click(); cy.get('.pf-v5-c-wizard').contains('Selected roles'); - cy.get(`[data-cy="HubPermission-${testContainerRole.name}"]`); + cy.get(`[data-cy="PulpPermission-${testContainerRole.name}"]`); cy.contains('Next').click(); - cy.get('.hub-custom-wizard-layout').contains(groupName); - cy.get('.hub-custom-wizard-layout').contains(testContainerRole.name); + cy.get('.pulp-custom-wizard-layout').contains(groupName); + cy.get('.pulp-custom-wizard-layout').contains(testContainerRole.name); cy.get('.pf-v5-c-wizard__footer > button') .contains('Add') diff --git a/cypress/e2e/namespaces/menu.js b/cypress/e2e/namespaces/menu.js index 0cc705f..a371893 100644 --- a/cypress/e2e/namespaces/menu.js +++ b/cypress/e2e/namespaces/menu.js @@ -1,4 +1,4 @@ -describe('Hub Menu Tests', () => { +describe('Pulp Menu Tests', () => { const username = 'nopermission'; const password = 'n0permissi0n'; diff --git a/cypress/e2e/namespaces/namespace-detail.js b/cypress/e2e/namespaces/namespace-detail.js index 0e76e1d..8baf540 100644 --- a/cypress/e2e/namespaces/namespace-detail.js +++ b/cypress/e2e/namespaces/namespace-detail.js @@ -30,7 +30,7 @@ describe('Namespace detail screen', () => { cy.get( '[data-cy="CollectionListItem"]:first button[aria-label="Actions"]', ).click(); - cy.contains('.body ul a', 'Deprecate').click(); + cy.contains('.pulp-section ul a', 'Deprecate').click(); // Reload the page cy.visit(`${uiPrefix}namespaces/namespace_detail_test`); diff --git a/cypress/e2e/namespaces/namespace-edit.js b/cypress/e2e/namespaces/namespace-edit.js index c12455e..4f74a9c 100644 --- a/cypress/e2e/namespaces/namespace-edit.js +++ b/cypress/e2e/namespaces/namespace-edit.js @@ -95,7 +95,7 @@ describe('Edit a namespace', () => { ); cy.get('#description').clear().type('A namespace description'); saveButton().click(); - cy.get('.hub-header-bottom').should('contain', 'A namespace description'); + cy.get('.pulp-header-bottom').should('contain', 'A namespace description'); }); it('tests the Links field', () => { diff --git a/cypress/e2e/namespaces/profile.js b/cypress/e2e/namespaces/profile.js index dcdc498..1d825be 100644 --- a/cypress/e2e/namespaces/profile.js +++ b/cypress/e2e/namespaces/profile.js @@ -31,7 +31,7 @@ describe('My Profile Tests', () => { 'password', 'password-confirm', ]; - cy.get('.body').within(() => { + cy.get('.pulp-section').within(() => { // restricted to text input types because there's a checkbox now for the // 'super user' option, but it's disabled. cy.get('input[type="text"]').each(($el) => { diff --git a/cypress/e2e/namespaces/rbac-access.js b/cypress/e2e/namespaces/rbac-access.js index dcec6d2..8c27cf8 100644 --- a/cypress/e2e/namespaces/rbac-access.js +++ b/cypress/e2e/namespaces/rbac-access.js @@ -92,7 +92,7 @@ function testAccessTab({ ).click(); cy.get('strong').contains('Selected group'); - cy.get('.hub-permission').contains('access_group'); + cy.get('.pulp-permission').contains('access_group'); cy.get('footer button').contains('Next').click(); @@ -105,7 +105,7 @@ function testAccessTab({ ).click(); cy.get('strong').contains('Selected roles'); - cy.get('.hub-permission').contains(role); + cy.get('.pulp-permission').contains(role); cy.get('footer button').contains('Next').click(); @@ -113,8 +113,8 @@ function testAccessTab({ cy.get('strong').contains('access_group'); cy.get('strong').contains(role); - cy.get('.hub-permission strong').contains(permissionGroup); - cy.get('.hub-permission').contains(permission); + cy.get('.pulp-permission strong').contains(permissionGroup); + cy.get('.pulp-permission').contains(permission); cy.get('footer button').contains('Add').click(); cy.get('.pf-v5-c-alert__title') diff --git a/cypress/e2e/namespaces/rbac.js b/cypress/e2e/namespaces/rbac.js index 78a3ac7..caf62d8 100644 --- a/cypress/e2e/namespaces/rbac.js +++ b/cypress/e2e/namespaces/rbac.js @@ -72,12 +72,12 @@ describe('RBAC test for user without permissions', () => { // cannot View user cy.menuMissing('User Access > Users'); cy.visit(`${uiPrefix}users`); - cy.contains('You do not have access to Automation Hub'); + cy.contains('You do not have access to Pulp UI'); // cannot Add user cy.contains('Create').should('not.exist'); cy.visit(`${uiPrefix}users/create`); - cy.contains('You do not have access to Automation Hub'); + cy.contains('You do not have access to Pulp UI'); // cannot Change and Delete user cy.visit(`${uiPrefix}users`); @@ -90,7 +90,7 @@ describe('RBAC test for user without permissions', () => { // cannot View group cy.menuMissing('User Access > Groups'); cy.visit(`${uiPrefix}group-list`); - cy.contains('You do not have access to Automation Hub'); + cy.contains('You do not have access to Pulp UI'); // cannot Add group cy.contains('Create').should('not.exist'); diff --git a/cypress/e2e/namespaces/task-list.js b/cypress/e2e/namespaces/task-list.js index c523178..c93f4dd 100644 --- a/cypress/e2e/namespaces/task-list.js +++ b/cypress/e2e/namespaces/task-list.js @@ -8,9 +8,7 @@ describe('Task table contains correct headers and filter', () => { cy.contains('Repositories'); - cy.intercept('POST', `${apiPrefix}content/rh-certified/v3/sync/`).as( - 'sync', - ); + cy.intercept('POST', `${apiPrefix}content/certified/v3/sync/`).as('sync'); cy.intercept('GET', `${apiPrefix}_ui/v1/remotes/?*`).as('remotes'); diff --git a/cypress/e2e/namespaces/task-management-detail.js b/cypress/e2e/namespaces/task-management-detail.js index 2727d86..1597180 100644 --- a/cypress/e2e/namespaces/task-management-detail.js +++ b/cypress/e2e/namespaces/task-management-detail.js @@ -8,9 +8,7 @@ describe('Task detail', () => { cy.contains('Repositories'); - cy.intercept('POST', `${apiPrefix}content/rh-certified/v3/sync/`).as( - 'sync', - ); + cy.intercept('POST', `${apiPrefix}content/certified/v3/sync/`).as('sync'); cy.intercept('GET', `${apiPrefix}_ui/v1/remotes/?*`).as('remotes'); diff --git a/cypress/e2e/namespaces/user-dashboard.js b/cypress/e2e/namespaces/user-dashboard.js index 25712e7..f03c6d8 100644 --- a/cypress/e2e/namespaces/user-dashboard.js +++ b/cypress/e2e/namespaces/user-dashboard.js @@ -1,4 +1,4 @@ -describe('Hub User Management Tests', () => { +describe('Pulp User Management Tests', () => { describe('prevents super-user and self deletion', () => { it("the super-user can't delete themselves", () => { cy.login(); diff --git a/cypress/e2e/namespaces/user-list.js b/cypress/e2e/namespaces/user-list.js index d16937a..a8d189f 100644 --- a/cypress/e2e/namespaces/user-list.js +++ b/cypress/e2e/namespaces/user-list.js @@ -45,39 +45,39 @@ describe('User list tests for sorting, paging and filtering', () => { }); it('paging', () => { - cy.get('.body').contains(items[0]); + cy.get('.pulp-section').contains(items[0]); - cy.get('.body').get('[aria-label="Go to next page"]:first').click(); - cy.get('.body').contains(items[10]); + cy.get('.pulp-section').get('[aria-label="Go to next page"]:first').click(); + cy.get('.pulp-section').contains(items[10]); - cy.get('.body').get('[aria-label="Go to next page"]:first').click(); - cy.get('.body').contains(items[20]); + cy.get('.pulp-section').get('[aria-label="Go to next page"]:first').click(); + cy.get('.pulp-section').contains(items[20]); }); it('sorting', () => { - cy.get('.body').get('[data-cy="sort_username"]').click(); - cy.get('.body tbody tr:first td:first').contains(items[20]); - cy.get('.body').contains(items[0]).should('not.exist'); + cy.get('.pulp-section').get('[data-cy="sort_username"]').click(); + cy.get('.pulp-section tbody tr:first td:first').contains(items[20]); + cy.get('.pulp-section').contains(items[0]).should('not.exist'); }); it('filter', () => { - cy.get('.body') + cy.get('.pulp-section') .get('[aria-label="username__contains"]:first') .type('user_test0{enter}'); - cy.get('.body').contains('user_test0'); - cy.get('.body').contains('user_test1').should('not.exist'); + cy.get('.pulp-section').contains('user_test0'); + cy.get('.pulp-section').contains('user_test1').should('not.exist'); }); it('set page size', () => { - cy.get('.body') + cy.get('.pulp-section') .get('[data-ouia-component-type="PF5/Pagination"] button:first') .click(); - cy.get('.body').contains('20 per page').click(); + cy.get('.pulp-section').contains('20 per page').click(); range(20).forEach((i) => { - cy.get('.body').contains(items[i]); + cy.get('.pulp-section').contains(items[i]); }); - cy.get('.body').contains(items[20]).should('not.exist'); + cy.get('.pulp-section').contains(items[20]).should('not.exist'); }); }); diff --git a/cypress/e2e/repo/container-signing.js b/cypress/e2e/repo/container-signing.js index ce451a2..8d3c2f6 100644 --- a/cypress/e2e/repo/container-signing.js +++ b/cypress/e2e/repo/container-signing.js @@ -52,7 +52,7 @@ describe('Container Signing', () => { cy.login(); cy.visit(`${uiPrefix}containers/remote1`); cy.contains('[data-cy="column-section"]', 'remote1'); - cy.contains('.hub-header-bottom', 'Unsigned', { + cy.contains('.pulp-header-bottom', 'Unsigned', { timeout: 10000, }); @@ -61,7 +61,7 @@ describe('Container Signing', () => { cy.get('button[aria-label="Actions"]').click(); cy.contains('.pf-v5-c-dropdown ul li a', 'Sign').click(); cy.contains('Signing started for container "remote1'); - cy.contains('.hub-header-bottom', 'Signed', { + cy.contains('.pulp-header-bottom', 'Signed', { timeout: 30000, }); }); @@ -70,7 +70,7 @@ describe('Container Signing', () => { cy.login(); cy.visit(`${uiPrefix}containers/remote2`); cy.contains('[data-cy="column-section"]', 'remote2'); - cy.contains('.hub-header-bottom', 'Unsigned', { + cy.contains('.pulp-header-bottom', 'Unsigned', { timeout: 10000, }); @@ -83,14 +83,14 @@ describe('Container Signing', () => { cy.login(); cy.visit(`${uiPrefix}containers/local1`); cy.contains('[data-cy="column-section"]', 'local1'); - cy.contains('.hub-header-bottom', 'Unsigned', { + cy.contains('.pulp-header-bottom', 'Unsigned', { timeout: 10000, }); cy.get('button[aria-label="Actions"]').click(); cy.contains('.pf-v5-c-dropdown ul li a', 'Sign').click(); cy.contains('Signing started for container "local1'); - cy.contains('.hub-header-bottom', 'Signed', { + cy.contains('.pulp-header-bottom', 'Signed', { timeout: 30000, }); }); @@ -100,9 +100,6 @@ describe('Container Signing', () => { cy.visit(`${uiPrefix}containers/local1`); // this is now covered by alert that should not be here in the future cy.get('button[aria-label="Actions"]').click({ force: true }); - cy.contains('[role=menu] li a', 'Use in Controller') - .should('have.attr', 'href') - .and('match', /^http.*\/execution-environments\/add.*local1%3Alatest$/); cy.contains('[role=menu] li', 'Sign').should('not.exist'); }); }); diff --git a/cypress/e2e/repo/repository-list.js b/cypress/e2e/repo/repository-list.js index a1aaecd..7d73431 100644 --- a/cypress/e2e/repo/repository-list.js +++ b/cypress/e2e/repo/repository-list.js @@ -35,7 +35,7 @@ describe('Repository', () => { ).click(); cy.contains('repoListTest1'); - cy.contains('rh-certified'); + cy.contains('certified'); cy.contains('validated'); cy.contains('repoListTest3'); cy.contains('community').should('not.exist'); @@ -46,7 +46,7 @@ describe('Repository', () => { cy.contains('[data-cy="ListPage-AnsibleRepositoryList"]', '11 of 11'); cy.contains('repoListTest1').should('not.exist'); - cy.contains('rh-certified').should('not.exist'); + cy.contains('certified').should('not.exist'); cy.contains('validated').should('not.exist'); cy.contains('repoListTest3').should('not.exist'); cy.contains('community'); @@ -60,7 +60,7 @@ describe('Repository', () => { ).click(); cy.contains('repoListTest1'); - cy.contains('rh-certified'); + cy.contains('certified'); cy.contains('validated').should('not.exist'); cy.contains('repoListTest3'); cy.contains('community'); @@ -70,7 +70,7 @@ describe('Repository', () => { ).click(); cy.contains('repoListTest1').should('not.exist'); - cy.contains('rh-certified').should('not.exist'); + cy.contains('certified').should('not.exist'); cy.contains('validated'); cy.contains('repoListTest3').should('not.exist'); cy.contains('community').should('not.exist'); @@ -88,7 +88,7 @@ describe('Repository', () => { }); cy.contains('community').should('not.exist'); cy.contains('validated').should('not.exist'); - cy.contains('rh-certified').should('not.exist'); + cy.contains('certified').should('not.exist'); cy.get('[data-cy="compound_filter"] input') .clear() @@ -98,7 +98,7 @@ describe('Repository', () => { cy.contains('repoListTest1').should('not.exist'); cy.contains('community').should('not.exist'); cy.contains('validated').should('not.exist'); - cy.contains('rh-certified').should('not.exist'); + cy.contains('certified').should('not.exist'); cy.contains('Clear all filters').click(); @@ -107,7 +107,7 @@ describe('Repository', () => { cy.contains('repoListTest1'); cy.contains('community').should('not.exist'); cy.contains('validated'); - cy.contains('rh-certified'); + cy.contains('certified'); cy.get('[data-cy="compound_filter"] input').clear().type('test{enter}'); @@ -117,7 +117,7 @@ describe('Repository', () => { cy.contains('community').should('not.exist'); cy.contains('validated').should('not.exist'); - cy.contains('rh-certified').should('not.exist'); + cy.contains('certified').should('not.exist'); }); it('tests deletion', () => { diff --git a/cypress/e2e/repo/repository.js b/cypress/e2e/repo/repository.js index 18624a8..c654f4f 100644 --- a/cypress/e2e/repo/repository.js +++ b/cypress/e2e/repo/repository.js @@ -87,7 +87,7 @@ function versionCheck(version) { if (withRemote) { // add remote cy.get('[data-cy="remote"] button').click(); - cy.contains('[data-cy="remote"]', 'rh-certified'); + cy.contains('[data-cy="remote"]', 'certified'); cy.contains('[data-cy="remote"]', 'community'); cy.contains( '[data-cy="remote"] button', diff --git a/cypress/e2e/screenshots/screenshots.js b/cypress/e2e/screenshots/screenshots.js index 1c13527..6f1cfe4 100644 --- a/cypress/e2e/screenshots/screenshots.js +++ b/cypress/e2e/screenshots/screenshots.js @@ -46,7 +46,7 @@ describe('screenshots', () => { screenshot('/tasks', { blackout: ['time'] }); screenshot('/signature-keys', { - blackout: ['time', '[data-cy=hub-signature-list-fingerprint]'], + blackout: ['time', '[data-cy=pulp-signature-list-fingerprint]'], }); screenshot('/users', { blackout: ['time'] }); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 2f160be..888c025 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -19,9 +19,9 @@ const name2element = (name) => { const [first, last] = name.split(' > '); return last ? cy.get( - `#page-sidebar [data-cy="hub-menu-section-${first}"] [data-cy="hub-menu-item-${last}"]`, + `#page-sidebar [data-cy="pulp-menu-section-${first}"] [data-cy="pulp-menu-item-${last}"]`, ) - : cy.get(`#page-sidebar [data-cy="hub-menu-item-${first}"]`); + : cy.get(`#page-sidebar [data-cy="pulp-menu-item-${first}"]`); }; Cypress.Commands.add('menuPresent', {}, (name) => { @@ -194,7 +194,7 @@ Cypress.Commands.add( cy.get('input[id="upstreamName"]').type(upstream_name); cy.get( - '.hub-formgroup-registry .pf-v5-c-form-control.pf-v5-c-select__toggle-typeahead input', + '.pulp-formgroup-registry .pf-v5-c-form-control.pf-v5-c-select__toggle-typeahead input', ) .click() .type(registry); @@ -318,7 +318,7 @@ Cypress.Commands.add('deleteContainers', {}, () => { Cypress.Commands.add('deleteRepositories', {}, () => { const initRepos = [ 'validated', - 'rh-certified', + 'certified', 'community', 'published', 'rejected', diff --git a/src/actions/ansible-repository-delete.tsx b/src/actions/ansible-repository-delete.tsx index 95dc10c..d97756b 100644 --- a/src/actions/ansible-repository-delete.tsx +++ b/src/actions/ansible-repository-delete.tsx @@ -40,12 +40,12 @@ export const ansibleRepositoryDeleteAction = Action({ disabled: ({ name }) => { if ( [ - 'rh-certified', - 'validated', + 'certified', 'community', 'published', - 'staging', 'rejected', + 'staging', + 'validated', ].includes(name) ) { return t`Protected repositories cannot be deleted.`; diff --git a/src/api/active-user.ts b/src/api/active-user.ts index 098ab87..a8b7005 100644 --- a/src/api/active-user.ts +++ b/src/api/active-user.ts @@ -19,9 +19,6 @@ class API extends HubAPI { return this.http.put(this.apiPath, data); } - // insights has some asinine way of loading tokens that involves forcing the - // page to refresh before loading the token that can't be done witha single - // API request. getToken(): Promise<{ data: { token: string } }> { return this.http.post('v3/auth/token/', {}); } diff --git a/src/app.scss b/src/app.scss index bc3386a..0dda308 100644 --- a/src/app.scss +++ b/src/app.scss @@ -1,33 +1,18 @@ -.body { +// Patternfly expects the root Page component to be the height of the browser window +body, +#root { + height: 100%; +} + +.pulp-section { background-color: white; padding: 16px; } -.clickable { +.pulp-clickable { cursor: pointer; } -#page-sidebar > div { - padding-top: 0; -} - -#page-sidebar { - border-top: solid var(--pf-v5-global--BorderWidth--sm) - var(--pf-v5-global--palette--black-800); -} - -.hub-nav-title { - &.pf-v5-c-nav__section:first-child { - padding-top: 0; - } - - & > .pf-v5-c-nav__section-title { - font-size: var(--pf-v5-c-nav__link--FontSize); - height: 50px; - margin-bottom: 0; - } -} - // this was getting applied globally when it was in the collection-info.scss file // which means other components now rely on it, so I'm just going move it here // so that it's explicitly setting these styles globally. @@ -45,31 +30,16 @@ pre { } } -// Patternfly expects the root Page component to be the height of the browser window -body, -#root { - height: 100%; -} - -// insights mode Sidenav/Navigation overrides this for all navitems, restoring in main -.pf-v5-c-page__main { - .pf-v5-c-nav__list > .pf-v5-c-nav__item:not(:first-child) { - border-top: 0; - } -} - // list screen toolbars -.hub-toolbar { +.pulp-toolbar { display: flex; justify-content: space-between; align-items: center; } -// inline alert inside pf-v5-c-content has big title and extra margin -.hub-content-alert-fix { - .pf-v5-c-alert__title { - margin: 0; - font-size: var(--pf-v5-c-alert__title--FontSize); - font-weight: var(--pf-v5-c-alert__title--FontWeight); - } +// inline alert inside pf-v5-c-content has big title and extra margin otherwise +.pf-v5-c-content .pf-v5-c-alert__title { + margin: 0; + font-size: var(--pf-v5-c-alert__title--FontSize); + font-weight: var(--pf-v5-c-alert__title--FontWeight); } diff --git a/src/components/base-header.tsx b/src/components/base-header.tsx index 642ff0c..dfacebe 100644 --- a/src/components/base-header.tsx +++ b/src/components/base-header.tsx @@ -68,7 +68,7 @@ export const BaseHeader = ({ {versionControl || null} {children ? ( -
{children}
+
{children}
) : (
)} diff --git a/src/components/card-list-switcher.tsx b/src/components/card-list-switcher.tsx index 1ac3fcc..5c1e2ea 100644 --- a/src/components/card-list-switcher.tsx +++ b/src/components/card-list-switcher.tsx @@ -23,7 +23,7 @@ export const CardListSwitcher: FunctionComponent = ({
updateParams(ParamHelper.setParam(params, 'view_type', 'card')) } @@ -33,7 +33,7 @@ export const CardListSwitcher: FunctionComponent = ({ updateParams(ParamHelper.setParam(params, 'view_type', 'list')) } diff --git a/src/components/cards.scss b/src/components/cards.scss index f4bc026..fe63645 100644 --- a/src/components/cards.scss +++ b/src/components/cards.scss @@ -1,4 +1,4 @@ -.hub-c-card-ns-container { +.pulp-c-card-ns-container { width: 300px; .title { @@ -13,7 +13,7 @@ } } -.hub-c-card-collection-container { +.pulp-c-card-collection-container { width: 280px; .card-badge-area { @@ -66,7 +66,7 @@ margin-right: 8px; } -.hub-card-layout { +.pulp-card-layout { display: flex; flex-wrap: wrap; diff --git a/src/components/collection-card.tsx b/src/components/collection-card.tsx index 6c604d8..0c1bfdf 100644 --- a/src/components/collection-card.tsx +++ b/src/components/collection-card.tsx @@ -33,7 +33,7 @@ export const CollectionNextPageCard = ({ onClick: () => void; }) => { return ( - +
+ updateParams(ParamHelper.setParam(params, 'showing', key)) diff --git a/src/components/collection-dependencies-list.tsx b/src/components/collection-dependencies-list.tsx index 8db4a16..6e7e434 100644 --- a/src/components/collection-dependencies-list.tsx +++ b/src/components/collection-dependencies-list.tsx @@ -29,7 +29,7 @@ export const CollectionDependenciesList = ({ } return ( - + {dependencies_repos.map((dependency, i) => listDep(dependency, i, dependencies), )} diff --git a/src/components/collection-header.tsx b/src/components/collection-header.tsx index 9738bc9..fd42e38 100644 --- a/src/components/collection-header.tsx +++ b/src/components/collection-header.tsx @@ -40,10 +40,10 @@ import { DeleteCollectionModal, DownloadCount, ExternalLink, - HubPagination, ImportModal, LinkTabs, Logo, + PulpPagination, RepositoryBadge, SignAllCertificatesModal, SignSingleCertificateModal, @@ -246,7 +246,7 @@ export const CollectionHeader = ({ }} > {t`${collectionName}'s versions.`} - )} - -
+
{renderTabs(activeTab)}
{urlKeys.map((link) => { diff --git a/src/components/collection-info.scss b/src/components/collection-info.scss index a6c7e92..232b4cd 100644 --- a/src/components/collection-info.scss +++ b/src/components/collection-info.scss @@ -4,14 +4,14 @@ display: table-cell; } -.hub-readme-container { +.pulp-readme-container { position: relative; max-height: 300px; min-height: 50px; overflow: hidden; } -.hub-fade-out { +.pulp-fade-out { position: absolute; z-index: 1; bottom: 0; @@ -30,10 +30,10 @@ padding: 8px; } -.hub-collection-download-alert { +.pulp-collection-download-alert { width: 100%; } -.hub-collection-download-alert > h4 { +.pulp-collection-download-alert > h4 { margin-top: 0; } diff --git a/src/components/collection-info.tsx b/src/components/collection-info.tsx index b970a2c..9026b9a 100644 --- a/src/components/collection-info.tsx +++ b/src/components/collection-info.tsx @@ -97,7 +97,7 @@ export const CollectionInfo = ({ {user.is_anonymous && !settings.GALAXY_ENABLE_UNAUTHENTICATED_COLLECTION_DOWNLOAD ? ( -
+
-
+
) : null}
-
+
{Object.keys(contentSummary.contents).map((type) => (
))}
-
+
{collection_version.tags.map((tag, index) => ( {tag.name} diff --git a/src/components/collection-list.tsx b/src/components/collection-list.tsx index ed70953..26fa477 100644 --- a/src/components/collection-list.tsx +++ b/src/components/collection-list.tsx @@ -5,7 +5,7 @@ import { type CollectionVersionSearch } from 'src/api'; import { CollectionListItem, EmptyStateFilter, - HubPagination, + PulpPagination, } from 'src/components'; import { ParamHelper } from 'src/utilities'; @@ -61,7 +61,7 @@ export const CollectionList = ({ /> )} - - - updateParams(params)} count={itemCount} diff --git a/src/components/detail-list.tsx b/src/components/detail-list.tsx index d8b79d2..754eecf 100644 --- a/src/components/detail-list.tsx +++ b/src/components/detail-list.tsx @@ -13,9 +13,9 @@ import { EmptyStateFilter, EmptyStateNoData, type FilterOption, - HubPagination, LoadingSpinner, type LocalizedSortHeaders, + PulpPagination, type Query, type RenderTableRow, SortTable, @@ -114,7 +114,7 @@ export function DetailList({ ) : ( <> -
+
@@ -137,7 +137,7 @@ export function DetailList({ - ({ )} - { return ( {t`Contact your organization administrator for more information.`} diff --git a/src/components/execution-environment-header.tsx b/src/components/execution-environment-header.tsx index 48087a1..2c1e9b6 100644 --- a/src/components/execution-environment-header.tsx +++ b/src/components/execution-environment-header.tsx @@ -101,7 +101,7 @@ export const ExecutionEnvironmentHeader = ({ /> )} {last_sync_task && ( -

+

Last updated from registry {lastSynced({ last_sync_task })} {' '} @@ -110,13 +110,13 @@ export const ExecutionEnvironmentHeader = ({ )}

 
-

+

{container.description}

-
+
diff --git a/src/components/header.scss b/src/components/header.scss index ceed808..eee0260 100644 --- a/src/components/header.scss +++ b/src/components/header.scss @@ -1,18 +1,18 @@ $breakpoint-md: 1000px; -.hub-header-bordered { +.pulp-header-bordered { border-bottom: 1px solid #d8d8d8; } -.hub-header-image { +.pulp-header-image { padding-right: 16px; } -.hub-header-bottom { +.pulp-header-bottom { padding-top: 10px; } -.hub-tab-link-container { +.pulp-tab-link-container { display: flex; margin-top: 10px; diff --git a/src/components/import-console.tsx b/src/components/import-console.tsx index 1d64db8..422bec3 100644 --- a/src/components/import-console.tsx +++ b/src/components/import-console.tsx @@ -104,9 +104,9 @@ export function ImportConsole({ if (loading || apiError) { return ( -
+
{title} -
+
{apiError ?
{apiError}
: }
@@ -122,7 +122,7 @@ export function ImportConsole({ const messages = task ? task.messages : []; return ( -
+
{title}
diff --git a/src/components/import-list.tsx b/src/components/import-list.tsx index f51bc56..2b6ba9b 100644 --- a/src/components/import-list.tsx +++ b/src/components/import-list.tsx @@ -14,8 +14,8 @@ import { DateComponent, EmptyStateFilter, EmptyStateNoData, - HubPagination, LoadingSpinner, + PulpPagination, Typeahead, } from 'src/components'; import { ParamHelper, filterIsSet, jsxErrorMessage } from 'src/utilities'; @@ -110,7 +110,7 @@ export const ImportList = ({ {renderList(selectImport, importList, selectedImport, loading)}
{params.namespace && ( - selectImport(item)} key={item.id} className={cx({ - clickable: true, + 'pulp-clickable': true, 'list-container': true, - 'hub-c-toolbar__item-selected-item': + 'pulp-c-toolbar__item-selected-item': item.type === selectedImport.type && item.id === selectedImport.id, })} diff --git a/src/components/index.ts b/src/components/index.ts index 4ec44c0..c4ab5a5 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -45,10 +45,6 @@ export { ExternalLink } from './external-link'; export { FormFieldHelper } from './form-field-helper'; export { GroupModal } from './group-modal'; export { HelpButton } from './help-button'; -export { HubAboutModal } from './hub-about-modal'; -export { HubCopyButton } from './hub-copy-button'; -export { HubListToolbar } from './hub-list-toolbar'; -export { HubPagination } from './hub-pagination'; export { ImportConsole } from './import-console'; export { ImportList } from './import-list'; export { ImportModal } from './import-modal'; @@ -103,7 +99,11 @@ export { PermissionCategories } from './permission-categories'; export { PermissionChipSelector } from './permission-chip-selector'; export { PreviewRoles } from './preview-roles'; export { ProviderLink } from './provider-link'; +export { PulpAboutModal } from './pulp-about-modal'; +export { PulpCopyButton } from './pulp-copy-button'; export { PulpLabels } from './pulp-labels'; +export { PulpListToolbar } from './pulp-list-toolbar'; +export { PulpPagination } from './pulp-pagination'; export { RemoteForm } from './remote-form'; export { RenderPluginDoc } from './render-plugin-doc'; export { RepositoryBadge } from './repository-badge'; diff --git a/src/components/list-item.scss b/src/components/list-item.scss index 7cf6546..4c8b7b1 100644 --- a/src/components/list-item.scss +++ b/src/components/list-item.scss @@ -1,7 +1,7 @@ -.hub-entry { +.pulp-entry { margin-top: 5px; - &.hub-right-col { + &.pulp-right-col { width: 200px; } } diff --git a/src/components/list-page.tsx b/src/components/list-page.tsx index 8e09313..769b69e 100644 --- a/src/components/list-page.tsx +++ b/src/components/list-page.tsx @@ -19,9 +19,9 @@ import { EmptyStateNoData, EmptyStateUnauthorized, type FilterOption, - HubPagination, LoadingSpinner, Main, + PulpPagination, SortTable, closeAlert, } from 'src/components'; @@ -265,8 +265,11 @@ export const ListPage = function ({ {loading ? ( ) : ( -
-
+
+
@@ -313,7 +316,7 @@ export const ListPage = function ({ - ({ this.renderTable(params, updateParams, actionContext) )} - ( -
+
{children}
); @@ -27,7 +27,7 @@ export const MultiSearchSearch = ({ return ( -
+
diff --git a/src/components/multiple-repo-selector.tsx b/src/components/multiple-repo-selector.tsx index 0a33048..5c12d03 100644 --- a/src/components/multiple-repo-selector.tsx +++ b/src/components/multiple-repo-selector.tsx @@ -21,8 +21,8 @@ import { AppliedFilters, CheckboxRow, CompoundFilter, - HubPagination, LabelGroup, + PulpPagination, RadioRow, SortTable, Spinner, @@ -284,7 +284,7 @@ export const MultipleRepoSelector = (props: IProps) => { return ( <> {renderLabels()} -
+
{!props.singleSelectionOnly && ( @@ -309,7 +309,7 @@ export const MultipleRepoSelector = (props: IProps) => { - setParams(p)} count={itemsCount} @@ -333,7 +333,7 @@ export const MultipleRepoSelector = (props: IProps) => { {loading ? : renderTable()}
- setParams(p)} count={itemsCount} diff --git a/src/components/my-imports.scss b/src/components/my-imports.scss index f86854b..71255df 100644 --- a/src/components/my-imports.scss +++ b/src/components/my-imports.scss @@ -4,11 +4,11 @@ $red: #ff5850; $warning: #f90; $white: #fff; -.hub-c-toolbar__item-selected-item { +.pulp-c-toolbar__item-selected-item { background-color: #edf8ff; } -.hub-import-loading { +.pulp-import-loading { height: 500px; display: flex; align-items: center; @@ -60,7 +60,7 @@ $white: #fff; } } -.hub-import-console { +.pulp-import-console { .title-bar { position: relative; margin-top: 15px; diff --git a/src/components/namespace-card.tsx b/src/components/namespace-card.tsx index b44e551..72f0dcf 100644 --- a/src/components/namespace-card.tsx +++ b/src/components/namespace-card.tsx @@ -26,7 +26,7 @@ interface IProps { export const NamespaceNextPageCard = ({ onClick }: { onClick: () => void }) => { return ( - +
{ const { avatar_url, name } = namespace; return ( - +
{ ); }; -// FIXME: pf-m-truncate / hub-m-truncated +// FIXME: pf-m-truncate / pulp-m-truncated function getDescription(d: string, MAX_DESCRIPTION_LENGTH = 26) { if (!d) { return ''; diff --git a/src/components/namespace-form.scss b/src/components/namespace-form.scss index 1e2d2f7..b735826 100644 --- a/src/components/namespace-form.scss +++ b/src/components/namespace-form.scss @@ -1,6 +1,6 @@ $breakpoint-md: 1000px; -.hub-card-row { +.pulp-card-row { @media (max-width: $breakpoint-md) { flex-direction: column-reverse; } @@ -12,7 +12,7 @@ $breakpoint-md: 1000px; margin-right: 15px; } - .hub-namespace-form-card { + .pulp-namespace-form-card { @media (min-width: $breakpoint-md) { border-left: 24px solid #ededed; border-bottom: 24px solid #ededed; diff --git a/src/components/namespace-form.tsx b/src/components/namespace-form.tsx index b37257a..7e35243 100644 --- a/src/components/namespace-form.tsx +++ b/src/components/namespace-form.tsx @@ -63,7 +63,7 @@ export const NamespaceForm = ({ return (
-
+
-
+
@@ -134,7 +134,7 @@ export const NamespaceForm = ({ {namespace.links.map((link, index) => renderLinkGroup(link, index))} {namespace.links.length === 0 && ( - addLink()}> + addLink()}> )} @@ -225,14 +225,14 @@ export const NamespaceForm = ({
- removeLink(index)}> + removeLink(index)}>
{last && ( - addLink()}> + addLink()}> )} diff --git a/src/components/page-with-tabs.tsx b/src/components/page-with-tabs.tsx index 3634d85..141b241 100644 --- a/src/components/page-with-tabs.tsx +++ b/src/components/page-with-tabs.tsx @@ -189,7 +189,7 @@ export const PageWithTabs = function < } pageControls={ loading ? null : ( -
+
@@ -209,7 +209,7 @@ export const PageWithTabs = function < } > {headerDetails?.(item)} -
+
@@ -224,7 +224,7 @@ export const PageWithTabs = function < ) : (
{this.renderTab(tab, actionContext)} diff --git a/src/components/page.tsx b/src/components/page.tsx index a824763..6167ab7 100644 --- a/src/components/page.tsx +++ b/src/components/page.tsx @@ -150,7 +150,7 @@ export const Page = function < /> } pageControls={ -
+
@@ -174,7 +174,10 @@ export const Page = function < {loading ? ( ) : ( -
+
{render(item, actionContext)}
)} diff --git a/src/components/partner-header.tsx b/src/components/partner-header.tsx index 6225deb..b263651 100644 --- a/src/components/partner-header.tsx +++ b/src/components/partner-header.tsx @@ -33,7 +33,7 @@ export const PartnerHeader = ({ namespace.avatar_url && ( } pageControls={pageControls} - className='hub-header-bordered' + className='pulp-header-bordered' > {namespace.description ? (
@@ -58,7 +58,7 @@ export const PartnerHeader = ({
) : null} -
+
diff --git a/src/components/preview-roles.tsx b/src/components/preview-roles.tsx index 4ec9d8b..9ad28bb 100644 --- a/src/components/preview-roles.tsx +++ b/src/components/preview-roles.tsx @@ -30,7 +30,7 @@ export const PreviewRoles = ({ user, group, selectedRoles }: IProps) => { const { model_permissions } = useAppContext().user; return ( -
+

{user ? ( @@ -45,19 +45,19 @@ export const PreviewRoles = ({ user, group, selectedRoles }: IProps) => { ) : null}

- + {selectedRoles.map((role) => ( {role.name}{' '} {role.description && `- ${translateLockedRole(role.name, role.description)}`} - + {role.permissions.map((permission) => ( { +export const PulpAboutModal = ({ isOpen, onClose, user, userName }: IProps) => { const [applicationInfo, setApplicationInfo] = useState({}); useEffect(() => { diff --git a/src/components/hub-copy-button.tsx b/src/components/pulp-copy-button.tsx similarity index 91% rename from src/components/hub-copy-button.tsx rename to src/components/pulp-copy-button.tsx index 21ca8bb..4de6a52 100644 --- a/src/components/hub-copy-button.tsx +++ b/src/components/pulp-copy-button.tsx @@ -2,7 +2,7 @@ import { t } from '@lingui/macro'; import React, { useState } from 'react'; import { ClipboardCopyButton } from 'src/components'; -export const HubCopyButton = ({ +export const PulpCopyButton = ({ text, textId, }: { @@ -18,7 +18,7 @@ export const HubCopyButton = ({ navigator.clipboard.writeText(text); }} variant='plain' - id='hub-copy-button' + id='pulp-copy-button' exitDelay={copied ? 1500 : 600} maxWidth='110px' onTooltipHidden={() => setCopied(false)} diff --git a/src/components/hub-list-toolbar.tsx b/src/components/pulp-list-toolbar.tsx similarity index 96% rename from src/components/hub-list-toolbar.tsx rename to src/components/pulp-list-toolbar.tsx index 3ef2d2e..f666bbf 100644 --- a/src/components/hub-list-toolbar.tsx +++ b/src/components/pulp-list-toolbar.tsx @@ -10,7 +10,7 @@ import { CardListSwitcher, CompoundFilter, type FilterOption, - HubPagination, + PulpPagination, Sort, type SortFieldType, } from 'src/components'; @@ -52,7 +52,7 @@ function useTypeaheads(typeaheads, { inputText, selectedFilter }) { return options; } -export function HubListToolbar({ +export function PulpListToolbar({ buttons, count, filterConfig, @@ -89,7 +89,7 @@ export function HubListToolbar({ : null; return ( - + ) : null} - {

The documentation object for this plugin seems to contain invalid - syntax that makes it impossible for Automation Hub to parse. You - can still look at the unformatted documentation object bellow if - you need to. + syntax that makes it impossible for Pulp UI to parse. You can + still look at the unformatted documentation object bellow if you + need to.

{t`Unformatted Documentation`}

-
+          
             {JSON.stringify(plugin, null, 2)}
           
@@ -266,7 +266,7 @@ export class RenderPluginDoc extends Component { } private formatPartCode(part: dom.CodePart): ReactNode { - return {part.text}; + return {part.text}; } private formatPartHorizontalLine(_part: dom.HorizontalLinePart): ReactNode { @@ -298,7 +298,7 @@ export class RenderPluginDoc extends Component { } private formatPartEnvVariable(part: dom.EnvVariablePart): ReactNode { - return {part.name}; + return {part.name}; } private formatPartOptionNameReturnValue( @@ -306,11 +306,11 @@ export class RenderPluginDoc extends Component { ): ReactNode { const content = part.value === undefined ? ( - + {part.name} ) : ( - + {part.name}={part.value} ); @@ -325,7 +325,7 @@ export class RenderPluginDoc extends Component { } private formatPartOptionValue(part: dom.OptionValuePart): ReactNode { - return {part.value}; + return {part.value}; } private formatPartPlugin(part: dom.PluginPart): ReactNode { @@ -518,13 +518,13 @@ export class RenderPluginDoc extends Component { return ( <>

{t`Parameters`}

- +
{content_type !== 'module' ? : null} @@ -566,7 +566,7 @@ export class RenderPluginDoc extends Component { colSpan={maxDepth + 1 - depth} className={option.suboptions ? 'parent' : ''} > - {option.name} + {option.name} {this.documentedType(option['type'])} {option['elements'] ? ( @@ -578,7 +578,7 @@ export class RenderPluginDoc extends Component { {option['required'] ? ( {' '} - / {t`required`} + / {t`required`} ) : null} @@ -603,7 +603,7 @@ export class RenderPluginDoc extends Component { {option['aliases'] ? ( - + {t`aliases`}: {option['aliases'].join(', ')} @@ -633,7 +633,7 @@ export class RenderPluginDoc extends Component { return ( <> {option['ini'] ? ( -
+
{t`ini entries:`} {option['ini'].map((v, i) => (

@@ -645,7 +645,7 @@ export class RenderPluginDoc extends Component { ) : null} {option['env'] ? ( -

+
{option['env'].map((v, i) => (
{t`env`}: {v.name} @@ -655,7 +655,7 @@ export class RenderPluginDoc extends Component { ) : null} {option['vars'] ? ( -
+
{option['vars'].map((v, i) => (
{t`var`}: {v.name} @@ -723,12 +723,12 @@ export class RenderPluginDoc extends Component { <> {choices && Array.isArray(choices) && choices.length !== 0 ? (
- {t`Choices:`}{' '} + {t`Choices:`}{' '}
    {choices.map((c, i) => (
  • {c === defaultChoice ? ( - +  ← ) : ( @@ -743,8 +743,8 @@ export class RenderPluginDoc extends Component { {defaultChoice !== undefined && !choices.includes(defaultChoice) ? ( - {t`Default:`}{' '} - {defaultChoice} + {t`Default:`}{' '} + {defaultChoice} ) : null} @@ -807,7 +807,7 @@ export class RenderPluginDoc extends Component { return ( <>

    {t`Return Values`}

    -
{t`Parameter`} {t`Choices`} /{' '} - {t`Defaults`} + {t`Defaults`} {t`Configuration`}{t`Comments`}
+
diff --git a/src/components/repository-badge.tsx b/src/components/repository-badge.tsx index fc7ee9a..11b3b20 100644 --- a/src/components/repository-badge.tsx +++ b/src/components/repository-badge.tsx @@ -33,7 +33,7 @@ export const RepositoryBadge = ({ const repoName = { - 'rh-certified': t`Red Hat Certified`, + certified: t`Certified`, community: t`Community`, published: t`Published`, rejected: t`Rejected`, diff --git a/src/components/repository-form.tsx b/src/components/repository-form.tsx index 280f04c..420d3c6 100644 --- a/src/components/repository-form.tsx +++ b/src/components/repository-form.tsx @@ -226,7 +226,7 @@ export class RepositoryForm extends Component { key='registry' fieldId='registry' label={t`Registry`} - className='hub-formgroup-registry' + className='pulp-formgroup-registry' isRequired > {!formErrors?.registries && ( diff --git a/src/components/select-group.tsx b/src/components/select-group.tsx index bd72f47..b24c7d3 100644 --- a/src/components/select-group.tsx +++ b/src/components/select-group.tsx @@ -8,8 +8,8 @@ import { CompoundFilter, EmptyStateFilter, EmptyStateNoData, - HubPagination, LoadingSpinner, + PulpPagination, RadioRow, RoleListTable, } from 'src/components'; @@ -51,7 +51,7 @@ export const SelectGroup: FunctionComponent = ({ if (loading) { return ( -
+
); @@ -63,7 +63,7 @@ export const SelectGroup: FunctionComponent = ({ if (noData && !filterIsSet(localParams, ['name__icontains'])) { return ( -
+
= ({ }; return ( -
+
= ({ }} direction={{ default: 'column' }} > - + = ({ @@ -133,7 +133,7 @@ export const SelectGroup: FunctionComponent = ({ ) : null} -
+
setInputText(inputText)} @@ -162,11 +162,11 @@ export const SelectGroup: FunctionComponent = ({ {noData && filterIsSet(localParams, ['name__icontains']) ? ( -
+
) : ( -
+
= ({ {!noData && ( - setLocalParams(p)} count={groupsCount} diff --git a/src/components/select-roles.tsx b/src/components/select-roles.tsx index 9f77414..1b00b3c 100644 --- a/src/components/select-roles.tsx +++ b/src/components/select-roles.tsx @@ -9,8 +9,8 @@ import { CompoundFilter, EmptyStateFilter, EmptyStateNoData, - HubPagination, LoadingSpinner, + PulpPagination, RoleListTable, } from 'src/components'; import { filterIsSet, translateLockedRole } from 'src/utilities'; @@ -59,7 +59,7 @@ export const SelectRoles: FunctionComponent = ({ if (loading) { return ( -
+
); @@ -72,7 +72,7 @@ export const SelectRoles: FunctionComponent = ({ if (noData && !filterIsSet(localParams, ['name__icontains'])) { return ( -
+
= ({ }; return ( -
+
= ({ }} direction={{ default: 'column' }} > - + = ({ {selectedRoles.map((role) => (
- + {options.headers.map((element) => getHeaderItem(element))} diff --git a/src/components/sort.tsx b/src/components/sort.tsx index 468a456..be4abbe 100644 --- a/src/components/sort.tsx +++ b/src/components/sort.tsx @@ -96,7 +96,7 @@ export const Sort = ({ ) : null} update(selectedOption, !isDescending)} style={{ margin: showSelect ? '6px 0 6px 5px' : '10px 0 6px 5px' }} > diff --git a/src/components/switcher.scss b/src/components/switcher.scss index ae4acaf..464c33e 100644 --- a/src/components/switcher.scss +++ b/src/components/switcher.scss @@ -1,4 +1,4 @@ -.hub-switcher-icon { +.pulp-switcher-icon { color: var(--pf-v5-global--icon--Color--light); cursor: pointer; margin-left: 8px; diff --git a/src/components/user-form-page.tsx b/src/components/user-form-page.tsx index cc37032..0659f7f 100644 --- a/src/components/user-form-page.tsx +++ b/src/components/user-form-page.tsx @@ -43,7 +43,7 @@ export const UserFormPage = ({ title={title} />
-
+
{ const actions = ( - + ); diff --git a/src/containers/ansible-repository/detail.tsx b/src/containers/ansible-repository/detail.tsx index d92429f..4bc5bdd 100644 --- a/src/containers/ansible-repository/detail.tsx +++ b/src/containers/ansible-repository/detail.tsx @@ -63,7 +63,7 @@ const AnsibleRepositoryDetail = PageWithTabs< headerDetails: (item) => ( <> {item?.last_sync_task && ( -

+

Last updated from registry {lastSynced(item)}{' '} {lastSyncStatus(item)}

diff --git a/src/containers/certification-dashboard/certification-dashboard.scss b/src/containers/certification-dashboard/certification-dashboard.scss index 53b2581..4811371 100644 --- a/src/containers/certification-dashboard/certification-dashboard.scss +++ b/src/containers/certification-dashboard/certification-dashboard.scss @@ -1,4 +1,4 @@ -.hub-certification-dashboard { +.pulp-certification-dashboard { .footer { padding-top: 16px; } diff --git a/src/containers/certification-dashboard/certification-dashboard.tsx b/src/containers/certification-dashboard/certification-dashboard.tsx index c4d6573..2fd02c2 100644 --- a/src/containers/certification-dashboard/certification-dashboard.tsx +++ b/src/containers/certification-dashboard/certification-dashboard.tsx @@ -26,10 +26,10 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, LoadingPage, LoadingSpinner, Main, + PulpPagination, SortTable, UploadSignatureModal, closeAlert, @@ -182,9 +182,9 @@ class CertificationDashboard extends Component { {unauthorized ? ( ) : ( -
-
-
+
+
+
@@ -235,7 +235,7 @@ class CertificationDashboard extends Component { - this.updateParams(p, () => this.queryCollections(true)) @@ -273,7 +273,7 @@ class CertificationDashboard extends Component { )}
- this.updateParams(p, () => this.queryCollections(true)) diff --git a/src/containers/collection-detail/collection-content.tsx b/src/containers/collection-detail/collection-content.tsx index 7e9217d..7c5d4bc 100644 --- a/src/containers/collection-detail/collection-content.tsx +++ b/src/containers/collection-detail/collection-content.tsx @@ -86,7 +86,7 @@ class CollectionContent extends Component { } />
-
+
{ }} />
-
+

{t`Dependencies`}

{t`This collections requires the following collections for use`}

diff --git a/src/containers/collection-detail/collection-detail.scss b/src/containers/collection-detail/collection-detail.scss index 65e2e28..127166d 100644 --- a/src/containers/collection-detail/collection-detail.scss +++ b/src/containers/collection-detail/collection-detail.scss @@ -1,12 +1,12 @@ $breakpoint-md: 1000px; -.hub-docs-main { +.pulp-docs-main { margin: 0; padding: 0; border-top: 1px solid #d8d8d8; } -.hub-docs-container { +.pulp-docs-container { padding-top: 24px; background-color: white; @@ -19,7 +19,7 @@ $breakpoint-md: 1000px; } } -.hub-docs-content { +.pulp-docs-content { flex-grow: 1; padding: 24px; padding-top: 0; @@ -41,7 +41,7 @@ $breakpoint-md: 1000px; } } -.hub-docs-sidebar { +.pulp-docs-sidebar { // This width lines up the border nicely with the tabs min-width: 294px; max-width: 294px; diff --git a/src/containers/collection-detail/collection-detail.tsx b/src/containers/collection-detail/collection-detail.tsx index 0a6b3bf..02341e0 100644 --- a/src/containers/collection-detail/collection-detail.tsx +++ b/src/containers/collection-detail/collection-detail.tsx @@ -101,7 +101,7 @@ class CollectionDetail extends Component { } />
-
+
{ } />
-
-
+
+
@@ -245,7 +245,7 @@ const CollectionDistributions = (props: RouteProps) => { - { }} /> {loading ? : renderTable(distributions, params)} - { this.updateParams(p, () => this.loadCollection(true)) } /> -
-
+
+
{ />
{displayHTML || pluginData ? ( diff --git a/src/containers/collection-detail/collection-import-log.tsx b/src/containers/collection-detail/collection-import-log.tsx index de2bb63..69ba1bc 100644 --- a/src/containers/collection-detail/collection-import-log.tsx +++ b/src/containers/collection-detail/collection-import-log.tsx @@ -101,7 +101,7 @@ class CollectionImportLog extends Component { } />
-
+
{ ) : (
-
+
{params.tab === 'edit-details' ? ( ), - - {t`Use in Controller`} - - } - />, hasPermission('container.delete_containerrepository') && ( +
-
+
{t`Key`}
+
{deleteModalVisible && ( -
+
@@ -269,7 +267,7 @@ class ExecutionEnvironmentDetailImages extends Component< - this.updateParams(p, () => @@ -318,7 +316,7 @@ class ExecutionEnvironmentDetailImages extends Component<
)} - this.updateParams(p, () => @@ -379,21 +377,6 @@ class ExecutionEnvironmentDetailImages extends Component< {t`Manage tags`} ), - - {t`Use in Controller`} - - } - />, hasPermission('container.delete_containerrepository') && ( - + {image.tags .sort() .map((tag) => diff --git a/src/containers/execution-environment-detail/execution-environment-detail.scss b/src/containers/execution-environment-detail/execution-environment-detail.scss index bd8928d..3f74f0a 100644 --- a/src/containers/execution-environment-detail/execution-environment-detail.scss +++ b/src/containers/execution-environment-detail/execution-environment-detail.scss @@ -1,9 +1,9 @@ -.hub-m-truncated { +.pulp-m-truncated { max-height: 3rem; text-overflow: ellipsis; overflow: hidden; } -.hub-c-button-edit { +.pulp-c-button-edit { float: right; } diff --git a/src/containers/execution-environment-detail/execution-environment-detail.tsx b/src/containers/execution-environment-detail/execution-environment-detail.tsx index 7fbf1f4..857fd7a 100644 --- a/src/containers/execution-environment-detail/execution-environment-detail.tsx +++ b/src/containers/execution-environment-detail/execution-environment-detail.tsx @@ -65,7 +65,7 @@ class ExecutionEnvironmentDetail extends Component { return ( -
+
{' '} {t`Instructions`} @@ -77,7 +77,7 @@ class ExecutionEnvironmentDetail extends Component<IDetailSharedProps, IState> { </section> </FlexItem> <FlexItem> - <section className='body pf-v5-c-content'> + <section className='pulp-section pf-v5-c-content'> <Card> <CardBody> <Title headingLevel='h2' size='lg'> @@ -85,7 +85,7 @@ class ExecutionEnvironmentDetail extends Component<IDetailSharedProps, IState> { this.state.readme && canEdit && ( <Button - className={'hub-c-button-edit'} + className={'pulp-c-button-edit'} variant={'primary'} onClick={() => { this.setState({ markdownEditing: true }); diff --git a/src/containers/execution-environment-list/execution-environment-list.tsx b/src/containers/execution-environment-list/execution-environment-list.tsx index f5dc910..551b374 100644 --- a/src/containers/execution-environment-list/execution-environment-list.tsx +++ b/src/containers/execution-environment-list/execution-environment-list.tsx @@ -31,10 +31,10 @@ import { EmptyStateUnauthorized, ExternalLink, HelpButton, - HubPagination, ListItemActions, LoadingSpinner, Main, + PulpPagination, RepositoryForm, SortTable, Tooltip, @@ -44,7 +44,6 @@ import { Paths, formatEEPath } from 'src/paths'; import { ParamHelper, type RouteProps, - controllerURL, filterIsSet, getContainersURL, taskAlert, @@ -232,8 +231,8 @@ class ExecutionEnvironmentList extends Component<RouteProps, IState> { {loading ? ( <LoadingSpinner /> ) : ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -267,7 +266,7 @@ class ExecutionEnvironmentList extends Component<RouteProps, IState> { </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryEnvironments()) @@ -291,7 +290,7 @@ class ExecutionEnvironmentList extends Component<RouteProps, IState> { </div> {this.renderTable(params)} - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryEnvironments()) @@ -391,17 +390,6 @@ class ExecutionEnvironmentList extends Component<RouteProps, IState> { {t`Sync from registry`} </DropdownItem> ), - <DropdownItem - key='use-in-controller' - component={ - <ExternalLink - href={controllerURL({ image: item.name })} - variant='menu' - > - {t`Use in Controller`} - </ExternalLink> - } - />, hasPermission('container.delete_containerrepository') && ( <DropdownItem key='delete' diff --git a/src/containers/execution-environment-manifest/execution-environment-manifest.tsx b/src/containers/execution-environment-manifest/execution-environment-manifest.tsx index 7a79d87..b31b9a8 100644 --- a/src/containers/execution-environment-manifest/execution-environment-manifest.tsx +++ b/src/containers/execution-environment-manifest/execution-environment-manifest.tsx @@ -19,10 +19,10 @@ import { ExecutionEnvironmentAPI } from 'src/api'; import { BaseHeader, Breadcrumbs, - HubCopyButton, LabelGroup, LoadingPage, Main, + PulpCopyButton, ShaLabel, TagLabel, } from 'src/components'; @@ -124,7 +124,7 @@ class ExecutionEnvironmentManifest extends Component<RouteProps, IState> { > <div className='copy-sha'> <ShaLabel digest={digest} long /> - <HubCopyButton text={digest} /> + <PulpCopyButton text={digest} /> </div> <LabelGroup numLabels={6}> diff --git a/src/containers/execution-environment/registry-list.tsx b/src/containers/execution-environment/registry-list.tsx index 0a9625c..c535197 100644 --- a/src/containers/execution-environment/registry-list.tsx +++ b/src/containers/execution-environment/registry-list.tsx @@ -23,10 +23,10 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, ListItemActions, LoadingSpinner, Main, + PulpPagination, RemoteForm, SortTable, Tooltip, @@ -244,8 +244,8 @@ class ExecutionEnvironmentRegistryList extends Component<RouteProps, IState> { {loading ? ( <LoadingSpinner /> ) : ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -272,7 +272,7 @@ class ExecutionEnvironmentRegistryList extends Component<RouteProps, IState> { </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryRegistries()) @@ -295,7 +295,7 @@ class ExecutionEnvironmentRegistryList extends Component<RouteProps, IState> { /> </div> {this.renderTable(params)} - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryRegistries()) diff --git a/src/containers/group-management/group-detail-role-management/group-detail-role-management.scss b/src/containers/group-management/group-detail-role-management/group-detail-role-management.scss index 4c005dd..e8fd3f6 100644 --- a/src/containers/group-management/group-detail-role-management/group-detail-role-management.scss +++ b/src/containers/group-management/group-detail-role-management/group-detail-role-management.scss @@ -1,48 +1,48 @@ -.hub-empty-state-box { +.pulp-empty-state-box { min-height: 500px; display: flex; align-items: center; justify-content: center; } -.hub-custom-wizard-layout { - .hub-select-roles-content { +.pulp-custom-wizard-layout { + .pulp-select-roles-content { overflow: auto; } - .hub-permission { + .pulp-permission { margin: 3px; } - .hub-preview-roles { + .pulp-preview-roles { margin-top: 20px; } - .hub-permissions { + .pulp-permissions { margin: 10px 0; } - .hub-filter { + .pulp-filter { width: 250px; } - .hub-selected-roles-list { + .pulp-selected-roles-list { overflow-x: auto; } - .hub-no-filter-data { + .pulp-no-filter-data { display: flex; justify-content: center; height: 400px; } - &.hub-no-data { + &.pulp-no-data { display: flex; justify-content: center; min-height: 590px; } - &.hub-loading-wizard { + &.pulp-loading-wizard { display: flex; align-items: center; } diff --git a/src/containers/group-management/group-detail-role-management/group-detail-role-management.tsx b/src/containers/group-management/group-detail-role-management/group-detail-role-management.tsx index e1a509c..df934ad 100644 --- a/src/containers/group-management/group-detail-role-management/group-detail-role-management.tsx +++ b/src/containers/group-management/group-detail-role-management/group-detail-role-management.tsx @@ -22,11 +22,11 @@ import { EmptyStateFilter, EmptyStateNoData, ExpandableRow, - HubPagination, ListItemActions, LoadingPage, PermissionCategories, PreviewRoles, + PulpPagination, RoleListTable, SelectRoles, WizardModal, @@ -162,7 +162,7 @@ const GroupDetailRoleManagement: FunctionComponent<IProps> = ({ if (loading) { return ( - <section className='body'> + <section className='pulp-section'> <LoadingPage /> </section> ); @@ -269,7 +269,7 @@ const GroupDetailRoleManagement: FunctionComponent<IProps> = ({ /> )} {noData ? ( - <section className='body hub-empty-state-box'> + <section className='pulp-section pulp-empty-state-box'> <EmptyStateNoData title={t`There are currently no roles assigned to this group.`} description={t`Please add a role by using the button below.`} @@ -277,8 +277,8 @@ const GroupDetailRoleManagement: FunctionComponent<IProps> = ({ /> </section> ) : ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -301,7 +301,7 @@ const GroupDetailRoleManagement: FunctionComponent<IProps> = ({ </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination count={rolesItemCount} params={params} updateParams={updateParams} @@ -364,7 +364,7 @@ const GroupDetailRoleManagement: FunctionComponent<IProps> = ({ </RoleListTable> <div style={{ paddingTop: '24px', paddingBottom: '8px' }}> - <HubPagination + <PulpPagination params={params} updateParams={updateParams} count={rolesItemCount} diff --git a/src/containers/group-management/group-detail.tsx b/src/containers/group-management/group-detail.tsx index ddafa0c..832171b 100644 --- a/src/containers/group-management/group-detail.tsx +++ b/src/containers/group-management/group-detail.tsx @@ -31,11 +31,11 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, LinkTabs, ListItemActions, LoadingPage, Main, + PulpPagination, SortTable, Typeahead, closeAlert, @@ -237,7 +237,7 @@ class GroupDetail extends Component<RouteProps, IState> { } pageControls={this.renderControls()} > - <div className='hub-tab-link-container'> + <div className='pulp-tab-link-container'> <div className='tabs'> <LinkTabs tabs={tabs} /> </div> @@ -556,8 +556,8 @@ class GroupDetail extends Component<RouteProps, IState> { } return ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -604,7 +604,7 @@ class GroupDetail extends Component<RouteProps, IState> { </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryUsers())} count={itemCount} @@ -630,7 +630,7 @@ class GroupDetail extends Component<RouteProps, IState> { </div> {this.renderUsersTable(users)} <div style={{ paddingTop: '24px', paddingBottom: '8px' }}> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryUsers())} count={itemCount} diff --git a/src/containers/group-management/group-list.tsx b/src/containers/group-management/group-list.tsx index dd58b59..e2b8c9b 100644 --- a/src/containers/group-management/group-list.tsx +++ b/src/containers/group-management/group-list.tsx @@ -28,10 +28,10 @@ import { EmptyStateNoData, EmptyStateUnauthorized, GroupModal, - HubPagination, ListItemActions, LoadingSpinner, Main, + PulpPagination, SortTable, closeAlert, } from 'src/components'; @@ -170,8 +170,8 @@ class GroupList extends Component<RouteProps, IState> { /> ) : ( <Main> - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -206,7 +206,7 @@ class GroupList extends Component<RouteProps, IState> { </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryGroups()) @@ -230,7 +230,7 @@ class GroupList extends Component<RouteProps, IState> { </div> {loading ? <LoadingSpinner /> : this.renderTable(params)} - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryGroups()) diff --git a/src/containers/index.ts b/src/containers/index.ts index bfa39cb..d963b44 100644 --- a/src/containers/index.ts +++ b/src/containers/index.ts @@ -26,8 +26,8 @@ export { default as MyImports } from './my-imports/my-imports'; export { default as NamespaceDetail } from './namespace-detail/namespace-detail'; export { default as MyNamespaces } from './namespace-list/my-namespaces'; export { default as Partners } from './namespace-list/partners'; -export { default as PulpStatus } from './pulp-status'; export { default as NotFound } from './not-found/not-found'; +export { default as PulpStatus } from './pulp-status'; export { default as RoleCreate } from './role-management/role-create'; export { default as EditRole } from './role-management/role-edit'; export { default as RoleList } from './role-management/role-list'; diff --git a/src/containers/my-imports/my-imports.tsx b/src/containers/my-imports/my-imports.tsx index f3bed45..b4f3198 100644 --- a/src/containers/my-imports/my-imports.tsx +++ b/src/containers/my-imports/my-imports.tsx @@ -135,7 +135,7 @@ class MyImports extends Component<RouteProps, IState> { } /> <Main> - <section className='body'> + <section className='pulp-section'> <div style={{ display: 'flex' }} data-cy='MyImports'> <div style={{ width: '400px' }}> <ImportList diff --git a/src/containers/namespace-detail/namespace-detail.tsx b/src/containers/namespace-detail/namespace-detail.tsx index 3dce754..875dc1e 100644 --- a/src/containers/namespace-detail/namespace-detail.tsx +++ b/src/containers/namespace-detail/namespace-detail.tsx @@ -27,11 +27,11 @@ import { DeleteModal, EmptyStateNoData, ExternalLink, - HubListToolbar, ImportModal, LoadingPage, Main, PartnerHeader, + PulpListToolbar, SignAllCertificatesModal, StatefulDropdown, closeAlert, @@ -442,7 +442,7 @@ export class NamespaceDetail extends Component<RouteProps, IState> { pageControls={this.renderPageControls()} /> {tab === 'collections' ? ( - <HubListToolbar + <PulpListToolbar count={filteredCount} ignoredParams={ignoredParams} params={params} @@ -468,7 +468,7 @@ export class NamespaceDetail extends Component<RouteProps, IState> { } /> ) : ( - <section className='body'> + <section className='pulp-section'> <CollectionList updateParams={updateParams} params={params} @@ -484,7 +484,7 @@ export class NamespaceDetail extends Component<RouteProps, IState> { ) ) : null} {tab === 'cli-configuration' ? ( - <section className='body'> + <section className='pulp-section'> <div> <div> <Trans> @@ -503,7 +503,7 @@ export class NamespaceDetail extends Component<RouteProps, IState> { ) : null} {tab === 'resources' ? this.renderResources(namespace) : null} {tab === 'access' ? ( - <section className='body'> + <section className='pulp-section'> <AccessTab showUserRemoveModal={this.state.showUserRemoveModal} showUserSelectWizard={this.state.showUserSelectWizard} diff --git a/src/containers/namespace-list/namespace-list.scss b/src/containers/namespace-list/namespace-list.scss index cc548b5..a530084 100644 --- a/src/containers/namespace-list/namespace-list.scss +++ b/src/containers/namespace-list/namespace-list.scss @@ -1,4 +1,4 @@ -.hub-namespace-page { +.pulp-namespace-page { height: 100%; display: flex; flex-direction: column; diff --git a/src/containers/namespace-list/namespace-list.tsx b/src/containers/namespace-list/namespace-list.tsx index 00c08d1..85f6d41 100644 --- a/src/containers/namespace-list/namespace-list.tsx +++ b/src/containers/namespace-list/namespace-list.tsx @@ -10,14 +10,14 @@ import { BaseHeader, EmptyStateFilter, EmptyStateNoData, - HubListToolbar, - HubPagination, LinkTabs, LoadingPage, LoadingSpinner, NamespaceCard, NamespaceModal, NamespaceNextPageCard, + PulpListToolbar, + PulpPagination, closeAlert, } from 'src/components'; import { Paths, formatPath } from 'src/paths'; @@ -176,7 +176,7 @@ export class NamespaceList extends Component<IProps, IState> { ]; return ( - <div className='hub-namespace-page'> + <div className='pulp-namespace-page'> <NamespaceModal isOpen={this.state.isModalOpen} toggleModal={this.handleModalToggle} @@ -203,7 +203,7 @@ export class NamespaceList extends Component<IProps, IState> { /> <BaseHeader title={t`Namespaces`}> {!(this.context as IAppContextType).user.is_anonymous && ( - <div className='hub-tab-link-container'> + <div className='pulp-tab-link-container'> <div className='tabs'> <LinkTabs tabs={tabs} /> </div> @@ -211,7 +211,7 @@ export class NamespaceList extends Component<IProps, IState> { )} </BaseHeader> {noData ? null : ( - <HubListToolbar + <PulpListToolbar buttons={buttons} count={itemCount} filterConfig={filterConfig} @@ -226,7 +226,7 @@ export class NamespaceList extends Component<IProps, IState> { </section> {noData || loading ? null : ( <section className='footer'> - <HubPagination + <PulpPagination params={params} updateParams={updateParams} count={itemCount} @@ -278,7 +278,7 @@ export class NamespaceList extends Component<IProps, IState> { } return ( - <section className='hub-card-layout'> + <section className='pulp-card-layout'> {namespaces.map((ns, i) => ( <div key={i} className='card-wrapper'> <NamespaceCard showDetailLink key={i} namespace={ns} /> diff --git a/src/containers/not-found/not-found.scss b/src/containers/not-found/not-found.scss index 8a1d5a9..fc974fd 100644 --- a/src/containers/not-found/not-found.scss +++ b/src/containers/not-found/not-found.scss @@ -1,4 +1,4 @@ -.hub-c-bullseye { +.pulp-c-bullseye { min-height: calc(100vh - 230px); &__center { diff --git a/src/containers/not-found/not-found.tsx b/src/containers/not-found/not-found.tsx index 80f391d..54ace6d 100644 --- a/src/containers/not-found/not-found.tsx +++ b/src/containers/not-found/not-found.tsx @@ -10,13 +10,13 @@ export const NotFound = (_props) => ( <> <BaseHeader title={t`404 - Page not found`} /> <Main> - <section className='body'> - <Bullseye className='hub-c-bullseye'> - <div className='hub-c-bullseye__center'> + <section className='pulp-section'> + <Bullseye className='pulp-c-bullseye'> + <div className='pulp-c-bullseye__center'> <img src={NotFoundImage} alt={t`Not found image`} /> <div>{t`We couldn't find the page you're looking for!`}</div> <div className='pf-v5-c-content'> - <span className='hub-c-bullseye__404'>404</span> + <span className='pulp-c-bullseye__404'>404</span> </div> </div> </Bullseye> diff --git a/src/containers/pulp-status.tsx b/src/containers/pulp-status.tsx index d261eba..b6aa2e0 100644 --- a/src/containers/pulp-status.tsx +++ b/src/containers/pulp-status.tsx @@ -58,7 +58,7 @@ class PulpStatus extends Component<RouteProps, IState> { <BaseHeader title={t`Status`} /> <Main> <Card> - <section className='body pf-v5-c-content'> + <section className='pulp-section pf-v5-c-content'> <CardTitle> <h2>{t`TODO`}</h2> </CardTitle> diff --git a/src/containers/role-management/role-create.tsx b/src/containers/role-management/role-create.tsx index 4470374..b4bcf33 100644 --- a/src/containers/role-management/role-create.tsx +++ b/src/containers/role-management/role-create.tsx @@ -71,7 +71,7 @@ class RoleCreate extends Component<RouteProps, IState> { <EmptyStateUnauthorized /> ) : ( <Main> - <section className='body'> + <section className='pulp-section'> <RoleForm nameValidated={errorMessages['name'] ? 'error' : null} nameHelperText={errorMessages['name']} diff --git a/src/containers/role-management/role-edit.tsx b/src/containers/role-management/role-edit.tsx index 0a6f12e..389f4db 100644 --- a/src/containers/role-management/role-edit.tsx +++ b/src/containers/role-management/role-edit.tsx @@ -172,7 +172,7 @@ class EditRole extends Component<RouteProps, IState> { <EmptyStateUnauthorized /> ) : ( <Main> - <section className='body'> + <section className='pulp-section'> <RoleForm {...this.state} name={name} diff --git a/src/containers/role-management/role-list.tsx b/src/containers/role-management/role-list.tsx index ebba54a..2dbc24a 100644 --- a/src/containers/role-management/role-list.tsx +++ b/src/containers/role-management/role-list.tsx @@ -24,11 +24,11 @@ import { EmptyStateNoData, EmptyStateUnauthorized, ExpandableRow, - HubPagination, ListItemActions, LoadingSpinner, Main, PermissionCategories, + PulpPagination, RoleListTable, Tooltip, closeAlert, @@ -223,8 +223,8 @@ export class RoleList extends Component<RouteProps, IState> { {loading ? ( <LoadingSpinner /> ) : ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -266,7 +266,7 @@ export class RoleList extends Component<RouteProps, IState> { </ToolbarGroup> </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryRoles()) @@ -349,7 +349,7 @@ export class RoleList extends Component<RouteProps, IState> { ) : ( <EmptyStateFilter /> )} - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.queryRoles()) diff --git a/src/containers/search/multi-search.tsx b/src/containers/search/multi-search.tsx index c0bc289..166bf49 100644 --- a/src/containers/search/multi-search.tsx +++ b/src/containers/search/multi-search.tsx @@ -30,7 +30,7 @@ import { } from 'src/utilities'; const PageSection = ({ children, ...rest }: { children: ReactNode }) => ( - <section className='body' {...rest}> + <section className='pulp-section' {...rest}> {children} </section> ); @@ -267,7 +267,7 @@ const MultiSearch = (props: RouteProps) => { > <DataList aria-label={t`Available matching containers`} - className='hub-card-layout' + className='pulp-card-layout' style={{ paddingTop: '8px' }} > {containers.map((item, index) => ( diff --git a/src/containers/search/search.scss b/src/containers/search/search.scss index ed52d64..0e40dc2 100644 --- a/src/containers/search/search.scss +++ b/src/containers/search/search.scss @@ -1,4 +1,4 @@ -.hub-search-page { +.pulp-search-page { height: 100%; display: flex; flex-direction: column; @@ -7,12 +7,12 @@ padding-top: 24px; flex-grow: 1; - .hub-cards { + .pulp-cards { display: flex; flex-wrap: wrap; align-content: flex-start; - .hub-c-card-collection-container { + .pulp-c-card-collection-container { margin-left: 24px; margin-bottom: 24px; } @@ -22,7 +22,7 @@ width: 100%; } - .hub-list { + .pulp-list { margin-bottom: 24px; margin-left: 24px; margin-right: 24px; diff --git a/src/containers/search/search.tsx b/src/containers/search/search.tsx index fd0d99a..9e61c89 100644 --- a/src/containers/search/search.tsx +++ b/src/containers/search/search.tsx @@ -20,10 +20,10 @@ import { DeleteCollectionModal, EmptyStateFilter, EmptyStateNoData, - HubListToolbar, - HubPagination, ImportModal, LoadingSpinner, + PulpListToolbar, + PulpPagination, closeAlert, collectionFilter, } from 'src/components'; @@ -161,7 +161,7 @@ class Search extends Component<RouteProps, IState> { return ( <> - <div className='hub-search-page'> + <div className='pulp-search-page'> <AlertList alerts={alerts} closeAlert={(i) => @@ -215,9 +215,9 @@ class Search extends Component<RouteProps, IState> { namespace={updateCollection.collection_version.namespace} /> )} - <BaseHeader className='hub-header-bordered' title={t`Collections`} /> + <BaseHeader className='pulp-header-bordered' title={t`Collections`} /> {!noData && ( - <HubListToolbar + <PulpListToolbar count={count} ignoredParams={ignoredParams} params={params} @@ -246,7 +246,7 @@ class Search extends Component<RouteProps, IState> { })} </section> <section className='footer'> - <HubPagination + <PulpPagination params={params} updateParams={updateParams} count={count} @@ -296,7 +296,7 @@ class Search extends Component<RouteProps, IState> { private renderCards(collections, { count, params, updateParams }) { return ( - <div className='hub-cards'> + <div className='pulp-cards'> {collections.map((c, i) => { return ( <CollectionCard @@ -452,7 +452,7 @@ class Search extends Component<RouteProps, IState> { private renderList(collections) { return ( <div className='list-container'> - <div className='hub-list'> + <div className='pulp-list'> <DataList className='data-list' aria-label={t`List of Collections`}> {collections.map((c, i) => ( <CollectionListItem diff --git a/src/containers/signature-keys/list.tsx b/src/containers/signature-keys/list.tsx index f903abe..8c26695 100644 --- a/src/containers/signature-keys/list.tsx +++ b/src/containers/signature-keys/list.tsx @@ -21,10 +21,10 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, ListItemActions, LoadingSpinner, Main, + PulpPagination, SortTable, closeAlert, } from 'src/components'; @@ -116,8 +116,8 @@ export class SignatureKeysList extends Component<RouteProps, IState> { {loading ? ( <LoadingSpinner /> ) : ( - <section className='body'> - <div className='hub-toolbar'> + <section className='pulp-section'> + <div className='pulp-toolbar'> <Toolbar> <ToolbarContent> <ToolbarGroup> @@ -143,7 +143,7 @@ export class SignatureKeysList extends Component<RouteProps, IState> { </ToolbarGroup> </ToolbarContent> </Toolbar> - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.query()) @@ -167,7 +167,7 @@ export class SignatureKeysList extends Component<RouteProps, IState> { </div> {loading ? <LoadingSpinner /> : this.renderTable(params)} - <HubPagination + <PulpPagination params={params} updateParams={(p) => this.updateParams(p, () => this.query())} count={itemCount} @@ -249,7 +249,7 @@ export class SignatureKeysList extends Component<RouteProps, IState> { return ( <Tr key={index}> <Td>{name}</Td> - <Td data-cy='hub-signature-list-fingerprint'>{pubkey_fingerprint}</Td> + <Td data-cy='pulp-signature-list-fingerprint'>{pubkey_fingerprint}</Td> <Td> <DateComponent date={pulp_created} /> </Td> diff --git a/src/containers/task-management/task-detail.tsx b/src/containers/task-management/task-detail.tsx index fe4ecf4..39bcae2 100644 --- a/src/containers/task-management/task-detail.tsx +++ b/src/containers/task-management/task-detail.tsx @@ -143,7 +143,7 @@ class TaskDetail extends Component<RouteProps, IState> { } status={ <StatusIndicator - className={'hub-c-task-status'} + className={'pulp-c-task-status'} status={task.state} /> } @@ -155,7 +155,7 @@ class TaskDetail extends Component<RouteProps, IState> { flex={{ default: 'flex_1' }} > <FlexItem> - <section className='body card-area'> + <section className='pulp-section card-area'> <Title headingLevel='h2' size='lg'> {t`Task detail`} @@ -191,7 +191,7 @@ class TaskDetail extends Component {
-
+
{t`Task groups`} @@ -247,7 +247,7 @@ class TaskDetail extends Component {
-
+
{t`Reserve resources`} @@ -296,7 +296,7 @@ class TaskDetail extends Component { > {!task.error && ( -
+
{t`Progress messages`} @@ -342,7 +342,7 @@ class TaskDetail extends Component {
)} {!!task.error && ( -
+
{t`Error message`} @@ -351,7 +351,7 @@ class TaskDetail extends Component { {t`Description`} {task.error.description} {t`Traceback`} - + {task.error.traceback} diff --git a/src/containers/task-management/task-list-view.tsx b/src/containers/task-management/task-list-view.tsx index ed0265d..488aff8 100644 --- a/src/containers/task-management/task-list-view.tsx +++ b/src/containers/task-management/task-list-view.tsx @@ -22,9 +22,9 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, LoadingSpinner, Main, + PulpPagination, SortTable, StatusIndicator, closeAlert, @@ -136,8 +136,8 @@ export class TaskListView extends Component { {loading ? ( ) : ( -
-
+
+
@@ -185,7 +185,7 @@ export class TaskListView extends Component { - this.updateParams(p, () => this.queryTasks()) @@ -210,7 +210,7 @@ export class TaskListView extends Component {
{loading ? : this.renderTable(params)} - this.updateParams(p, () => this.queryTasks()) diff --git a/src/containers/task-management/task.scss b/src/containers/task-management/task.scss index 975470f..a36bedf 100644 --- a/src/containers/task-management/task.scss +++ b/src/containers/task-management/task.scss @@ -1,7 +1,7 @@ -.hub-c-task-status { +.pulp-c-task-status { margin-left: 10px; } -.hub-code-block { +.pulp-code-block { white-space: pre-wrap; } diff --git a/src/containers/token/token.tsx b/src/containers/token/token.tsx index 2610f95..32ffa86 100644 --- a/src/containers/token/token.tsx +++ b/src/containers/token/token.tsx @@ -68,7 +68,7 @@ class Token extends Component { ) : ( -
+

{t`API token`}

diff --git a/src/containers/user-management/user-list.tsx b/src/containers/user-management/user-list.tsx index f1095c4..726774f 100644 --- a/src/containers/user-management/user-list.tsx +++ b/src/containers/user-management/user-list.tsx @@ -25,11 +25,11 @@ import { EmptyStateFilter, EmptyStateNoData, EmptyStateUnauthorized, - HubPagination, LabelGroup, ListItemActions, LoadingSpinner, Main, + PulpPagination, SortTable, Tooltip, closeAlert, @@ -146,8 +146,8 @@ class UserList extends Component { ) : (
-
-
+
+
@@ -194,7 +194,7 @@ class UserList extends Component { - this.updateParams(p, () => this.queryUsers()) @@ -221,7 +221,7 @@ class UserList extends Component {
{loading ? : this.renderTable(params)} - this.updateParams(p, () => this.queryUsers()) diff --git a/src/layout.tsx b/src/layout.tsx index 66abd77..ee72778 100644 --- a/src/layout.tsx +++ b/src/layout.tsx @@ -21,9 +21,9 @@ import { Link } from 'react-router-dom'; import { ActiveUserAPI, type UserType } from 'src/api'; import { ExternalLink, - HubAboutModal, LanguageSwitcher, LoginLink, + PulpAboutModal, SmallLogo, StatefulDropdown, } from 'src/components'; @@ -92,7 +92,7 @@ export const StandaloneLayout = ({ children, setUser, user }: IProps) => { ].filter(Boolean); aboutModal = ( - setAboutModalVisible(false)} user={user} diff --git a/src/utilities/get-repo-url.ts b/src/utilities/get-repo-url.ts index 96bf7de..6c43be0 100644 --- a/src/utilities/get-repo-url.ts +++ b/src/utilities/get-repo-url.ts @@ -29,23 +29,3 @@ export function getContainersURL({ digest && !tag ? `@${digest}` : '' }`; } - -// returns controller UI URL for the EE add form, prefilling a chosen image from hub -export function controllerURL({ - image: name, - tag, - digest, -}: { - image: string; - tag?: string; - digest?: string; -}) { - if (!digest && !tag) { - tag = 'latest'; - } - - const imageURL = encodeURIComponent(getContainersURL({ name, tag, digest })); - const origin = window.location.origin; - - return `${origin}/execution/infrastructure/execution-environments/add?image=${imageURL}`; -} diff --git a/src/utilities/index.ts b/src/utilities/index.ts index 41f64ac..4730df2 100644 --- a/src/utilities/index.ts +++ b/src/utilities/index.ts @@ -6,7 +6,7 @@ export { downloadString } from './download-data'; export { errorMessage, handleHttpError, jsxErrorMessage } from './fail-alerts'; export { filterIsSet } from './filter-is-set'; export { getHumanSize } from './get-human-size'; -export { controllerURL, getContainersURL, getRepoURL } from './get-repo-url'; +export { getContainersURL, getRepoURL } from './get-repo-url'; export { lastSyncStatus, lastSynced } from './last-sync-task'; export { ErrorMessagesType,