admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3741 from xyz-li/app-fix

Browse Source 
Fix search bugs in app template page
This commit is contained in:
KubeSphere CI Bot
2021-04-15 18:20:07 +08:00
committed by GitHub
parent e587887aac 5e09533483
commit ffb0de0f5a
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/openpitrix/applicationversions.go
View File

@@ -550,7 +550,7 @@ func (c *applicationOperator) GetAppVersionFiles(versionId string, request *GetA
switch header.Typeflag {
case tar.TypeReg:
curData, _ := ioutil.ReadAll(tarReader)
name := strings.TrimLeft(header.Name, fmt.Sprintf("%s/", version.GetTrueName()))
name := strings.TrimPrefix(header.Name, fmt.Sprintf("%s/", version.GetTrueName()))
res.Files[name] = curData
default:
klog.Errorf(

3
pkg/models/openpitrix/repos.go
View File

@@ -274,9 +274,10 @@ func (c *repoOperator) ListRepos(conditions *params.Conditions, orderBy string,
}
func helmRepoFilter(namePrefix string, list []*v1alpha1.HelmRepo) (res []*v1alpha1.HelmRepo) {
lowerPrefix := strings.ToLower(namePrefix)
for _, repo := range list {
name := repo.GetTrueName()
if strings.Contains(name, namePrefix) {
if strings.Contains(strings.ToLower(name), lowerPrefix) {
res = append(res, repo)
}
}

16
pkg/models/openpitrix/utils.go
View File

@@ -586,7 +586,7 @@ func filterAppByName(app *v1alpha1.HelmApplication, namePart string) bool {
}
name := app.GetTrueName()
if strings.Contains(name, namePart) {
if strings.Contains(strings.ToLower(name), strings.ToLower(namePart)) {
return true
}
return false
@@ -615,7 +615,7 @@ func filterAppReviews(versions []*v1alpha1.HelmApplicationVersion, conditions *p
curr := 0
for i := 0; i < len(versions); i++ {
if conditions.Match[Keyword] != "" {
if !(strings.Contains(versions[i].Spec.Name, conditions.Match[Keyword])) {
if !(strings.Contains(strings.ToLower(versions[i].Spec.Name), strings.ToLower(conditions.Match[Keyword]))) {
continue
}
}
@@ -645,8 +645,8 @@ func filterAppVersions(versions []*v1alpha1.HelmApplicationVersion, conditions *
curr := 0
for i := 0; i < len(versions); i++ {
if conditions.Match[Keyword] != "" {
if !(strings.Contains(versions[i].Spec.Version, conditions.Match[Keyword]) ||
strings.Contains(versions[i].Spec.AppVersion, conditions.Match[Keyword])) {
if !(strings.Contains(strings.ToLower(versions[i].Spec.Version), strings.ToLower(conditions.Match[Keyword])) ||
strings.Contains(strings.ToLower(versions[i].Spec.AppVersion), strings.ToLower(conditions.Match[Keyword]))) {
continue
}
}
@@ -754,11 +754,11 @@ func filterReleases(releases []*v1alpha1.HelmRelease, conditions *params.Conditi
curr := 0
for i := 0; i < len(releases); i++ {
keyword := conditions.Match[Keyword]
keyword := strings.ToLower(conditions.Match[Keyword])
if keyword != "" {
fv := strings.Contains(releases[i].GetTrueName(), keyword) ||
strings.Contains(releases[i].Spec.ChartVersion, keyword) ||
strings.Contains(releases[i].Spec.ChartAppVersion, keyword)
fv := strings.Contains(strings.ToLower(releases[i].GetTrueName()), keyword) ||
strings.Contains(strings.ToLower(releases[i].Spec.ChartVersion), keyword) ||
strings.Contains(strings.ToLower(releases[i].Spec.ChartAppVersion), keyword)
if !fv {
continue
}