Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a8ce915
generic changes from https://github.com/rancher/dashboard/pull/14492/…
richard-cox Aug 21, 2025
166e8cb
VERY WIP
richard-cox Aug 22, 2025
62fa416
very wip, vaguely working
richard-cox Aug 28, 2025
c640ed6
starting to tidy up
richard-cox Aug 28, 2025
78bc66e
more tidying
richard-cox Aug 29, 2025
ab74007
wip - pre-pivot
richard-cox Aug 29, 2025
bc4afb2
maybe...
richard-cox Aug 29, 2025
cf502d8
tidying up
richard-cox Aug 29, 2025
57bc490
asd
richard-cox Aug 29, 2025
b47bb83
Remove now uneeded sideNavCache
richard-cox Aug 29, 2025
295b410
big refactor, untested
richard-cox Aug 29, 2025
8c22f2b
tidying up
richard-cox Sep 5, 2025
4844a7f
tidying
richard-cox Sep 5, 2025
2230b97
more tidying
richard-cox Sep 5, 2025
cfd20e1
more tidying
richard-cox Sep 5, 2025
db1212d
add some super basic unit tests, fix another
richard-cox Sep 5, 2025
12cb0eb
remove debug logger and last todos
richard-cox Sep 5, 2025
ea388be
more unit test fixes
richard-cox Sep 5, 2025
a8fb3ef
Fix two bugs, and fix e2e tests
richard-cox Sep 8, 2025
f157f5d
more e2e fixes
richard-cox Sep 9, 2025
251fef5
Merge remote-tracking branch 'upstream/master' into pagination-fix-cl…
richard-cox Sep 23, 2025
8044d08
Tidying up following review
richard-cox Sep 23, 2025
d6471d6
Disable support for ssp in side bar and clusters
richard-cox Oct 2, 2025
5accc8c
Show alternative restricted, locally paginated home page cluster list
richard-cox Oct 3, 2025
2c337d5
Merge remote-tracking branch 'upstream/master' into pagination-home-p…
richard-cox Oct 10, 2025
4e45ae6
version 2
richard-cox Oct 10, 2025
f60c2c0
V3
richard-cox Oct 10, 2025
5803c9f
v4
richard-cox Oct 14, 2025
599d120
e2e fixes
richard-cox Oct 15, 2025
e1a0d41
Merge remote-tracking branch 'upstream/master' into pagination-home-p…
richard-cox Oct 15, 2025
1b0ea9f
e2e fix with new code
richard-cox Oct 15, 2025
9243a84
Ensure home page does not show console error for base-users who haven…
richard-cox Oct 16, 2025
a1d2fef
Merge remote-tracking branch 'upstream/master' into pagination-home-p…
richard-cox Oct 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@/cypress/e2e/blueprints/global_settings/settings-data';

// If there's more than one cluster the currentCluster used in links can be different to `local`
const settingsClusterId = 'local';
const settingsClusterId = '_';
const settingsPage = new SettingsPagePo(settingsClusterId);
const homePage = new HomePagePo();
const accountPage = new AccountPagePo();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/global-settings/settings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { settings } from '@/cypress/e2e/blueprints/global_settings/settings-data
import UserMenuPo from '@/cypress/e2e/po/side-bars/user-menu.po';

// If there's more than one cluster the currentCluster used in links can be different to `local`
const settingsClusterId = 'local';
const settingsClusterId = '_';
const settingsPage = new SettingsPagePo(settingsClusterId);
const accountPage = new AccountPagePo();
const createKeyPage = new CreateKeyPagePo();
Expand Down
5 changes: 3 additions & 2 deletions cypress/e2e/tests/pages/users-and-auth/azuread.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import HomePagePo from '@/cypress/e2e/po/pages/home.po';
import AzureadPo from '@/cypress/e2e/po/edit/auth/azuread.po';
import { AuthProvider, AuthProviderPo } from '@/cypress/e2e/po/pages/users-and-auth/authProvider.po';

const authProviderPo = new AuthProviderPo('local');
const azureadPo = new AzureadPo('local');
const authClusterId = '_';
const authProviderPo = new AuthProviderPo(authClusterId);
const azureadPo = new AzureadPo(authClusterId);

const tenantId = '564b6f53-ebf4-43c3-8077-44c56a44990a';
const applicationId = '18cca356-170e-4bd9-a4a4-2e349855f96b';
Expand Down
5 changes: 3 additions & 2 deletions cypress/e2e/tests/pages/users-and-auth/cognito.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import HomePagePo from '@/cypress/e2e/po/pages/home.po';
import AmazonCognitoPo from '@/cypress/e2e/po/edit/auth/cognito.po';
import { AuthProvider, AuthProviderPo } from '@/cypress/e2e/po/pages/users-and-auth/authProvider.po';

const authProviderPo = new AuthProviderPo('local');
const cognitoPo = new AmazonCognitoPo('local');
const authClusterId = '_';
const authProviderPo = new AuthProviderPo(authClusterId);
const cognitoPo = new AmazonCognitoPo(authClusterId);

const clientId = 'test-client-id';
const clientSecret = 'test-client-secret';
Expand Down
5 changes: 3 additions & 2 deletions cypress/e2e/tests/pages/users-and-auth/githubapp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import HomePagePo from '@/cypress/e2e/po/pages/home.po';
import GithubAppPo from '@/cypress/e2e/po/edit/auth/githubapp.po';
import { AuthProvider, AuthProviderPo } from '@/cypress/e2e/po/pages/users-and-auth/authProvider.po';

const authProviderPo = new AuthProviderPo('local');
const githubAppPo = new GithubAppPo('local');
const authClusterId = '_';
const authProviderPo = new AuthProviderPo(authClusterId);
const githubAppPo = new GithubAppPo(authClusterId);

const clientId = 'test-client-id';
const clientSecret = 'test-client-secret';
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/priority/no-vai-setup.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { FeatureFlagsPagePo } from '@/cypress/e2e/po/pages/global-settings/featu

// Vai ('ui-sql-cache') is now on by default. This sets up the `noVai` test suite by disabling it

const featureFlagsPage = new FeatureFlagsPagePo('local');
const featureFlagsPage = new FeatureFlagsPagePo('_');

describe('Disable Vai', { testIsolation: 'off', tags: ['@noVai', '@adminUser'] }, () => {
before(() => {
Expand Down
2 changes: 1 addition & 1 deletion shell/assets/styles/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ H1 {
}

H2 {
font-size: 21px;
font-size: $font-size-h2;
}

H3 {
Expand Down
5 changes: 5 additions & 0 deletions shell/assets/translations/en-us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3824,6 +3824,11 @@ landing:
homepage: Homepage
clusters:
title: Clusters
tooMany:
showAll: Show all clusters (may increase load time)
showSome: Show some clusters (may improve load time)
showingAll: Showing {total} clusters.
showingSome: Showing {rows} of {total} recently created clusters.
provider: Provider
distro: Distro
kubernetesVersion: Kubernetes Version
Expand Down
19 changes: 17 additions & 2 deletions shell/components/SortableTable/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ export default {
<div
v-if="showHeaderRow"
class="fixed-header-actions"
:class="{button: !!$slots['header-button'], 'advanced-filtering': hasAdvancedFiltering}"
:class="{button: !!$slots['header-button'], 'with-sub-header': !!$slots['sub-header-row'], 'advanced-filtering': hasAdvancedFiltering}"
>
<div
:class="bulkActionsClass"
Expand Down Expand Up @@ -1296,6 +1296,12 @@ export default {
<slot name="header-button" />
</div>
</div>
<div
v-if="!!$slots['sub-header-row']"
class="sub-header-row"
>
<slot name="sub-header-row" />
</div>
</div>
<table
ref="table"
Expand Down Expand Up @@ -2047,8 +2053,17 @@ export default {
grid-template-columns: [bulk] auto [middle] min-content [search] minmax(min-content, 350px);
}

$header-padding: 20px;
.sub-header-row {
padding: 0 0 $header-padding / 2 0;
}

.fixed-header-actions {
padding: 0 0 20px 0;
padding: 0 0 $header-padding 0;
&.with-sub-header {
padding: 0 0 $header-padding / 4 0;
}

width: 100%;
z-index: z-index('fixedTableHeader');
background: transparent;
Expand Down
Loading