From a374157d6f5078e77c9eeb56ec64863c50155a9b Mon Sep 17 00:00:00 2001
From: Prabhat Khera <91852476+prabhat-org@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:34:10 +1300
Subject: [PATCH] fix(ui): update search placeholder [EE-6667] (#11191)

* update search placeholder

* remove box selector description
---
 .../helm-templates-list/helm-templates-list.html  |  2 +-
 app/kubernetes/views/deploy/deployController.js   |  2 +-
 .../BoxSelector/common-options/build-methods.tsx  |  6 ------
 .../HelmRepositoryDatatable.tsx                   | 15 +++++++++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

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 @@
 
     <div class="searchBar vertical-center !mr-0">
       <pr-icon icon="'search'" class="searchIcon"></pr-icon>
-      <input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search for a chart..." auto-focus ng-model-options="{ debounce: 300 }" />
+      <input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus ng-model-options="{ debounce: 300 }" />
     </div>
     <div class="w-1/5">
       <por-select
diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js
index fb792b709..f214e27fe 100644
--- a/app/kubernetes/views/deploy/deployController.js
+++ b/app/kubernetes/views/deploy/deployController.js
@@ -34,7 +34,7 @@ class KubernetesDeployController {
       { ...git, value: KubernetesDeployBuildMethods.GIT },
       { ...editor, value: KubernetesDeployBuildMethods.WEB_EDITOR },
       { ...url, value: KubernetesDeployBuildMethods.URL },
-      { ...customTemplate, description: 'Use custom template', value: KubernetesDeployBuildMethods.CUSTOM_TEMPLATE },
+      { ...customTemplate, value: KubernetesDeployBuildMethods.CUSTOM_TEMPLATE },
       { ...helm, value: KubernetesDeployBuildMethods.HELM },
     ];
 
diff --git a/app/react/components/BoxSelector/common-options/build-methods.tsx b/app/react/components/BoxSelector/common-options/build-methods.tsx
index 678a45c6d..9c6366a3c 100644
--- a/app/react/components/BoxSelector/common-options/build-methods.tsx
+++ b/app/react/components/BoxSelector/common-options/build-methods.tsx
@@ -10,7 +10,6 @@ export const editor: BoxSelectorOption<'editor'> = {
   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() {
     <Datatable
       getRowId={(row) => String(row.Id)}
       dataset={helmRepos}
-      description={<HelmDatatableDescription />}
+      description={<HelmDatatableDescription isAdmin={isAdminUser} />}
       settingsManager={tableState}
       columns={columns}
       title="Helm repositories"
@@ -74,15 +77,19 @@ export function HelmRepositoryDatatable() {
   );
 }
 
-function HelmDatatableDescription() {
+function HelmDatatableDescription({ isAdmin }: { isAdmin: boolean }) {
   return (
     <TextTip color="blue" className="mb-3">
       Adding a Helm repo here only makes it available in your own user
       account&apos;s Portainer UI. Helm charts are pulled down from these repos
       (plus the{' '}
-      <Link to="portainer.settings" params={{ '#': 'kubernetes-settings' }}>
+      {isAdmin ? (
+        <Link to="portainer.settings" params={{ '#': 'kubernetes-settings' }}>
+          <span>globally-set Helm repo</span>
+        </Link>
+      ) : (
         <span>globally-set Helm repo</span>
-      </Link>
+      )}
       ) and shown in the Create from Manifest screen&apos;s Helm charts list.
     </TextTip>
   );