diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html index 4c9e64a0d..7a622c042 100644 --- a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html +++ b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html @@ -6,7 +6,7 @@
= { icon: Edit, iconType: 'badge', label: 'Web editor', - description: 'Use our Web editor', value: 'editor', }; @@ -19,7 +18,6 @@ export const upload: BoxSelectorOption<'upload'> = { icon: UploadCloud, iconType: 'badge', label: 'Upload', - description: 'Upload from your computer', value: 'upload', }; @@ -28,7 +26,6 @@ export const git: BoxSelectorOption<'repository'> = { icon: GitIcon, iconType: 'logo', label: 'Repository', - description: 'Use a git repository', value: 'repository', }; @@ -46,7 +43,6 @@ export const customTemplate: BoxSelectorOption<'template'> = { icon: FileText, iconType: 'badge', label: 'Custom template', - description: 'Use a custom template', value: 'template', }; @@ -54,7 +50,6 @@ export const helm: BoxSelectorOption<'helm'> = { id: 'method_helm', icon: Helm, label: 'Helm chart', - description: 'Use a Helm chart', value: 'helm', iconClass: '!text-[#0f1689] th-dark:!text-white th-highcontrast:!text-white', }; @@ -64,6 +59,5 @@ export const url: BoxSelectorOption<'url'> = { icon: Globe, iconType: 'badge', label: 'URL', - description: 'Specify a URL to a file', value: 'url', }; diff --git a/app/react/portainer/account/AccountView/HelmRepositoryDatatable/HelmRepositoryDatatable.tsx b/app/react/portainer/account/AccountView/HelmRepositoryDatatable/HelmRepositoryDatatable.tsx index 82d162d28..b7a23252b 100644 --- a/app/react/portainer/account/AccountView/HelmRepositoryDatatable/HelmRepositoryDatatable.tsx +++ b/app/react/portainer/account/AccountView/HelmRepositoryDatatable/HelmRepositoryDatatable.tsx @@ -2,6 +2,7 @@ import { useMemo, useEffect } from 'react'; import { useCurrentUser } from '@/react/hooks/useUser'; import helm from '@/assets/ico/vendor/helm.svg?c'; +import { isPureAdmin } from '@/portainer/users/user.helpers'; import { Link } from '@@/Link'; import { Datatable } from '@@/datatables'; @@ -22,6 +23,8 @@ export function HelmRepositoryDatatable() { const { user } = useCurrentUser(); const helmReposQuery = useHelmRepositories(user.Id); + const isAdminUser = isPureAdmin(user); + const tableState = useTableState(settingsStore, storageKey); const helmRepos = useMemo(() => { @@ -58,7 +61,7 @@ export function HelmRepositoryDatatable() { String(row.Id)} dataset={helmRepos} - description={} + description={} settingsManager={tableState} columns={columns} title="Helm repositories" @@ -74,15 +77,19 @@ export function HelmRepositoryDatatable() { ); } -function HelmDatatableDescription() { +function HelmDatatableDescription({ isAdmin }: { isAdmin: boolean }) { return ( Adding a Helm repo here only makes it available in your own user account's Portainer UI. Helm charts are pulled down from these repos (plus the{' '} - + {isAdmin ? ( + + globally-set Helm repo + + ) : ( globally-set Helm repo - + )} ) and shown in the Create from Manifest screen's Helm charts list. );