Skip to content

Consolidate two project secret columns into one#16642

Merged
momesgin merged 13 commits intorancher:masterfrom
momesgin:remove-columns
Feb 26, 2026
Merged

Consolidate two project secret columns into one#16642
momesgin merged 13 commits intorancher:masterfrom
momesgin:remove-columns

Conversation

@momesgin
Copy link
Copy Markdown
Member

@momesgin momesgin commented Feb 12, 2026

Summary

Fixes #14892

Occurred changes and/or fixed issues

  • Consolidated the "Created by Project Secret" and "Project Secret" columns in the Secrets list into a single "Origin" column.
  • Added a new SecretOrigin formatter component to handle the display logic for the new column.
  • The "Origin" column displays:
    • "Project Secret" for Project Scoped Secrets (with a tooltip showing the project and cluster).
    • "Via Project Secret" for secrets created by a Project Scoped Secret (with a tooltip showing the source secret and project).
  • Added optional chaining to the project lookup in shell/edit/secret/index.vue to prevent potential runtime errors.

Technical notes summary

  • Replaced SECRET_CLONE and SECRET_PROJECT_SCOPED headers with SECRET_ORIGIN in shell/config/table-headers.js and shell/list/secret.vue.
  • The new SecretOrigin.vue component handles fetching necessary project/cluster data for the tooltip if it's missing from the store.
  • Removed the now unused clusterAndProjectLabel getter from shell/models/secret.js.
  • Sorting for the new column is based on the management.cattle.io/project-scoped-secret-copy annotation.

Areas or cases that should be tested

Make sure to enable this option "Show dynamic Namespaces managed by Rancher (not intended for editing or deletion)" in preferences to be able to see the PSS created from downstream clusters in the local's secrets list page.

  • Secrets List:
    • Verify that standard secrets have an empty or dash indicator in the "Origin" column.
    • Verify that Project Scoped Secrets display "Project Secret" in the "Origin" column.
    • Verify that Copied Secrets (created by a Project Scoped Secret) display "Via Project Secret".
    • Hover over the values in the "Origin" column to ensure the tooltips display the correct project/cluster information.

Areas which could experience regressions

  • Secrets list table layout and sorting behaviour.
  • Test sorting by the "Origin" column to ensure it behaves as before.
  • Tooltip display for secrets with missing project/cluster metadata.

Screenshot/Video

image image image

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes
  • The PR has been reviewed in terms of Accessibility
  • The PR has considered, and if applicable tested with, the three Global Roles Admin, Standard User and User Base

@momesgin momesgin requested a review from richard-cox February 12, 2026 02:08
@momesgin momesgin self-assigned this Feb 12, 2026
return this.$rootGetters[`${ STORE.MANAGEMENT }/byId`](MANAGEMENT.PROJECT, `${ this.projectScopedClusterId }/${ this.projectScopedProjectId }`);
}

get clusterAndProjectLabel() {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was not needed anymore

@momesgin momesgin added this to the v2.14.0 milestone Feb 25, 2026
@momesgin momesgin marked this pull request as ready for review February 25, 2026 00:40
@momesgin momesgin requested a review from richard-cox February 25, 2026 00:40
@momesgin momesgin changed the title Replace pss columns with tooltips Consolidate two project secret columns into one Feb 25, 2026
Copy link
Copy Markdown
Member

@richard-cox richard-cox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just two small comments, with suggested updates, otherwise looks good.

Appreciated the inline comments as well

@momesgin momesgin merged commit 90ce39c into rancher:master Feb 26, 2026
67 of 68 checks passed
@momesgin momesgin deleted the remove-columns branch February 26, 2026 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Secrets list - visual bugs

2 participants